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

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

frontend/src/api/check/interface/index.ts

@@ -1,3 +1,11 @@
+export interface DataCheck {
+    testScriptName: string,
+    errorSysName: string,
+    dataRule: string,
+    deviceName: string,
+    monitorIdx: string,
+}
+
 /**
  * 用于定义 查看（设备）通道检测结果 类型
  */
@@ -24,10 +32,65 @@ export interface RawDataItem {
     L3: number
 }
 
-/**
- * 用于定义 （设备）通道的原始数据
- */
-export interface RawData {
-    chnNum: string,
-    rawDataItems: RawDataItem[]
+
+// 用来描述检测脚本类型
+export interface ScriptItem {
+    id: string,
+    scriptItemName: string,
+    children?: ScriptItem[]
 }
+
+// 用来描述 通道检测结果
+export enum ChnCheckResultEnum {
+    UNKNOWN = -1,
+    FAIL = 0,
+    SUCCESS = 1,
+}
+
+//用来描述 某个脚本测试项对所有通道的检测结果
+export interface ScriptChnItem {
+    scriptID: string
+    scriptItemName: string
+
+    // 设备
+    devices: Array<{
+        deviceID: string,
+        deviceName: string,
+        chnResult: ChnCheckResultEnum[] //通道检测结果
+    }>
+}
+
+/**
+ * 用于描述 （设备）通道检测结果展示的按钮类型
+ */
+export interface ButtonResult {
+    resultType: 'info' | 'success' | 'danger',
+    resultValue: '-' | '√' | '×'
+}
+
+/**
+ * 用于描述 脚本检测结果展示的按钮类型
+ */
+export interface ScriptChnViewItem {
+    scriptID: string,
+    scriptItemName: string //脚本项名称
+
+    // 设备
+    devices:Array<{
+        deviceID: string,
+        deviceName: string,
+        chnResult: ButtonResult[],
+    }>
+}
+
+
+/**
+ * 定义检测日志类型
+ */
+export interface LogItem {
+    type: 'info' | 'error'
+    log: string
+}
+
+
+

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

@@ -456,6 +456,7 @@ const currentStepStatus = ref<'error' | 'finish' | 'wait' | 'success' | 'process
       total.value = 0;
       activeIndex.value = 0
       qualified.value = 0
+      active.value = 0
       dialogVisible.value = false
   }
 

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

@@ -1,42 +1,28 @@
 <template>
 
   <div class="table-main">
-    <el-collapse v-model="activeName" accordion style="width: 100%;height:335px">
-      <el-collapse-item v-for="(item, index) in tableData" :key="index+1" :title="'通道'+ (index+1)" :name="'通道'+ (index+1)">
-
-        <el-table :data="item.rawDataItems" stripe border :header-cell-style="{ textAlign: 'center' } "
-                  :cell-style="{ textAlign: 'center' }" height="335px" style="width: 100%;max-height: 250px;overflow-y: auto;">
-          <el-table-column type="index" fixed="left" label="序号" width="70"/>
+    <el-table :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } "
+              :cell-style="{ textAlign: 'center' }" height="335px"
+              style="width: 100%;">
+      <el-table-column type="index" label="序号" width="70" fixed="left"/>
       <el-table-column prop="updateTime" label="数据时间"/>
       <el-table-column prop="L1" label="L1（V）"/>
       <el-table-column prop="L2" label="L2（V）"/>
       <el-table-column prop="L3" label="L3（V）"/>
     </el-table>
-
-      </el-collapse-item>
-    </el-collapse>
   </div>
 
 </template>
 
 <script lang="tsx" setup>
 
-import type {RawData} from "@/api/check/interface";
+import type {RawDataItem} from "@/api/check/interface";
 
 const {tableData} = defineProps<{
-  tableData:RawData[]
+  tableData: RawDataItem[]
 }>()
 
-const activeName = ref('通道1')
 
