diff --git a/src/router/index.js b/src/router/index.js index 9cc0ec06..7e3a70db 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -70,20 +70,20 @@ export const constantRoutes = [ ] }, - /* { - path: '', - component: Layout, - redirect: 'index1', - children: [ - { - path: 'index1', - component: () => import('@/views/index'), - name: 'Index1', - meta: { title: '快捷导航', icon: 'dashboard', affix: true } - }, + { + path: '', + component: Layout, + redirect: 'index1', + children: [ + { + path: 'index1', + component: () => import('@/views/index'), + name: 'Index1', + meta: { title: '快捷导航', icon: 'dashboard', affix: true } + }, - ] - }, */ + ] + }, { path: '/qrCode/qrCodePage', component: () => import('@/views/qrCode/qrCode'), diff --git a/src/views/business/apply/applyList.vue b/src/views/business/apply/applyList.vue index 114809a6..73016b7d 100644 --- a/src/views/business/apply/applyList.vue +++ b/src/views/business/apply/applyList.vue @@ -71,7 +71,7 @@ - 自用申请列表 + 出库申请列表 新建申请 diff --git a/src/views/business/audit/addAudit.vue b/src/views/business/audit/addAudit.vue index 1d73a27e..a9505a35 100644 --- a/src/views/business/audit/addAudit.vue +++ b/src/views/business/audit/addAudit.vue @@ -35,7 +35,7 @@ - 自用审核列表 + 出库审核列表 diff --git a/src/views/business/audit/auditList.vue b/src/views/business/audit/auditList.vue index ab08e6aa..ca8a34dd 100644 --- a/src/views/business/audit/auditList.vue +++ b/src/views/business/audit/auditList.vue @@ -69,7 +69,7 @@ - 自用审核列表 + 出库审核列表 - 自用出库列表 + 出库执行列表 全部出库 diff --git a/src/views/business/outbound/index.vue b/src/views/business/outbound/index.vue index 1dba0dcc..e0f57684 100644 --- a/src/views/business/outbound/index.vue +++ b/src/views/business/outbound/index.vue @@ -50,7 +50,7 @@ - 自用出库列表 + 出库执行列表
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
-
-
- - - - - - - - - - -
- - - - - -
-
-
- - - - - - - -
- - - - - -
-
-
- - - - - - - - -
- - - - - -
-
-
- - - - - - - - -
- - - - - -
-
-
- - - - - - - - -
- - - - - -
-
-
- - - - - - - - -
- - - - - - - - - - - -
-
-
- - - - - - - - -
- - - - - -
-
-
- - - - - + + - + - -
- - + +
+ + + - - + +
+
+
- - - - - -
-
-
- - - - - - - - - + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
- - - - + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
- - - - + + + + + + + + + + + + + + + + +
+ + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
- - - - - - - - + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
- - - - + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
- - - - + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
- - - - + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
- - - - + + - + style="cursor: pointer"> + - -
- - - + +
+ + - -
-
-
+ + - - - - - - + + + + +
+
+
+ + + + - + style="cursor: pointer"> + - -
- - - + +
+ + - -
-
-
+ + - - - - + + + + +
+
+
+ + + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
- - - - + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
- - - - + + - + style="cursor: pointer"> + - -
- - - + +
+ + + - -
-
-
+ +
+
+
+ + + + + + + +
+ + + + + +
+
+
+ + + + + + + +
+ + + + + +
+
+
+ + + + + + + +
+ + + + + +
+
+
+ + + + + + + +
+ + + + + +
+
+
+ + + + + + + +
+ + + + + +
+
+
+ + + + + + + + +
+ + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + +
@@ -2802,7 +2660,7 @@ export default { this.$router.push({ path: '/equipment/equipment-ledger' }) } else if (nodeId === 'equipmentRepair') { // 维修申请 - this.$router.push({ path: '/business/equipmentRepair/repairList' }) + this.$router.push({ path: '/equipmentRepair/repairList' }) } else if (nodeId === 'equipmentEntry') { // 装备录入 this.$router.push({ path: '/equipment/equipment-entry-apply' }) @@ -2858,13 +2716,22 @@ export default { this.$router.push({ path: '/business/EquipmentRetireApply/EquipmentRetireApply' }) } else if (nodeId === 'repairAuditList') { // 维修审核 - this.$router.push({ path: '/business/equipmentRepair/repairAuditList' }) + this.$router.push({ path: '/equipmentRepair/repairAuditList' }) } else if (nodeId === 'warehouse-auditList') { // 退库审核 this.$router.push({ path: '/business/warehouse/auditList' }) } else if (nodeId === 'applicantList') { // 工具录入申请 this.$router.push({ path: '/toolsManage/applicantList' }) + } else if (nodeId === 'codeToolsLedger') { + // 编码工具台账 + this.$router.push({ path: '/equipment/codeToolsLedger'}) + } else if (nodeId === 'inventoryAudit') { + // 入库审核 + this.$router.push({ path: '/stockManagement/inventoryAudit' }) + } else if (nodeId == 'entryApply') { + // 入库申请 + this.$router.push({ path: '/stockManagement/entryApply'}) } }, }, @@ -2875,7 +2742,7 @@ export default { .flowchart-container { background-image: url('../assets/images/index-bg.png'); background-size: 100% 100%; - padding-top: 58px; + padding-top: 28px; height: calc(100vh - 86px); display: flex; flex-direction: column; diff --git a/src/views/screen/cityScreen/components/countryMap/index.vue b/src/views/screen/cityScreen/components/countryMap/index.vue index 8383940f..76777b22 100644 --- a/src/views/screen/cityScreen/components/countryMap/index.vue +++ b/src/views/screen/cityScreen/components/countryMap/index.vue @@ -209,10 +209,10 @@ export default { }, label: { normal: { - show: false, + show: true, fontSize: 12, fontWeight: 500, - color: 'rgba(255,255,255,0.5)', + color: 'rgba(255,255,255,0.8)', }, emphasis: { show: true, diff --git a/src/views/screen/cityScreen/components/maintenance/index.vue b/src/views/screen/cityScreen/components/maintenance/index.vue index 77ccb936..78f424b7 100644 --- a/src/views/screen/cityScreen/components/maintenance/index.vue +++ b/src/views/screen/cityScreen/components/maintenance/index.vue @@ -9,7 +9,7 @@
-
+
序号
工序
@@ -162,11 +162,12 @@ export default { .tableHeader { width: 100%; height: 15%; - background-color: #082d6e; - opacity: 0.8; - font-size: 10px; + background-image: url('../../../../../assets/cityScreen/tableHeader.png'); + background-size: 100% 100%; + font-size: 11px; display: flex; align-items: center; + font-weight: 800; } .tableBox { @@ -200,7 +201,7 @@ export default { } .header { - color: #ccc; + color: #72b1f1; padding: 4px 0; width: 25%; height: 100%; @@ -208,7 +209,7 @@ export default { display: flex; align-items: center; justify-content: center; - font-size: 10px; + font-size: 11px; } ::-webkit-scrollbar { diff --git a/src/views/screen/cityScreen/components/retire/index.vue b/src/views/screen/cityScreen/components/retire/index.vue index 99e536c3..bc3ff9c2 100644 --- a/src/views/screen/cityScreen/components/retire/index.vue +++ b/src/views/screen/cityScreen/components/retire/index.vue @@ -10,25 +10,25 @@
-
+
序号
-
工序
-
设备
-
预警情况
+
工序
+
设备
+
预警情况
{{ index + 1 }}
-
+
{{ item.procedureName }}
-
+
{{ item.deviceName }}
-
+
{{ item.situation }}
@@ -163,9 +163,10 @@ export default { .tableHeader { width: 100%; height: 15%; - background-color: #082d6e; - opacity: 0.8; - font-size: 10px; + background-image: url('../../../../../assets/cityScreen/tableHeader.png'); + background-size: 100% 100%; + font-size: 13px; + font-weight: 800; display: flex; align-items: center; } @@ -206,7 +207,7 @@ export default { } .header { - color: #ccc; + color: #72b1f1; padding: 4px 0; width: 25%; height: 100%; @@ -214,7 +215,7 @@ export default { display: flex; align-items: center; justify-content: center; - font-size: 10px; + font-size: 11px; } // @media screen and (min-width: 1080px) { diff --git a/src/views/screen/cityScreen/index.vue b/src/views/screen/cityScreen/index.vue index 6c2a2c8a..9f8565d0 100644 --- a/src/views/screen/cityScreen/index.vue +++ b/src/views/screen/cityScreen/index.vue @@ -207,7 +207,7 @@ export default { } .right_3 { - height: 306px; + height: 270px; grid-row: 7 / 12; display: flex; }