Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

frontend/src/api/device/device/deviceData.ts

@@ -48,8 +48,8 @@ const data = [
       {
         id: '1',     //装置序号ID
         name: '240001', //设备名称
-        dev_Type: 'PQS-882A',//设备类型
+        dev_Type: 'PQS-882B4',//设备类型
-        dev_Chns: 1,  //设备通道数
+        dev_Chns: 4,  //设备通道数
         check_Result: '未检测', //检测结果
         report_State: '未生成', //报告状态
         document_State: '未归档', //归档状态
@@ -81,8 +81,8 @@ const data = [
       {
         id: '4',     //装置序号ID
         name: '240004', //设备名称
-        dev_Type: 'PQS-882A',//设备类型
+        dev_Type: 'PQS-882B4',//设备类型
-        dev_Chns: 1,  //设备通道数
+        dev_Chns: 4,  //设备通道数
         check_Result: '未检测', //检测结果
         report_State: '未生成', //报告状态
         document_State: '未归档', //归档状态

frontend/src/views/home/components/channelsTest.vue

@@ -6,7 +6,7 @@
 
         <div class="right-title">
           <!-- <div>系数校准表</div> -->
-          <div>当前源输出为：Ua=Ub=Uc=57.74V Ia=Ib=Ic=1A； 电压误差为：±0.1Un%； 电流误差为：±0.5%</div>
+          <div>{{ outputDsc }}</div>
           <div>
             <span style="  font-size: 18px;font-weight: 600;">
               设备已合格 <span style="color: #67C23A">{{ qualified }}</span> 台/共 <span style="color: green">{{ total }}</span>
@@ -20,13 +20,13 @@
         <div class="right-content">
           <el-tabs type="border-card">
             <el-empty description="暂无数据，等待检测开始" v-if="activeIndex === 0" />
-            <el-tab-pane label="被检设备1" v-if="activeIndex > 0">
+            <el-tab-pane label="240001" v-if="activeIndex > 0">
               <channelsTestTable :tableData="tableData1"></channelsTestTable>
             </el-tab-pane>
-            <el-tab-pane label="被检设备2" v-if="activeIndex > 1">
+            <el-tab-pane label="240002" v-if="activeIndex > 1">
               <template #label>
                 <span class="custom-tabs-label">
-                  <span>被检设备2</span>
+                  <span>240002</span>
                   <el-icon>
                     <Failed />
                   </el-icon>
@@ -34,9 +34,12 @@
               </template>
               <channelsTestTable :tableData="tableData2"></channelsTestTable>
             </el-tab-pane>
-            <el-tab-pane label="被检设备3" v-if="activeIndex > 2">
+            <el-tab-pane label="240003" v-if="activeIndex > 2">
               <channelsTestTable :tableData="tableData3"></channelsTestTable>
             </el-tab-pane>
+            <el-tab-pane label="240004" v-if="activeIndex > 3">
+              <channelsTestTable :tableData="tableData4"></channelsTestTable>
+            </el-tab-pane>
           </el-tabs>
 
         </div>
@@ -50,8 +53,9 @@
 import { SuccessFilled, Failed } from '@element-plus/icons-vue'
 
 const activeIndex = ref(0)
-const activeTotalNum = ref(3)
+const activeTotalNum = ref(4)
 const qualified = ref(0)
+const outputDsc = ref('电压误差为：±0.1Un%； 电流误差为：±0.5%')
 const total = ref(0)
 
 const activities = [
@@ -87,7 +91,7 @@ const tableData1 = ref([
   {
     id: '1',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备1',
+    deviceName: '240001',
     MonitorIdx: 1,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -100,7 +104,7 @@ const tableData1 = ref([
   {
     id: '2',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备1',
+    deviceName: '240001',
     MonitorIdx: 2,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -113,7 +117,7 @@ const tableData1 = ref([
   {
     id: '3',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备1',
+    deviceName: '240001',
     MonitorIdx: 3,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -126,7 +130,7 @@ const tableData1 = ref([
   {
     id: '4',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备1',
+    deviceName: '240001',
     MonitorIdx: 4,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -141,7 +145,7 @@ const tableData2 = ref([
   {
     id: '1',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备2',
+    deviceName: '240002',
     MonitorIdx: 1,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -154,7 +158,7 @@ const tableData2 = ref([
   {
     id: '2',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备2',
+    deviceName: '240002',
     MonitorIdx: 2,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -167,7 +171,7 @@ const tableData2 = ref([
   {
     id: '3',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备2',
+    deviceName: '240002',
     MonitorIdx: 3,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -180,7 +184,7 @@ const tableData2 = ref([
   {
     id: '4',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备2',
+    deviceName: '240002',
     MonitorIdx: 4,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -195,7 +199,7 @@ const tableData3 = ref([
   {
     id: '1',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备3',
+    deviceName: '240003',
     MonitorIdx: 1,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -208,7 +212,7 @@ const tableData3 = ref([
   {
     id: '2',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备3',
+    deviceName: '240003',
     MonitorIdx: 2,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -221,7 +225,7 @@ const tableData3 = ref([
   {
     id: '3',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备3',
+    deviceName: '240003',
     MonitorIdx: 3,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -234,7 +238,61 @@ const tableData3 = ref([
   {
     id: '4',
     updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备3',
+    deviceName: '240003',
+    MonitorIdx: 4,
+    Ua: 1.0003,
+    Ub: 1.0003,
+    Uc: 0.0096,
+    Ia: 1.0003,
+    Ib: 1.0003,
+    Ic: 1.0008,
+    Result: '合格',
+  },
+])
+const tableData4 = ref([
+  {
+    id: '1',
+    updateTime: '2024-10-10 10:30:00',
+    deviceName: '240004',
+    MonitorIdx: 1,
+    Ua: 1.0003,
+    Ub: 1.0003,
+    Uc: 0.0096,
+    Ia: 1.0003,
+    Ib: 1.0003,
+    Ic: 1.0008,
+    Result: '合格',
+  },
+  {
+    id: '2',
+    updateTime: '2024-10-10 10:30:00',
+    deviceName: '240004',
+    MonitorIdx: 2,
+    Ua: 1.0003,
+    Ub: 1.0003,
+    Uc: 0.0096,
+    Ia: 1.0003,
+    Ib: 1.0003,
+    Ic: 1.0008,
+    Result: '合格',
+  },
+  {
+    id: '3',
+    updateTime: '2024-10-10 10:30:00',
+    deviceName: '240004',
+    MonitorIdx: 3,
+    Ua: 1.0003,
+    Ub: 1.0003,
+    Uc: 0.0096,
+    Ia: 1.0003,
+    Ib: 1.0003,
+    Ic: 1.0008,
+    Result: '合格',
+  },
+  {
+    id: '4',
+    updateTime: '2024-10-10 10:30:00',
+    deviceName: '240004',
     MonitorIdx: 4,
     Ua: 1.0003,
     Ub: 1.0003,
@@ -264,7 +322,10 @@ watch(testStatus, function (newValue, oldValue) {
     let timer = setInterval(() => {
       if (activeIndex.value < activeTotalNum.value) {
         activeIndex.value++
-        qualified.value = activeIndex.value
+        if(activeIndex.value > 1)
+        qualified.value = activeIndex.value -1;//演示效果，实际运行时使用后端传来的真实数据即可
+        else
+        qualified.value = activeIndex.value;
       }
       else if (activeIndex.value === activeTotalNum.value) {
         clearInterval(timer)
@@ -279,60 +340,15 @@ watch(testStatus, function (newValue, oldValue) {
     }, 1000);
   }
 })
-// watch(activeIndex, function (newValue, oldValue) {
 
-// if(activeIndex.value === 1)
+watch(activeIndex, function (newValue, oldValue) {
-// {
-//   activities.value.length = 0;
-//   activities.value.push({
-//     content: '开始检测',
-//     timestamp: '2018-04-12 20:46',
-//     size: 'large',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//   });
-// }
-// if(activeIndex.value === 2)
-// {
-//   activities.value.push({
-//     content: 'GPS上送时刻',
-//     timestamp: '2018-04-03 20:46',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//     size: 'large',
-//   });
-// }
-// if(activeIndex.value === 3)
-// {
-//   activities.value.push({
-//     content: '设备最早上送时刻',
-//     timestamp: '2018-04-03 20:46',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//     size: 'large',
-//   });
 
-//   deviceOperatorData.value.length = 0;
+if(activeIndex.value === 1)
-//   deviceOperatorData.value = deviceData.value;
+{
-// }
+  outputDsc.value = "电压误差为：±0.1Un%； 电流误差为：±0.5%；当前源输出为：Ua=Ub=Uc=57.74V Ia=Ib=Ic=1A";
-// if(activeIndex.value > 3)
+}
-// {
+
-//   activities.value.push({
+})
-//     content: '设备最晚上送时刻',
-//     timestamp: '2018-04-03 20:46',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//     size: 'large',
-//   });
-//   activities.value.push({
-//     content: '检测结束',
-//     timestamp: '2018-04-03 20:46',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//     size: 'large',
-//   });
-// }
-// })
 
 const emit = defineEmits(['update:testStatus']);
 //监听sn

frontend/src/views/home/components/channelsTestTable.vue

@@ -32,8 +32,9 @@
                     </el-table-column>
                     <el-table-column  label="校准结果">
                       <template #default="scope">
-                    <el-tag :type="scope.row.Result === '合格' ? 'success' : 'danger'">{{ scope.row.Result }}</el-tag>
+                        <el-tag type="danger" v-if="scope.row.Result === '不合格'">{{ scope.row.Result }}</el-tag>
-                  </template>
+                        <span v-if="scope.row.Result != '不合格'">{{ scope.row.Result }}</span>
+                      </template>
                     </el-table-column>
                    
             </el-table>

frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue

@@ -38,106 +38,188 @@
           <!-- <el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">合格92项/共103项</el-button> 
                   <el-button type="primary" v-if="activeIndex >= activeTotalNum" disabled>合格92项/共103项</el-button>  -->
           <span style="  font-size: 18px;font-weight: 600;">
-            设备已合格 <span style="color: #67C23A">{{ qualified }}</span> 台/共 <span style="color: green">{{ 103 }}</span>
+            数据已合格 <span style="color: #67C23A">{{ qualified }}</span> 项/共 <span style="color: green">{{ 103 }}</span>
-            台
+            项
           </span>
         </div>
         <div class="dialog-content">
-          <el-table :data="tableData" row-key="id" height="450px"
+          <el-table :data="tableData" :cell-class-name="tableCell"  row-key="id" height="450px"
             :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' }" style="width: 100%"
             border>
             <el-table-column fixed prop="scriptItemName" label="检测项目" width="210px" />
-
+            <el-table-column label="被检通道1" :min-width="minwidth" align="center">
-            <el-table-column label="被检通道1" align="center">
+              <template #header>
-              <template #default="scope">
+                <span>被检通道1</span>
-
+                 <el-tooltip content = "240001被检通道1" placement="top" style="align-items: bottom;">
-                <el-tooltip :content="scope.row.resultType1 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
+                  <el-icon><InfoFilled  /></el-icon>
-                  <el-button :disabled="scope.row.resultType1 == 'info'" :type="scope.row.resultType1" size="small"
-                    @click="handleClick(scope.row)">
-                    {{ scope.row.resultValue1 }}
-                  </el-button>
                 </el-tooltip>
-
-
               </template>
-            </el-table-column>
-            <el-table-column label="被检通道2" align="center">
               <template #default="scope">
-                <el-tooltip :content="scope.row.resultType2 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
+              <!-- <el-tooltip content = "info" placement="top">
-                  <el-button :disabled="scope.row.resultType2 == 'info'" :type="scope.row.resultType2" size="small"
+                <i class="el-icon-info"></i>
-                    @click="handleClick(scope.row)">
+              </el-tooltip> -->
-                    {{ scope.row.resultValue2 }}
+              <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
-                  </el-button>
+                <el-button
+                :disabled = "scope.row.resultType1=='info'"
+                :type="scope.row.resultType1"
+                size="small"
+                @click="handleClick(scope.row)"
+              >
+                {{ scope.row.resultValue1 }}
+              </el-button>
+            </el-tooltip>
+              
+            </template>
+            </el-table-column>
+            <el-table-column label="被检通道2" :min-width="minwidth" align="center">
+              <template #header>
+                <span>被检通道2</span>
+                 <el-tooltip content = "240001被检通道2" placement="top">
+                  <el-icon><InfoFilled  /></el-icon>
+                </el-tooltip>
+              </template>
+              <template #default="scope">
+                <el-tooltip :content="scope.row.resultType2==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                  <el-button
+                  :disabled = "scope.row.resultType2=='info'"
+                  :type="scope.row.resultType2"
+                  size="small"
+                  @click="handleClick(scope.row)"
+                >
+                  {{ scope.row.resultValue2 }}
+                </el-button>
                 </el-tooltip>
 
               </template>
             </el-table-column>
-            <el-table-column label="被检通道3" align="center">
+            <el-table-column label="被检通道3" :min-width="minwidth" align="center">
+              <template #header>
+                <span>被检通道3</span>
+                 <el-tooltip content = "240001被检通道3" placement="top">
+                  <el-icon><InfoFilled  /></el-icon>
+                </el-tooltip>
+              </template>
               <template #default="scope">
-                <el-tooltip :content="scope.row.resultType3 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
+                <el-tooltip :content="scope.row.resultType3==='info' ? '暂无数据' : '点击查看详情'" placement="top">
-                  <el-button :disabled="scope.row.resultType3 == 'info'" :type="scope.row.resultType3" size="small"
+                  <el-button
-                    @click="handleClick(scope.row)">
+                  :disabled = "scope.row.resultType3=='info'"
-                    {{ scope.row.resultValue3 }}
+                  :type="scope.row.resultType3"
-                  </el-button>
+                  size="small"
+                  @click="handleClick(scope.row)"
+                >
+                  {{ scope.row.resultValue3 }}
+                </el-button>
                 </el-tooltip>
 
               </template>
             </el-table-column>
-            <el-table-column label="被检通道4" align="center">
+            <el-table-column label="被检通道4" :min-width="minwidth" align="center">
-              <template #default="scope">
+              <template #header>
-                <el-tooltip :content="scope.row.resultType4 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
+                <span>被检通道4</span>
-                  <el-button :disabled="scope.row.resultType4 == 'info'" :type="scope.row.resultType4" size="small"
+                 <el-tooltip content = "240001被检通道4" placement="top">
-                    @click="handleClick(scope.row)">
+                  <el-icon><InfoFilled  /></el-icon>
-                    {{ scope.row.resultValue4 }}
-                  </el-button>
                 </el-tooltip>
+              </template>
+                            <template #default="scope">
+                              <el-tooltip :content="scope.row.resultType4==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                                <el-button
+                  :disabled = "scope.row.resultType4=='info'"
+                  :type="scope.row.resultType4"
+                  size="small"
+                  @click="handleClick(scope.row)"
+                >
+                  {{ scope.row.resultValue4 }}
+                </el-button>
+                              </el-tooltip>
 
               </template>
             </el-table-column>
-            <el-table-column p label="被检通道5" align="center">
+            <el-table-column p label="被检通道5" :min-width="minwidth" align="center">
-              <template #default="scope">
+              <template #header>
-                <el-tooltip :content="scope.row.resultType5 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
+                <span>被检通道5</span>
-                  <el-button :disabled="scope.row.resultType5 == 'info'" :type="scope.row.resultType5" size="small"
+                 <el-tooltip content = "240002被检通道1" placement="top">
-                    @click="handleClick(scope.row)">
+                  <el-icon><InfoFilled  /></el-icon>
-                    {{ scope.row.resultValue5 }}
-                  </el-button>
                 </el-tooltip>
+              </template>
+                            <template #default="scope">
+                              <el-tooltip :content="scope.row.resultType5==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                                <el-button
+                  :disabled = "scope.row.resultType5=='info'"
+                  :type="scope.row.resultType5"
+                  size="small"
+                  @click="handleClick(scope.row)"
+                >
+                  {{ scope.row.resultValue5 }}
+                </el-button>
+                              </el-tooltip>
 
               </template>
             </el-table-column>
-            <el-table-column label="被检通道6" align="center">
+            <el-table-column label="被检通道6" :min-width="minwidth" align="center">
-              <template #default="scope">
+              <template #header>
-                <el-tooltip :content="scope.row.resultType6 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
+                <span>被检通道6</span>
-                  <el-button tip :disabled="scope.row.resultType6 == 'info'" :type="scope.row.resultType6" size="small"
+                 <el-tooltip content = "240002被检通道2" placement="top">
-                    @click="handleClick(scope.row)">
+                  <el-icon><InfoFilled  /></el-icon>
-                    {{ scope.row.resultValue6 }}
-                  </el-button>
                 </el-tooltip>
+              </template>
+                            <template #default="scope">
+                              <el-tooltip :content="scope.row.resultType6==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                                <el-button
+                  tip
+                  :disabled = "scope.row.resultType6=='info'"
+                  :type="scope.row.resultType6"
+                  size="small"
+                  @click="handleClick(scope.row)"
+                >
+                  {{ scope.row.resultValue6 }}
+                </el-button>
+                              </el-tooltip>
 
               </template>
             </el-table-column>
-            <el-table-column label="被检通道7" align="center">
+            <el-table-column label="被检通道7" :min-width="minwidth" align="center">
-              <template #default="scope">
+              <template #header>
-                <el-tooltip :content="scope.row.resultType7 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
+                <span>被检通道7</span>
-                  <el-button :disabled="scope.row.resultType7 == 'info'" :type="scope.row.resultType7" size="small"
+                 <el-tooltip content = "240002被检通道3" placement="top">
-                    @click="handleClick(scope.row)">
+                  <el-icon><InfoFilled  /></el-icon>
-                    {{ scope.row.resultValue7 }}
-                  </el-button>
                 </el-tooltip>
+              </template>
+                            <template #default="scope">
+                              <el-tooltip :content="scope.row.resultType7==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                                <el-button
+                  :disabled = "scope.row.resultType7=='info'"
+                  :type="scope.row.resultType7"
+                  size="small"
+                  @click="handleClick(scope.row)"
+                >
+                  {{ scope.row.resultValue7 }}
+                </el-button>
+                              </el-tooltip>
 
               </template>
             </el-table-column>
-            <el-table-column label="被检通道8" align="center">
+            <el-table-column label="被检通道8" :min-width="minwidth" align="center">
-              <template #default="scope">
+              <template #header>
-                <el-tooltip :content="scope.row.resultType8 === 'info' ? '暂无数据' : '点击查看详情'" placement="top">
+                <span>被检通道8</span>
-                  <el-button :disabled="scope.row.resultType8 == 'info'" :type="scope.row.resultType8" size="small"
+                 <el-tooltip content = "240002被检通道4" placement="top">
-                    @click="handleClick(scope.row)">
+                  <el-icon><InfoFilled  /></el-icon>
-                    {{ scope.row.resultValue8 }}
-                  </el-button>
                 </el-tooltip>
+              </template>
+                            <template #default="scope">
+                              <el-tooltip :content="scope.row.resultType8==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                                <el-button
+                  :disabled = "scope.row.resultType8=='info'"
+                  :type="scope.row.resultType8"
+                  size="small"
+                  @click="handleClick(scope.row)"
+                >
+                  {{ scope.row.resultValue8 }}
+                </el-button>
+                              </el-tooltip>
 
               </template>
             </el-table-column>
+
             <!-- <el-table-column  v-for="(item, index) in monitorList" :key="index"  :prop="item.prop" :label="item.label">
           </el-table-column> -->
 
@@ -263,7 +345,9 @@ const handleCancel = () => {
   //clearInterval(timer.value);
   reportDisabled.value = true;
   activeIndex.value = 0;
+  qualified.value = 0;
   tableData.value.length = 0;
+  columnList.value.length = 0;
   tableData.value = JSON.parse(JSON.stringify(operatorTableData.value));
 };
 
@@ -401,9 +485,23 @@ const testLogList = ref([
     log: '暂无数据，等待检测开始',
   },
 ])
-
+const columnList = ref([]);
 const tableKey = ref(0);
+function tableCell ({row,columnIndex}){
+  let items = columnList?.value.filter((item) => item === row.id)
 
+if(columnIndex === 0 && items.length > 0)
+{
+    // console.log(row.id,items.length,columnList?.value)
+  return 'warning-row'
+}
+
+  if(columnIndex === 0)
+  {
+    return 'header-row'
+  }
+
+}
 const tableRowClassName = ({
   row,
   rowIndex,
@@ -442,6 +540,8 @@ function traverseTableData(data: any[], id: string): void {
         if (getRandomInt(10) > 8 && activeIndex.value > 2) {
           item[field1] = "danger";
           item[field2] = "×";
+          columnList.value.push(activeIndex.value.toString());
+          console.log(id,activeIndex.value,columnList.value)
         }
         else {
           item[field1] = "success";
@@ -1867,7 +1967,22 @@ const resumeTimer = () => {
 
 
 </script>
-<style scoped>
+<style scoped lang="scss">
+:deep(.el-table .header-row) {
+  // background-color:var(--el-color-warning-light-9);
+  background-color:#f5f7fa;
+  // color:red;
+  // font-size:30px;
+  // --el-table-tr-bg-color: var(--el-color-warning-light-9);
+}
+:deep(.el-table .warning-row) {
+  // background-color:var(--el-color-warning-light-9);
+  //background-color:#bed96557;
+   color:red;
+  // font-size:30px;
+  // --el-table-tr-bg-color: var(--el-color-warning-light-9);
+}
+
 .change-errsys-dialog {
   display: flex;
   flex-direction: column;

frontend/src/views/home/components/dataCheckResultTable.vue

@@ -36,9 +36,13 @@
                     
                 </el-table-column>
                 <el-table-column  prop="Result" label="检测结果">
-                    <template #default="scope">
+                    <!-- <template #default="scope">
                     <el-tag :type="scope.row.Result === '合格' ? 'success' : 'danger'">{{ scope.row.Result }}</el-tag>
-                  </template>
+                  </template> -->
+                  <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>
+                      </template>
                 </el-table-column>
                
         </el-table>

frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue

@@ -21,7 +21,7 @@
             <div class="data-check-content">
                 <div class="content-right">
                     <div class="content-right-title">
-                        <el-divider >当前检测项目：</el-divider>
+                        <el-divider >当前检测项目</el-divider>
                         <span>{{currentScriptDsc}}</span>
                     </div>
                     <div class="content-right-Tabs">

frontend/src/views/home/components/reportPopup.vue

@@ -25,16 +25,18 @@
                         <el-tab-pane label="报告生成进度">
                             <div class="form-grid">
                                 <div class="tabs-title ">
+                                    <el-button type="primary" :icon="Download"  >报告下载</el-button>     
                                     <span style="  font-size: 18px;font-weight: 600;">
                                         已生成 <span style="color: #67C23A">2</span> 台/共 <span style="color: green">3</span> 台
                                     </span>
-                                    <!-- <el-button type="primary" loading >已生成2台/共3台</el-button> -->
+                                    
                                     </div> 
                                 <div class="table-main">
                                     <el-table :data="reportData" :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" border class="custom-table">
+                                    <el-table-column type="selection" width="55" />
                                     <el-table-column prop="id" width="70" label="序号" />
                                     <el-table-column prop="deviceName" width="150" label="设备名称" />
-                                    <el-table-column label="生成进度" width="450">
+                                    <el-table-column label="生成进度">
                                         <template #default="scope">
                                             <el-progress :color="customColors" :percentage="scope.row.processValue" />
                                          </template>
@@ -142,7 +144,7 @@ const props = defineProps<{
 }
 .tabs-title{
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
     margin-bottom: 10px;
 }
 

frontend/src/views/home/components/table.vue

@@ -269,7 +269,6 @@ const dialogForm = ref<any>({
       state:1,     
 });
 const shouldShowOption = (item) => {
-  console.log(item,12345)
   return !item.disabled; 
 };
 //console.log(window.innerHeight, "+++++++++");

frontend/src/views/home/components/test.vue

@@ -53,7 +53,7 @@
             <el-table-column label="被检通道1" :min-width="minwidth" align="center">
               <template #header>
                 <span>被检通道1</span>
-                 <el-tooltip content = "被检装置1被检通道1" placement="top" style="align-items: bottom;">
+                 <el-tooltip content = "240001被检通道1" placement="top" style="align-items: bottom;">
                   <el-icon><InfoFilled  /></el-icon>
                 </el-tooltip>
               </template>
@@ -77,7 +77,7 @@
             <el-table-column label="被检通道2" :min-width="minwidth" align="center">
               <template #header>
                 <span>被检通道2</span>
-                 <el-tooltip content = "被检装置1被检通道2" placement="top">
+                 <el-tooltip content = "240001被检通道2" placement="top">
                   <el-icon><InfoFilled  /></el-icon>
                 </el-tooltip>
               </template>
@@ -98,7 +98,7 @@
             <el-table-column label="被检通道3" :min-width="minwidth" align="center">
               <template #header>
                 <span>被检通道3</span>
-                 <el-tooltip content = "被检装置1被检通道3" placement="top">
+                 <el-tooltip content = "240001被检通道3" placement="top">
                   <el-icon><InfoFilled  /></el-icon>
                 </el-tooltip>
               </template>
@@ -119,7 +119,7 @@
             <el-table-column label="被检通道4" :min-width="minwidth" align="center">
               <template #header>
                 <span>被检通道4</span>
-                 <el-tooltip content = "被检装置1被检通道4" placement="top">
+                 <el-tooltip content = "240001被检通道4" placement="top">
                   <el-icon><InfoFilled  /></el-icon>
                 </el-tooltip>
               </template>
@@ -140,7 +140,7 @@
             <el-table-column p label="被检通道5" :min-width="minwidth" align="center">
               <template #header>
                 <span>被检通道5</span>
-                 <el-tooltip content = "被检装置2被检通道1" placement="top">
+                 <el-tooltip content = "240002被检通道1" placement="top">
                   <el-icon><InfoFilled  /></el-icon>
                 </el-tooltip>
               </template>
@@ -161,7 +161,7 @@
             <el-table-column label="被检通道6" :min-width="minwidth" align="center">
               <template #header>
                 <span>被检通道6</span>
-                 <el-tooltip content = "被检装置2被检通道2" placement="top">
+                 <el-tooltip content = "240002被检通道2" placement="top">
                   <el-icon><InfoFilled  /></el-icon>
                 </el-tooltip>
               </template>
@@ -183,7 +183,7 @@
             <el-table-column label="被检通道7" :min-width="minwidth" align="center">
               <template #header>
                 <span>被检通道7</span>
-                 <el-tooltip content = "被检装置2被检通道3" placement="top">
+                 <el-tooltip content = "240002被检通道3" placement="top">
                   <el-icon><InfoFilled  /></el-icon>
                 </el-tooltip>
               </template>
@@ -204,7 +204,7 @@
             <el-table-column label="被检通道8" :min-width="minwidth" align="center">
               <template #header>
                 <span>被检通道8</span>
-                 <el-tooltip content = "被检装置2被检通道4" placement="top">
+                 <el-tooltip content = "240002被检通道4" placement="top">
                   <el-icon><InfoFilled  /></el-icon>
                 </el-tooltip>
               </template>
@@ -316,9 +316,7 @@ const scrollContainer = ref<HTMLElement | null>(null); // 声明 scrollContainer
 
 const scrollToBottom = () => {
       if (scrollContainer.value) {
-        //console.log(scrollContainer.value)
         scrollContainer.value.scrollTop = scrollContainer.value.scrollHeight;
-        //console.log(scrollContainer.value)
       }
     };
 
@@ -367,7 +365,7 @@ const updateLog = () => {
       case 10:
       case 11:
       case 12:
-            updateTableData(activeIndex.value.toString())
+            // updateTableData(activeIndex.value.toString())
       break;
 
     }
@@ -380,14 +378,24 @@ const testLogList = ref([
     log:'暂无数据，等待检测开始',
   },
 ])
+const columnList = ref([]);
 
 const tableKey = ref(0);
 function tableCell ({row,columnIndex}){
 
+  let items = columnList?.value.filter((item) => item === row.id)
+
+  if(columnIndex === 0 && items.length > 0)
+  {
+      console.log(row.id,items.length,columnList?.value)
+    return 'warning-row'
+  }
+
   if(columnIndex === 0)
-{
+  {
-  return 'warning-row'
+    return 'header-row'
-}
+  }
+
 }
 
 const tableRowClassName = ({
@@ -397,8 +405,6 @@ const tableRowClassName = ({
   row: any
   rowIndex: number
 }) => {
-  //  console.log(activeIndex.value,rowIndex,row)
-
   if (row.rowIndex === activeIndex.value.toString()) {
     return 'warning-row'
   } 
@@ -433,6 +439,8 @@ function traverseTableData(data: any[],id: string): void {
         {
           item[field1] = "danger";
           item[field2] = "×";
+          columnList.value.push(activeIndex.value.toString());
+          console.log(id,activeIndex.value,columnList.value)
         }
         else
         {
@@ -452,7 +460,6 @@ function traverseTableData(data: any[],id: string): void {
 
 const updateTableData = (id: string) => {
   traverseTableData(tableData.value,id);
-  console.log(id)
 };
 
 const handleReCheck = () => {
@@ -460,15 +467,13 @@ const handleReCheck = () => {
     percentage.value = 0;
     tableData.value.length = 0;
     testLogList.value.length = 0;
-
+    columnList.value.length = 0;
-    console.log(tableData.value,operatorTableData.value)
     tableData.value = JSON.parse(JSON.stringify(operatorTableData.value));
     resumeTimer()
 };
 let timer: any = ref("");
 const handlePauseTest = () => {
 
-  
   if (!isPause.value) {
     pauseTimer()
   } else {
@@ -1791,7 +1796,7 @@ const ts = ref('');
 const startTimer = () => {
   //if (timer.value !== null) return; // 如果定时器已经启动，则不再重复启动
   timer.value = setInterval(() => {
-    console.log(activeIndex.value,111,activeTotalNum.value,222)
+
     if(activeIndex.value <= activeTotalNum.value)
         {
 
@@ -1901,13 +1906,20 @@ watch(ts, function (newValue, oldValue) {
 
 </script>
 <style scoped lang="scss">
-:deep(.el-table .warning-row) {
+:deep(.el-table .header-row) {
   // background-color:var(--el-color-warning-light-9);
   background-color:#f5f7fa;
   // color:red;
   // font-size:30px;
   // --el-table-tr-bg-color: var(--el-color-warning-light-9);
 }
+:deep(.el-table .warning-row) {
+  // background-color:var(--el-color-warning-light-9);
+  //background-color:#bed96557;
+   color:red;
+  // font-size:30px;
+  // --el-table-tr-bg-color: var(--el-color-warning-light-9);
+}
 .el-table .success-row {
   --el-table-tr-bg-color: var(--el-color-success-light-9);
 }

frontend/src/views/home/components/timeTest.vue

@@ -160,17 +160,17 @@ const columns = reactive([
   {
     prop: 'updataTime',
     label: '上送时刻',
-    width: 230,
+    // width: 230,
   },
   {
     prop: 'ErrorValue',
     label: '守时误差',
-    width: 100,
+    // width: 100,
   },
   {
     prop: 'Result',
     label: '检测结果',
-    width: 100,
+    // width: 100,
     render: (scope) => {
       if (scope.row.Result === '不合格') {
         return (

frontend/src/views/home/components/tree.vue

@@ -134,15 +134,16 @@ defineExpose({ getTreeData })
   margin-top: 12px;
 }
 
-.filter-tree span {
+//.filter-tree span {
-  font-size: 16px;
+//  font-size: 16px;
-  display:block;
+//  display:block;
-  overflow:hidden;
+//  overflow:hidden;
   // word-break:keep-all;
   // white-space:nowrap;
   //  text-overflow:ellipsis;
-   padding-right: 12px;
+//   padding-right: 12px;
-}
+//}
+
 .leftBox {
   // float: left;
   // width: 20%;

frontend/src/views/plan/planList/index.vue

@@ -178,7 +178,7 @@ const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
   {
     prop: 'testSourceName',
     label: '检测源',
-    width: 365,
+    width: 375,
     render: scope => {
       return (
           <div class='flx-flex-start'>