From 6137ac18b7653665c5ff3afb789a485725257854 Mon Sep 17 00:00:00 2001
From: GYYM <704080176@qq.com>
Date: Fri, 22 Nov 2024 10:46:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/home/components/channelsTest.vue  | 11 ++++++-----
 .../views/home/components/dataCheckPopup.vue    |  8 ++++----
 .../src/views/home/components/reportPopup.vue   | 17 ++++++++++-------
 frontend/src/views/home/components/table.vue    |  4 ++--
 frontend/src/views/home/components/test.vue     |  7 +++++--
 .../src/views/home/components/testPopup.vue     | 12 +++++++++++-
 frontend/src/views/home/tabs/dashboard.vue      |  6 ++++--
 .../plan/planList/components/planPopup.vue      |  6 +++++-
 8 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue
index 93659ad..b6da0d1 100644
--- a/frontend/src/views/home/components/channelsTest.vue
+++ b/frontend/src/views/home/components/channelsTest.vue
@@ -14,6 +14,7 @@
       </div>
       <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"> 
             <channelsTestTable></channelsTestTable>
           </el-tab-pane>
@@ -87,12 +88,12 @@ if(ts.value==='start')
   ts.value = 'process'
 
   let timer = setInterval(() => {
-      if(activeIndex.value < activeTotalNum.value - 2)
+      if(activeIndex.value < activeTotalNum.value)
           activeIndex.value++
-      else if(activeIndex.value === activeTotalNum.value -2)
+      else if(activeIndex.value === activeTotalNum.value)
       {
-          activeIndex.value++
-          activeIndex.value++
+          clearInterval(timer)
+          ts.value = 'success'
       }
       else 
       {
@@ -176,6 +177,6 @@ emit('update:testStatus',ts.value)
       margin-bottom: 10px;
   }
   .right-content{
-    min-height: 400px;
+    max-height: 400px;
   }
 </style>
diff --git a/frontend/src/views/home/components/dataCheckPopup.vue b/frontend/src/views/home/components/dataCheckPopup.vue
index eb5bbad..a5b82d2 100644
--- a/frontend/src/views/home/components/dataCheckPopup.vue
+++ b/frontend/src/views/home/components/dataCheckPopup.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog  title="数据查询" :model-value='visible' @close="handleCancel" v-bind="dialogBig">
+    <el-dialog  title="数据查询" :model-value='visible' @close="handleCancel" width="1050px">
         <div class="data-check-dialog">
             <div class="data-check-title">
                 <el-form :model='formContent'>
@@ -49,13 +49,13 @@
                             class="ml-2"
                             inline-prompt
                             style="--el-switch-on-color: #003078; --el-switch-off-color: #5a79a9"
-                            active-text="仅显示不合格测试项"
-                            inactive-text="显示全部测试项"
+                            active-text="不合格测试项"
+                            inactive-text="全部测试项"
                         />
                     </div>
                     <div>
                         <el-tree
-                            :default-expanded-keys="['0','1']"
+                            :default-expanded-keys="['0','0-1','0-2','0-3','1']"
                             node-key="id"
                             :data="data"
                             :props="defaultProps"
diff --git a/frontend/src/views/home/components/reportPopup.vue b/frontend/src/views/home/components/reportPopup.vue
index 1407c3f..dce9071 100644
--- a/frontend/src/views/home/components/reportPopup.vue
+++ b/frontend/src/views/home/components/reportPopup.vue
@@ -1,15 +1,15 @@
 <template>
-    <el-dialog  title="报告生成" :model-value='visible' @close="handleCancel" v-bind="dialogBig">
+    <el-dialog  title="报告生成" :model-value='visible' @close="handleCancel" width="832px">
         <div class="report-dialog">
             <div class="report-title">
                 <div>
-                    <el-row  :gutter="16" >
-                    <el-col :span="8">
+                    <el-row  :gutter="24" >
+                    <el-col :span="12">
                         <el-form-item label="检测脚本:"  >
                             <el-input v-model='testScriptName' :disabled="true"/>
                         </el-form-item>              
                     </el-col>
-                    <el-col :span="8">
+                    <el-col :span="12">
                         <el-form-item label="误差体系"  >
                             <el-input v-model='errorSysName' :disabled="true"/>
                         </el-form-item>              
@@ -17,13 +17,13 @@
                 </el-row> 
                 </div>
                 <div>
-                    <el-row  :gutter="16" >
-                                    <el-col :span="8">
+                    <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="8">
+                                    <el-col :span="12">
                                         <el-form-item label="报告模板"  >
                                     <el-input v-model='reportTemplate' :disabled="true"/>
                                 </el-form-item>           
@@ -132,8 +132,11 @@ const props = defineProps<{
 }
 
 .report-title{
+    margin-left: 15px;
+
     /* display: flex; */
     /* flex-direction: row;
+
     margin-top: 10px; */
 }
 
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index e3c7d0e..e45eadc 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -90,10 +90,10 @@
           link
           :icon="View"
           @click="openDrawer('查看', scope.row)"
-          v-if="form.activeTabs === 3 && form.activeChildTabs === 0"
+          v-if="form.activeTabs === 3 && form.activeChildTabs === 1"
           >查看</el-button
         >
-        <div class='cn-render-buttons' v-if="form.activeTabs === 3 && form.activeChildTabs === 1">
+        <div class='cn-render-buttons' v-if="form.activeTabs === 3 && form.activeChildTabs === 0">
           <el-dropdown trigger='click'>
             <el-button link type='primary' :icon="View" class='table-operate'>
               <div class='table-operate-text'>查看...</div>
diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index aafc013..6476b77 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/frontend/src/views/home/components/test.vue
@@ -1190,8 +1190,7 @@ watch(ts, function (newValue, oldValue) {
   --el-table-tr-bg-color: var(--el-color-success-light-9);
 }
 
-:deep(.dialog){
-    height: 900px !important;
+.dialog{
     display: flex;
     flex-direction: column;
 }
@@ -1203,6 +1202,10 @@ watch(ts, function (newValue, oldValue) {
     margin-right:10px;
     margin-bottom:10px;
 }
+.dialog-content{
+  max-height: 545px;
+  overflow-y: auto;
+}
 
 .dialog-log{
   max-height: 50px;
diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue
index 8ac07ef..f1db73c 100644
--- a/frontend/src/views/home/components/testPopup.vue
+++ b/frontend/src/views/home/components/testPopup.vue
@@ -193,7 +193,7 @@ const detectionOptions = ref([
     //       
     //   })
     // }
-
+    clearData()
     emit('update:visible', false); // 关闭对话框
   };
   
@@ -255,6 +255,16 @@ const detectionOptions = ref([
   
   <style scoped lang="scss">
 
+:deep(.dialog-big .el-dialog__body){
+    max-height: 840px !important;
+}
+// :deep(.dialog-big){
+//     max-height: 840px !important;
+// }
+// :deep(.el-dialog__body){
+//     max-height: 840px !important;
+// }
+
   .steps-container :deep(.test-head-steps){
       height: 80px;
       margin-bottom: 10px;
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index 565ce14..26cad45 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -315,11 +315,13 @@ const handleCheckFunction = (val: any) => {
     tabLabel1.value = "设备复检";
     break;
     case 3://报告生成
-    tabLabel1.value = "未检设备";
-    tabShow.value = true;
+    tabLabel1.value = "报告生成";
+    //tabShow.value = true;
     break;
     case 4://设备归档
     tabLabel1.value = "设备归档";
+    case 5://数据查询
+    tabLabel1.value = "数据查询";
     break;
   }
     
diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue
index 1edb29e..2b4b7b2 100644
--- a/frontend/src/views/plan/planList/components/planPopup.vue
+++ b/frontend/src/views/plan/planList/components/planPopup.vue
@@ -66,6 +66,10 @@
             />
           </el-select>
           </el-form-item>
+          <el-form-item label='检测功能' :label-width='100' prop='device_Id'>
+            <el-checkbox v-model="checked1" label="守时检测" size="large" />
+          </el-form-item>
+
       </el-form>
     </div>
       <template #footer>
@@ -104,7 +108,7 @@
         
     };
   }>();
-
+  const checked1 = ref(false)
   const fatherPlanList = [
   { label: '/', value: 'type0' },
   { label: '检测计划1', value: 'type1' },