From 6010cbf20af588542acc0f6c14df672e7541d4dd Mon Sep 17 00:00:00 2001
From: GYYM <704080176@qq.com>
Date: Thu, 5 Dec 2024 17:30:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dataCheckChangeErrSysPopup.vue |  8 +--
 .../views/home/components/dataCheckPopup.vue  | 10 ++--
 .../src/views/home/components/reportPopup.vue | 60 +++++++++----------
 .../src/views/home/components/resultPopup.vue |  4 +-
 frontend/src/views/home/components/table.vue  |  3 +-
 frontend/src/views/home/tabs/dashboard.vue    | 20 +++----
 frontend/src/views/plan/planList/index.vue    | 21 -------
 7 files changed, 50 insertions(+), 76 deletions(-)

diff --git a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
index 87c6b49..6820952 100644
--- a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
+++ b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue
@@ -4,19 +4,19 @@
       <div class="change-errsys-title">
         <el-form :model='formContent' label-width="auto" class="form-three">
 
-          <el-form-item label="设备名称:">
+          <el-form-item label="设备名称">
             <el-input v-model='deviceName' :disabled="true" />
           </el-form-item>
-           <el-form-item label="检测脚本:">
+           <el-form-item label="检测脚本">
             <el-input v-model='testScriptName' :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="数据处理原则:">
+            <el-form-item label="数据原则">
               <el-input v-model='dataRule' :disabled="true" />
             </el-form-item>
 
 
-            <el-form-item label="误差体系:">
+            <el-form-item label="误差体系">
               <el-select v-model="error_Sys_Id" autocomplete="off">
                 <el-option v-for="plan in testErrSystDataList" :key="plan.id" :label="plan.label" :value="plan.id"
                   :disabled="plan.label === errorSysName">
diff --git a/frontend/src/views/home/components/dataCheckPopup.vue b/frontend/src/views/home/components/dataCheckPopup.vue
index f557f61..aadd6d3 100644
--- a/frontend/src/views/home/components/dataCheckPopup.vue
+++ b/frontend/src/views/home/components/dataCheckPopup.vue
@@ -3,16 +3,16 @@
         <div class="data-check-dialog">
             <div class="data-check-title">
                 <el-form :model='formContent' label-width="auto" class="form-three ">
-                                <el-form-item label="检测脚本:"  >
+                                <el-form-item label="检测脚本"  >
                                     <el-input v-model='testScriptName' :disabled="true"/>
                                 </el-form-item>             
-                                <el-form-item label="误差体系:"  >
+                                <el-form-item label="误差体系"  >
                                     <el-input v-model='errorSysName' :disabled="true"/>
                                 </el-form-item>              
-                                <el-form-item label="数据处理原则:"  >
+                                <el-form-item label="数据原则"  >
                                     <el-input v-model='dataRule' :disabled="true"/>
                                 </el-form-item>           
-                                <el-form-item label="设备名称:"  >
+                                <el-form-item label="设备名称"  >
                                     <el-input v-model='deviceName' :disabled="true"/>
                                 </el-form-item>          
                           
@@ -28,7 +28,7 @@
                                     </el-select>
                                 </el-form-item>       
                             </el-col> -->
-                                <el-form-item label='通道号:'>
+                                <el-form-item label='通道号'>
                                     <el-select v-model="monitorIdx">
                                         <el-option
                                         v-for="item in monitorIdxList"
diff --git a/frontend/src/views/home/components/reportPopup.vue b/frontend/src/views/home/components/reportPopup.vue
index a69c6d5..2f861e7 100644
--- a/frontend/src/views/home/components/reportPopup.vue
+++ b/frontend/src/views/home/components/reportPopup.vue
@@ -1,43 +1,37 @@
 <template>
-    <el-dialog  title="报告生成" :model-value='visible' @close="handleCancel" width="832px">
+    <el-dialog  title="报告生成" :model-value='visible' @close="handleCancel" width="832px" draggable>
         <div class="report-dialog">
-            <div class="report-title">
-                <div>
-                    <el-row  :gutter="24" >
-                    <el-col :span="12">
-                        <el-form-item label="检测脚本:"  >
+            <div class="report-title form-two">
+
+                        <el-form-item label="检测脚本"  label-width="100px">
                             <el-input v-model='testScriptName' :disabled="true"/>
                         </el-form-item>              
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="误差体系"  >
+
+                        <el-form-item label="误差体系"  label-width="100px">
                             <el-input v-model='errorSysName' :disabled="true"/>
                         </el-form-item>              
-                    </el-col>
-                </el-row> 
-                </div>
-                <div>
-                    <el-row  :gutter="24" >
-                                    <el-col :span="12">
-                                        <el-form-item label="数据处理原则"  >
-                                    <el-input v-model='dataRule' :disabled="true"/>
-                                </el-form-item>              
-                                    </el-col>
-                                    <el-col :span="12">
-                                        <el-form-item label="报告模板"  >
-                                    <el-input v-model='reportTemplate' :disabled="true"/>
-                                </el-form-item>           
-                                    </el-col>
-                                </el-row> 
-                </div>
+
+                        <el-form-item label="数据原则"  label-width="100px">
+                            <el-input v-model='dataRule' :disabled="true"/>
+                        </el-form-item>              
+
+                        <el-form-item label="报告模板"  label-width="100px">
+                            <el-input v-model='reportTemplate' :disabled="true"/>
+                        </el-form-item>           
             </div>
             <div class="report-content">
                 <div>
                     <el-tabs type="border-card">
