From 63a1e9ec56d9d7dde28d1aba7374782759b519ed Mon Sep 17 00:00:00 2001
From: GYYM <704080176@qq.com>
Date: Thu, 5 Dec 2024 11:21:10 +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

---
 .../src/api/system/dictionary/dictData.ts     |  4 +--
 frontend/src/views/home/components/table.vue  | 25 ++++++++-----------
 .../src/views/home/components/timeTest.vue    | 15 +++++++----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/frontend/src/api/system/dictionary/dictData.ts b/frontend/src/api/system/dictionary/dictData.ts
index 18ac6c1..b971a51 100644
--- a/frontend/src/api/system/dictionary/dictData.ts
+++ b/frontend/src/api/system/dictionary/dictData.ts
@@ -216,7 +216,7 @@ const dictData: Dict[] = [
     children: [
       {
         id: "0",
-        label: 'FLUKE6100A电能功率标准源',
+        label: 'FLUKE.6100A电能功率标准源',
         code: 0,
       },
       {
@@ -236,7 +236,7 @@ const dictData: Dict[] = [
       },
       {
         id: "4",
-        label: 'PQV-520电能质量检测装置',
+        label: 'PQV-520便携式电能质量监测装置',
         code: 4,
       },
     ],
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 53ccd42..0f9f915 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -631,6 +631,7 @@ let testType = "test";//检测还是复检
 const handleSelectionChange = (selection: any[]) => {
 
   devNum = selection.length;
+  devChannelsNum = 0;
   for (let i = 0; i < selection.length; i++) {
     devChannelsNum += selection[i].dev_Chns;
   }
@@ -923,19 +924,15 @@ const handleTest = (val:string) => {
         },
     )
         .then(() => {
-          ElMessage.success(val);
-    dialogTitle.value = val;
-    dialogFormVisible.value = true; // 打开对话框
+          ElMessage.success('不合格项复检');
+          dialogTitle.value = val;
+          dialogFormVisible.value = true; // 打开对话框
+        })
+        .catch((action: Action) => {
+          ElMessage.success('全部复检');
+          dialogTitle.value = val;
+          dialogFormVisible.value = true; // 打开对话框
         })
-        // .catch((action: Action) => {
-        //   ElMessage({
-        //     type: 'info',
-        //     message:
-        //         action === 'cancel'
-        //             ? '以当前数据为主完成数据覆盖'
-        //             : '取消本次导入操作',
-        //   })
-        // })
     }
     else
     {
@@ -966,7 +963,7 @@ const handleTest = (val:string) => {
      return
   }
 
-  if(val==='归档')
+  if(val==='批量归档')
   {
     const loading = ElLoading.service({
       lock: true,
@@ -975,7 +972,7 @@ const handleTest = (val:string) => {
     })
     setTimeout(() => {
       loading.close()
-      ElMessage.success("批量归档成功");
+      ElMessage.success("归档成功");
     }, 2000)
   }
 };
diff --git a/frontend/src/views/home/components/timeTest.vue b/frontend/src/views/home/components/timeTest.vue
index 709ce3e..4f8c1a3 100644
--- a/frontend/src/views/home/components/timeTest.vue
+++ b/frontend/src/views/home/components/timeTest.vue
@@ -3,11 +3,11 @@
 <div class = "test-dialog">
     <div class="dialog-left">
       <el-steps direction="vertical" :active="activeIndex" :process-status="currentStepStatus" finish-status="success">
-        <el-step title="开始检测" description="2018-04-12 20:46"/>
-        <el-step title="GPS完成上送" description="2018-04-12 20:46"/>
-        <el-step title="设备开始上送时刻"  description="2018-04-12 20:46"/>
-        <el-step title="设备最晚上送时刻"  description="2018-04-12 20:46"/>
-        <el-step title="检测完成"  description="2018-04-12 20:46"/>
+        <el-step title="开始检测" :description="startTime"/>
+        <el-step title="GPS完成上送" :description="gpsTime"/>
+        <el-step title="设备开始上送时刻"  :description="devStartTime"/>
+        <el-step title="设备最晚上送时刻"  :description="devEndTime"/>
+        <el-step title="检测完成"  :description="finishTime"/>
       </el-steps>
         <!-- <el-timeline style="max-width: 600px">
           <el-timeline-item
@@ -54,6 +54,11 @@ import { SuccessFilled } from '@element-plus/icons-vue'
 
 const activeIndex = ref(0)
 const activeTotalNum = ref(5)
+const startTime = ref('')
+const gpsTime = ref('')
+const devStartTime = ref('')
+const devEndTime = ref('')
+const finishTime = ref('')
 
 interface Activity {
   content: string;