-// 清空数据
-const clear = () => {
-  activeName.value = '通道1'
-}
-
-defineExpose({
-  clear
-})
 </script>
 
 <style scoped>

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

@@ -3,7 +3,11 @@
   <div class="table-main">
     <el-table :data="tableData" height="335px" :header-cell-style="{ textAlign: 'center' } "
               :cell-style="{ textAlign: 'center' }">
-      <el-table-column prop="chnNum" label="序号" width="70"/>
+      <el-table-column prop="chnNum" label="通道号" width="80">
+        <template #default="{row}">
+          {{ '通道' + row.chnNum }}
+        </template>
+      </el-table-column>
       <el-table-column prop="standardValue" label="标准值（V）"/>
       <el-table-column label="L1（V）">
         <el-table-column prop="L1" width="80" label="被检值">
@@ -33,9 +37,6 @@
 
       </el-table-column>
       <el-table-column prop="result" label="检测结果">
-        <!-- <template #default="scope">
-        <el-tag :type="scope.row.Result === '合格' ? 'success' : 'danger'">{{ scope.row.Result }}</el-tag>
-      </template> -->
         <template #default="scope">
           <el-tag type="danger" v-if="scope.row.result === '不合格'">{{ scope.row.result }}</el-tag>
           <span v-if="scope.row.result != '不合格'">{{ scope.row.result }}</span>

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

@@ -1,24 +1,44 @@
 <template>
-    <el-dialog  title="数据查询" :model-value='visible' @close="close" v-bind="dialogBig">
+  <el-dialog :append-to-body="appendToBody" class="dialog" title="数据查询" :model-value='visible' @close="close"
+             v-bind="dialogBig" :draggable="false" style="margin-left: 20%;">
     <div class="data-check-dialog">
-            <div class="data-check-title">
-
- 
-                
-                
-
-                <!-- <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"
-                    />
+      <div class="data-check-head">
+        <el-form :model='formContent' label-width="auto" class="form-three ">
+          <el-form-item label="检测脚本">
+            <el-input v-model='formContent.testScriptName' :disabled="true"/>
+          </el-form-item>
+          <el-form-item label="误差体系">
+            <el-input v-model='formContent.errorSysName' :disabled="true"/>
+          </el-form-item>
+          <el-form-item label="数据原则">
+            <el-input v-model='formContent.dataRule' :disabled="true"/>
+          </el-form-item>
+          <el-form-item label="设备名称">
+            <el-input v-model='formContent.deviceName' :disabled="true"/>
+          </el-form-item>
+          <el-form-item label='通道号'>
+            <el-select v-model="formContent.monitorIdx" @change="handleChnNumChange">
+              <el-option v-for="item in monitorIdxList" :key="item.value" :label="item.value"
+                         :value="item.value"/>
             </el-select>
-                </el-form-item> -->
+          </el-form-item>
+        </el-form>
       </div>
-            <div class="data-check-content">
+
+      <div class="data-check-body">
+        <div class="content-left-tree">
+          <div>
+            <el-radio-group v-model="checkItemSwitch" @change="handleCheckItemSwitch">
+              <el-radio-button label="不合格测试项" :value="0"/>
+              <el-radio-button label="全部测试项" :value="1"/>
+            </el-radio-group>
+          </div>
+          <div class="content-tree">
+            <el-tree :default-expanded-keys="['0', '0-1', '0-2', '0-3', '1']" node-key="id" :data="treeData"
+                     :props="defaultProps" @node-click="handleNodeClick"/>
+          </div>
+        </div>
+
         <div class="content-right">
           <div class="content-right-title">
             <el-divider>当前检测项目</el-divider>
@@ -41,67 +61,72 @@
 
 </template>
 <script setup lang='ts'>
