From f58f7b97e5529a6ee873bc0712e59ad823b50b2c Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Mon, 13 Jan 2025 15:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=8D=95=E4=BD=8D=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/home/components/dataCheckRawDataTable.vue | 10 +++++-----
 .../views/home/components/dataCheckResultTable.vue  |  8 ++++----
 .../dataCheckSingleChannelSingleTestPopup.vue       | 13 ++++++++-----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/frontend/src/views/home/components/dataCheckRawDataTable.vue b/frontend/src/views/home/components/dataCheckRawDataTable.vue
index 9fdcba4..1c2dfb9 100644
--- a/frontend/src/views/home/components/dataCheckRawDataTable.vue
+++ b/frontend/src/views/home/components/dataCheckRawDataTable.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-button type="primary" @click="exportData" style="margin-bottom: 10px">导出</el-button>
+  <el-button v-if="tableData.length > 0" type="primary" @click="exportData" style="margin-bottom: 10px">导出</el-button>
   <div class="table-main">
     <el-table v-if="tableData.length > 0" :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } "
               :cell-style="{ textAlign: 'center' }" height="315px"
@@ -7,12 +7,12 @@
       <el-table-column type="index" label="序号" width="70" fixed="left"/>
       <el-table-column prop="time" label="数据时间"/>
       <template v-if="phaseT === 0">
-        <el-table-column prop="dataA" :label="`A（${unit}）`"/>
-        <el-table-column prop="dataB" :label="`B（${unit}）`"/>
-        <el-table-column prop="dataC" :label="`C（${unit}）`"/>
+        <el-table-column prop="dataA" :label="'A'+(unit==''?'':'（'+unit+'）')"/>
+        <el-table-column prop="dataB" :label="'B'+(unit==''?'':'（'+unit+'）')"/>
+        <el-table-column prop="dataC" :label="'C'+(unit==''?'':'（'+unit+'）')"/>
       </template>
       <template v-if="phaseT === 1">
-        <el-table-column prop="dataT" :label="`T（${unit}）`"/>
+        <el-table-column prop="dataT" :label="'T'+(unit==''?'':'（'+unit+'）')"/>
       </template>
     </el-table>
   </div>
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index 36301c3..3a0ee3e 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -9,7 +9,7 @@
       <!--        </template>-->
       <!--      </el-table-column>-->
       <template v-if="phaseT === 0">
-        <el-table-column :label="`A（${unit}）`">
+        <el-table-column :label="'A'+(unit==''?'':'（'+unit+'）')">
           <el-table-column prop="stdA" width="100" label="标准值"/>
           <el-table-column prop="dataA" width="100" label="被检值"/>
           <el-table-column prop="isDataA" label="检测结果">
@@ -26,7 +26,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column :label="`B（${unit}）`">
+        <el-table-column :label="'B'+(unit==''?'':'（'+unit+'）')">
           <el-table-column prop="stdB" width="100" label="标准值"/>
           <el-table-column prop="dataB" width="100" label="被检值"/>
           <el-table-column prop="isDataB" label="检测结果">
@@ -43,7 +43,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column :label="`C（${unit}）`">
+        <el-table-column :label="'C'+(unit==''?'':'（'+unit+'）')">
           <el-table-column prop="stdC" width="100" label="标准值"/>
           <el-table-column prop="dataC" width="100" label="被检值"/>
           <el-table-column prop="isDataC" label="检测结果">
@@ -63,7 +63,7 @@
       </template>
 
       <template v-if="phaseT === 1">
-        <el-table-column :label="`T（${unit}）`">
+        <el-table-column :label="'T'+(unit==''?'':'（'+unit+'）')">
           <el-table-column prop="stdT" label="标准值"/>
           <el-table-column prop="dataT" label="被检值"/>
           <el-table-column prop="isDataT" label="检测结果">
diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
index 1774c8c..495d4b3 100644
--- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
+++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue
@@ -267,7 +267,7 @@ const defaultOperate = () => {
     defaultExpandedKeys = [node.index]
 
     treeRef.value?.setCurrentKey(node.index);
-    scriptType = node.scriptType
+    scriptType = node.scriptType ?? scriptType
   } else {
     currentScriptTypeName.value = ''
     currentDesc.value = ''
@@ -341,7 +341,10 @@ const updateTableData = async () => {
     } else if (keys1.length != 0) {
       let tempHarmNumList: { value: string, label: string }[] = []
       for (let [key, value] of resTableData.resultData) {
-        tempHarmNumList.push({value: key, label: value.isData === 1 ? key : value.isData === 4 ? `${formatHarmNum(key)}（/）` : `${formatHarmNum(key)}（不符合）`})
+        tempHarmNumList.push({
+          value: key,
+          label: value.isData === 1 ? key : value.isData === 4 ? `${formatHarmNum(key)}（/）` : `${formatHarmNum(key)}（不符合）`
+        })
       }
 
       Object.assign(harmNumList, tempHarmNumList)
@@ -455,10 +458,10 @@ const setCheckResultData = (data: CheckData.ResCheckResult) => {
 }
 
 const formatHarmNum = (num: string) => {
-  if(num.includes('.5')){
+  if (num.includes('.5')) {
     return num
-  }else{
-    return num.replace('.0','')
+  } else {
+    return num.replace('.0', '')
   }
 }