From 9af98b034f7f4cb4269489534d278d1c5635a98d Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Tue, 11 Mar 2025 14:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/check/interface/index.ts     |  1 +
 .../components/controlSourceDetail.vue        | 21 +++++++++++++++--
 .../machine/controlSource/components/tree.vue | 10 +++++---
 .../src/views/machine/controlSource/index.vue | 23 ++++++++++++++-----
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts
index 2550b7f..d7701ca 100644
--- a/frontend/src/api/check/interface/index.ts
+++ b/frontend/src/api/check/interface/index.ts
@@ -107,6 +107,7 @@ export namespace CheckData {
 
     // 用来描述 检测数据-左侧树结构
     export interface TreeItem {
+        id:string | null,
         scriptTypeName: string | null,
         sourceDesc: string | null,
         harmNum: number | null,
diff --git a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue
index 1df930e..babfbe3 100644
--- a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue
+++ b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue
@@ -286,6 +286,7 @@ const second = ref(0)
 const emit = defineEmits(['update:activeName','update:activeIndex','update:startDisabeld','update:pauseDisabled'])
 
 watch(()=>props.formControl.scriptId,()=>{
+    console.log("切换脚本",props.formControl.scriptId);
   if(props.formControl.scriptId!=''){
     getTree()
   }
@@ -303,6 +304,19 @@ const getTree = () => {
     }).then(res => {
         if (res.code === 'A0000') {
             treeData.value = res.data
+            
+            // 为 treeData 及其子节点添加 id
+            let idCounter = 0;
+            const addIdToTree = (nodes: any[]) => {
+                nodes.forEach(node => {
+                    node.id = idCounter++; // 为每个节点添加唯一的 id
+                    if (node.children && node.children.length > 0) {
+                        addIdToTree(node.children); // 递归为子节点添加 id
+                    }
+                });
+            };
+
+            addIdToTree(treeData.value);
 
             // 添加tab子项
             props.options.forEach((k: any, i: number) => {
@@ -312,6 +326,7 @@ const getTree = () => {
                         item.children.forEach((s: any) => {
                             k.children.forEach((P: any) => {
                                 if (P.code == s.scriptTypeCode) {
+                                
                                     tabData.value[i].children.push({
                                         label: P.label,
                                         value: P.code,
@@ -336,6 +351,8 @@ const getTree = () => {
             tabChange()
         }
     })
+
+   
 }
 
 
@@ -376,7 +393,7 @@ const tabChange = () => {
 const inquireTable = () => {
     const sortOrder = ['Ua', 'Ia', 'Ub', 'Ib', 'Uc', 'Ic']
     dlsDetails({
-        scriptId: '9ff96807cf8c7524587982ed8baa8b57',
+        scriptId: props.formControl.scriptId,
         scriptType: activeName.value,
         scriptSubType: childActiveName.value
     }).then((res: any) => {
@@ -393,7 +410,7 @@ const inquireTable = () => {
         }
     })
 
-
+    console.log('treeData',treeData.value)
 }
 
 
diff --git a/frontend/src/views/machine/controlSource/components/tree.vue b/frontend/src/views/machine/controlSource/components/tree.vue
index ed5c850..46e3ae9 100644
--- a/frontend/src/views/machine/controlSource/components/tree.vue
+++ b/frontend/src/views/machine/controlSource/components/tree.vue
@@ -1,6 +1,6 @@
 <template>
     <el-tree
-        node-key="scriptName"
+        node-key="id"
         default-expand-all
         :data="props.treeData"
         :props="defaultProps"
@@ -44,7 +44,7 @@ const childActiveName = ref('')
 const activeIndex = ref()
 const treeRef = ref()
 const handleNodeClick = (data, node) => {
-    console.log('handleNodeClick', props.treeData)
+    //console.log('handleNodeClick', props.treeData)
   if(data.index!= null){
     let code = ['Base', 'VOL', 'Freq', 'Harm', 'Base_0_10', 'Base_20_85', 'Base_110_200']
     const parents = getParentNodes(node, [])
@@ -105,8 +105,12 @@ function findTargetCodes(data: any[], targetCodes: string[]) {
 function handleCheckChange(data,isChecked) {
     console.log('handleCheckChange', data,isChecked)
     if(isChecked){
-            const checked = [data.scriptName]; // id为tree的node-key属性
+            const checked = [data.id]; // id为tree的node-key属性
             treeRef.value?.setCheckedKeys(checked);
+            emit('setTab', {
+                activeIndex:data.index
+            })
+            
           }
 }
 // // 对外映射
diff --git a/frontend/src/views/machine/controlSource/index.vue b/frontend/src/views/machine/controlSource/index.vue
index 943332e..422abf1 100644
--- a/frontend/src/views/machine/controlSource/index.vue
+++ b/frontend/src/views/machine/controlSource/index.vue
@@ -80,14 +80,24 @@ const pqSourceList=ref<TestSource.ResTestSource[]>([])//获取指定模式下所
 const modeStore = useModeStore()
 const pqSourceArray = ref<{ label: string; value: string; }[]>()
 const scriptArray = reactive<{label: string, value: string}[]>([])
+// const formContent = ref<TestScript.ResTestScript>({
+//   id : '9ff96807cf8c7524587982ed8baa8b57',
+//   name: '测试',
+//   type: '1',
+//   valueType: '2973cb938b591b93d0df2547599b87d8',
+//   pattern: modeId.value,
+//   standardName: 'GBT 19862',
+//   standardTime: '2025',
+//   state: 1
+// })
 const formContent = ref<TestScript.ResTestScript>({
-  id : '9ff96807cf8c7524587982ed8baa8b57',
-  name: '测试',
-  type: '1',
-  valueType: '2973cb938b591b93d0df2547599b87d8',
+  id : '',
+  name: '',
+  type: '',
+  valueType: '',
   pattern: modeId.value,
-  standardName: 'GBT 19862',
-  standardTime: '2025',
+  standardName: '',
+  standardTime: '',
   state: 1
 })
 const connectDisabeld = ref(false)
@@ -167,6 +177,7 @@ onMounted(async () => {
   nextTick(async () => {
     await treeInfo(modeStore.currentMode)
     formContent.value.pattern = modeId.value
+    formContent.value.id = controlContent.value.scriptId
     show.value = true
   })
 })