Merge branch 'main' of http://192.168.65.198:3000/Front_Team/SPDM

src/views/data/analysis/index.vue

@@ -103,6 +103,8 @@
           <div class="compare-container-left">
             <BaseTable
               ref="tableCompareRef"
+              v-if="diaVisible"
+              :data="csvCompareData"
               tableName="COMPARE_CURVE"
               showIndex
               showCheckbox
@@ -659,6 +661,7 @@ const getProjectOptionsFun = () => {
 };
 
 const diaVisible = ref<boolean>(false);
+const csvCompareData = ref<any>([]);
 const closeFun = () => {
   diaVisible.value = false;
 };
@@ -677,9 +680,11 @@ const displayCompareFun = (flag: any) => {
   });
   if (flag === '4') {
     diaVisible.value = true;
-    nextTick(() => {
-      tableCompareRef.value.setDataFun(data);
-    });
+    compareData.value = {};
+    csvCompareData.value = data;
+    // nextTick(() => {
+    //   tableCompareRef.value.setDataFun(data);
+    // });
   } else {
     comparePngData.value = []; // 清空
     diaPngVisible.value = true;

src/views/task/execution/components/runDetailPage/runPagecomponent/resultData.vue

@@ -225,7 +225,9 @@
     <div class="compare-container">
       <div class="compare-container-left">
         <BaseTable
+          v-if="diaVisible"
           ref="tableCompareRef"
+          :data="csvCompareData"
           tableName="RUN_RESULT_CANVAS_TABLE"
           showIndex
           showCheckbox
@@ -504,6 +506,7 @@ const runDirs = ref<any>([]);
 const runDirNameList = ref<any>([]);
 const showPage = ref(false);
 const diaVisible = ref(false);
+const csvCompareData = ref<any>([]);
 const columnData = ref<number>(1);
 const tableCompareRef = ref();
 const isCsv = ref(false);
@@ -912,9 +915,11 @@ const viewFun = () => {
       // });
     } else if (name === '曲线结果') {
       diaVisible.value = true;
-      nextTick(() => {
-        tableCompareRef.value.setDataFun(data);
-      });
+      compareData.value = {};
+      csvCompareData.value = data;
+      // nextTick(() => {
+      //   tableCompareRef.value.setDataFun(data);
+      // });
     }
   } else {
     ElMessage.warning('请选择文件进行对比查看');