From 0a4385f29bc6af3bf58f06fe449ef0b42d3848a9 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Sat, 21 Dec 2024 12:41:06 +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    | 10 +++----
 frontend/src/views/home/components/table.vue |  3 ++-
 frontend/src/views/home/components/test.vue  | 28 ++++++++++----------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts
index a0f78c0..36189bb 100644
--- a/frontend/src/api/check/interface/index.ts
+++ b/frontend/src/api/check/interface/index.ts
@@ -34,7 +34,7 @@ export namespace CheckData {
     }
 
     export interface Device {
-        deviceID: string;     //装置序号ID
+        deviceId: string;     //装置序号Id
         deviceName: string; //设备名称
         chnNum: number;   //设备通道数
     }
@@ -55,12 +55,12 @@ export namespace CheckData {
 
     //用来描述 某个脚本测试项对所有通道的检测结果
     export interface ScriptChnItem {
-        scriptID: string
+        scriptId: string
         scriptItemName?: string  //可以不要该属性，有点多余
 
         // 设备
         devices: Array<{
-            deviceID: string,
+            deviceId: string,
             deviceName: string,
             chnResult: ChnCheckResultEnum[] //通道检测结果
         }>
@@ -78,12 +78,12 @@ export namespace CheckData {
      * 用于描述 脚本检测结果展示的按钮类型
      */
     export interface ScriptChnViewItem {
-        scriptID: string,
+        scriptId: string,
         scriptItemName?: string //脚本项名称，可以不要该属性，有点多余
 
         // 设备
         devices: Array<{
-            deviceID: string,
+            deviceId: string,
             deviceName: string,
             chnResult: ButtonResult[],
         }>
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index b61c777..c3ded25 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -256,6 +256,7 @@ import { useDictStore } from '@/stores/modules/dict'
 import ChannelsTest from './channelsTest.vue'
 import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store
 import {useCheckStore} from '@/stores/modules/check'
+import {CheckData} from '@/api/check/interface'
 
 const dictStore = useDictStore()
 const checkStore = useCheckStore()
@@ -558,7 +559,7 @@ const handleSelectionChange = (selection: any[]) => {
   {
     testType= "reTest";
   }
-  let devices: Check.Device[] = selection.map((item: any) => {
+  let devices: CheckData.Device[] = selection.map((item: any) => {
     return {
       deviceId: item.id,
       deviceName: item.name,
diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index 66a7c3b..62c702a 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/frontend/src/views/home/components/test.vue
@@ -45,9 +45,9 @@
         </el-table-column>
 
         <template v-if="chnSum<=MAX_CHN_SUM">
-          <el-table-column v-for="(item,index1) in deviceList" :key="item.deviceID" :label="item.deviceName"
+          <el-table-column v-for="(item,index1) in deviceList" :key="item.deviceId" :label="item.deviceName"
                            :min-width="110" align="center">
-            <el-table-column v-for="(chnItem,index2) in item.chnNum" :key="`${item.deviceID}${chnItem}`"
+            <el-table-column v-for="(chnItem,index2) in item.chnNum" :key="`${item.deviceId}${chnItem}`"
                              :label="'通道'+chnItem" align="center">
               <template #default="{row}">
                 <el-tooltip
@@ -68,7 +68,7 @@
         </template>
 
         <template v-else>
-          <el-table-column v-for="(item,index) in deviceList" :key="item.deviceID" :label="item.deviceName"
+          <el-table-column v-for="(item,index) in deviceList" :key="item.deviceId" :label="item.deviceName"
                            :min-width="110" align="center">
             <template #default="{row}">
               <el-tooltip :content="row.devices[index].chnResult[0].resultType==='info' ? '暂无数据' : '点击查看详情'"
@@ -253,7 +253,7 @@ const initScriptData = () => {
 const initDeviceList = () => {
   checkStore.devices.forEach(item => {
     deviceList.push({
-      deviceID: item.deviceID,
+      deviceId: item.deviceId,
       deviceName: item.deviceName,
       chnNum: item.chnNum,
     })
@@ -266,7 +266,7 @@ const initCheckResult = () => {
   scriptData.forEach(item => {
     // 处理当前节点的数据
     let temp: CheckData.ScriptChnItem = {
-      scriptID: item.id,
+      scriptId: item.id,
       scriptItemName: item.scriptItemName,
       devices: []
     }
@@ -276,7 +276,7 @@ const initCheckResult = () => {
         tempChnResult.push(CheckData.ChnCheckResultEnum.UNKNOWN)
       }
       temp.devices.push({
-        deviceID: deviceList[i].deviceID,
+        deviceId: deviceList[i].deviceId,
         deviceName: deviceList[i].deviceName,
         chnResult: tempChnResult
       })
@@ -286,10 +286,10 @@ const initCheckResult = () => {
 }
 // 更新检测结果（详细到通道）
 const updateCheckResult = (data: CheckData.ScriptChnItem) => {
-  const {scriptID} = {...data}
+  const {scriptId} = {...data}
 
   checkResult.forEach(item => {
-    if (item.scriptID == scriptID) {
+    if (item.scriptId == scriptId) {
       item.devices.forEach((device, index) => {
         device.chnResult = [...data.devices[index].chnResult]
       })
@@ -302,7 +302,7 @@ const checkResultView = computed(() => {
 
   let result: CheckData.ScriptChnViewItem[] = checkResult.map(item => {
     let temp: CheckData.ScriptChnViewItem = {
-      scriptID: item.scriptID,
+      scriptId: item.scriptId,
       scriptItemName: item.scriptItemName,
       devices: []
     }
@@ -335,7 +335,7 @@ const checkResultView = computed(() => {
       }
 
       temp.devices.push({
-        deviceID: device.deviceID,
+        deviceId: device.deviceId,
         deviceName: device.deviceName,
         chnResult: tempChnBtnResult
       })
@@ -657,7 +657,7 @@ const updateCheckResultView = (scriptID: string) => {
 };
 
 // 模拟检测 todo 可移除
-const simulateCheck = (scriptID: string) => {
+const simulateCheck = (scriptId: string) => {
   let devices = []
 
   devices = deviceList.map(item => {
@@ -672,19 +672,19 @@ const simulateCheck = (scriptID: string) => {
       if (randomNum <= item.chnNum) {
         tempChnResult[randomNum] = CheckData.ChnCheckResultEnum.FAIL
 
-        errorCheckItem.push(scriptID)
+        errorCheckItem.push(scriptId)
       }
     }
 
     return {
-      deviceID: item.deviceID,
+      deviceId: item.deviceId,
       deviceName: item.deviceName,
       chnResult: tempChnResult,
     }
   })
 
   let tempScriptChnItem: CheckData.ScriptChnItem = {
-    scriptID,
+    scriptId,
     devices,
   }