From 4cfca89895ce1b7fb3d0a079f9198812e347c247 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Wed, 18 Dec 2024 15:49:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/echarts/pie/default.vue    |   2 +-
 .../views/home/components/channelsTest.vue    | 131 ++++++++++++------
 .../home/components/channelsTestTable.vue     |  38 +++--
 frontend/src/views/home/components/table.vue  |  51 +++++--
 .../src/views/home/components/testPopup.vue   | 127 ++++++++---------
 .../src/views/home/components/timeTest.vue    |  34 ++++-
 frontend/src/views/home/tabs/dashboard.vue    |  42 +++++-
 .../plan/planList/components/moreButtons.vue  |   2 +-
 .../plan/planList/components/planPopup.vue    |   9 +-
 9 files changed, 280 insertions(+), 156 deletions(-)

diff --git a/frontend/src/components/echarts/pie/default.vue b/frontend/src/components/echarts/pie/default.vue
index 3525b66..d4d5af7 100644
--- a/frontend/src/components/echarts/pie/default.vue
+++ b/frontend/src/components/echarts/pie/default.vue
@@ -78,7 +78,7 @@ const init = () => {
         data: props.chartsData,
         formatter: function (name: any) {
           const item = props.chartsData.filter(item=>item.name==name)
-          console.log(item)
+          //console.log(item)
           if(item)
           return item[0].value;
           },
diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue
index 9218e33..9440aa6 100644
--- a/frontend/src/views/home/components/channelsTest.vue
+++ b/frontend/src/views/home/components/channelsTest.vue
@@ -1,7 +1,6 @@
 <template>
-  <div>
-    <div class="test-dialog">
-
+  <el-dialog v-model='dialogVisible' title="系数校准"  width="1200px" height="1000px">
+    <div class="test-dialog" >
       <div class="dialog-content">
 
         <div class="right-title">
@@ -46,18 +45,24 @@
       </div>
 
     </div>
-  </div>
-
+      <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleSubmit">开始系数校准</el-button>
+      </div>
+      </template>
+  </el-dialog>
+       
 </template>
 <script lang="tsx" setup name="channelsTest">
 import { SuccessFilled, Failed } from '@element-plus/icons-vue'
+import { ref, toRef, watch } from 'vue'
 
 const activeIndex = ref(0)
 const activeTotalNum = ref(4)
 const qualified = ref(0)
 const outputDsc = ref('电压误差为：±0.1Un%； 电流误差为：±0.5%')
 const total = ref(0)
-
+const dialogVisible = ref(false)
 const activities = [
   {
     content: '开始检测',
@@ -305,41 +310,58 @@ const tableData4 = ref([
 ])
 const currentStepStatus = ref<'error' | 'finish' | 'wait' | 'success' | 'process'>('finish');
 
-const props = defineProps({
-  testStatus: {
-    type: String,
-    default: 'wait'
-  }
-})
-const testStatus = toRef(props, 'testStatus');
-const ts = ref('');
-//监听goods_sn的变化
-watch(testStatus, function (newValue, oldValue) {
-  ts.value = props.testStatus;
-  if (ts.value === 'start') {
-    ts.value = 'process'
 
-    let timer = setInterval(() => {
-      if (activeIndex.value < activeTotalNum.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)
-        ts.value = 'success'
-      }
-      else {
-        clearInterval(timer)
-        ts.value = 'success'
-      }
-
-      total.value = activeTotalNum.value
-    }, 1000);
+  // 打开弹窗，可能是新增，也可能是编辑
+  const open = () => {
+    dialogVisible.value = true;
+    activeIndex.value = 1
   }
-})
+
+// const props = defineProps({
+//   testStatus: {
+//     type: String,
+//     default: 'wait'
+//   }
+// })
+// const testStatus = toRef(props, 'testStatus');
+// const ts = ref('');
+// //监听goods_sn的变化
+// watch(testStatus, function (newValue, oldValue) {
+  
+//   ts.value = props.testStatus;
+//   if (ts.value === 'start') {
+//     ts.value = 'process'
+//     let timer = setInterval(() => {
+//       if (activeIndex.value < activeTotalNum.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)
+//         ts.value = 'success'
+//       }
+//       else {
+//         clearInterval(timer)
+//         ts.value = 'success'
+//       }
+
+//       total.value = activeTotalNum.value
+//     }, 1000);
+//   }
+// })
+
+
+
+// const emit = defineEmits(['update:testStatus']);
+// //监听sn
+// watch(ts, function (newValue, oldValue) {
+//   //修改父组件
+//   emit('update:testStatus', ts.value)
+// })
+
 
 watch(activeIndex, function (newValue, oldValue) {
 
@@ -350,13 +372,32 @@ if(activeIndex.value === 1)
 
 })
 
-const emit = defineEmits(['update:testStatus']);
-//监听sn
-watch(ts, function (newValue, oldValue) {
-  //修改父组件
-  emit('update:testStatus', ts.value)
-})
+const handleSubmit = () => {
+    let timer = setInterval(() => {
+      if (activeIndex.value < activeTotalNum.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)
+      }
+      else {
+        clearInterval(timer)
+      }
 
+      total.value = activeTotalNum.value
+    }, 1000);
+  
+};
+
+ // 对外映射
+ defineExpose({ open })
+ 
+
+  
 </script>
 <style scoped>
 .right-title {
diff --git a/frontend/src/views/home/components/channelsTestTable.vue b/frontend/src/views/home/components/channelsTestTable.vue
index 3db3852..53c93b9 100644
--- a/frontend/src/views/home/components/channelsTestTable.vue
+++ b/frontend/src/views/home/components/channelsTestTable.vue
@@ -1,13 +1,34 @@
 <template>
-
         <div class="table-container table-main">
-            <el-table :data="tableData" :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" >
-
-                    <el-table-column prop="id" label="序号" width="70" />
-                    <el-table-column prop="updateTime" label="上送时刻" width="180"/>
+            <el-table :data="tableData" 
+            :header-cell-style="{ textAlign: 'center' } " 
+            :cell-style="{ textAlign: 'center' }" 
+            style="width: 100%" 
+            max-height="400px">
+                    <el-table-column  type="expand">
+                      <template #default="props">
+                        <div style="display: flex">
+                          <p >大电压A相：57.74V,</p>
+                          <p >大电压B相：57.74V,</p>
+                          <p >大电压C相：57.74V,</p>
+                          <p >大电流A相：1A,</p>
+                          <p >大电流B相：1A,</p>
+                          <p >大电流C相：1A</p>
+                        </div>
+                        <div style="display: flex">
+                          <p >小电压A相：57.74V,</p>
+                          <p >小电压B相：57.74V,</p>
+                          <p >小电压C相：57.74V,</p>
+                          <p >小电流A相：1A,</p>
+                          <p >小电流B相：1A,</p>
+                          <p >小电流C相：1A</p>
+                        </div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column   prop="MonitorIdx" label="监测点序号"/>
+                    <!-- <el-table-column prop="updateTime" label="上送时刻" width="180"/> -->
                     <!-- <el-table-column prop="deviceName" label="设备名称"  /> -->
-                    <el-table-column prop="MonitorIdx" label="监测点序号"  />
-
+                    
                     <el-table-column label="电压通道" >
                         <el-table-column prop="Ua" label="L1">
 
@@ -39,9 +60,6 @@
                    
             </el-table>
         </div>
-
-
-
 </template>
   
   <script lang="ts" setup name="ErrorSystemDialog">
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 2a4041e..2daaacf 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -101,6 +101,8 @@
             <!-- <el-button type="primary" :icon="CirclePlus" @click="addDevice('设备新增')" v-if="form.activeTabs === 0"
               >设备新增</el-button> -->
             
+              <el-button type="primary" :icon="Odometer"  @click="handleTest('系数校准')"  v-if="form.activeTabs === 0"
+              >系数校准</el-button>
           </el-form-item>
         </el-form>
       </template>
@@ -120,7 +122,7 @@
           link
           :icon="Download"
           @click="openDrawer('报告下载', scope.row)"
-          v-if="form.activeTabs === 3 && form.activeChildTabs === 0"
+          v-if="form.activeTabs === 3 && form.activeChildTabs === 0 && scope.row.reportState === 1"
           >报告下载</el-button
         >
 
@@ -206,12 +208,13 @@
     </ProTable>
 
     <!-- 检测过程对话框 -->
-    <testPopup     
+    <!-- <testPopup     
       :visible="dialogFormVisible"
       :formData="dialogForm"
        :dialogTitle="dialogTitle"
       @update:visible="dialogFormVisible = $event"
-    />
+    /> -->
+    <TestPopup  ref="testPopup"></TestPopup>
 
     <reportPopup
       :visible="reportDialogVisible"
@@ -232,6 +235,9 @@
       :visible="matchDialogVisible"
       @update:visible="matchDialogVisible = $event"
       ></matchPopup>
+
+      <!--系数校准-->>
+      <ChannelsTest  ref="channelsTest"></ChannelsTest>
   </div>
 </template>
 
@@ -243,17 +249,19 @@ import { ElMessage, ElMessageBox, ElLoading, Action} from "element-plus";
 import ProTable from "@/components/ProTable/index.vue";
 import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/interface'
 import {
-  Search,View,Delete,Download,EditPen,Clock,ChatLineRound,ChatLineSquare,ChatDotSquare,Postcard,Notebook,Switch,PieChart,CirclePlus
+  Search,View,Delete,Download,EditPen,Clock,ChatLineRound,ChatLineSquare,ChatDotSquare,Postcard,Notebook,Switch,PieChart,CirclePlus,Odometer
 } from "@element-plus/icons-vue";
 import { getPlanList } from "@/api/plan/planList";
 import deviceDataList from '@/api/device/device/deviceData'
-import testPopup from "./testPopup.vue";
+import TestPopup from "./testPopup.vue";
 import reportPopup from "./reportPopup.vue";
 import dataCheckPopup from "./dataCheckPopup.vue";
 import dataCheckChangeErrSysPopup from "./dataCheckChangeErrSysPopup.vue";
 import { getBoundPqDevList } from '@/api/plan/plan.ts'
 import { onMounted, reactive, ref, watch } from "vue";
 import { useDictStore } from '@/stores/modules/dict'
+import ChannelsTest from './channelsTest.vue'
+import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store
 
 const dictStore = useDictStore()
 let devNum = 0;//当前选取的被检设备数量
@@ -264,7 +272,6 @@ const router = useRouter();
 const value1 = ref("");
 const value2 = ref("");
 const tableHeight = ref(0);
-const dialogFormVisible = ref(false)
 const reportDialogVisible = ref(false)
 const dataCheckDialogVisible = ref(false)
 const dataCheckChangeErrSysDialogVisible = ref(false)
@@ -280,6 +287,7 @@ const dialogForm = ref<any>({
       enable:1,
       state:1,     
 });
+const modeStore = useModeStore();
 const shouldShowOption = (item) => {
   //return !item.disabled; 
   return item; 
@@ -292,12 +300,18 @@ const documentStateShow = ref(false);
 const checkStateShow = ref(true);
 const operationMinWidth = ref(200);
 const selectionShow = ref(true);
+const channelsTest = ref()
+const testPopup = ref()
 
 const props = defineProps({
 id: {
       type: String,
       required: true,
     },
+isTimeCheck: {
+      type: Boolean,
+      required: true,
+    },
 })
 
 //下拉框数据
@@ -383,7 +397,6 @@ const proTable = ref<ProTableInstance>();
 const boundPqDevList=ref<Device.ReqPqDevParams[]>([])//根据检测计划id查询出所有已绑定的设备 
 
 const getTableList = async (params: any) => {
-console.log('activeTabs',form.activeTabs)
   if(props.id){
     const checkStateList = ref<any>()
   if(form.value.checkStatus != null){
@@ -508,6 +521,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
   ])
 
 
+
 // 跳转详情页
 const toDetail = () => {
   router.push(
@@ -536,8 +550,8 @@ const handleSelectionChange = (selection: any[]) => {
     devChannelsNum += selection[i].dev_Chns;
   }
 
-  devTestedNum = selection.filter((item) => item.check_State === '检测完成').length;
-  const result = selection.filter((item) => item.check_Result != "不符合")
+  devTestedNum = selection.filter((item) => item.checkState === 2).length;
+  const result = selection.filter((item) => item.checkResult != 0)
   if(result.length > 0)
   {
     testType= "test";    
@@ -584,7 +598,6 @@ const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => {
 
 //根据当前功能，初始化表头下拉框中的默认值和禁用值
 function tableHeaderInit(val: number) {
-  console.log("tableHeader",val)
   refreshStatusList()
   switch (val) {
     case 0://设备检测
@@ -715,7 +728,7 @@ const addDevice = (val:string) => {
     path: "/machine/device",
   });
 };
-const handleTest = (val:string) => {
+const handleTest = async (val:string) => {
 
   if(devNum == 0)
   {
@@ -773,23 +786,29 @@ const handleTest = (val:string) => {
         .then(() => {
           ElMessage.success('不合格项复检');
           dialogTitle.value = val;
-          dialogFormVisible.value = true; // 打开对话框
+          testPopup.value?.open(dialogTitle.value,props.isTimeCheck)// 打开对话框
         })
         .catch((action: Action) => {
           ElMessage.success('全部复检');
           dialogTitle.value = val;
-          dialogFormVisible.value = true; // 打开对话框
+          testPopup.value?.open(dialogTitle.value,props.isTimeCheck) // 打开对话框
         })
     }
     else
     {
       ElMessage.success(val);
       dialogTitle.value = val;
-      dialogFormVisible.value = true; // 打开对话框
+      testPopup.value?.open(dialogTitle.value,props.isTimeCheck)
     }
     return
 
   }
+
+  if(val==='系数校准')
+  {
+    channelsTest.value?.open()
+    return
+  }
   
   if(devTestedNum == 0)
   {
@@ -822,6 +841,9 @@ const handleTest = (val:string) => {
       ElMessage.success("归档成功");
     }, 2000)
   }
+
+
+  
 };
 
 
@@ -829,7 +851,6 @@ const handleTest = (val:string) => {
 const openDrawer = (title: string, row: any) => {
     if (title === '查看')
     {
-      console.log(title);
       const link = document.createElement('a');
       const fileUrl = 'G:/南网数研院非结构化数据生成程序MMS_JSON修改记录.docx'; // 文件路径
       link.href = fileUrl;
diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue
index 48a26fe..953ed33 100644
--- a/frontend/src/views/home/components/testPopup.vue
+++ b/frontend/src/views/home/components/testPopup.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog  :title="dialogTitle" :model-value="visible" :before-close="beforeClose" @close="handleCancel" width="1200px" height="1000px" draggable>
+    <el-dialog  :title="dialogTitle" :model-value="dialogVisible" :before-close="beforeClose" @close="handleCancel" width="1200px" height="1000px" draggable>
        
       <div class="steps-container">
         <!-- simple -->
@@ -8,16 +8,16 @@
           <!-- style="height:100px"  -->
         <!-- <el-step title="预检测" :icon="getIcon(0)" /> -->
         <el-step title="预检测" :icon="stepsActiveIndex > 1 ? SuccessFilled :Edit" />
-        <el-step title="守时检测" :icon="stepsActiveIndex > 1 ? SuccessFilled :UploadFilled"/>
-        <el-step title="系数校准" :icon="stepsActiveIndex > 2 ? SuccessFilled :Odometer" />
+        <el-step title="守时检测" :icon="stepsActiveIndex > 1 ? SuccessFilled :UploadFilled" v-if="isTimeCheck"/>
+        <!-- <el-step title="系数校准" :icon="stepsActiveIndex > 2 ? SuccessFilled :Odometer" /> -->
         <el-step title="正式检测" :icon="stepsActiveIndex > 3 ? SuccessFilled :Coin" />
         <el-step title="检测完成" :icon="stepsActiveIndex > 4 ? SuccessFilled :Key" />
         </el-steps>
       </div>
         <preTest v-if="stepsActiveIndex === 0" v-model:testStatus="preTestStatus"></preTest>
-        <timeTest v-if="stepsActiveIndex === 1" v-model:testStatus="timeTestStatus"></timeTest>
-        <channelsTest v-if="stepsActiveIndex === 2" v-model:testStatus="channelsTestStatus"></channelsTest>
-        <test v-if="stepsActiveIndex >= 3" v-model:testStatus="TestStatus"></test>
+        <timeTest v-if="stepsActiveIndex === 1 && isTimeCheck" v-model:testStatus="timeTestStatus"></timeTest>
+        <!-- <channelsTest v-if="stepsActiveIndex === 2" v-model:testStatus="channelsTestStatus"></channelsTest> -->
+        <test v-if="stepsActiveIndex >= 2" v-model:testStatus="TestStatus"></test>
 
         <template #footer>
             <div>
@@ -36,7 +36,7 @@
   
   <script lang="tsx" setup name="testPopup">
   import { h } from 'vue';
-  import{ElMessage, ElSelectV2, FormInstance,FormItemRule}from'element-plus'
+  import{ElMessage, ElMessageBox, ElSelectV2, FormInstance,FormItemRule}from'element-plus'
   import { defineProps, defineEmits, reactive,watch,ref, Ref } from 'vue';
   import { dialogBig,dialogMiddle} from '@/utils/elementBind'
   //import IndicatorTypeDialog from "@/views/machine/errorSystem/components/IndicatorTypeDialog.vue"; // 导入子组件
@@ -53,28 +53,29 @@
 //   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
 //   </svg>
 // `;
-  const props = defineProps<{
-    visible: boolean;
-    dialogTitle: string;
+  // const props = defineProps<{
+  //   visible: boolean;
+  //   dialogTitle: string;
     
-    formData: {
-        id: string;//误差体系表Id
-        name: string;//误差体系名称
-        standard_Name:string;//参照标准名称
-        standard_Time:string;//标准推行时间
-        dev_Level:string;//使用设备等级
-        enable:number;//状态：0-不启用 1-启用
-        state:number;//0-删除 1-正常
-    };
-  }>();
+  //   formData: {
+  //       id: string;//误差体系表Id
+  //       name: string;//误差体系名称
+  //       standard_Name:string;//参照标准名称
+  //       standard_Time:string;//标准推行时间
+  //       dev_Level:string;//使用设备等级
+  //       enable:number;//状态：0-不启用 1-启用
+  //       state:number;//0-删除 1-正常
+  //   };
+  // }>();
 
-  const emit = defineEmits<{
-    (e: 'update:visible', value: boolean): void;
-    (e: 'submit', data: any): void;
-  }>();
+  // const emit = defineEmits<{
+  //   (e: 'update:visible', value: boolean): void;
+  //   (e: 'submit', data: any): void;
+  // }>();
 
   const skipDisabled = ref(false);
   const nextStepText = ref('下一步');
+  const dialogVisible = ref(false)
 //定义与预检测配置数组
 const detectionOptions = ref([
   {
@@ -117,13 +118,22 @@ const detectionOptions = ref([
   // },
 ]);
 
-  const stepsTotalNum = ref(5);//步骤总数
+  const stepsTotalNum = ref(4);//步骤总数
   const stepsActiveIndex = ref(0); //当前正在执行的步骤索引
   const ActiveStatue = ref('waiting');//当前步骤状态
   const preTestStatus = ref('waiting');//预检测执行状态
   const timeTestStatus = ref('waiting');//守时校验执行状态
   const channelsTestStatus = ref('waiting');//通道系数校准执行状态
   const TestStatus = ref('waiting');//正式检测执行状态
+  const dialogTitle = ref('');
+  const isTimeCheck = ref(false)
+
+  // 打开弹窗，可能是新增，也可能是编辑
+  const open = (title: string,time:boolean) => {
+    dialogTitle.value = title;
+    dialogVisible.value = true;
+    isTimeCheck.value = time
+  }
 
   watch(preTestStatus,function(newValue,oldValue){
     console.log(newValue,oldValue);
@@ -148,9 +158,10 @@ const detectionOptions = ref([
 
   watch(ActiveStatue,function(newValue,oldValue){
 
-    if(newValue === 'success' || newValue === 'error')
-    skipDisabled.value = false
-
+    if(newValue === 'success' || newValue === 'error'){
+      skipDisabled.value = false
+    }
+    
     if(newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value - 2)
     {
       stepsActiveIndex.value++;
@@ -175,13 +186,17 @@ const getIcon = (index: number) => {
     if(stepsActiveIndex.value < stepsTotalNum.value )
     {
       stepsActiveIndex.value++
+      if(!isTimeCheck.value){//不具备守时检测，预检测后直接跳正式检测
+        stepsActiveIndex.value++
+      }
+      
       ActiveStatue.value = 'waiting'
     }
     else if(stepsActiveIndex.value === stepsTotalNum.value)
     {
-      emit('update:visible', false); // 关闭对话框
+      //emit('update:visible', false); // 关闭对话框
       clearData()
-
+      dialogVisible.value = false;
     }
   };
   
@@ -208,14 +223,15 @@ const getIcon = (index: number) => {
     )
       .then(() => {
         clearData()
-        emit('update:visible', false); // 关闭对话框
-          
+        //emit('update:visible', false); // 关闭对话框
+        dialogVisible.value = false;
       })
     }
     else
     {
       clearData()
-      emit('update:visible', false); // 关闭对话框
+      //emit('update:visible', false); // 关闭对话框
+      dialogVisible.value = false;
     }
   // ElMessageBox.confirm('Are you sure to close this dialog?')
   //   .then(() => {
@@ -228,6 +244,7 @@ const getIcon = (index: number) => {
   const handleCancel = () => {
     // clearData()
     // emit('update:visible', false); // 关闭对话框
+    
   };
   
   const handleSubmit = () => {
@@ -239,10 +256,10 @@ const getIcon = (index: number) => {
       case 1:
             timeTestStatus.value = 'start'
         break;
+      // case 2:
+      //       channelsTestStatus.value = 'start'
+      //   break;
       case 2:
-            channelsTestStatus.value = 'start'
-        break;
-      case 3:
             TestStatus.value = 'start'
         break;
       default:
@@ -252,38 +269,16 @@ const getIcon = (index: number) => {
 
   };
   
-  // 当 props.visible 改变时，更新 formData
-  watch(() => props.visible, (newVal) => {
-    if (!newVal) {
-      // 这里可以重置表单数据，如果需要的话
+  // // 当 props.visible 改变时，更新 formData
+  // watch(() => props.visible, (newVal) => {
+  //   if (!newVal) {
+  //     // 这里可以重置表单数据，如果需要的话
      
-    }
-  });
-
-
-
-//选中
- // 处理选择变化
- const handleSelectionChange = (selection: any[]) => {
-    multipleSelection.value = selection.map(row => row.id); // 更新选中的行
-    
-  };
-  const openAddDialog = () => {
-    tableData.value.push({
-        id: tableData.value.length + 1,
-        type: '',
-        startSelect: '',
-        startRange: '',
-        endSelect: '',
-        endRange: '',
-        unit:'',
-        maxErrorValue:'',
-        errorType:''
-  });
-};
-
-
+  //   }
+  // });
 
+   // 对外映射
+ defineExpose({ open })
   </script>
   
   <style scoped lang="scss">
diff --git a/frontend/src/views/home/components/timeTest.vue b/frontend/src/views/home/components/timeTest.vue
index 6ac7ffe..41916a2 100644
--- a/frontend/src/views/home/components/timeTest.vue
+++ b/frontend/src/views/home/components/timeTest.vue
@@ -1,5 +1,26 @@
 <template>
   <div>
+    <el-tabs type="border-card">
+      <el-tab-pane label="守时误差">
+        <div class="right-title" >
+          <span v-if="activeIndex <= 1"> </span>
+            <span v-if="activeIndex > 1" style="  font-size: 18px;font-weight: 600;">
+            标准时间: <span style="color: #003078">{{ gpsTime }}</span> 
+            </span>
+            <div class="error-dsc">
+              <div class="green-div"></div>
+              <span style=" color: #606266; font-size: 16px;font-weight: 600;">
+              守时误差≤1000ms
+            </span>
+
+            <div class="red-div"></div>
+            <span style=" color: #F56C6c; font-size: 16px;font-weight: 600;">
+              守时误差>1000ms
+            </span>
+            </div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
     <div class="test-dialog">
       <div class="dialog-left">
         <el-steps direction="vertical" :active="stepsIndex" :process-status="currentStepStatus"
@@ -29,7 +50,7 @@
         <div class="right-title">
           <!-- <div>设备上送时刻表</div> -->
 
-            <span v-if="activeIndex <= 1"> </span>
+            <!-- <span v-if="activeIndex <= 1"> </span>
             <span v-if="activeIndex > 1" style="  font-size: 18px;font-weight: 600;">
             标准时间: <span style="color: #003078">{{ gpsTime }}</span> 
             </span>
@@ -43,7 +64,7 @@
             <span style=" color: #F56C6c; font-size: 16px;font-weight: 600;">
               守时误差>1000ms
             </span>
-            </div>
+            </div> -->
             <!-- <span style="  font-size: 18px;font-weight: 600;">
               设备已合格 <span style="color: #67C23A">{{ qualified }}</span> 台/共 <span style="color: green">4</span> 台
             </span> -->
@@ -57,7 +78,7 @@
             :cell-style="{ textAlign: 'center' }" style="width: 100%; height:435px" border>
           </ProTable> -->
 
-          <el-table v-if="activeIndex > 0" :data="deviceOperatorData" stripe :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" border>
+          <el-table v-if="activeIndex > 0" :data="deviceOperatorData" stripe :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="margin-top: -30px;width: 100%" border>
                 <el-table-column prop="deviceName" label="设备名称" />
                 <el-table-column prop="updataTime" label="上送时刻" />
                 <el-table-column prop="ErrorValue" label="守时误差(ms)">
@@ -311,14 +332,15 @@ watch(ts, function (newValue, oldValue) {
 
 </script>
 <style scoped>
+
+
 .test-dialog {
+  height: 350px;
   display: flex;
 
   flex-direction: row;
   /* 横向排列 */
-  /* margin-top: 20px; */
-  /* min-height: 300px; */
-  height: 472px;
+  margin-top: 20px;
   /* .dialog-left{
         margin-right: 20px;
     } */
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index 1e643fa..b9aea4c 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -92,7 +92,7 @@
       <el-tab-pane :label="tabLabel1" :style="{ height: tabPaneHeight }"> 
         <!-- 列表数据 -->
         <div class="container_table" :style="{ height: tableHeight }">
-          <Table ref="tableRef1" :id='currentId'></Table>
+          <Table ref="tableRef1" :id='currentId'  :isTimeCheck = 'isTimeCheck'></Table>
         </div>
       </el-tab-pane>
     
@@ -123,6 +123,7 @@ import type { CollapseModelValue } from "element-plus/es/components/collapse/src
 import { type Device } from "@/api/device/interface/device";
 import { getBoundPqDevList } from '@/api/plan/plan.ts'
 import { CENTERED_ALIGNMENT } from "element-plus/es/components/virtual-list/src/defaults";
+import { ResultData } from "@/api/interface";
 
 const dictStore = useDictStore()
 const modeStore = useModeStore();
@@ -151,9 +152,9 @@ const tabsHeight = ref('calc(100vh - 538px)'); // 初始高度
 const tabPaneHeight = ref('calc(100% - 5px)'); // 初始高度
 const tableHeight = ref('calc(100% - 5px)'); // 初始高度
 const handleChange = (val: string[]) => {
- 
 }
-
+const isTimeCheck = ref<boolean>(false);
+const planList = ref<ResultData<Plan.ReqPlan[]>>();
 const handleCollapseChange = (val: CollapseModelValue) => {
 
   // 计算新的高度
@@ -264,6 +265,23 @@ const pieRef1 = ref(),
 const chartsData1: any = ref([]),
   chartsData2: any = ref([]),
   chartsData3: any = ref([]);
+
+  const findPlanById = (plans: Plan.ReqPlan[], id: string): Plan.ReqPlan | undefined => {
+  for (const plan of plans) {
+    if (plan.id === id) {
+      return plan;
+    }
+    console.log('plan.children', plan.children);
+    if (plan.children) {
+      const foundPlan = findPlanById(plan.children, id);
+      if (foundPlan) {
+        return foundPlan;
+      }
+    }
+  }
+  return undefined;
+};
+
 const getPieData = async (id: string) => {
   currentId.value = id; // 设置当前ID
   //handleCheckFunction(0)//切换左侧树，默认css功能是设备检测
@@ -274,6 +292,13 @@ const getPieData = async (id: string) => {
   const reportStateCount: { [key: number]: number } = { 0: 0, 1: 0, 2: 0 };
   if (id) {
     const boundPqDevList = ref<Device.ResPqDev[]>([])//根据检测计划id查询出所有已绑定的设备
+    const plan = findPlanById(planList.value?.data || [], id);
+    if (plan) {
+      isTimeCheck.value = plan.timeCheck ===1; // 将 1 转换为 true，0 转换为 false
+    } else {
+      // 处理未找到计划的情况
+      isTimeCheck.value = false; // 或者其他默认值
+    }
     const pqDevList_Result2 = await getBoundPqDevList({'planId': id, 'checkStateList': [0, 1, 2, 3]});
     boundPqDevList.value = pqDevList_Result2.data as Device.ResPqDev[];
     // 遍历 boundPqDevList 并更新计数对象
@@ -411,14 +436,17 @@ onBeforeMount(async () => {
         code: 0,
         state: 0
     };
-  const planList = await getPlanListByPattern(reqPlan);
-  if (planList.data[0].children[0]) {
-    currentId.value = planList.data[0].children[0].id;
+    planList.value = (await getPlanListByPattern(reqPlan)) as ResultData<Plan.ReqPlan[]>;
+
+    console.log('qqq',planList.value)
+
+  if (planList.value.data[0].children[0]) {
+    currentId.value = planList.value.data[0].children[0].id;
   }
  if (chartsInfoRef.value) {
     resizeObserver.observe(chartsInfoRef.value);
   }
-  getTree(planList.data);
+  getTree(planList.value.data);
 
   getPieData(currentId.value);
 });
diff --git a/frontend/src/views/plan/planList/components/moreButtons.vue b/frontend/src/views/plan/planList/components/moreButtons.vue
index d31423f..5c6e36f 100644
--- a/frontend/src/views/plan/planList/components/moreButtons.vue
+++ b/frontend/src/views/plan/planList/components/moreButtons.vue
@@ -38,7 +38,7 @@ const handleSourceClick = (index: number) => {
   if (props.sourceIds && props.sourceIds[index]) {
     emit('source-clicked', props.sourceIds[index]);
   } else {
-    console.log('sourceIds is undefined or the index is out of bounds');
+    //console.log('sourceIds is undefined or the index is out of bounds');
   }
 };
 
diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue
index a0f2055..14c02ef 100644
--- a/frontend/src/views/plan/planList/components/planPopup.vue
+++ b/frontend/src/views/plan/planList/components/planPopup.vue
@@ -240,7 +240,7 @@ const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
           //                         pattern: device.pattern,
           //                       }));
 
-          console.log('保持',formContent.devIds)
+      
           if (formContent.id) {
                 if( mode.value === '比对式'){
                   await updatePlan(formContent)
@@ -248,9 +248,7 @@ const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
                   await updatePlan({...formContent,'sourceIds':[formContent.sourceIds],'datasourceIds':[formContent.datasourceIds]});
                 }
                 ElMessage.success({ message: `${dialogTitle.value}成功！` })
-                console.log('保存完成后还有绑定',boundPqDevList)
-                console.log('保存完成后还有表单',formContent.devIds)
-                console.log('保存完成后还有未绑定',unboundPqDevList)
+
             } else {  
               // 新增需要把设备模式转成字典ID
               const patternItem = dictStore.getDictData('Pattern').find(item => item.name === formContent.pattern);
@@ -317,7 +315,7 @@ const open = async (sign: string,
             getPqScriptList(data),
             getPqErrSysList(),    
             getBoundPqDevList({ 'planId': data.id }),
-            getUnboundPqDevList(data,)
+            getUnboundPqDevList(data)
         ]);
         
         pqSourceList.value = pqSource_Result.data as TestSource.ResTestSource[];
@@ -325,6 +323,7 @@ const open = async (sign: string,
         pqErrSysList.value = PqErrSys_Result.data as unknown as ErrorSystem.ErrorSystemList[];  
         const boundData = Array.isArray(boundPqDevList_Result.data) ? boundPqDevList_Result.data : [];
         const unboundData = Array.isArray(unboundPqDevList_Result.data) ? unboundPqDevList_Result.data : [];
+
         pqDevList.value = [...boundData,...unboundData] as Device.ResPqDev[];
         formContent.devIds = boundData.map(i =>  i.id );// 已绑定设备id集合