From 1038d9478039695259dff35ae3eff26b95b55761 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 23 五月 2025 18:04:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/dnc/base/modules/DeviceStructure/DeviceStructureTreeContextMenu.vue |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTreeContextMenu.vue b/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTreeContextMenu.vue
index 001b2db..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,15 +41,18 @@
     },
     computed: {
       getCurrentMenuLevel() {
-        if (!this.treeParams.equipmentId) return 'workshop'
+        if (this.treeParams.type===1) return 'workshop'
         else return 'device'
       }
     },
     methods: {
       onContextMenuClick(treeKey, menuKey) {
         const level = this.getCurrentMenuLevel
-        const treeNodeInfo = Object.assign({}, this.treeParams)
-        if (treeNodeInfo.equipmentId) treeNodeInfo.type = 4
+        const { param } = this.treeParams
+        const treeNodeInfo = Object.assign({}, this.treeParams, { param })
+        console.log('treeNodeInfo++++++++++++++++++++++++++++', treeNodeInfo)
+        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