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] =?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 },
 ])