-                        <el-tab-pane label="报告生成状态表：">
+                        <el-tab-pane label="报告生成进度">
                             <div class="form-grid">
-                                <div class="tabs-title"><el-button type="primary" loading >已生成2台/共4台</el-button> </div>
-                                <el-table :data="reportData" stripe="" :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" border class="custom-table">
+                                <div class="tabs-title ">
+                                    <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 prop="id" width="70" label="序号" />
                                     <el-table-column prop="deviceName" width="150" label="设备名称" />
                                     <el-table-column label="生成进度" width="450">
@@ -51,6 +45,8 @@
                                          </template>
                                     </el-table-column>
                                 </el-table>
+                                </div>
+                                
                             </div>
                         </el-tab-pane>
                     </el-tabs>
@@ -81,9 +77,9 @@ import { CirclePlus, Delete, Download,View } from '@element-plus/icons-vue'
   const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
 
 const reportData = ref([
-  { id: '1', deviceName: '被检设备1', processValue: '100' , action:'查看' },
-  { id: '2', deviceName: '被检设备2', processValue: '100' , action:'查看' },
-  { id: '3', deviceName: '被检设备3', processValue: '10', action:'查看' },
+  { id: '1', deviceName: '240001', processValue: '100' , action:'查看' },
+  { id: '2', deviceName: '240002', processValue: '100' , action:'查看' },
+  { id: '3', deviceName: '240003', processValue: '10', action:'查看' },
 ])
 const customColors = [
   { color: "red", percentage: 0 },
diff --git a/frontend/src/views/home/components/resultPopup.vue b/frontend/src/views/home/components/resultPopup.vue
index 557a289..f324608 100644
--- a/frontend/src/views/home/components/resultPopup.vue
+++ b/frontend/src/views/home/components/resultPopup.vue
@@ -3,13 +3,13 @@
        <div class="result-dialog">
         <div class="result-title">
             <el-row>
-            <el-form-item label="检测脚本:"  >
+            <el-form-item label="检测脚本"  >
                 <el-input v-model='testScriptName' :disabled="true"/>
             </el-form-item>    
             <el-form-item label="误差体系"  >
                 <el-input v-model='errorSysName' :disabled="true"/>
             </el-form-item>    
-            <el-form-item label="数据处理原则"  >
+            <el-form-item label="数据原则"  >
                 <el-input v-model='dataRule' :disabled="true"/>
             </el-form-item>    
         </el-row>  
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 0f9f915..baa426a 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -24,7 +24,7 @@
           <el-form-item label="检测状态" v-if="form.activeTabs != 3 && form.activeTabs != 5">
             <el-select v-model="form.checkStatus" clearable>
               <el-option
-                v-for="(item, index) in checkResultList"
+                v-for="(item, index) in checkStatusList"
                 :label="item.label"
                 :value="item.value"
                 :disabled="item.disabled"
@@ -734,7 +734,6 @@ const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => {
   form.value.activeChildTabs= val2;
   deviceData.value = tabledata;
   tableHeaderInit(val)
-  console.log(form,val,val2,666)
 };
 
 //根据当前功能，初始化表头下拉框中的默认值和禁用值
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index 470f4bd..56dc6ff 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -251,15 +251,15 @@ const chartsData1: any = ref([]),
 const getPieData = () => {
   
   chartsData1.value = [
-    { value: Math.floor(Math.random() * 100) + 1, name: "未检测", itemStyle: { color: '#fac858' } },
-    { value: Math.floor(Math.random() * 100) + 1, name: "检测中", itemStyle: { color: '#ee6666' }  },
-    { value: Math.floor(Math.random() * 100) + 1, name: "检测完成", itemStyle: { color: '#91cc75' }  },
-    { value: Math.floor(Math.random() * 100) + 1, name: "归档", itemStyle: { color: '#5470c6' }  },
+    { value: 12, name: "未检测", itemStyle: { color: '#fac858' } },
+    { value: 0, name: "检测中", itemStyle: { color: '#ee6666' }  },
+    { value: 6, name: "检测完成", itemStyle: { color: '#91cc75' }  },
+    { value: 2, name: "归档", itemStyle: { color: '#5470c6' }  },
   ];
   chartsData2.value = [
-    { value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } },
-    { value: Math.floor(Math.random() * 100) + 1, name: "不合格" , itemStyle: { color: '#ee6666' } },
-    { value: Math.floor(Math.random() * 100) + 1, name: "合格", itemStyle: { color: '#91cc75' }  },
+    { value: 12, name: "未检测" , itemStyle: { color: '#fac858' } },
+    { value: 3, name: "不合格" , itemStyle: { color: '#ee6666' } },
+    { value: 5, name: "合格", itemStyle: { color: '#91cc75' }  },
     //     { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项" , itemStyle: { color: '#ee6666' } },
     // { value: Math.floor(Math.random() * 100) + 1, name: "全部合格", itemStyle: { color: '#91cc75' }  },
   ];
@@ -268,9 +268,9 @@ const getPieData = () => {
     // { value: Math.floor(Math.random() * 100) + 1, name: "已生成报告" },
     // { value: Math.floor(Math.random() * 100) + 1, name: "未生成报告" },
 
-    { value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } },
-    { value: Math.floor(Math.random() * 100) + 1, name: "未生成" , itemStyle: { color: '#ee6666' } },
-    { value: Math.floor(Math.random() * 100) + 1, name: "已生成", itemStyle: { color: '#91cc75' }  },
+    { value: 12, name: "未检测" , itemStyle: { color: '#fac858' } },
+    { value: 4, name: "未生成" , itemStyle: { color: '#ee6666' } },
+    { value: 4, name: "已生成", itemStyle: { color: '#91cc75' }  },
 
 
     // { value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } },
diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue
index d6a6a83..a0ed3b6 100644
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -248,27 +248,6 @@ const columns = reactive<ColumnProps<Plan.PlanAndSourceBO>[]>([
     search: { el: 'select', props: { filterable: true } },
     fieldNames: { label: 'label', value: 'id' },
   },
-//  {
-//    prop: 'father_Plan_Id',
-//    label: '父节点',
-//    width: 200,
-//    enum: testFatherPlanList,
-//    fieldNames: { label: 'label', value: 'id' },
-//  },
-  //  {
-  //   prop: 'create_Time',
-  //   label: '记录时间',
-  //   minWidth: 180,
-  //   search: {
-  //     span: 2,
-  //     render: () => {
-  //       return (
-  //         <div class='flx-flex-start'>
-  //         </div>
-  //       )
-  //     },
-  //   },
-  // },
   { prop: 'operation', label: '操作', fixed: 'right', width: 250 },
 ])
 

