From fd21d32f4a7016a3005a55b36f0a0416d47ff28b Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Mon, 23 Dec 2024 13:23:28 +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/test/index.ts          |  5 +++
 frontend/src/api/plan/autoTest.json           |  2 +-
 .../home/components/dataCheckResultTable.vue  | 16 ++++-----
 .../dataCheckSingleChannelSingleTestPopup.vue | 34 ++++++++++---------
 frontend/src/views/home/components/test.vue   | 18 +++++-----
 .../src/views/home/components/testPopup.vue   | 18 +++++-----
 6 files changed, 50 insertions(+), 43 deletions(-)
 create mode 100644 frontend/src/api/check/test/index.ts

diff --git a/frontend/src/api/check/test/index.ts b/frontend/src/api/check/test/index.ts
new file mode 100644
index 0000000..b3cd167
--- /dev/null
+++ b/frontend/src/api/check/test/index.ts
@@ -0,0 +1,5 @@
+import http from "@/api";
+
+export const getCheckItemDetail = (params: { checkItemId: string, deviceId: string, chnNum: number }) => {
+    return http.post<any>("/check/test/detail/", params, {loading: false});
+}
\ No newline at end of file
diff --git a/frontend/src/api/plan/autoTest.json b/frontend/src/api/plan/autoTest.json
index aa54f89..7812c02 100644
--- a/frontend/src/api/plan/autoTest.json
+++ b/frontend/src/api/plan/autoTest.json
@@ -29,7 +29,7 @@
                             "isChildNode":true,
                             "pid": "0-1",
                             "id": "0-1-3",
-                            "name": "输入：频率 50.05Hz..."
+                            "name": "输入：频率 50.05Hz...."
                         }
                     ]
                 },
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index 28a0ea0..7d75816 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -10,33 +10,33 @@
       </el-table-column>
       <el-table-column prop="standardValue" label="标准值（V）"/>
       <el-table-column label="L1（V）">
-        <el-table-column prop="L1" width="80" label="被检值">
+        <el-table-column prop="L1" width="75" label="被检值">
 
         </el-table-column>
-        <el-table-column prop="L1_errValue" width="80" label="误差值">
+        <el-table-column prop="L1_errValue" width="75" label="误差值">
 
         </el-table-column>
       </el-table-column>
       <el-table-column label="L2（V）">
-        <el-table-column prop="L2" width="80" label="被检值">
+        <el-table-column prop="L2" width="75" label="被检值">
 
         </el-table-column>
-        <el-table-column prop="L2_errValue" width="80" label="误差值">
+        <el-table-column prop="L2_errValue" width="75" label="误差值">
 
         </el-table-column>
       </el-table-column>
       <el-table-column label="L3（V）">
-        <el-table-column prop="L3" width="80" label="被检值">
+        <el-table-column prop="L3" width="75" label="被检值">
 
         </el-table-column>
-        <el-table-column prop="L3_errValue" width="80" label="误差值">
+        <el-table-column prop="L3_errValue" width="75" label="误差值">
 
         </el-table-column>
       </el-table-column>
-      <el-table-column prop="maxErrVaule" width="130" label="最大误差（V）">
+      <el-table-column prop="maxErrVaule" width="110" label="最大误差（V）">
 
       </el-table-column>
-      <el-table-column prop="result" label="检测结果">
+      <el-table-column prop="result" label="检测结果" width="100">
         <template #default="scope">
           <el-tag type="danger" v-if="scope.row.result === '不合格'">{{ scope.row.result }}</el-tag>
           <span v-if="scope.row.result != '不合格'">{{ scope.row.result }}</span>
diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index 26abd7e..f26fd7f 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -34,7 +34,7 @@
             </el-radio-group>
           </div>
           <div class="content-tree">
-            <el-tree :default-expanded-keys="['0', '0-1', '0-2', '0-3', '1']" node-key="id" :data="treeData"
+            <el-tree :default-expanded-keys="['0', '0-2']" node-key="id" :data="treeData"
                      :props="defaultProps" @node-click="handleNodeClick"/>
           </div>
         </div>
@@ -65,7 +65,7 @@ import {dialogBig} from '@/utils/elementBind'
 import {reactive, ref} from 'vue'
 import DataCheckResultTable from './dataCheckResultTable.vue'
 import DataCheckRawDataTable from './dataCheckRawDataTable.vue'