-
-import IPAddress from '@/components/IpAddress/index.vue'
-import {dialogBig, dialogMiddle} from '@/utils/elementBind'
-import { type Device } from '@/api/device/interface/device'
-import { ElMessage, type FormItemRule } from 'element-plus'
-import { addPqDev, updatePqDev } from '@/api/device/device'
-import { computed, reactive, type Ref, ref } from 'vue'
-import { useDictStore } from '@/stores/modules/dict'
-import { CirclePlus, Delete, EditPen } from '@element-plus/icons-vue'
-// 使用 dayjs 库格式化
-import dayjs from 'dayjs'
-import { getPqMonList } from '@/api/device/monitor'
-import { type ColumnProps } from '@/components/ProTable/interface'
-import { type Monitor } from '@/api/device/interface/monitor'
-import { data } from "@/api/plan/autoTest.json";
+import {dialogBig} from '@/utils/elementBind'
+import {reactive, ref} from 'vue'
 import DataCheckResultTable from './dataCheckResultTable.vue'
 import DataCheckRawDataTable from './dataCheckRawDataTable.vue'
-import type {CheckResult, RawData} from "@/api/check/interface";
+import type {CheckResult, DataCheck, RawDataItem} from "@/api/check/interface";
+import {data as treeData} from "@/api/plan/autoTest.json";
 
-const activeName = ref('rawDataTab')
+const {appendToBody} = withDefaults(defineProps<{
+  appendToBody: boolean
+}>(), {appendToBody: false})
+
+
+const formContent = reactive<DataCheck>({
+  testScriptName: 'Q/GDW 10650.4-2021 模拟式',
+  errorSysName: 'Q/GDW 10650.2-2021',
+  dataRule: '所有值',
+  deviceName: '被检设备1',
+  monitorIdx: '1',
+})
+
+const activeName = ref('resultTab')
+
+const checkItemSwitch = ref(0)
 