From b1c9375873886aa5bb54dedc99b274ed63f2aa36 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 5 Dec 2024 18:14:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/plan/static.json             |   2 +-
 frontend/src/components/ProTable/index.vue    |   4 +-
 .../src/components/echarts/pie/default.vue    |   4 +-
 frontend/src/styles/common.scss               |   4 +-
 frontend/src/styles/element.scss              |  30 +--
 .../views/home/components/dataCheckPopup.vue  | 206 ++++++++++--------
 .../home/components/dataCheckRawDataTable.vue |   4 +-
 .../home/components/dataCheckResultTable.vue  |  14 +-
 frontend/src/views/home/components/tree.vue   |  36 ++-
 frontend/src/views/home/tabs/dashboard.vue    |   2 +-
 10 files changed, 171 insertions(+), 135 deletions(-)

diff --git a/frontend/src/api/plan/static.json b/frontend/src/api/plan/static.json
index 39f2a68..f34325e 100644
--- a/frontend/src/api/plan/static.json
+++ b/frontend/src/api/plan/static.json
@@ -7,7 +7,7 @@
                 {
                     "id": 4,
                     "pid": 1,
-                    "name": "邯郸220kV团城站电能质量检测11111111111111111111111111"
+                    "name": "邯郸220kV团城站电能质量检测"
                 },
                 {
                     "id": 5,
diff --git a/frontend/src/components/ProTable/index.vue b/frontend/src/components/ProTable/index.vue
index c0395f0..efd38e8 100644
--- a/frontend/src/components/ProTable/index.vue
+++ b/frontend/src/components/ProTable/index.vue
@@ -8,7 +8,6 @@
     :search-param='searchParam'
     :search-col='searchCol'
   />
-
   <!-- 表格主体 -->
   <div class='table-main' :class='{ card: showCard }'  >
     <!-- 表格头部 操作按钮 -->
@@ -43,10 +42,11 @@
     >
       <!-- 默认插槽 -->
       <slot />
+      
       <template v-for='item in tableColumns' :key='item'>
         <!-- selection || radio || index || expand || sort -->
         <el-table-column
-          v-if='item.type && columnTypes.includes(item.type)'
+          v-if='item.type && columnTypes.includes(item.type) && item.isShow'
           v-bind='item'
           :align="item.align ?? 'center'"
           :reserve-selection="item.type == 'selection'"
diff --git a/frontend/src/components/echarts/pie/default.vue b/frontend/src/components/echarts/pie/default.vue
index 1cbd0c9..576a852 100644
--- a/frontend/src/components/echarts/pie/default.vue
+++ b/frontend/src/components/echarts/pie/default.vue
@@ -40,7 +40,7 @@ const init = () => {
     icon: "roundRect", // 图例项的icon,类型包括 circle(圆形),rect(正方形),//roundRect(圆角正方形),triangle(三角形),diamond(菱形),//pin(大头针行),arrow(箭头形),none(无图例项的icon)
     orient: "vertical", //图例排列方向
     left: "right", //可选属性left,right,top,bottom,可选属性值 left,right,top,bottom,px,百分比,数值,
-    itemGap: 1, // 设置图例项之间的间隔为20
+    itemGap: 10, // 设置图例项之间的间隔为20
     ...props.legendData,
   };
   chart.value = chartsRef.value && echarts.init(chartsRef.value);
@@ -101,7 +101,7 @@ const init = () => {
               fontSize: 12,
             },
             formatter: function (data) {
-                                return data.value
+                                return data.value +'台'
                             }
           },
         },
diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss
index 2ce6ba1..6b6ee87 100644
--- a/frontend/src/styles/common.scss
+++ b/frontend/src/styles/common.scss
@@ -77,8 +77,8 @@
 
 /* scroll bar */
 ::-webkit-scrollbar {
-  width: 6px;
-  height: 200px;
+  width: 8px;
+  height: 8px;
   // background-color: var(--el-color-primary);
 }
 /* 滚动条实际可拖动部分的颜色 */
diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss
index a163182..d0cc594 100644
--- a/frontend/src/styles/element.scss
+++ b/frontend/src/styles/element.scss
@@ -142,13 +142,16 @@
       margin-bottom: 15px;
     }
   }
-
+.el-table__body{
+  // border-left: 1px solid var(--el-table-border-color)
+}
   // el-table 表格样式
   .el-table {
+    // border: 1px solid var(--el-table-border-color);
     // flex: 1;
     width: 100%;
     height: 100%;
-
+    border-left: 1px solid var(--el-table-border-color)
     // 修复 safari 浏览器表格错位 https://github.com/HalseySpicy/Geeker-Admin/issues/83
     table {
       width: 100%;
@@ -398,7 +401,7 @@
 
   &::-webkit-scrollbar {
     width: 8px !important;
-    height: 200px !important;
+    height: 8px !important;
     // background-color: var(--el-color-primary);
     z-index: 3001;
   }
@@ -457,27 +460,6 @@
   }
 }
 
