From fa4b5d26e533c730f3d8d25dfe05f1ccf6dbed69 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Mon, 30 Dec 2024 19:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E6=95=B0=E6=A0=A1=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/home/components/channelsTest.vue    | 65 +++++++------------
 .../home/components/channelsTestTable.vue     | 38 +++++++----
 2 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue
index 58db81f..8344161 100644
--- a/frontend/src/views/home/components/channelsTest.vue
+++ b/frontend/src/views/home/components/channelsTest.vue
@@ -131,6 +131,8 @@ const total = ref(0)
 const dialogVisible = ref(false)
 const active = ref(0)
 let intervalId: NodeJS.Timeout | null = null;
+let timer1: NodeJS.Timeout | null = null; // 声明并初始化 timer1
+let timer2: NodeJS.Timeout | null = null; // 同样声明并初始化 timer2
   const name = ref<string[]>([])//系数校准所选设备名字数组
   const channel = ref<number[]>([])//系数校准所选设备通道数组
 // 在 setup 函数中
@@ -512,25 +514,6 @@ const currentStepStatus = ref<'error' | 'finish' | 'wait' | 'success' | 'process
 
       tableDataMap.set(i,currentTableData)
     }
-    // // 循环生成数据
-    // for (let i = 0; i < channel.value.length; i++) {
-    //   const currentTableData = ref<TableDataItem[]>([]);
-    //   // 随机选择 dataTemplates 或 dataTemplates2
-    //   const selectedTemplates = Math.random() < 0.5 ? dataTemplates : dataTemplates2;
-
-    //   for(let j = 0; j < channel.value[i]; j++){
-    //         const id = (j + 1).toString();
-    //         selectedTemplates.forEach((template) => {
-    //           currentTableData.value.push({
-    //             id: id,
-    //             MonitorIdx: j + 1,
-    //             ...template,
-    //           });
-    //         });
-    //       }  
-
-    //   tableDataMap.set(i,currentTableData)
-    // }
   }
 
   const handleCancel=() => {
@@ -624,17 +607,17 @@ const handleSubmit = async () => {
     clearInterval(intervalId);
   }
 
+ 
   // 初始化 currentTableData
   let isTimer2Completed = false;
-
-  // 设置 loading 状态为 true
-    // 初始化 loadingStates 为 true
-    loadingStates.value = new Array(name.value.length).fill(true);
+  // 初始化 loadingStates 为 true
+  loadingStates.value = new Array(name.value.length).fill(true);
 
 for (let i = 0; i < channel.value.length; i++) {
- 
-  console.log('channel', channel.value[i]);
-  console.log('activeIndex', activeIndex.value);
+
+
+  // 完成所有步骤后重置状态变量
+  active.value = 0;
   const currentTableData = ref<TableDataItem[]>([]);
   const selectedTemplates = dataTemplates4;
 
@@ -650,13 +633,23 @@ for (let i = 0; i < channel.value.length; i++) {
   }
 
   tableDataMap.set(i, currentTableData);
-  console.log('tableDataMap after set', tableDataMap);
   activeIndex.value++;
 
-   
+// 清除之前的 timer1
+clearInterval(timer1);
+  // 启动 timer1
+ timer1 = setInterval(() => {
+  active.value++;
+  console.log('active', active.value);
+  if (active.value > 5) {
+    clearInterval(timer1);
+  }
+}, 500);
 
+// 清除之前的 timer2
+clearInterval(timer2);
   // 启动 timer2
-  let timer2 = setInterval(() => {
+   timer2 = setInterval(() => {
     // 初始化 currentTableData
     const currentTableData = ref<TableDataItem[]>([]);
      
@@ -691,9 +684,7 @@ for (let i = 0; i < channel.value.length; i++) {
     clearInterval(timer2);
   
     const currentDataRef = tableDataMap.get(activeIndex.value - 1);
-    console.log('activeIndex.value',activeIndex.value);
-    console.log('tableDataMap',tableDataMap);
-    console.log('currentDataRef',currentDataRef);
+    console.log('currentDataRef',currentDataRef)
     if (currentDataRef) {
       const currentData = currentDataRef.value;
       // 检查当前数据中有无不合格字段
@@ -704,7 +695,7 @@ for (let i = 0; i < channel.value.length; i++) {
       }
       updateErrorState(activeIndex.value - 1, hasError);
     }
-    activeIndex.value++;
+    
     // 设置标志变量为 true，表示 timer2 已经完成
     isTimer2Completed = true;
   }, 3000);
@@ -720,13 +711,7 @@ for (let i = 0; i < channel.value.length; i++) {
   isTimer2Completed = false;
 }
 
-   // 启动 timer1
-   let timer1 = setInterval(() => {
-      active.value++;
-      if (active.value > 5) {
-        clearInterval(timer1);
-      }
-    }, 1000);
+
 };
 
 
diff --git a/frontend/src/views/home/components/channelsTestTable.vue b/frontend/src/views/home/components/channelsTestTable.vue
index 2691e04..27b6164 100644
--- a/frontend/src/views/home/components/channelsTestTable.vue
+++ b/frontend/src/views/home/components/channelsTestTable.vue
@@ -13,7 +13,7 @@
                         <el-table-column prop="Ua" label="L1">
                           <el-table-column prop="UaData" label="数据(V)">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.UaData === '—'&& loading">
+                              <el-icon v-if="scope.row.UaData === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -26,7 +26,7 @@
                               <el-tag type="danger" v-if="scope.row.UaChannel === '不合格'">
                                 {{ scope.row.UaChannel }}
                               </el-tag>
-                              <el-icon v-else-if="scope.row.UaChannel === '—'&& loading">
+                              <el-icon v-else-if="scope.row.UaChannel === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -39,7 +39,7 @@
                         <el-table-column prop="Ub" label="L2">
                           <el-table-column prop="UbData" label="数据(V)">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.UbData === '—'&& loading">
+                              <el-icon v-if="scope.row.UbData === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -52,7 +52,7 @@
                               <el-tag type="danger" v-if="scope.row.UbChannel === '不合格'">
                                 {{ scope.row.UbChannel }}
                               </el-tag>
-                              <el-icon v-else-if="scope.row.UbChannel === '—'&& loading">
+                              <el-icon v-else-if="scope.row.UbChannel === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -64,7 +64,7 @@
                         <el-table-column prop="Uc" label="L3">
                           <el-table-column prop="UcData" label="数据(V)">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.UcData === '—'&& loading">
+                              <el-icon v-if="scope.row.UcData === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -77,7 +77,7 @@
                               <el-tag type="danger" v-if="scope.row.UcChannel === '不合格'">
                                 {{ scope.row.UcChannel }}
                               </el-tag>
-                              <el-icon v-else-if="scope.row.UcChannel === '—'&& loading">
+                              <el-icon v-else-if="scope.row.UcChannel === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -91,7 +91,7 @@
                         <el-table-column prop="Ia" label="L1">
                           <el-table-column prop="IaData" label="数据(A)">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.IaData === '—'&& loading">
+                              <el-icon v-if="scope.row.IaData === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -104,7 +104,7 @@
                               <el-tag type="danger" v-if="scope.row.IaChannel === '不合格'">
                                 {{ scope.row.IaChannel }}
                               </el-tag>
-                              <el-icon v-else-if="scope.row.IaChannel === '—'&& loading">
+                              <el-icon v-else-if="scope.row.IaChannel === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -116,7 +116,7 @@
                         <el-table-column prop="Ib" label="L2">
                           <el-table-column prop="IbData" label="数据(A)">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.IbData === '—'&& loading">
+                              <el-icon v-if="scope.row.IbData === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -129,7 +129,7 @@
                               <el-tag type="danger" v-if="scope.row.IbChannel === '不合格'">
                                 {{ scope.row.IbChannel }}
                               </el-tag>
-                              <el-icon v-else-if="scope.row.IbChannel === '—'&& loading">
+                              <el-icon v-else-if="scope.row.IbChannel === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -141,7 +141,7 @@
                         <el-table-column prop="Ic" label="L3">
                           <el-table-column prop="IcData" label="数据(A)">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.IcData === '—'&& loading">
+                              <el-icon v-if="scope.row.IcData === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -154,7 +154,7 @@
                               <el-tag type="danger" v-if="scope.row.IcChannel === '不合格'">
                                 {{ scope.row.IcChannel }}
                               </el-tag>
-                              <el-icon v-else-if="scope.row.IcChannel === '—'&& loading">
+                              <el-icon v-else-if="scope.row.IcChannel === '—'&& loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
@@ -176,7 +176,7 @@
 </template>
   
   <script lang="ts" setup name="ErrorSystemDialog">
-  import { defineProps, defineEmits, reactive,watch,ref, Ref } from 'vue';
+  import { defineProps } from 'vue';
   import { ElIcon, ElLoading, ElTag } from 'element-plus';
   //import IndicatorTypeDialog from "@/views/machine/errorSystem/components/IndicatorTypeDialog.vue"; // 导入子组件
 
@@ -327,5 +327,17 @@
   overflow-x: hidden; /* 隐藏水平滚动条 */
 }
 
+/* 确保 el-icon-loading 的动画效果没有被覆盖 */
+.loading-box {
+  animation: rotate 2s linear infinite;
+}
 
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
 </style>
\ No newline at end of file