-const deviceName = ref('被检设备1');
-  const monitorIdx = ref('1');
-  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 monitorIdxList = [
-//   {
-//     value: '1',
-//   },
-//   {
-//     value: '2',
-//   },
-//   {
-//     value: '3',
-//   },
-//   {
-//     value: '4',
-//   },
-// ]
+const monitorIdxList = [
+  {
+    value: '1',
+  },
+  {
+    value: '2 （不合格）',
+  },
+  {
+    value: '3',
+  },
+  {
+    value: '4 （不合格）',
+  },
+]
 
-// const handleNodeClick = (data) => {
-//   console.log(data);
-// };
-// const MonIsShow = ref(false)
-// const DevIsShow = ref(false)
-// const IsPasswordShow = ref(false)
-// const dictStore = useDictStore()
-// 定义弹出组件元信息
-// const dialogFormRef = ref()
-// const disabledDate = (time: Date) => {
-//   return time.getTime() > Date.now()
-// }
+// 改变通道号下拉框触发事件
+const handleChnNumChange = (data: any) => {
+  console.log(data);
+}
+
+// 切换不合格测试项、全部测试项 触发事件
+const handleCheckItemSwitch = (data: any) => {
+  // 0 不合格测试项、1 全部测试项
+  if (data === 0) {
+
+  } else {
+
+  }
+}
+
+// 点击左侧树节点触发事件
+const handleNodeClick = (data: any) => {
+  console.log(data);
+};
 
 const checkResultTableData = reactive<CheckResult[]>([
   {
@@ -115,24 +140,10 @@ const checkResultTableData = reactive<CheckResult[]>([
     L3_errValue: 0.01,
     maxErrVaule: 0.05774,
     result: '合格',
-  },
-  {
-    chnNum: '2',
-    standardValue: 57.74,
-    L1: 57.73,
-    L1_errValue: 0.01,
-    L2: 57.73,
-    L2_errValue: 0.01,
-    L3: 57.73,
-    L3_errValue: 0.01,
-    maxErrVaule: 0.05774,
-    result: '合格',
   }
 ])
-const rawTableData = reactive<RawData[]>([
-  {
-    chnNum: '1',
-    rawDataItems: [
+
+const rawTableData = reactive<RawDataItem[]>([
   {
     updateTime: "2024-10-10 09:30:00",
     L1: 57.73,
@@ -253,258 +264,6 @@ const rawTableData = reactive<RawData[]>([
     L2: 57.73,
     L3: 57.73,
   }
-    ]
-  },
-  {
-    chnNum: '2',
-    rawDataItems: [
-      {
-        updateTime: "2024-10-10 09:30:00",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:03",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:06",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:09",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:12",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:15",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:18",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:21",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:24",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:27",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:30",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:33",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:36",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:39",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:42",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:45",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:48",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:51",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:54",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:57",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      }
-    ]
-  },
-  {
-    chnNum: '3',
-    rawDataItems: [
-      {
-        updateTime: "2024-10-10 09:30:00",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:03",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:06",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:09",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:12",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:15",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:18",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:21",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:24",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:27",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:30",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:33",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:36",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:39",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:42",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:45",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:48",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:51",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:54",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      },
-      {
-        updateTime: "2024-10-10 09:30:57",
-        L1: 57.73,
-        L2: 57.73,
-        L3: 57.73,
-      }
-    ]
-  }
 ])
 
 const resultTableRef = ref()
@@ -516,18 +275,17 @@ const close = () => {
   //数据清空
 
   activeName.value = 'rawDataTab'
-  rawDataTableRef.value?.clear()
 
   visible.value = false;
 };
 
-const open = (deviceItem:any,chnNum:number) => {
+const open = (deviceItem: any, chnNum?: number) => {
   // 发起后端请求，查询详细信息
   // const deviceItem = await getDetail(planId,checkItemId,deviceItem.id, chnNum)
 
   // 数据处理
   // checkResultTableData=[];
-
+  //formContent.value = ...
 
   visible.value = true;
 }
@@ -536,33 +294,60 @@ defineExpose({
   open
 })
 </script>
-<style scoped>
+
+<style lang="scss" scoped>
+
+.dialog {
+  display: flex;
+  flex-direction: column;
+  overflow-y: hidden;
+  overflow-x: hidden;
+  width: 100%;
 
   .data-check-dialog {
     display: flex;
     flex-direction: column;
-    width: 100%;
-}
 
-.data-check-title{
-    display: flex;
-    flex-direction: row;
-    margin-top: 5px;
-    width: 100%;
-}
-
-.data-check-content{
+    .data-check-head {
       display: flex;
       flex-direction: row;
       width: 100%;
     }
 
+    .data-check-body {
+      display: flex;
+      flex-direction: row;
+      width: 100%;
+
+      .content-left-tree {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        padding: 10px 0;
+        border: 1px solid #ccc;
+
+        .content-tree {
+          width: 250px;
+          max-width: 250px;
+          height: 450px;
+          max-height: 450px;
+          overflow-x: auto;
+          overflow-y: auto;
+          margin-top: 10px;
+        }
+      }
+
       .content-right {
-    width: 100%;
-}
+        margin-left: 10px;
+        flex: 1;
 
         .content-right-title {
-    margin-bottom: 10px;
+          /*margin-bottom: 10px;*/
+          div {
+            font-size: 16px;
+            font-weight: 600;
+          }
         }
 
         .content-right-Tabs {
@@ -571,4 +356,8 @@ defineExpose({
           margin-bottom: 10px;
           max-height: 400px;
         }
+      }
+    }
+  }
+}
 </style>

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

@@ -114,8 +114,7 @@
           :icon="View"
           @click="openDrawer('查看', scope.row)"
           v-if="form.activeTabs === 3 && form.activeChildTabs === 1"
-          >查看</el-button
-        >
+          >查看</el-button>
 
         <el-button
         type="primary"
@@ -123,8 +122,7 @@
           :icon="Download"
           @click="openDrawer('报告下载', scope.row)"
           v-if="form.activeTabs === 3 && form.activeChildTabs === 0 && scope.row.reportState === 1"
-          >报告下载</el-button
-        >
+          >报告下载</el-button>
 
         <!-- <div class='cn-render-buttons' v-if="form.activeTabs === 3 && form.activeChildTabs === 0">
           <el-dropdown trigger='click'>
@@ -147,8 +145,7 @@
           :icon="Postcard"
           @click="openDrawer('生成', scope.row)"
           v-if="form.activeTabs === 3"
-          >报告生成</el-button
-        >
+          >报告生成</el-button>
         <!-- <el-button
         type="primary"
           link
@@ -164,24 +161,23 @@
           @click="openDrawer('归档', scope.row)"
           v-if="form.activeTabs === 4"
           :disabled = "scope.row.checkState != 2"
-          >归档</el-button
-        >
+          >归档</el-button>
+
         <el-button
         type="primary"
           link
           :icon="PieChart"
           @click="openDrawer('检测数据查询', scope.row)"
           v-if="form.activeTabs === 5"
-          >检测数据查询</el-button
-        >
+          >检测数据查询</el-button>
+
         <el-button
         type="primary"
           link
           :icon="Switch"
           @click="openDrawer('误差体系更换', scope.row)"
           v-if="form.activeTabs === 5 && scope.row.documentState === 1"
-          >误差体系更换</el-button
-        >
+          >误差体系更换</el-button>
 
         <div class='cn-render-buttons' v-if="form.activeTabs === 5 && scope.row.documentState === 1">
           <el-dropdown trigger='click'>
@@ -221,10 +217,7 @@
       @update:visible="reportDialogVisible = $event"
     ></reportPopup>
 
-    <dataCheckPopup
-      :visible="dataCheckDialogVisible"
-      @update:visible="dataCheckDialogVisible = $event"
-    ></dataCheckPopup>
+    <dataCheckPopup ref="dataCheckPopupRef"/>
 
     <dataCheckChangeErrSysPopup
     :visible="dataCheckChangeErrSysDialogVisible"
@@ -255,7 +248,7 @@ import { getPlanList } from "@/api/plan/planList";
 import deviceDataList from '@/api/device/device/deviceData'
 import TestPopup from "./testPopup.vue";
 import reportPopup from "./reportPopup.vue";
-import dataCheckPopup from "./dataCheckPopup.vue";
+import dataCheckPopup from "./dataCheckSingleChannelSingleTestPopup.vue";
 import dataCheckChangeErrSysPopup from "./dataCheckChangeErrSysPopup.vue";
 import { getBoundPqDevList } from '@/api/plan/plan.ts'
 import { onMounted, reactive, ref, watch } from "vue";
@@ -273,7 +266,9 @@ const value1 = ref("");
 const value2 = ref("");
 const tableHeight = ref(0);
 const reportDialogVisible = ref(false)
-const dataCheckDialogVisible = ref(false)
+
+const dataCheckPopupRef=ref<InstanceType<typeof dataCheckPopup>>()
+
 const dataCheckChangeErrSysDialogVisible = ref(false)
 const matchDialogVisible = ref(false)
 const dialogTitle = ref('手动检测')
@@ -405,7 +400,7 @@ const getTableList = async (params: any) => {
   }else{
     checkStateList.value = checkStateTable.value
   }
-  return  getBoundPqDevList({'planId': props.id, 
+  return  getBoundPqDevList({'planId': props.id,
                              'checkStateList': checkStateList.value,
                              'checkResult': form.value.checkResult,
                              'reportState': form.value.checkReportStatus,
@@ -867,7 +862,8 @@ const openDrawer = (title: string, row: any) => {
       
     if(title === '检测数据查询')
     {
-      dataCheckDialogVisible.value = true;
+      let device={}
+      dataCheckPopupRef.value?.open(device)
     }
     if (title === '误差体系更换')
     {

frontend/src/views/home/tabs/dashboard.vue

@@ -95,7 +95,6 @@
             <Table ref="tableRef1" :id='currentId' :isTimeCheck='isTimeCheck'></Table>
           </div>
         </el-tab-pane>
-    
         <!--      <el-tab-pane label="已检设备"  v-if="tabShow" :style="{ height: tabPaneHeight }">-->
         <!--        &lt;!&ndash; 列表数据 &ndash;&gt;-->
         <!--        <div class="container_table" :style="{ height: tableHeight }">-->
@@ -107,22 +106,19 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { getStaticTreeData } from "@/api/plan/static";
 import pie from "@/components/echarts/pie/default.vue";
 import {useRouter} from "vue-router";
 import tree from "../components/tree.vue";
 import Table from "../components/table.vue";
 //import { data } from "@/api/plan/static.json";
 import deviceDataList from '@/api/device/device/deviceData'
-import {getPlanListByPattern } from '@/api/plan/plan.ts'
-import { onBeforeMount, onMounted, onUnmounted, ref, watch } from "vue";
+import {getBoundPqDevList, getPlanListByPattern} from '@/api/plan/plan.ts'
+import {onBeforeMount, onUnmounted, ref, watch} from "vue";
 import {useModeStore} from '@/stores/modules/mode'; // 引入模式 store
 import {useDictStore} from '@/stores/modules/dict'
 import {type Plan} from "@/api/plan/interface";
 import type {CollapseModelValue} from "element-plus/es/components/collapse/src/collapse.mjs";
 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()
@@ -228,13 +224,11 @@ watch(
         {
           const tabledata = deviceData.filter((item) => item.document_State === "未归档")
           tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata);
-    }
-    else if(form.value.activeTabs === 4)//设备归档
+        } else if (form.value.activeTabs === 4)//设备归档
         {
           const tabledata = deviceData.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档")
           tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata);
-    }
-    else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
+        } else if (form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
         {
           const tabledata = deviceData.filter((item) => item.check_State === "检测完成");
           tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata);
@@ -400,7 +394,6 @@ const handleCheckFunction = (val: any) => {
 };
 
 
-
 const resizeObserver = new ResizeObserver(entries => {
   for (let entry of entries) {
     chartsWidth.value = entry.contentRect.width;
@@ -457,7 +450,6 @@ onUnmounted(() => {
 });
 
 
-
 </script>
 <style lang="scss" scoped>
 .static {
@@ -512,6 +504,7 @@ onUnmounted(() => {
         border-radius: 8px;
         padding: 0px 30px;
         margin-right: 50px;;
+
         .item_img {
           width: 60px;
           height: 60px;
@@ -564,6 +557,7 @@ onUnmounted(() => {
         }
       }
     }
+
     // .container_function {
     //   width: 100%;
     //   height: auto;
@@ -655,6 +649,7 @@ onUnmounted(() => {
       // padding-left: 2ch;
       margin-bottom: 10px;
     }
+
     .el-collapse {
       width: 100% !important;
       // min-height: 200px !important;
@@ -702,6 +697,7 @@ onUnmounted(() => {
     .tabs-menu {
       height: 100%;
     }
+
     .container_table {
       // width: 100%;
       flex: 1 !important;
@@ -717,15 +713,18 @@ onUnmounted(() => {
     }
   }
 }
+
 :deep(.el-collapse-item__header) {
   color: var(--el-color-primary);
   font-size: 14px;
   font-family: "Microsoft YaHei", "微软雅黑", "Arial", sans-serif;
 }
+
 :deep(.el-collapse-item__conten) {
   // background-color:#f6f6f6;
   padding-bottom: 0px !important;
 }
+
 :deep(.el-collapse-item__content ) {
   // background-color:#f6f6f6;
   padding-bottom: 0px !important;