-.form-two {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-
-  .el-form-item {
-    display: flex;
-    width: 48%;
-
-    .el-form-item__content {
-      flex: 1;
-
-      .el-select,
-      .el-cascader,
-      .el-input__inner,
-      .el-date-editor {
-        width: 100%;
-      }
-    }
-  }
-}
 
 .cn-render-buttons {
   cursor: pointer;
diff --git a/frontend/src/views/home/components/dataCheckPopup.vue b/frontend/src/views/home/components/dataCheckPopup.vue
index aadd6d3..9d8f5ee 100644
--- a/frontend/src/views/home/components/dataCheckPopup.vue
+++ b/frontend/src/views/home/components/dataCheckPopup.vue
@@ -1,22 +1,22 @@
 <template>
-    <el-dialog  title="数据查询" :model-value='visible' @close="handleCancel" width="1065px" draggable>
+    <el-dialog title="数据查询" :model-value='visible' @close="handleCancel" width="1065px" draggable>
         <div class="data-check-dialog">
             <div class="data-check-title">
                 <el-form :model='formContent' label-width="auto" class="form-three ">
-                                <el-form-item label="检测脚本"  >
-                                    <el-input v-model='testScriptName' :disabled="true"/>
-                                </el-form-item>             
-                                <el-form-item label="误差体系"  >
-                                    <el-input v-model='errorSysName' :disabled="true"/>
-                                </el-form-item>              
-                                <el-form-item label="数据原则"  >
-                                    <el-input v-model='dataRule' :disabled="true"/>
-                                </el-form-item>           
-                                <el-form-item label="设备名称"  >
-                                    <el-input v-model='deviceName' :disabled="true"/>
-                                </el-form-item>          
-                          
-                            <!-- <el-col :span="8">
+                    <el-form-item label="检测脚本">
+                        <el-input v-model='testScriptName' :disabled="true" />
+                    </el-form-item>
+                    <el-form-item label="误差体系">
+                        <el-input v-model='errorSysName' :disabled="true" />
+                    </el-form-item>
+                    <el-form-item label="数据处理原则">
+                        <el-input v-model='dataRule' :disabled="true" />
+                    </el-form-item>
+                    <el-form-item label="设备名称">
+                        <el-input v-model='deviceName' :disabled="true" />
+                    </el-form-item>
+
+                    <!-- <el-col :span="8">
                                 <el-form-item label='复检次数:'>
                                     <el-select v-model="reCheckIdx">
                                         <el-option
@@ -28,44 +28,43 @@
                                     </el-select>
                                 </el-form-item>       
                             </el-col> -->
-                                <el-form-item label='通道号'>
-                                    <el-select v-model="monitorIdx">
-                                        <el-option
-                                        v-for="item in monitorIdxList"
-                                        :key="item.value"
-                                        :label="item.value"
-                                        :value="item.value"
-                                        />
-                                    </el-select>
-                                </el-form-item>       
+                    <el-form-item label='通道号'>
+                        <el-select v-model="monitorIdx">
+                            <el-option v-for="item in monitorIdxList" :key="item.value" :label="item.value"
+                                :value="item.value" />
+                        </el-select>
+                    </el-form-item>
                 </el-form>
             </div>
             <div class="data-check-content">
                 <div class="content-left-tree">
                     <div class="content-left-tree-switch">
-                        <el-switch
+                        <!-- <el-switch
                             v-model="scriptSwitch"
                             class="ml-2"
                             inline-prompt
                             style="--el-switch-on-color: #003078; --el-switch-off-color: #5a79a9"
                             active-text="不合格测试项"
                             inactive-text="全部测试项"
-                        />
+                        /> -->
+                        <el-radio-group v-model="scriptSwitch">
+                            <el-radio-button label="不合格测试项" value="0" />
+                            <el-radio-button label="全部测试项" value="1" />
+
+                        </el-radio-group>
                     </div>
-                    <div>
-                        <el-tree
-                            :default-expanded-keys="['0','0-1','0-2','0-3','1']"
-                            node-key="id"
-                            :data="data"
-                            :props="defaultProps"
-                            @node-click="handleNodeClick"
-                        />
+                    <div class="content-tree">
+                        <el-tree :default-expanded-keys="['0', '0-1', '0-2', '0-3', '1']" node-key="id" :data="data"
+                            :props="defaultProps" @node-click="handleNodeClick" />
                     </div>
                 </div>
                 <div class="content-right">
                     <div class="content-right-title">
-                        <el-divider >当前检测项目：</el-divider>
-                        <span>{{currentScriptDsc}}</span>
+                        <!-- <el-divider>当前检测项目：</el-divider> -->
+                        <div>
+                            当前检测项目
+                        </div>
+                        <span>{{ currentScriptDsc }}</span>
                     </div>
                     <div class="content-right-Tabs">
                         <el-tabs type="border-card" v-model="activeName">
@@ -101,52 +100,52 @@ import { type Monitor } from '@/api/device/interface/monitor'
 import { data } from "@/api/plan/autoTest.json";
 import DataCheckResultTable from './dataCheckResultTable.vue'
 import DataCheckRawDataTable from './dataCheckRawDataTable.vue'
-
+const formContent = ref({})
 const activeName = ref('rawDataTab')
 const deviceName = ref('被检设备1');
-  const monitorIdx = ref('1');
-  const reCheckIdx = ref('3');
-  const testScriptName = ref('Q/GDW 10650.4-2021 模拟式');
-  const errorSysName = ref('Q/GDW 10650.2-2021');
-  const dataRule = ref('所有值');
-  const scriptSwitch = ref(true);
-  const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
-  const defaultProps = {
-  children: "children",
-  label: "name",
-  pid: "pid",
+const monitorIdx = ref('1');
+const reCheckIdx = ref('3');
+const testScriptName = ref('Q/GDW 10650.4-2021 模拟式');
+const errorSysName = ref('Q/GDW 10650.2-2021');
+const dataRule = ref('所有值');
+const scriptSwitch = ref("0");
+const currentScriptDsc = ref('电压准确度检测：频率：42.5Hz Ua=46.192V 0° Ub=46.192V -120° Uc=46.192V 120° Ia=1A 0° Ib=1A -120° Ic=1A 120°');
+const defaultProps = {
+    children: "children",
+    label: "name",
+    pid: "pid",
 };
 
 const reCheckList = [
-  {
-    value: '0',
-  },
-  {
-    value: '1',
-  },
-  {
-    value: '2',
-  },
-  {
-    value: '3',
-  },
+    {
+        value: '0',
+    },
+    {
+        value: '1',
+    },
+    {
+        value: '2',
+    },
+    {
+        value: '3',
+    },
 ]
 const monitorIdxList = [
-  {
-    value: '1',
-  },
-  {
-    value: '2 （不合格）',
-  },
-  {
-    value: '3',
-  },
-  {
-    value: '4 （不合格）',
-  },
+    {
+        value: '1',
+    },
+    {
+        value: '2 （不合格）',
+    },
+    {
+        value: '3',
+    },
+    {
+        value: '4 （不合格）',
+    },
 ]
 const handleNodeClick = (data) => {
-  console.log(data);
+    console.log(data);
 };
 const MonIsShow = ref(false)
 const DevIsShow = ref(false)
@@ -155,55 +154,76 @@ const dictStore = useDictStore()
 // 定义弹出组件元信息
 const dialogFormRef = ref()
 const disabledDate = (time: Date) => {
-  return time.getTime() > Date.now()
+    return time.getTime() > Date.now()
 }
 
 const props = defineProps<{
     visible: boolean;
-  }>();
+}>();
 
-  const emit = defineEmits<{
+const emit = defineEmits<{
     (e: 'update:visible', value: boolean): void;
     (e: 'submit', data: any): void;
-  }>();
+}>();
 
-  const handleCancel = () => {
+const handleCancel = () => {
     emit('update:visible', false); // 关闭对话框
-  };
+};
 </script>
 <style scoped>
-
-.data-check-dialog{
+.data-check-dialog {
     display: flex;
     flex-direction: column;
     max-height: 580px;
 }
 
-.data-check-title{
+.data-check-title {
     display: flex;
     flex-direction: row;
     margin-top: 10px;
 }
 
-.data-check-content{
+.data-check-content {
     display: flex;
-    flex-direction: row;
+    /* flex-direction: row; */
 }
 
-.content-left-tree{
-    width: 20%;
-    max-height: 475px;
-    overflow-y: auto;
+.content-left-tree {
+    width: 240px;
+    max-height: 445px;
+    /* overflow-y: auto; */
+    padding: 10px 0;
+    border: 1px solid #ccc;
     /* background-color: gray; */
 }
-.content-left-tree-switch{
+
+.content-tree {
+    max-height: 405px;
+    margin-top: 10px;
+    overflow-y: auto;
+}
+
+.content-left-tree-switch {
     text-align: right;
     margin-right: 10px;
 }
-.content-right{
-    margin-left: 20px;
+
+.content-right {
+    margin-left: 10px;
+    flex: 1;
 }
-.content-right-Tabs{
+
+.content-right-Tabs {
     margin-top: 15px;
 }
+
+:deep(.el-divider--horizontal) {
+    margin: 15px 0;
+}
+.content-right-title{
+    div{
+        font-size: 16px;
+        font-weight: 600;    
+    }
+}
 </style>
\ No newline at end of file
diff --git a/frontend/src/views/home/components/dataCheckRawDataTable.vue b/frontend/src/views/home/components/dataCheckRawDataTable.vue
index b9b8cad..d761a92 100644
--- a/frontend/src/views/home/components/dataCheckRawDataTable.vue
+++ b/frontend/src/views/home/components/dataCheckRawDataTable.vue
@@ -1,7 +1,7 @@
 <template>
 
     <div class="table-container table-main">
-        <el-table :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" height="310px" style="width: 100%" >
+        <el-table :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" height="335px" style="width: 100%" >
                 <el-table-column prop="id" label="序号" width="70" />
                 <el-table-column prop="updateTime" label="数据时间" />
                 <el-table-column prop="L1" label="L1（V）" />
@@ -170,7 +170,7 @@ const tableData = ref([
 <style scoped>
 
 .table-container {
-max-height: 320px; /* 根据需要调整高度 */
+
 overflow-y: auto; /* 允许垂直滚动 */
 overflow-x: hidden; /* 隐藏水平滚动条 */
 }
diff --git a/frontend/src/views/home/components/dataCheckResultTable.vue b/frontend/src/views/home/components/dataCheckResultTable.vue
index 66dfb1e..a2a3084 100644
--- a/frontend/src/views/home/components/dataCheckResultTable.vue
+++ b/frontend/src/views/home/components/dataCheckResultTable.vue
@@ -2,32 +2,32 @@
 
     <div class="table-container  table-main">
         
-        <el-table :data="tableData" height="310px"  :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" >
+        <el-table :data="tableData" height="335px"  :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" >
 
                 <el-table-column prop="id" label="序号" width="70" />
                 <el-table-column prop="standardValue" label="标准值（V）" />
 
                 <el-table-column label="L1（V）" >
-                    <el-table-column prop="L1" label="被检值">
+                    <el-table-column prop="L1"  width="70" label="被检值">
 
                     </el-table-column>
-                    <el-table-column prop="L1_errValue" label="误差值">
+                    <el-table-column prop="L1_errValue"  width="70" label="误差值">
                         
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="L2（V）" >
-                    <el-table-column prop="L2" label="被检值">
+                    <el-table-column prop="L2"  width="70" label="被检值">
 
                     </el-table-column>
-                    <el-table-column prop="L2_errValue" label="误差值">
+                    <el-table-column prop="L2_errValue"  width="70" label="误差值">
                         
                     </el-table-column>
                 </el-table-column>
                 <el-table-column label="L3（V）" >
-                    <el-table-column prop="L3" label="被检值">
+                    <el-table-column prop="L3"  width="70" label="被检值">
 
                     </el-table-column>
-                    <el-table-column prop="L3_errValue" label="误差值">
+                    <el-table-column prop="L3_errValue"  width="70" label="误差值">
                         
                     </el-table-column>
                 </el-table-column>
diff --git a/frontend/src/views/home/components/tree.vue b/frontend/src/views/home/components/tree.vue
index 2c4d731..e5f1883 100644
--- a/frontend/src/views/home/components/tree.vue
+++ b/frontend/src/views/home/components/tree.vue
@@ -15,6 +15,7 @@
         :filter-node-method='filterNode'
         :props='defaultProps'
         node-key='id'
+       class="filter-tree"
         default-expand-all
         :default-checked-keys='defaultChecked'
         @node-click='handleNodeClick'
@@ -119,9 +120,42 @@ defineExpose({ getTreeData })
     overflow-x: auto;
 
     .el-tree {
-      height: 100%;
+      // height: 100%;
       width: auto;
     }
   }
 }
+.filter-tree {
+//  border: 1px solid #dcdfe6;
+  min-width: 100%;
+ height: 97%;
+  display: inline-block;
+  overflow: auto;
+  margin-top: 12px;
+}
+
+.filter-tree span {
+  font-size: 16px;
+  display:block;
+  overflow:hidden;
+  // word-break:keep-all;
+  // white-space:nowrap;
+  //  text-overflow:ellipsis;
+   padding-right: 12px;
+}
+.leftBox {
+  // float: left;
+  // width: 20%;
+  height: 100%;
+  width: 100%;
+}
+.left {
+  height: calc(100% - 45px);
+  overflow: auto;
+}
+/* 设置滚动条宽度 */
+:deep(.bodyTwo ::-webkit-scrollbar) {
+    width: 3px !important; 
+    height: 6px !important;   
+  } 
 </style>
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index 56dc6ff..becaf49 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -457,7 +457,7 @@ onUnmounted(() => {
           p {
             margin: 0;
             font-weight: 800;
-            color: var(--el-color-primary);
+            color:#fff;
             font-size: 14px;
             font-family: "Microsoft YaHei", "微软雅黑", "Arial", sans-serif;
           }

From c195a58eb4adfafd33bb3ff6f9dc77d06366b115 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 5 Dec 2024 19:31:43 +0800
Subject: [PATCH 3/3] =?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/device/error/errorData.ts    | 144 +++++++++---------
 .../components/errorStandardPopup.vue         |  84 +++++-----
 2 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/frontend/src/api/device/error/errorData.ts b/frontend/src/api/device/error/errorData.ts
index 521af2c..b8e9c43 100644
--- a/frontend/src/api/device/error/errorData.ts
+++ b/frontend/src/api/device/error/errorData.ts
@@ -42,194 +42,194 @@ const errordata = ref<ErrorSystem.ErrorSystemList[]>([
       {
           col1:'频率偏差',
           col2: '',
-           deviceLevel: 'A', 
+           deviceLevel: 'A',
            measurementType:'频率',
-           condition: '42.5~57.5 Hz', 
-           maxErrorValue: '±0.01Hz' 
+           condition: '42.5~57.5 Hz',
+           maxErrorValue: '±0.01Hz'
       },
       {
           col1:'三相不平衡度',
           col2: '',
-         deviceLevel: 'A', 
+         deviceLevel: 'A',
          measurementType:'电压',
-         condition: '0.5%~5%', 
-         maxErrorValue: '±0.15%' 
+         condition: '0.5%~5%',
+         maxErrorValue: '±0.15%'
       },
       {
           col1:'三相不平衡度',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电压',
-        condition: '5%（不包含）~ 40%', 
-        maxErrorValue: '±0.3%' 
+        condition: '5%（不包含）~ 40%',
+        maxErrorValue: '±0.3%'
      },
      {
          col1:'三相不平衡度',
          col2: '',
-      deviceLevel: 'A', 
+      deviceLevel: 'A',
       measurementType:'电流',
-      condition: '', 
-      maxErrorValue: '±1%' 
+      condition: '',
+      maxErrorValue: '±1%'
       },
       {
           col1:'电压波动',
           col2: '电压幅值',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电压',
-        condition: '', 
-        maxErrorValue: '±0.2%Un' 
+        condition: '',
+        maxErrorValue: '±0.2%Un'
       },
       {
           col1:'电压波动',
           col2: '持续时间',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'时间',
-        condition: '', 
-        maxErrorValue: '±1周波' 
+        condition: '',
+        maxErrorValue: '±1周波'
       },
       {
           col1:'闪变',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'短时间闪变',
-        condition: 'Pst：0.2~10', 
-        maxErrorValue: '±5%' 
+        condition: 'Pst：0.2~10',
+        maxErrorValue: '±5%'
       },
       {
           col1:'谐波和间谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电压',
-        condition: 'Uh≥1%Un', 
-        maxErrorValue: '±5%Uh' 
+        condition: 'Uh≥1%Un',
+        maxErrorValue: '±5%Uh'
       },
       {
           col1:'谐波和间谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电压',
-        condition: 'Uh＜1%Un', 
-        maxErrorValue: '±0.05%Un' 
+        condition: 'Uh＜1%Un',
+        maxErrorValue: '±0.05%Un'
       },
       {
           col1:'谐波和间谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电流',
-        condition: 'In≥3%In', 
-        maxErrorValue: '±5%Ih' 
+        condition: 'In≥3%In',
+        maxErrorValue: '±5%Ih'
       },
       {
           col1:'谐波和间谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电流',
-        condition: 'In＜3%In', 
-        maxErrorValue: '±0.15%In' 
+        condition: 'In＜3%In',
+        maxErrorValue: '±0.15%In'
       },
       {
           col1:'谐波和间谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'相角',
-        condition: '', 
-        maxErrorValue: 'h≤5,±1°*h' 
+        condition: '',
+        maxErrorValue: 'h≤5,±1°*h'
       },
       {
           col1:'谐波和间谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'相角',
-        condition: '', 
-        maxErrorValue: 'h>5,±5°' 
+        condition: '',
+        maxErrorValue: 'h>5,±5°'
       },
       {
           col1:'谐波和间谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'功率',
-        condition: 'Ph≥150W', 
-        maxErrorValue: '±1%Ph' 
+        condition: 'Ph≥150W',
+        maxErrorValue: '±1%Ph'
       },
       {
           col1:'谐波和间谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'功率',
-        condition: 'Ph＜150W', 
-        maxErrorValue: '±1.5W' 
+        condition: 'Ph＜150W',
+        maxErrorValue: '±1.5W'
       },
       {
           col1:'高频次谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电压',
-        condition: 'Uh≥1%Un', 
-        maxErrorValue: '±5%Uh' 
+        condition: 'Uh≥1%Un',
+        maxErrorValue: '±5%Uh'
       },
       {
           col1:'高频次谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电压',
-        condition: 'Uh＜1%Un', 
-        maxErrorValue: '±0.05%Un' 
+        condition: 'Uh＜1%Un',
+        maxErrorValue: '±0.05%Un'
       },
       {
           col1:'高频次谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电流',
-        condition: 'In≥3%In', 
-        maxErrorValue: '±5%Ih' 
+        condition: 'In≥3%In',
+        maxErrorValue: '±5%Ih'
       },
       {
           col1:'高频次谐波',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电流',
-        condition: 'In＜3%In', 
-        maxErrorValue: '±0.15%In' 
+        condition: 'In＜3%In',
+        maxErrorValue: '±0.15%In'
       },
       {
           col1:'功率',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'功率',
-        condition: '', 
-        maxErrorValue: '±0.5%' 
+        condition: '',
+        maxErrorValue: '±0.5%'
       },
       {
           col1:'电流',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电流',
-        condition: 'I≥0.05In', 
-        maxErrorValue: '±0.5%' 
+        condition: 'I≥0.05In',
+        maxErrorValue: '±0.5%'
       },
       {
           col1:'电流',
           col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电流',
-        condition: '0.01In≤I＜0.05In', 
-        maxErrorValue: '±1%' 
+        condition: '0.01In≤I＜0.05In',
+        maxErrorValue: '±1%'
       },
       {
         col1: '电压暂降、电压暂升和短时中断',
           col2: '电压幅值',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'电压',
-        condition: '', 
-        maxErrorValue: '±0.2%Un' 
+        condition: '',
+        maxErrorValue: '±0.2%Un'
       },
       {
         col1: '电压暂降、电压暂升和短时中断',
         col2: '持续时间',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
         measurementType:'时间',
-        condition: '', 
-        maxErrorValue: '±1周波' 
+        condition: '',
+        maxErrorValue: '±1周波'
       },
     ])
     
diff --git a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
index 2c42eea..d5f7148 100644
--- a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
+++ b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
@@ -78,58 +78,58 @@ const spanMethod = ({
   rowIndex,
   columnIndex,
 }: SpanMethodProps) => {
- 
-  if (columnIndex === 0  ) { // 检查是否为第一列
-  
-    if (rowIndex === 2||rowIndex === 5 ||rowIndex === 21||rowIndex === 23) { // 检查是否为第三行
+  if (columnIndex === 0) {
+    if (rowIndex <= 1 || rowIndex === 7 || rowIndex == 20) {
       return {
-        rowspan: 2, // 合并行数
-        colspan: 1,  // 单元格列数
-      };
-    }else if (rowIndex === 8) { // 
+        rowspan: 1, 
+        colspan: 2,
+      }
+    }
+    if (rowIndex === 2) {
       return {
-        rowspan: 8, 
-        colspan: 1,
-      };
-    } 
-    else if (rowIndex === 16) { // 
-      return {
-        rowspan: 4, 
-        colspan: 1,
-      };
-    } 
-    else if (rowIndex === 3 ||rowIndex === 6 ||rowIndex === 9 || rowIndex === 10|| rowIndex === 11
-            || rowIndex === 12|| rowIndex === 13|| rowIndex === 14|| rowIndex === 15
-            || rowIndex === 17 || rowIndex === 18|| rowIndex === 19
-            || rowIndex === 22 ||rowIndex === 24) { // 检查是否为第四行
+        rowspan: 3, // 不显示该单元格
+        colspan: 2,
+      }
+    }
+    if (rowIndex === 3 || rowIndex === 4 || rowIndex === 6 || rowIndex >= 9 && rowIndex <= 15 || rowIndex >= 17 && rowIndex <= 19 || rowIndex === 22 || rowIndex === 24) {
       return {
         rowspan: 0, // 不显示该单元格
         colspan: 0,
-      };
+      }
     }
-  }
-
-  if (columnIndex === 1 || columnIndex === 2){
-  
-    if (rowIndex === 2 
-        || rowIndex === 8|| rowIndex === 10|| rowIndex === 12|| rowIndex === 14
-        || rowIndex === 16|| rowIndex === 18
-        || rowIndex === 21) { 
+    if (rowIndex === 5 || rowIndex === 23) {
       return {
         rowspan: 2, 
         colspan: 1,
-      };
-    } 
-    else if (rowIndex === 3
-            || rowIndex === 9|| rowIndex === 11|| rowIndex === 13|| rowIndex === 15
-            || rowIndex === 17|| rowIndex === 19
-            || rowIndex === 22) { // 检查是否为第四行
-      return {
-        rowspan: 0, // 不显示该单元格
-        colspan: 0,
-      };
+      }
     }
-  } 
+    if (rowIndex === 8) {
+      return {
+        rowspan: 8, 
+        colspan: 2,
+      }
+    }
+    if (rowIndex === 16) {
+      return {
+        rowspan: 4, 
+        colspan: 2,
+      }
+    }
+    if (rowIndex === 21 || rowIndex === 22) {
+      return {
+        rowspan: 2, 
+        colspan: 2,
+      }
+    }
+  }
+  if (columnIndex === 1) {
+    if (rowIndex <= 4 || rowIndex >= 7 && rowIndex <= 22) {
+      return {
+        rowspan: 0, 
+        colspan: 0,
+      }
+    }
+  }
 };
 
     // 关闭弹窗