diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue index bacb1632..368ffda1 100644 --- a/src/components/RightToolbar/index.vue +++ b/src/components/RightToolbar/index.vue @@ -60,7 +60,7 @@ export default { props: { columns: { type: Array, - required: true, + default: () => [], }, gutter: { type: Number, @@ -94,9 +94,10 @@ export default { immediate: true, deep: true, handler(val) { - // 复用你原来 transfer 逻辑的“本地副本”思想 - this.innerColumns = val.map((c) => ({ ...c })) - this.backupColumns = val.map((c) => ({ ...c })) + const safeCols = Array.isArray(val) ? val : [] + + this.innerColumns = safeCols.map((c) => ({ ...c })) + this.backupColumns = safeCols.map((c) => ({ ...c })) }, }, }, diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 827fd731..763a72a3 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -2,7 +2,12 @@
- +
@@ -47,7 +52,7 @@ />
-
+
收藏
@@ -182,54 +187,49 @@
- - + 手机号 138****8251
- - + 修改密码
- - + 设置默认首页
- - + 操作手册下载
- - + 一键换肤
- - + 清除缓存
- - + 测试网络速度
- - + 意见反馈/闭环
- - + 联系我们
- + 退出
@@ -254,13 +254,14 @@
-
+
- {{ currentMenu.meta.title }} + {{ item.meta.title }}
-
+ +
@@ -273,7 +274,7 @@ /> - +
@@ -330,48 +331,7 @@
- - -
-
-
我的收藏
-
编辑
-
确定
-
-
-
职能菜单
-
-
-
{{ item.name }}
-
取消
-
-
-
- -
暂无数据
-
-
-
-
-
-
项目菜单
-
-
-
{{ item.name }}
-
取消
-
-
-
- -
暂无数据
-
-
-
-
-
- - { - if (l1.children && l1.children.length) { - level1.push(l1.path) - l1.children.forEach((l2) => { - if (l2.children && l2.children.length) { - level2.push(l2.path) + children.forEach((item) => { + if (item.children && item.children.length) { + // 👉 child 这一层（控制 openLevel1） + item.children.forEach((child) => { + if (child.children && child.children.length) { + level1.push(child.path) + + // 👉 c2 这一层（控制 openLevel2） + child.children.forEach((c2) => { + if (c2.children && c2.children.length) { + level2.push(c2.path) + } + }) } }) } @@ -638,47 +592,6 @@ export default { }, } - - diff --git a/src/views/index.vue b/src/views/index.vue index ca3dcf67..7a6c954b 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -2655,83 +2655,79 @@ export default { // 对于有多个出线的节点，默认高亮第一条线 if (nodeId === 'equipmentLedger') { // 装备台账 - this.$router.push({ path: '/equipment/equipment-ledger' }) - } else if (nodeId === 'equipmentShelf') { - this.$router.push({ path: '/equipment/equipment-ledger' }) + this.$router.push({ path: '/equipment/manage/equipment-ledger' }) } else if (nodeId === 'equipmentRepair') { // 维修申请 - this.$router.push({ path: '/equipmentRepair/repairList' }) + this.$router.push({ path: '/all/equipmentRepair/repairList' }) } else if (nodeId === 'equipmentEntry') { // 装备录入 this.$router.push({ path: '/equipment/equipment-entry-apply' }) } else if (nodeId === 'entryAudit') { // 装备录入审核 this.$router.push({ path: '/equipment/equipment-entry-approval' }) - } else if (nodeId === 'equipmentOffShelf') { - this.$router.push({ path: '/equipment/equipment-ledger' }) } else if (nodeId === 'selfUseOut') { this.$router.push({ path: '/equipment/euq-out' }) } else if (nodeId === 'retire-apply') { // 退役申请 - this.$router.push({ path: '/business/EquipmentRetireApply/equipment/retire-apply' }) + this.$router.push({ path: '/all/business/EquipmentRetireApply/equipment/retire-apply' }) } else if (nodeId === 'equipmentReturn' || nodeId === 'shareReturn') { this.$router.push({ path: '/equipment/equ-repair' }) } else if (nodeId === 'rentalHall') { // 共享大厅 - this.$router.push({ path: '/equipmentShared/MallIframe' }) + this.$router.push({ path: '/equipmentShared/app/MallIframe' }) } else if (nodeId === 'shareOut') { // 共享出库 - this.$router.push({ path: '/equipmentShared/order/equipment-shared-lessor' }) + this.$router.push({ path: '/equipmentShared/app/order/equipment-shared-lessor' }) } else if (nodeId === 'equStore') { this.$router.push({ path: '/equipment/equStore' }) } else if (nodeId === 'sharedLessor') { // 共享订单 - this.$router.push({ path: '/equipmentShared/order/equipment-shared-order' }) + this.$router.push({ path: '/equipmentShared/app/order/equipment-shared-order' }) } else if (nodeId === 'warehouse') { // 退库申请 - this.$router.push({ path: '/business/warehouse/index' }) + this.$router.push({ path: '/all/business/warehouse/index' }) } else if (nodeId === 'outbound') { // 自用出库 - this.$router.push({ path: '/business/outbound/index' }) + this.$router.push({ path: '/all/business/outbound/index' }) } else if (nodeId === 'toolsLedger') { // 工具台账 - this.$router.push({ path: '/equipment/toolsLedger' }) + this.$router.push({ path: '/equipment/manage/tools/toolsLedger' }) } else if (nodeId === 'equipmen') { // 装备上架 - this.$router.push({ path: '/equipmentShared/euqipmentUpOrDown/equipmen' }) + this.$router.push({ path: '/equipmentShared/shareManage/euqipmentUpOrDown/equipmen' }) } else if (nodeId === 'tool') { // 工具上架 - this.$router.push({ path: '/equipmentShared/euqipmentUpOrDown/tool' }) + this.$router.push({ path: '/equipmentShared/shareManage/euqipmentUpOrDown/tool' }) } else if (nodeId === 'auditList') { // 自用审核 - this.$router.push({ path: '/business/outbound/auditList' }) + this.$router.push({ path: '/all/business/outbound/auditList' }) } else if (nodeId === 'applyList') { // 自用申请 - this.$router.push({ path: '/business/outbound/applyList' }) + this.$router.push({ path: '/all/business/outbound/addApply' }) } else if (nodeId === 'approveList') { // 工具录入审核 this.$router.push({ path: '/toolsManage/approveList' }) } else if (nodeId === 'EquipmentRetireApply') { // 退役审核 - this.$router.push({ path: '/business/EquipmentRetireApply/EquipmentRetireApply' }) + this.$router.push({ path: '/all/business/EquipmentRetireApply/EquipmentRetireApply' }) } else if (nodeId === 'repairAuditList') { // 维修审核 - this.$router.push({ path: '/equipmentRepair/repairAuditList' }) + this.$router.push({ path: '/all/equipmentRepair/repairAuditList' }) } else if (nodeId === 'warehouse-auditList') { // 退库审核 - this.$router.push({ path: '/business/warehouse/auditList' }) + this.$router.push({ path: '/all/business/warehouse/auditList' }) } else if (nodeId === 'applicantList') { // 工具录入申请 this.$router.push({ path: '/toolsManage/applicantList' }) } else if (nodeId === 'codeToolsLedger') { // 编码工具台账 - this.$router.push({ path: '/equipment/codeToolsLedger'}) + this.$router.push({ path: '/equipment/manage/tools/codeToolsLedger'}) } else if (nodeId === 'inventoryAudit') { // 入库审核 - this.$router.push({ path: '/stockManagement/inventoryAudit' }) + this.$router.push({ path: '/all/stockManagement/inventoryAudit' }) } else if (nodeId == 'entryApply') { // 入库申请 - this.$router.push({ path: '/stockManagement/entryApply'}) + this.$router.push({ path: '/all/stockManagement/entryApply'}) } }, }, diff --git a/src/views/screen/wsScreen/components/center/index-ah.vue b/src/views/screen/wsScreen/components/center/index-ah.vue index fead39f7..c06e3888 100644 --- a/src/views/screen/wsScreen/components/center/index-ah.vue +++ b/src/views/screen/wsScreen/components/center/index-ah.vue @@ -416,7 +416,7 @@ export default { console.log('🚀 ~ initChart ~ params.data-->>:', params.data) if (!params.data) return this.$router.push({ - path: '/equipment/equipment-ledger', + path: '/equipment/manage/equipment-ledger', query: { parentId: params.data.parentId, deptId: params.data.deptId, diff --git a/src/views/screen/wsScreen/components/center/index.vue b/src/views/screen/wsScreen/components/center/index.vue index 5b8fbc88..1a76e61c 100644 --- a/src/views/screen/wsScreen/components/center/index.vue +++ b/src/views/screen/wsScreen/components/center/index.vue @@ -423,7 +423,7 @@ export default { console.log('🚀 ~ initChart ~ params.data-->>:', params.data) if (!params.data) return this.$router.push({ - path: '/equipment/equipment-ledger', + path: '/equipment/manage/equipment-ledger', query: { parentId: params.data.parentId, deptId: params.data.deptId, diff --git a/src/views/screen/wsScreenWidescreen/components/center/index-ah.vue b/src/views/screen/wsScreenWidescreen/components/center/index-ah.vue index 8e62fd61..1c524d7a 100644 --- a/src/views/screen/wsScreenWidescreen/components/center/index-ah.vue +++ b/src/views/screen/wsScreenWidescreen/components/center/index-ah.vue @@ -416,7 +416,7 @@ export default { console.log('🚀 ~ initChart ~ params.data-->>:', params.data) if (!params.data) return this.$router.push({ - path: '/equipment/equipment-ledger', + path: '/equipment/manage/equipment-ledger', query: { parentId: params.data.parentId, deptId: params.data.deptId, diff --git a/src/views/screen/wsScreenWidescreen/components/center/index.vue b/src/views/screen/wsScreenWidescreen/components/center/index.vue index 3cadbd0e..6d8932d0 100644 --- a/src/views/screen/wsScreenWidescreen/components/center/index.vue +++ b/src/views/screen/wsScreenWidescreen/components/center/index.vue @@ -423,7 +423,7 @@ export default { console.log('🚀 ~ initChart ~ params.data-->>:', params.data) if (!params.data) return this.$router.push({ - path: '/equipment/equipment-ledger', + path: '/equipment/manage/equipment-ledger', query: { parentId: params.data.parentId, deptId: params.data.deptId, diff --git a/src/views/stockManagement/entryApply/apply.vue b/src/views/stockManagement/entryApply/apply.vue index 7e9e38fd..c6772a34 100644 --- a/src/views/stockManagement/entryApply/apply.vue +++ b/src/views/stockManagement/entryApply/apply.vue @@ -48,7 +48,7 @@ export default { }, methods: { goBack() { - this.$router.push({ path: '/stockManagement/entryApply' }).then(() => { + this.$router.push({ path: '/all/stockManagement/entryApply' }).then(() => { this.$tab.closePage({ path: '/stockManagement/entryApply/apply' }) }) }, diff --git a/src/views/stockManagement/entryApply/components/EquipmentAdd.vue b/src/views/stockManagement/entryApply/components/EquipmentAdd.vue index da4b3e7d..8373e88d 100644 --- a/src/views/stockManagement/entryApply/components/EquipmentAdd.vue +++ b/src/views/stockManagement/entryApply/components/EquipmentAdd.vue @@ -93,21 +93,21 @@ - 导入 + 导入 下载导入模板 - 导入 + 导入 @@ -836,7 +836,7 @@ export default { { key: 42, label: `特征项9`, prop: 'featureItem9', visible: true }, { key: 43, label: `特征值9`, prop: 'featureValue9', visible: true } ], - fieldVoList:[], + fieldVoList:[], dialogVisible: false, dialogTitle: '', dialogList: [], @@ -1051,7 +1051,7 @@ export default { // 返回上一页 goBack() { // this.$router.go(-1) - this.$router.push({ path: '/stockManagement/entryApply' }) + this.$router.push({ path: '/all/stockManagement/entryApply' }) }, async approval(row, status) { equipmentPassAndRejectApiNew({ devIds: row.maId, status: status, id: this.orderId }).then((res) => { diff --git a/src/views/stockManagement/entryApply/index.vue b/src/views/stockManagement/entryApply/index.vue index 414b81b6..c6961b49 100644 --- a/src/views/stockManagement/entryApply/index.vue +++ b/src/views/stockManagement/entryApply/index.vue @@ -223,7 +223,7 @@ export default { query: { isAddVisible: false, isApprovalVisible: false } }) .then(() => { - this.$tab.closePage({ path: '/stockManagement/entryApply' }) + this.$tab.closePage({ path: '/all/stockManagement/entryApply' }) }) }, // 编辑 @@ -241,7 +241,7 @@ export default { } }) .then(() => { - this.$tab.closePage({ path: '/stockManagement/entryApply' }) + this.$tab.closePage({ path: '/all/stockManagement/entryApply' }) }) }, // 删除 diff --git a/src/views/stockManagement/inventoryAudit/index.vue b/src/views/stockManagement/inventoryAudit/index.vue index d6b13e64..a1a7c345 100644 --- a/src/views/stockManagement/inventoryAudit/index.vue +++ b/src/views/stockManagement/inventoryAudit/index.vue @@ -217,7 +217,7 @@ export default { }, }) .then(() => { - this.$tab.closePage({ path: '/stockManagement/entryApply' }) + this.$tab.closePage({ path: '/all/stockManagement/entryApply' }) }) }, // 提交 diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 7eb1a9f9..92639577 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -33,7 +33,7 @@ 菜单管理列表 - 共{{total}}条记录 +