From 489c0882ac39fce1e9c31a7e33eeb7c7cd9a36b7 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Wed, 5 Mar 2025 09:32:13 +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

---
 .../testScript/components/communication.vue       |  5 +++--
 .../machine/testScript/components/viewRow.vue     | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/machine/testScript/components/communication.vue b/frontend/src/views/machine/testScript/components/communication.vue
index 2e52967..6b320e5 100644
--- a/frontend/src/views/machine/testScript/components/communication.vue
+++ b/frontend/src/views/machine/testScript/components/communication.vue
@@ -11,7 +11,7 @@
             height="calc(100vh - 480px)"
             :style="{ overflow: 'hidden' }"
             row-key="id"
-            default-expand-all
+            :expand-row-keys="[props.activeName]"
         >
             <el-table-column prop="name" label="指标" show-overflow-tooltip />
             <el-table-column align="center" label="参与误差比较" width="110px">
@@ -166,12 +166,13 @@ const info = async () => {
         }
     })
 
-    console.log('🚀 ~ item.children.forEach ~ tableData.value:', tableData.value)
+    //console.log('🚀 ~ item.children.forEach ~ tableData.value:', tableData.value)
 }
 const getData = () => {
     return tableData.value
 }
 onMounted(() => {
+    //console.log('🚀 ~ onMounted ~ props:', props)
     info()
     // tableData.value = data.data[0].children || []
 })
diff --git a/frontend/src/views/machine/testScript/components/viewRow.vue b/frontend/src/views/machine/testScript/components/viewRow.vue
index 2697cbd..67acfb6 100644
--- a/frontend/src/views/machine/testScript/components/viewRow.vue
+++ b/frontend/src/views/machine/testScript/components/viewRow.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-model="dialogVisible" :title= "titleType"  v-bind="dialogBig" >
+    <el-dialog v-model="dialogVisible" :title= "titleType"  v-bind="dialogBig" @close="close">
         <!-- <el-descriptions :column="5" border>
             <el-descriptions-item label="脚本名称">测试</el-descriptions-item>
             <el-descriptions-item label="参照标准名称">GBT 19862</el-descriptions-item>
@@ -8,8 +8,8 @@
             <el-descriptions-item label="值类型">相对值</el-descriptions-item>
         </el-descriptions> -->
         <!-- tableData?.channelList -->
-        <el-tabs type="border-card">
-            <el-tab-pane :label="`L${item}`" v-for="item in 3">
+        <el-tabs type="border-card" >
+            <el-tab-pane :label="`L${item}`" v-for="item in 3" :key="item">
                 <div class="tabPane">
                     <el-descriptions :column="4" border>
                         <el-descriptions-item label-align="right" label="电压有效值(%)">
@@ -233,6 +233,7 @@ const harmVIsShow = ref(false)
 const harmAIsShow = ref(false)
 const iHarmVIsShow = ref(false)
 const iHarmAIsShow = ref(false)
+const activeTab = ref<string | number>('L1') // 设置默认激活的标签页
 const props = defineProps({
     activeName: {
         type: String,
@@ -277,7 +278,8 @@ const tabVisibilityMap: { [key: string]: { harmVIsShow: boolean, harmAIsShow: bo
     '谐波有功功率': { harmVIsShow: true, harmAIsShow: true, iHarmVIsShow: false, iHarmAIsShow: false },
 };
 const open = async (row: any,communicationList:any,parentTabName:string,childrenTabName:string) => {
-    
+    //重置标签页
+    activeTab.value = 'L1' // 设置默认激活的标签页
     //对应表格显示隐藏
     const visibilitySettings = tabVisibilityMap[parentTabName] || { harmVIsShow: false, harmAIsShow: false, iHarmVIsShow: false, iHarmAIsShow: false };
     harmVIsShow.value = visibilitySettings.harmVIsShow;
@@ -344,7 +346,10 @@ const open = async (row: any,communicationList:any,parentTabName:string,children
 }
 
 
-
+// 关闭弹窗
+const close = () => {
+    dialogVisible.value = false
+}
 
 // 处理多余数据
 const handleHarmData = (row: any) => {