-import type {CheckResult, DataCheck, RawDataItem} from "@/api/check/interface";
+import {CheckData} from "@/api/check/interface";
 import {data as treeData} from "@/api/plan/autoTest.json";
 
 const {appendToBody} = withDefaults(defineProps<{
@@ -73,7 +73,7 @@ const {appendToBody} = withDefaults(defineProps<{
 }>(), {appendToBody: false})
 
 
-const formContent = reactive<DataCheck>({
+const formContent = reactive<CheckData.DataCheck>({
   testScriptName: 'Q/GDW 10650.4-2021 模拟式',
   errorSysName: 'Q/GDW 10650.2-2021',
   dataRule: '所有值',
@@ -128,7 +128,7 @@ const handleNodeClick = (data: any) => {
   console.log(data);
 };
 
-const checkResultTableData = reactive<CheckResult[]>([
+const checkResultTableData = reactive<CheckData.CheckResult[]>([
   {
     chnNum: '1',
     standardValue: 57.74,
@@ -143,7 +143,7 @@ const checkResultTableData = reactive<CheckResult[]>([
   }
 ])
 
-const rawTableData = reactive<RawDataItem[]>([
+const rawTableData = reactive<CheckData.RawDataItem[]>([
   {
     updateTime: "2024-10-10 09:30:00",
     L1: 57.73,
@@ -279,9 +279,10 @@ const close = () => {
   visible.value = false;
 };
 
-const open = (deviceItem: any, chnNum?: number) => {
+const open = (checkItemId: string, deviceId: string, chnNum?: number) => {
+  console.log(checkItemId, deviceId, chnNum);
   // 发起后端请求，查询详细信息
-  // const deviceItem = await getDetail(planId,checkItemId,deviceItem.id, chnNum)
+  //const result = await getCheckItemDetail({checkItemId,deviceId, chnNum})
 
   // 数据处理
   // checkResultTableData=[];
@@ -302,7 +303,7 @@ defineExpose({
   flex-direction: column;
   overflow-y: hidden;
   overflow-x: hidden;
-  width: 100%;
+
 
   .data-check-dialog {
     display: flex;
@@ -315,30 +316,30 @@ defineExpose({
     }
 
     .data-check-body {
+      width: 100%;
       display: flex;
       flex-direction: row;
-      width: 100%;
 
       .content-left-tree {
+        width: 25%;
         display: flex;
         flex-direction: column;
         align-items: center;
+        max-height: 473px;
 
         padding: 10px 0;
         border: 1px solid #ccc;
-
+        overflow: auto;
         .content-tree {
-          width: 250px;
-          max-width: 250px;
-          height: 450px;
-          max-height: 450px;
-          overflow-x: auto;
-          overflow-y: auto;
+          min-width: 100%;
+          height: 100%;
+          max-height: 100%;
           margin-top: 10px;
         }
       }
 
       .content-right {
+        width: 75%;
         margin-left: 10px;
         flex: 1;
 
@@ -360,4 +361,5 @@ defineExpose({
     }
   }
 }
+
 </style>
\ No newline at end of file
diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index 62c702a..dd5e6aa 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/frontend/src/views/home/components/test.vue
@@ -38,10 +38,10 @@
     </div>
 
     <div class="dialog-content">
-      <el-table :data="checkResultView" :cell-class-name="tableCell" row-key="scriptID" height="450px"
+      <el-table :data="checkResultView" :cell-class-name="tableCell" row-key="scriptId" height="450px"
                 :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%"
                 border>
-        <el-table-column fixed prop="scriptItemName" label="检测项目" width="250px">
+        <el-table-column fixed prop="scriptItemName" label="检测项目" width="140px" align="center">
         </el-table-column>
 
         <template v-if="chnSum<=MAX_CHN_SUM">
@@ -57,7 +57,7 @@
                       :disabled="row.devices[index1].chnResult[index2].resultType=='info'"
                       :type="row.devices[index1].chnResult[index2].resultType"
                       size="small"
-                      @click="handleClick(item,chnItem)"
+                      @click="handleClick(row.scriptId,item.deviceId,chnItem)"
                   >
                     {{ row.devices[index1].chnResult[index2].resultValue }}
                   </el-button>
@@ -77,7 +77,7 @@
                     :disabled="row.devices[index].chnResult[0].resultType=='info'"
                     :type="row.devices[index].chnResult[0].resultType"
                     size="small"
-                    @click="handleClick(item,-1)"
+                    @click="handleClick(row.scriptId,item.deviceId,-1)"
                 >
                   {{ row.devices[index].chnResult[0].resultValue }}
                 </el-button>
@@ -628,7 +628,7 @@ const errorCheckItem = reactive<string[]>([]);
 
 // 动态获取表格单元格样式
 function tableCell({row, columnIndex}) {
-  let items = errorCheckItem.filter((item) => item === row.scriptID)
+  let items = errorCheckItem.filter((item) => item === row.scriptId)
 
   if (columnIndex === 0 && items.length > 0) {
     return 'warning-row'
@@ -650,8 +650,8 @@ const resultDialogVisible = ref(false)
 function clear() {
 }
 
-const updateCheckResultView = (scriptID: string) => {
-  const temp = simulateCheck(scriptID)
+const updateCheckResultView = (scriptId: string) => {
+  const temp = simulateCheck(scriptId)
   updateCheckResult(temp)
   // traverseTableData(scriptData, id);
 };
@@ -730,8 +730,8 @@ const handlePauseOrContinue = () => {
 };
 
 // 点击查看（设备）通道检测详情。参数1：设备信息，参数2：通道号，-1：代表查看全部通道
-const handleClick = (deviceItem: any, chnNum: number) => {
-  dataCheckSingleChannelSingleTestPopupRef.value?.open(deviceItem, chnNum);
+const handleClick = (scriptId:string,deviceId: any, chnNum: number) => {
+  dataCheckSingleChannelSingleTestPopupRef.value?.open(scriptId, deviceId, chnNum);
 };
 
 const props = defineProps({
diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue
index ceaf722..1ce6e03 100644
--- a/frontend/src/views/home/components/testPopup.vue
+++ b/frontend/src/views/home/components/testPopup.vue
@@ -207,15 +207,15 @@ const detectionOptions = ref([
            text: '',
            background: 'rgb(255, 255, 255, 0)',
          })*/
-        startTest({
-          userPageId: "cdf",
-          devIds:["5eaba83670ff4d9daf892a62a5e13ea3","80b4b4f52a4c4064a18319525f8ac13c"],
-          //planId:"31cc203f3fa94fa39323ae7cc411cd66"
-        }).then(res=>{
-
-
-
-        })
+        // startTest({
+        //   userPageId: "cdf",
+        //   devIds:["5eaba83670ff4d9daf892a62a5e13ea3","80b4b4f52a4c4064a18319525f8ac13c"],
+        //   //planId:"31cc203f3fa94fa39323ae7cc411cd66"
+        // }).then(res=>{
+        //
+        //
+        //
+        // })
         break;
       case 1:
         timeTestStatus.value = 'start'