From 95b6a6388e4cc4e6ed0f54cc04212a86cd8cf829 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 23 五月 2025 13:37:09 +0800
Subject: [PATCH] 1、用户管理新增和编辑用户时设置工单为必填项 2、新增终端登录、首页、设备点检、故障上报、上下班打卡、停机原因维护页面（未与后端联调且客户未确定页面设计）并调整全局路由守卫相关逻辑 3、调整设备结构树设备层级和车间层级区分的判断条件 4、调整电子样板检索与部件借用弹窗列表与搜索区域样式
---
src/views/dnc/base/modules/DeviceStructure/DeviceStructureTreeContextMenu.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTreeContextMenu.vue b/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTreeContextMenu.vue
index 61f72e4..58082fe 100644
--- a/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTreeContextMenu.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTreeContextMenu.vue
@@ -33,7 +33,7 @@
],
//璁惧
device: [
- { label: '瀵煎叆NC鏂囨。', code: 'device_import', icon: 'import', isCommonMethod: true },
+ { label: '瀵煎叆NC鏂囨。', code: 'device_nc_import', icon: 'import', isCommonMethod: true },
{ label: '鏉冮檺閰嶇疆', code: 'public_assign_permission', icon: 'idcard', isCommonMethod: true }
]
}
@@ -41,7 +41,7 @@
},
computed: {
getCurrentMenuLevel() {
- if (!this.treeParams.equipmentId) return 'workshop'
+ if (this.treeParams.type===1) return 'workshop'
else return 'device'
}
},
@@ -51,8 +51,8 @@
const { param } = this.treeParams
const treeNodeInfo = Object.assign({}, this.treeParams, { param })
console.log('treeNodeInfo++++++++++++++++++++++++++++', treeNodeInfo)
- if (treeNodeInfo.type === 2) treeNodeInfo.type = 4
- // 璁惧缁撴瀯鏍戣妭鐐逛腑鐨勮澶囧眰绾т负2锛屼絾鍦ㄤ骇鍝佺粨鏋勬爲涓皢璁惧灞傜骇鐨則ype璁剧疆涓�4锛屼负淇濊瘉涓や釜缁撴瀯鏍戝叡鐢ㄧ殑鏂规硶鑳芥甯歌繍琛岋紝鍥犳鍦ㄦ澶勫悓鏍疯缃负4
+ if (treeNodeInfo.type === 2) treeNodeInfo.type = 7
+ // 璁惧缁撴瀯鏍戣妭鐐逛腑鐨勮澶囧眰绾т负2锛屼絾鍦ㄤ骇鍝佺粨鏋勬爲涓皢璁惧灞傜骇鐨則ype璁剧疆涓�7锛屽洜姝ゅ湪姝ゅ璁剧疆涓�7
const menuKeyArray = menuKey.split('_')
const isCommonMethod = this.defaultContextMenuList[level].find(item => item.code === menuKey).isCommonMethod
// product_add => handleAdd 瑙﹀彂瀵瑰簲缁勪欢浜嬩欢
--
Gitblit v1.9.3