diff --git a/public/favicon.ico b/public/favicon.ico index e3bdd359..47918ab0 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js index 38085d6a..9933c9b7 100644 --- a/src/api/base/orderManage.js +++ b/src/api/base/orderManage.js @@ -113,6 +113,15 @@ export function orderMonitor(query) { }) } +// 获取订单绑定的工单和数量信息，可传订单id列表，map索引为订单id +export function orderAssignmentList(query) { + return request({ + url: '/base/order/orderAssignmentList', + method: 'get', + params: query + }) +} + // 获得所有客户列表 export function customerList() { return request({ diff --git a/src/api/equipment/base/maintain/record.js b/src/api/equipment/base/maintain/record.js index 89f74906..8ca6f36f 100644 --- a/src/api/equipment/base/maintain/record.js +++ b/src/api/equipment/base/maintain/record.js @@ -1,7 +1,7 @@ /* * @Author: Do not edit * @Date: 2023-11-08 15:56:52 - * @LastEditTime: 2023-11-21 10:50:55 + * @LastEditTime: 2023-11-23 19:10:07 * @LastEditors: DY * @Description: */ @@ -32,3 +32,13 @@ export function exportMaintainMonitorExcel(query) { responseType: 'blob' }) } + +// 导出设备保养记录 +export function exportMaintainLogExcel(query) { + return request({ + url: '/base/equipment-maintain-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/equipment/base/repair.js b/src/api/equipment/base/repair.js index c8b115e2..79fb191b 100644 --- a/src/api/equipment/base/repair.js +++ b/src/api/equipment/base/repair.js @@ -1,7 +1,7 @@ /* * @Author: Do not edit * @Date: 2023-11-10 16:09:33 - * @LastEditTime: 2023-11-16 18:57:08 + * @LastEditTime: 2023-11-23 20:29:28 * @LastEditors: DY * @Description: */ @@ -31,3 +31,13 @@ export function deleteRepair(id) { method: 'delete' }) } + +// 导出设备维修 +export function exportRepairLogExcel(query) { + return request({ + url: '/base/equipment-repair-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/extend/processEquMaterialBom.js b/src/api/extend/processEquMaterialBom.js index def6ad48..0a01aa7d 100644 --- a/src/api/extend/processEquMaterialBom.js +++ b/src/api/extend/processEquMaterialBom.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-11-07 19:47:48 - * @LastEditTime: 2023-11-16 17:49:23 + * @LastEditTime: 2023-11-23 13:57:41 * @LastEditors: zhp * @Description: */ @@ -104,3 +104,18 @@ export function getMaterialList(data) { data: data }) } +export function getMaterialCode(data) { + return request({ + url: '/extend/process-equ-material-bom/getCode', + method: 'get', + params: data + }) +} + +export function createProcessEquMaterialBomDetList(data) { + return request({ + url: '/extend/process-equ-material-bom-det/createByList', + method: 'post', + data: data + }) +} diff --git a/src/api/extend/processEquValueBom.js b/src/api/extend/processEquValueBom.js index 93d6a740..6c9b5067 100644 --- a/src/api/extend/processEquValueBom.js +++ b/src/api/extend/processEquValueBom.js @@ -1,7 +1,7 @@ /* * @Author: zhp * @Date: 2023-11-09 09:37:14 - * @LastEditTime: 2023-11-16 17:47:21 + * @LastEditTime: 2023-11-23 14:15:45 * @LastEditors: zhp * @Description: */ @@ -104,3 +104,19 @@ export function getValueList(data) { params: data }) } + +export function getValueCode(data) { + return request({ + url: '/extend/process-equ-value-bom/getCode', + method: 'get', + params: data + }) +} + +export function createProcessEquValueBomDetList(data) { + return request({ + url: '/extend/process-equ-value-bom-det/createByList', + method: 'post', + data: data + }) +} diff --git a/src/assets/icons/svg/order-monitoring.svg b/src/assets/icons/svg/order-monitoring.svg new file mode 100644 index 00000000..5960b5b3 --- /dev/null +++ b/src/assets/icons/svg/order-monitoring.svg @@ -0,0 +1,20 @@ + + + 编组 17 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/return.svg b/src/assets/icons/svg/return.svg new file mode 100644 index 00000000..768c0c40 --- /dev/null +++ b/src/assets/icons/svg/return.svg @@ -0,0 +1,14 @@ + + + rollback + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss index bea1fe9d..4df69394 100644 --- a/src/assets/styles/login.scss +++ b/src/assets/styles/login.scss @@ -37,6 +37,9 @@ $tabWidth: $tabW * 1px; $rowHeight: $rowH * 1px; $buttonHeight: $buttonH * 1px; +// 1080px 高度为基准的 1px +$base1px: 0.15vh; // 1px / 1080px; + // - - - - - 页面基础设置 .container { .login-code { @@ -87,7 +90,7 @@ $buttonHeight: $buttonH * 1px; width: 100%; height: 100%; background-color: #ffffff; - // box-shadow: 0px 16px 40px rgba(0, 0, 0, 0.07); + // box-shadow: 0px calc(16 * 0.12vh) 40px rgba(0, 0, 0, 0.07); // border-radius: 20px; // 定位 position: relative; @@ -100,6 +103,7 @@ $buttonHeight: $buttonH * 1px; // 元素 // width: $picWidth; height: $picHeight; + // height: 10vh; background-image: url($picImage); background-repeat: no-repeat; background-size: 100% 100%; @@ -118,7 +122,7 @@ $buttonHeight: $buttonH * 1px; } .field { position: relative; - margin-top: 8%; + margin-top: 14vh; flex: 2; // width: 800px; display: flex; @@ -130,17 +134,36 @@ $buttonHeight: $buttonH * 1px; text-align: center; clear: both; position: relative; - top: -36px; - height: 128px; + top: calc(-32 * $base1px); + height: calc(128 * $base1px); .title { margin: 0; - margin-left: 32px; + margin-left: calc(28 * 0.12vh); font-weight: 400; user-select: none; color: #000; - font-size: 36px; - line-height: 54px; + font-size: calc(28 * 0.12vh); + line-height: calc(40 * 0.12vh); + letter-spacing: calc(2 * 0.12vh); + + .cnbm_logo { + height: calc(40 * 0.12vh); + width: calc(40 * 0.12vh); + position: relative; + top: calc(8 * 0.12vh); + right: calc(8 * 0.12vh); + } + } + + .sub-title { + margin: 0; + margin-left: calc(28 * 0.12vh); + font-weight: 400; + user-select: none; + color: #000; + font-size: calc(28 * 0.12vh); + line-height: calc(48 * 0.12vh); letter-spacing: 2px; } } @@ -159,10 +182,10 @@ $buttonHeight: $buttonH * 1px; .footer { user-select: none; // 元素 - margin: 12px 0; - height: 16px; - line-height: 16px; - font-size: 12px; + margin: calc(12 * 0.12vh) 0; + height: calc(16 * 0.12vh); + line-height: calc(16 * 0.12vh); + font-size: calc(12 * 0.12vh); color: #8c8c8c; a, @@ -176,12 +199,8 @@ $buttonHeight: $buttonH * 1px; .form { margin-top: 0; box-sizing: border-box; - // width: $formWidth; width: 100%; - // - - - tab - :deep(.el-tabs__nav) { - // background: #f0f3; - } + :deep(.el-tabs__content) { padding: 20px 0 0; } @@ -189,12 +208,13 @@ $buttonHeight: $buttonH * 1px; user-select: none; // 元素 width: $tabWidth; - height: $rowHeight; + // height: $rowHeight; + height: calc(54 * 0.12vh); padding: 0; // 文字 line-height: $rowHeight; color: #666666; - font-size: 18px; + font-size: calc(14 * 0.12vh); font-weight: 400; text-align: center; } @@ -210,7 +230,8 @@ $buttonHeight: $buttonH * 1px; :deep(.el-input__inner) { // 元素 width: 100%; - height: $rowHeight; + // height: $rowHeight; + height: calc(72 * 0.12vh); background: #f5f5f5; border: 0; border-radius: 28px; @@ -280,7 +301,7 @@ $buttonHeight: $buttonH * 1px; margin-bottom: 20px; // 文字 line-height: 26px; - font-size: 20px; + font-size: calc(18 * 0.12vh); color: #ffffff; } .button-active { @@ -299,13 +320,14 @@ $buttonHeight: $buttonH * 1px; :deep(.el-input__inner) { // 元素 width: 420px; - height: 66px; + height: calc(52 * 0.12vh); + // height: 66px; color: #262626; - font-size: 18px; + font-size: calc(14 * 0.12vh); } :deep(.el-checkbox__label) { - font-size: 18px; - line-height: 14px; + font-size: calc(14 * 0.12vh); + line-height: calc(12 * 0.12vh); } } } @@ -314,19 +336,42 @@ $buttonHeight: $buttonH * 1px; @media screen and (min-width: 1920px) { .container { .content { - .field { flex: initial; - width: 800px; + // width: 800px; + width: 40vw; + } + } + } +} + +@media screen and (min-height: 1024px) { + .container { + .content { + .field { + margin-top: 16vh; + } + } + } +} + +@media screen and (max-height: 1024px) { + .container { + .content { + .field { + margin-top: 8vh; } } } } + @media screen and (min-width: 599px) and (max-width: 1366px) { .container { - min-width: 599px; + // min-width: 599px; + min-width: 42vw; + .content { // width: 710px; // height: 397px; @@ -337,6 +382,7 @@ $buttonHeight: $buttonH * 1px; display: none; } .field { + // margin-top: 6vh; // width: calc(710px - 314px); // left: 314px; // justify-content: center; @@ -363,6 +409,14 @@ $buttonHeight: $buttonH * 1px; } } +// @media screen and (max-height: 1080px) { +// .container { +// .field { +// transform: scale(0.74); +// } +// } +// } + /* ===== MOBILE DESIGN ===== */ $mobileW: 375; $mobileH: 812; @@ -503,7 +557,7 @@ $iconBgImage: '../assets/images/icon.png'; .footer { // 元素 - font-size: 12px; + font-size: calc(12 * 0.12vh); font-family: PingFang SC; font-weight: 400; line-height: 17px; @@ -511,7 +565,7 @@ $iconBgImage: '../assets/images/icon.png'; opacity: 0.6; // 定位 // position: absolute; - bottom: -32px; + bottom: -calc(32 * 0.12vh); } } } diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index 53655af5..3c92a2f4 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -347,6 +347,8 @@ export default { console.log('setting code: ', response.data); // 处理输入框数据 this.form[opt.prop] = response.data; + // 更新下外部的 dataForm，防止code字段有数据也报空的bug + this.$emit('update', this.form) } }); } diff --git a/src/mixins/lb/basicPageMixin.js b/src/mixins/lb/basicPageMixin.js index 61d46432..51b89d80 100644 --- a/src/mixins/lb/basicPageMixin.js +++ b/src/mixins/lb/basicPageMixin.js @@ -33,6 +33,7 @@ export default { addUrl: '', pageUrl: '', infoUrl: '', + deleteUrl: '', basePath: '', form: {} }; @@ -60,7 +61,7 @@ export default { return this.$axios({ url, method, - params: method === 'get' ? payload : null, + params: (method === 'get' || method === 'delete') ? payload : null, data: method !== 'get' ? payload : null, }) }, @@ -77,6 +78,7 @@ export default { return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload); }, del(payload) { + debugger; return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload); }, diff --git a/src/styles/index.scss b/src/styles/index.scss index 93916ac0..6b3ebaee 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -163,7 +163,7 @@ input, textarea{ } ::-webkit-scrollbar-thumb { - background-color: rgba(144,147,153,.5); + background-color: #EDEDED; background-clip: padding-box; min-height: 28px; -webkit-border-radius: 2em; @@ -174,7 +174,7 @@ input, textarea{ } ::-webkit-scrollbar-thumb:hover { - background-color: rgba(144,147,153,.3); + background-color: #D9D9D9; } // 抽屉head区域---start diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue index 9a4b5fe2..5ac357bc 100644 --- a/src/views/OperationalOverview/AGVBoard.vue +++ b/src/views/OperationalOverview/AGVBoard.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-07-19 15:18:30 * @LastEditors: zhp - * @LastEditTime: 2023-11-22 13:58:30 + * @LastEditTime: 2023-11-23 11:14:30 * @Description: -->