From 82e8bf2e0b142df7e2d544173154b42e74aafa35 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 28 Feb 2025 09:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A3=80=E6=B5=8B=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/device/testScript/index.ts   |  3 ++-
 .../api/system/dictionary/dictTree/index.ts   |  9 ++++-----
 .../machine/testScript/components/tree.vue    | 20 +++++++++++++------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/frontend/src/api/device/testScript/index.ts b/frontend/src/api/device/testScript/index.ts
index 396773c..55bf0a3 100644
--- a/frontend/src/api/device/testScript/index.ts
+++ b/frontend/src/api/device/testScript/index.ts
@@ -1,5 +1,6 @@
 import type { TestScript } from '@/api/device/interface/testScript'
 import http from '@/api'
+import { Loading } from '@element-plus/icons-vue'
 
 /**
  * @name 检测脚本管理模块
@@ -48,5 +49,5 @@ export const scriptDtlsCheckDataList = (params: any) => {
 }
 // 通讯脚本回显
 export const checkDataList = (params: any) => {
-    return http.post(`/pqScript/checkDataList`, params)
+    return http.post(`/pqScript/checkDataList`, params, { loading: true })
 }
diff --git a/frontend/src/api/system/dictionary/dictTree/index.ts b/frontend/src/api/system/dictionary/dictTree/index.ts
index 4abe467..bc2e4de 100644
--- a/frontend/src/api/system/dictionary/dictTree/index.ts
+++ b/frontend/src/api/system/dictionary/dictTree/index.ts
@@ -1,15 +1,15 @@
 import http from '@/api'
 import { type Dict } from '@/api/system/dictionary/interface'
-import {c} from "vite/dist/node/types.d-aGj9QkWt";
+import { c } from 'vite/dist/node/types.d-aGj9QkWt'
 
 //获取字典类型
 export const getDictTreeByCode = (params: Dict.ResDictTree) => {
-    const code = params.code || '';
-    return http.get(`/dictTree/getTreeByCode?code=${code}`)
+    const code = params.code || ''
+    return http.get(`/dictTree/getTreeByCode?code=${code}`, { loading: true })
 }
 
 export const getDictTreeByName = (params: Dict.ResDictTree) => {
-    const name = params.name || '';
+    const name = params.name || ''
     return http.get(`/dictTree/getTreeByName?name=${name}`)
 }
 
@@ -27,4 +27,3 @@ export const updateDictTree = (params: Dict.ResDictTree) => {
 export const deleteDictTree = (params: Dict.ResDictTree) => {
     return http.post(`/dictTree/delete?id=${params.id}`)
 }
-
diff --git a/frontend/src/views/machine/testScript/components/tree.vue b/frontend/src/views/machine/testScript/components/tree.vue
index 2026203..f12ae11 100644
--- a/frontend/src/views/machine/testScript/components/tree.vue
+++ b/frontend/src/views/machine/testScript/components/tree.vue
@@ -9,7 +9,7 @@
         @node-click="handleNodeClick"
     >
         <template #default="{ node, data }">
-            <el-tooltip effect="dark" :content="data.scriptTypeName || data.sourceDesc" placement="top" :hide-after="0">
+            <el-tooltip effect="dark" :content="data.sourceDesc || data.scriptTypeName" placement="top" :hide-after="0">
                 <div class="custom-tree-node">
                     {{ data.scriptTypeName || data.sourceDesc }}
                 </div>
@@ -34,19 +34,27 @@ const defaultProps = {
     label: 'scriptTypeName',
     pid: 'pid'
 }
+const activeName = ref('')
+const childActiveName = ref('')
 const handleNodeClick = (data, node) => {
     let code = ['Base', 'VOL', 'Freq', 'Harm', 'Base_0_10', 'Base_20_85', 'Base_110_200']
     const parents = getParentNodes(node, [])
     parents.pop()
     parents.unshift(node.data)
     parents.reverse()
+    let active = parents[0].scriptTypeCode
+    let childActive = findTargetCodes(parents, code)[0] || ''
     // 获取当前节点的直接父节点
-
-    emit('setTab', {
-        activeName: parents[0].scriptTypeCode,
-        childActiveName: findTargetCodes(parents, code)[0] || ''
-    })
+    if (activeName.value != active || childActiveName.value != childActive) {
+        activeName.value = active
+        childActiveName.value = childActive
+        emit('setTab', {
+            activeName: active,
+            childActiveName: childActive
+        })
+    }
 }
+
 // 返回父级
 const getParentNodes = (node, parents) => {
     if (node.parent) {