diff --git a/frontend/src/api/device/device/index.ts b/frontend/src/api/device/device/index.ts
index f9cf8d9..c5109c6 100644
--- a/frontend/src/api/device/device/index.ts
+++ b/frontend/src/api/device/device/index.ts
@@ -25,24 +25,16 @@ export const deletePqDev = (params: string[]) => {
   return http.post(`/pqDev/delete`, params)
 }
 
-//导出被检设备
-export const exportPqDev=(params: Device.ReqPqDevParams)=>{
-  return http.download(`/pqDev/export`, params)
-}
 export const downloadTemplate = () => {
   return http.download(`/pqDev/downloadTemplate`)
 }
-//导入被检设备(比对)
-export const importPqDev=(params: Device.ReqPqDevParams)=>{
-  return http.upload(`/pqDev/import`, params)
-}
+
 
 //根据设备类型决定（电源、icd、模板、通道数、额定电压、额定电流）；
 export const getPqDev = () => {
   return http.post(`/devType/list`)
 }
 
-
 //被检设备归档
 export const documentedPqDev=(ids:string[])=>{
   return http.post(`/pqDev/documented`, ids)
diff --git a/frontend/src/api/device/interface/device.ts b/frontend/src/api/device/interface/device.ts
index c8c5952..cbc53aa 100644
--- a/frontend/src/api/device/interface/device.ts
+++ b/frontend/src/api/device/interface/device.ts
@@ -14,6 +14,14 @@ export namespace Device {
     pattern:string;
   }
 
+  /**
+   *  被检设备表格分页查询参数
+   */
+  export interface ReqDevReportParams extends ReqPage{
+    planId?:string; // 计划id
+    devId?:string; // 装置id
+  }
+
     /**
    * 被检设备新增、修改、根据id查询返回的对象
    */
diff --git a/frontend/src/api/plan/plan.ts b/frontend/src/api/plan/plan.ts
index cfc612a..03901a5 100644
--- a/frontend/src/api/plan/plan.ts
+++ b/frontend/src/api/plan/plan.ts
@@ -2,17 +2,18 @@ import type { Plan } from './interface'
 import http from '@/api'
 import type { ErrorSystem } from '../device/interface/error'
 import type { Device } from '../device/interface/device'
+import { ReqDevReportParams } from '@/api/device/interface/device'
 
 /**
  * @name 检测计划管理模块
  */
 // 获取检测计划列表
 export const getPlanList = (params: Plan.ReqPlanParams) => {
-    return http.post(`/adPlan/list`, params)
+  return http.post(`/adPlan/list`, params)
 }
 
 // 新增检测计划
-export const addPlan = (params:any) => {
+export const addPlan = (params: any) => {
   return http.post(`/adPlan/add`, params)
 }
 
@@ -48,7 +49,7 @@ export const getUnboundPqDevList = (params: Plan.ReqPlan) => {
 
 //根据检测计划id查询出所有已绑定的设备
 export const getBoundPqDevList = (params: any) => {
-  return http.post(`/pqDev/listByPlanId`,params)
+  return http.post(`/pqDev/listByPlanId`, params)
 }
 
 //检测计划绑定设备
@@ -57,12 +58,12 @@ export const getBoundPqDevList = (params: any) => {
 // }
 
 // 按照模式查询检测计划（用于首页展示）
-export const getPlanListByPattern = (params:Plan.ReqPlan) => {
+export const getPlanListByPattern = (params: Plan.ReqPlan) => {
   return http.get(`/adPlan/listByPattern?pattern=${params.pattern}`)
 }
 
 // 导出检测计划
-export const exportPlan=(params: Device.ReqPqDevParams)=>{
+export const exportPlan = (params: Device.ReqPqDevParams) => {
   return http.download(`/adPlan/export`, params)
 }
 
@@ -71,11 +72,16 @@ export const downloadTemplate = () => {
   return http.download(`/adPlan/downloadTemplate`)
 }
 // 导入检测计划
-export const importPlan=(params: Device.ReqPqDevParams)=>{
+export const importPlan = (params: Device.ReqPqDevParams) => {
   return http.upload(`/adPlan/import`, params)
 }
 
-//导出被检设备
-export const downloadDevData=(params: Device.ReqPqDevParams)=>{
-  return http.download(`/report/generateReport`, params)
+// 装置检测报告生成
+export const generateDevReport = (params: Device.ReqDevReportParams) => {
+  return http.post(`/report/generateReport`, params)
+}
+
+// 装置检测报告下载
+export const downloadDevData = (params: Device.ReqDevReportParams) => {
+  return http.download(`/report/downloadReport`, params)
 }
\ No newline at end of file
diff --git a/frontend/src/views/home/components/preTest.vue b/frontend/src/views/home/components/preTest.vue
index 0a3e8ec..2ca9879 100644
--- a/frontend/src/views/home/components/preTest.vue
+++ b/frontend/src/views/home/components/preTest.vue
@@ -51,7 +51,11 @@
             <div class="div-log">
               <p v-for="(item, index) in step4InitLog" :key="index"
                  :style="{ color: item.type === 'error' ? '#F56C6C' : 'var(--el-text-color-regular)' }">
-                {{ item.log }} <br/>
+                {{ item.log.split('&&')[0] }}
+                <br v-if="item.log.includes('&&')">
+                {{ item.log.split('&&')[1] }}
+                <br/>
+
               </p>
             </div>
           </el-collapse-item>
@@ -441,14 +445,14 @@ watch(webMsgSend, function (newValue, oldValue) {
           if (newValue.code == 10200) {
             step4InitLog.value.push({
               type: 'info',
-              log: '源已接通!',
+              log: '源参数下发成功,等待校验中.....',
             })
 
           } else if (newValue.code == 10201) {
             step4.value = 'process'
             step4InitLog.value = [{
               type: 'wait',
-              log: '正在接通源.....',
+              log: '源参数下发中.....',
             }];
           } else if (newValue.code == 10552) {
             ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
@@ -470,9 +474,11 @@ watch(webMsgSend, function (newValue, oldValue) {
             if (newValue.data.includes('不合格')) {
               type = 'error'
             }
+
+            newValue.data.split('<br/>')
             step4InitLog.value.push({
               type: type,
-              log: '相序校验:' + newValue.data,
+              log:newValue.data,
             })
 
           } else if (newValue.code == 10201) {
@@ -488,7 +494,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '相序校验未通过!',
             })
             ts.value = 'error'
-          }else if (newValue.code == 25001) {
+          } else if (newValue.code == 25001) {
             step4.value = 'success'
             step5.value = 'success'
             step4InitLog.value.push({
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index b96f4a3..203d886 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -1,89 +1,95 @@
 <template>
-  <div class="table_info">
+  <div class='table_info'>
     <!-- :request-api="getTableList" -->
     <ProTable
-      ref="proTable"
-      :columns="columns"
-      @drag-sort="sortTable"
+      ref='proTable'
+      :columns='columns'
+      @drag-sort='sortTable'
       :default-sort="{ prop: 'check_State', order: 'ascending' }"
-      :stripe="true"
-      :pagination = "false"
-      :key="tableKey"
+      :stripe='true'
+      :pagination='false'
+      :key='tableKey'
       @selection-change='handleSelectionChange'
       :request-api='getTableList'
-      :toolButton = 'false'
+      :toolButton='false'
     >
-    <!-- :height="tableHeight" -->
+      <!-- :height="tableHeight" -->
       <!-- 表格 header 按钮 -->
-      <template #tableHeader="">
-        <el-form :model="form" :inline="true">
-          <el-form-item label="关键字" >
-            <el-input v-model="form.search" placeholder="请输入设备名称" clearable style="width: 140px;"></el-input>
+      <template #tableHeader=''>
+        <el-form :model='form' :inline='true'>
+          <el-form-item label='关键字'>
+            <el-input v-model='form.search' placeholder='请输入设备名称' clearable style='width: 140px;'></el-input>
           </el-form-item>
-          <el-form-item label="检测状态" v-if="form.activeTabs != 3 && form.activeTabs != 4 && form.activeTabs != 5">
-            <el-select v-model="form.checkStatus" clearable>
+          <el-form-item label='检测状态' v-if='form.activeTabs != 3 && form.activeTabs != 4 && form.activeTabs != 5'>
+            <el-select v-model='form.checkStatus' clearable>
               <el-option
-                v-for="(item, index) in checkStatus"
-                :label="item.label"
-                :value="item.id"
-                :key="index"
-                v-show="shouldShowOption(item)"
+                v-for='(item, index) in checkStatus'
+                :label='item.label'
+                :value='item.id'
+                :key='index'
+                v-show='shouldShowOption(item)'
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="检测结果">
-            <el-select v-model="form.checkResult" clearable>
+          <el-form-item label='检测结果'>
+            <el-select v-model='form.checkResult' clearable>
               <el-option
-                v-for="(item, index) in checkResult"
-                :label="item.label"
-                :value="item.id"
+                v-for='(item, index) in checkResult'
+                :label='item.label'
+                :value='item.id'
 
-                :key="index"
-                v-show="shouldShowOption(item)"
+                :key='index'
+                v-show='shouldShowOption(item)'
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="报告状态" >
-            <el-select v-model="form.checkReportStatus" clearable>
+          <el-form-item label='报告状态'>
+            <el-select v-model='form.checkReportStatus' clearable>
               <el-option
-                v-for="(item, index) in checkReportStatus"
-                :label="item.label"
-                :value="item.id"
+                v-for='(item, index) in checkReportStatus'
+                :label='item.label'
+                :value='item.id'
 
-                :key="index"
-                v-show="shouldShowOption(item)"
+                :key='index'
+                v-show='shouldShowOption(item)'
               ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" :icon="Search" @click="handleSearch"
-              >查询</el-button
+            <el-button type='primary' :icon='Search' @click='handleSearch'
+            >查询
+            </el-button
             >
             <el-button :icon="Delete" @click="handleRefresh"
               >重置</el-button
             >
             <!-- :disabled='!scope.isSelected' -->
             <el-button
-              type="primary"
-              :icon="Clock"
+              type='primary'
+              :icon='Clock'
               @click="handleTest('手动检测')"
-              v-if="form.activeTabs === 0"
-              >手动检测</el-button
+              v-if='form.activeTabs === 0'
+            >手动检测
+            </el-button
             >
 
             <!-- :disabled='!scope.isSelected' -->
             <el-button
-              type="primary"
-              :icon="ChatLineRound"
+              type='primary'
+              :icon='ChatLineRound'
               @click="handleTest('自动检测')"
-              v-if="form.activeTabs === 0"
-              >自动检测</el-button
+              v-if='form.activeTabs === 0'
+            >自动检测
+            </el-button
             >
-            <el-button type="primary" :icon="ChatLineSquare" @click="handleTest('不合格项复检')" v-if="form.activeTabs === 2"
-              >不合格项复检</el-button
+            <el-button type='primary' :icon='ChatLineSquare' @click="handleTest('不合格项复检')"
+                       v-if='form.activeTabs === 2'
+            >不合格项复检
+            </el-button
             >
-            <el-button type="primary" :icon="ChatDotSquare" @click="handleTest('全部复检')" v-if="form.activeTabs === 2"
-              >全部复检</el-button
+            <el-button type='primary' :icon='ChatDotSquare' @click="handleTest('全部复检')" v-if='form.activeTabs === 2'
+            >全部复检
+            </el-button
             >
 
             <!-- :disabled='!scope.isSelected' -->
@@ -96,33 +102,30 @@
             > -->
 
             <!-- :disabled="!scope.isSelected || scope.selectedList.filter((item) => item.check_State === '检测完成').length === 0" -->
-            <el-button type="primary" :icon="Notebook"  @click="handleTest('批量归档')" v-if="form.activeTabs === 4"
-              >归档</el-button>
+            <el-button type='primary' :icon='Notebook' @click="handleTest('批量归档')" v-if='form.activeTabs === 4'
+            >归档
+            </el-button>
             <!-- <el-button type="primary" :icon="CirclePlus" @click="addDevice('设备新增')" v-if="form.activeTabs === 0"
               >设备新增</el-button> -->
 
-              <el-button type="primary" v-auth.role="'channelsTest'" :icon="Odometer"  @click="handleTest('系数校准')"  v-if="form.activeTabs === 0"
-              >系数校准</el-button>
+            <el-button type='primary' v-auth.role="'channelsTest'" :icon='Odometer' @click="handleTest('系数校准')"
+                       v-if='form.activeTabs === 0'
+            >系数校准
+            </el-button>
           </el-form-item>
         </el-form>
       </template>
       <!-- 表格操作 -->
-      <template #operation="scope">
+      <template #operation='scope'>
         <el-button
-        type="primary"
+          type='primary'
           link
-          :icon="View"
+          :icon='View'
           @click="openDrawer('查看', scope.row)"
-          v-if="form.activeTabs === 3 && form.activeChildTabs === 1"
-          >查看</el-button>
+          v-if='form.activeTabs === 3 && form.activeChildTabs === 1'
+        >查看
+        </el-button>
 
-        <!-- <el-button
-        type="primary"
-          link
-          :icon="Download"
-          @click="openDrawer('报告下载', scope.row)"
-          v-if="form.activeTabs === 3 && form.activeChildTabs === 0 && scope.row.reportState === 1"
-          >报告下载</el-button> -->
 
         <!-- <div class='cn-render-buttons' v-if="form.activeTabs === 3 && form.activeChildTabs === 0">
           <el-dropdown trigger='click'>
@@ -140,12 +143,22 @@
         </div> -->
 
         <el-button
-        type="primary"
+          type='primary'
           link
-          :icon="Postcard"
-          @click="openDrawer('生成', scope.row)"
-          v-if="form.activeTabs === 3"
-          >报告生成</el-button>
+          :icon='Download'
+          @click="openDrawer('报告下载', scope.row)"
+          v-if='form.activeTabs === 3 && form.activeChildTabs === 0 && scope.row.reportState === 1'
+        >报告下载
+        </el-button>
+
+        <el-button
+          type='primary'
+          link
+          :icon='Postcard'
+          @click="openDrawer('报告生成', scope.row)"
+          v-if='form.activeTabs === 3 && scope.row.reportState !== 1'
+        >报告生成
+        </el-button>
         <!-- <el-button
         type="primary"
           link
@@ -155,28 +168,31 @@
           >数据查看</el-button
         > -->
         <el-button type='primary'
-          link
-          :icon="Notebook"
-          @click="openDrawer('归档', scope.row)"
-          v-if="form.activeTabs === 4"
-          :disabled = "scope.row.reportState != 1"
-          >归档</el-button>
+                   link
+                   :icon='Notebook'
+                   @click="openDrawer('归档', scope.row)"
+                   v-if='form.activeTabs === 4'
+                   :disabled='scope.row.reportState != 1'
+        >归档
+        </el-button>
 
         <el-button
-        type="primary"
+          type='primary'
           link
-          :icon="PieChart"
+          :icon='PieChart'
           @click="openDrawer('检测数据查询', scope.row)"
-          v-if="form.activeTabs === 5"
-          >检测数据查询</el-button>
+          v-if='form.activeTabs === 5'
+        >检测数据查询
+        </el-button>
 
         <el-button
-        type="primary"
+          type='primary'
           link
-          :icon="Switch"
+          :icon='Switch'
           @click="openDrawer('误差体系更换', scope.row)"
-          v-if="form.activeTabs === 5"
-          >误差体系更换</el-button>
+          v-if='form.activeTabs === 5'
+        >误差体系更换
+        </el-button>
 
         <!-- <div class='cn-render-buttons' v-if="form.activeTabs === 5 ">
           <el-dropdown trigger='click'>
@@ -209,194 +225,210 @@
        :dialogTitle="dialogTitle"
       @update:visible="dialogFormVisible = $event"
     /> -->
-    <TestPopup ref="testPopup" @quitClicked="handleQuitClicked" ></TestPopup>
+    <TestPopup ref='testPopup' @quitClicked='handleQuitClicked'></TestPopup>
 
     <reportPopup
-      :visible="reportDialogVisible"
-      @update:visible="reportDialogVisible = $event"
+      :visible='reportDialogVisible'
+      @update:visible='reportDialogVisible = $event'
     ></reportPopup>
 
-    <dataCheckPopup ref="dataCheckPopupRef"/>
+    <dataCheckPopup ref='dataCheckPopupRef' />
 
     <dataCheckChangeErrSysPopup
-    :visible="dataCheckChangeErrSysDialogVisible"
-      @update:visible="dataCheckChangeErrSysDialogVisible = $event"
-      ></dataCheckChangeErrSysPopup>
+      :visible='dataCheckChangeErrSysDialogVisible'
+      @update:visible='dataCheckChangeErrSysDialogVisible = $event'
+    ></dataCheckChangeErrSysPopup>
 
-      <matchPopup
-      :visible="matchDialogVisible"
-      @update:visible="matchDialogVisible = $event"
-      ></matchPopup>
+    <matchPopup
+      :visible='matchDialogVisible'
+      @update:visible='matchDialogVisible = $event'
+    ></matchPopup>
 
-      <!--系数校准-->
-      <ChannelsTest  ref="channelsTest" :webMsgSend="webMsgSend" @quitClicked="handleQuitClicked"></ChannelsTest>
+    <!--系数校准-->
+    <ChannelsTest ref='channelsTest' :webMsgSend='webMsgSend' @quitClicked='handleQuitClicked'></ChannelsTest>
   </div>
 </template>
 
-<script setup lang="tsx" name="useProTable">
-import { useRouter } from "vue-router";
+<script setup lang='tsx' name='useProTable'>
+import { useRouter } from 'vue-router'
 import type { Device } from '@/api/device/interface/device'
-import { useHandleData } from "@/hooks/useHandleData";
-import { ElMessage, ElMessageBox, ElLoading, Action} from "element-plus";
-import ProTable from "@/components/ProTable/index.vue";
+import { useHandleData } from '@/hooks/useHandleData'
+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,Odometer
-} from "@element-plus/icons-vue";
-import { getPlanList } from "@/api/plan/planList";
+  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 reportPopup from "./reportPopup.vue";
-import dataCheckPopup from "./dataCheckSingleChannelSingleTestPopup.vue";
-import dataCheckChangeErrSysPopup from "./dataCheckChangeErrSysPopup.vue";
-import { getBoundPqDevList } from '@/api/plan/plan.ts'
-import { onBeforeMount, onMounted, reactive, ref, watch } from "vue";
+import TestPopup from './testPopup.vue'
+import reportPopup from './reportPopup.vue'
+import dataCheckPopup from './dataCheckSingleChannelSingleTestPopup.vue'
+import dataCheckChangeErrSysPopup from './dataCheckChangeErrSysPopup.vue'
+import { generateDevReport, getBoundPqDevList } from '@/api/plan/plan.ts'
+import { onBeforeMount, onMounted, reactive, ref, watch } from 'vue'
 import { useDictStore } from '@/stores/modules/dict'
 import ChannelsTest from './channelsTest.vue'
-import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store
-import {useCheckStore} from '@/stores/modules/check'
-import {CheckData} from '@/api/check/interface'
-import socketClient from '@/utils/webSocketClient';
-import auth from "@/directives/modules/auth";
-import { useAuthStore } from "@/stores/modules/auth";
+import { useModeStore } from '@/stores/modules/mode' // 引入模式 store
+import { useCheckStore } from '@/stores/modules/check'
+import { CheckData } from '@/api/check/interface'
+import socketClient from '@/utils/webSocketClient'
+import auth from '@/directives/modules/auth'
+import { useAuthStore } from '@/stores/modules/auth'
 import { useDownload } from '@/hooks/useDownload'
-import {downloadDevData} from '@/api/plan/plan.ts'
-import {documentedPqDev} from "@/api/device/device";
+import { downloadDevData } from '@/api/plan/plan.ts'
+import { documentedPqDev } from '@/api/device/device'
 import { getPqDev } from '@/api/device/device/index.ts'
-import {ResultEnum} from "@/enums/httpEnum";
+import { ResultEnum } from '@/enums/httpEnum'
+
 const dictStore = useDictStore()
 const checkStore = useCheckStore()
-const webMsgSend = ref();//webSocket推送的数据
-let devNum = 0;//当前选取的被检设备数量
-let devChannelsNum = 0;//当前选择的被检设备通道总数
-let devTestedNum = 0;//当前选择的已完成检测的被检设备数量
-const tableKey = ref(0);
-const router = useRouter();
-const value1 = ref("");
-const value2 = ref("");
-const tableHeight = ref(0);
+const webMsgSend = ref()//webSocket推送的数据
+let devNum = 0//当前选取的被检设备数量
+let devChannelsNum = 0//当前选择的被检设备通道总数
+let devTestedNum = 0//当前选择的已完成检测的被检设备数量
+const tableKey = ref(0)
+const router = useRouter()
+const value1 = ref('')
+const value2 = ref('')
+const tableHeight = ref(0)
 const reportDialogVisible = ref(false)
 
-const dataCheckPopupRef=ref<InstanceType<typeof dataCheckPopup>>()
+const dataCheckPopupRef = ref<InstanceType<typeof dataCheckPopup>>()
 
 const dataCheckChangeErrSysDialogVisible = ref(false)
 const matchDialogVisible = ref(false)
 const dialogTitle = ref('手动检测')
-const checkStateTable = ref<number[]>([0,1,2])
+const checkStateTable = ref<number[]>([0, 1, 2])
 const dialogForm = ref<any>({
-      id: '',
-      name: '',
-      standard_Name:'',
-      standard_Time:'',
-      dev_Level:'',
-      enable:1,
-      state:1,     
-});
-const modeStore = useModeStore();
+  id: '',
+  name: '',
+  standard_Name: '',
+  standard_Time: '',
+  dev_Level: '',
+  enable: 1,
+  state: 1,
+})
+const modeStore = useModeStore()
 const shouldShowOption = (item) => {
-   // 检查 weiJianTab 是否不等于 0
-   if (weiJianTab.value !== 0) {
+  // 检查 weiJianTab 是否不等于 0
+  if (weiJianTab.value !== 0) {
     // 排除 label 为“归档”和“未检”的项
-    return item.label !== '归档' && item.label !== '未检';
+    return item.label !== '归档' && item.label !== '未检'
   } else {
     // 只排除 label 为“归档”的项
-    return item.label !== '归档';
+    return item.label !== '归档'
   }
-};
+}
 
-tableHeight.value = window.innerHeight - 600;
-const deviceData = ref<Device.ResPqDev[]>([]);
-const operationShow = ref(false);
-const documentStateShow = ref(false);
-const checkStateShow = ref(true);
-const factorCheckShow = ref(true);
-const operationMinWidth = ref(200);
-const selectionShow = ref(true);
+tableHeight.value = window.innerHeight - 600
+const deviceData = ref<Device.ResPqDev[]>([])
+const operationShow = ref(false)
+const documentStateShow = ref(false)
+const checkStateShow = ref(true)
+const factorCheckShow = ref(true)
+const operationMinWidth = ref(200)
+const selectionShow = ref(true)
 const channelsTest = ref()
 const testPopup = ref()
 const weiJianTab = ref(0)//除设备检测外，检测结果不显示'未检'
 const channelsSelection = ref<Device.ResPqDev[]>([])
 const props = defineProps({
-id: {
-      type: String,
-      required: true,
-    },
-isTimeCheck: {
-      type: Boolean,
-      required: true,
-    },
+  id: {
+    type: String,
+    required: true,
+  },
+  isTimeCheck: {
+    type: Boolean,
+    required: true,
+  },
   plan: {
     type: Object,
-    default: null
-  }
+    default: null,
+  },
 })
 
 const emit = defineEmits<{
   (e: 'batchGenerateClicked'): void;
-}>();
+}>()
 
 // 存储设备类型选项
-const devTypeOptions = ref<{ 
-                          id: string; 
-                          name: string ,
-                          icd:string ,
-                          power:string,
-                          devVolt:number,
-                          devCurr:number,
-                          devChns:number,
-                        }[]>([])
+const devTypeOptions = ref<{
+  id: string;
+  name: string,
+  icd: string,
+  power: string,
+  devVolt: number,
+  devCurr: number,
+  devChns: number,
+}[]>([])
 
 //下拉框数据
 interface Dict {
   id: string;
   label: string;
 }
+
 //检测状态数据
 const checkStatus: Dict[] = [
   {
-    id: "0",
+    id: '0',
     label: '未检',
   },
   {
-    id: "1",
+    id: '1',
     label: '检测中',
   },
   {
-    id: "2",
+    id: '2',
     label: '检测完成',
   },
   {
-    id: "3",
+    id: '3',
     label: '归档',
   },
 ]
 //检测报告状态数据
 const checkReportStatus: Dict[] = [
   {
-    id: "0",
+    id: '0',
     label: '未生成',
   },
   {
-    id: "1",
+    id: '1',
     label: '已生成',
   },
   {
-    id: "2",
+    id: '2',
     label: '未检',
   },
 ]
 //检测结果数组
 const checkResult: Dict[] = [
   {
-    id: "0",
+    id: '0',
     label: '不符合',
   },
   {
-    id: "1",
+    id: '1',
     label: '符合',
   },
   {
-    id: "2",
+    id: '2',
     label: '未检',
   },
 ]
@@ -412,217 +444,201 @@ const form: any = ref({
   deviceBindStatus: 0, //绑定状态
   deviceType: 0, //设备类型
   manufacturer: 0, //制造厂商
-});
+})
 const searchForm = ref({
   intervalType: 0,
-  time: ["2024-08-20", "2024-08-27"],
-  searchBeginTime: "",
-  searchEndTime: "",
+  time: ['2024-08-20', '2024-08-27'],
+  searchBeginTime: '',
+  searchEndTime: '',
   checkStatus: 0,
   checkReportStatus: 0,
   checkResult: 0,
-});
+})
 // ProTable 实例
-const proTable = ref<ProTableInstance>();
+const proTable = ref<ProTableInstance>()
 
 const getTableList = async (params: any) => {
-    //权限不包含通道系数，表格不展示列
-    const authStore = useAuthStore()
-    const currentPageRoles = authStore.authButtonListGet[authStore.routeName] ?? []
-    if (!currentPageRoles.includes('channelsTest')) {
-        factorCheckShow.value = false;  
-    }
-    
+  //权限不包含通道系数，表格不展示列
+  const authStore = useAuthStore()
+  const currentPageRoles = authStore.authButtonListGet[authStore.routeName] ?? []
+  if (!currentPageRoles.includes('channelsTest')) {
+    factorCheckShow.value = false
+  }
 
-   // 调用 ProTable 的 clearSelection 方法清空选择
-   if (proTable.value) {
-      proTable.value.clearSelection();
-    }
-  if(props.id){
+
+  // 调用 ProTable 的 clearSelection 方法清空选择
+  if (proTable.value) {
+    proTable.value.clearSelection()
+  }
+  if (props.id) {
     const checkStateList = ref<any>()
-    if(form.value.checkStatus != null){
+    if (form.value.checkStatus != null) {
       checkStateList.value = [form.value.checkStatus]
-    }else{
+    } else {
       checkStateList.value = checkStateTable.value
     }
-    return  getBoundPqDevList({'planId': props.id,
-                              'checkStateList': checkStateList.value,
-                              'checkResult': form.value.checkResult,
-                              'reportState': form.value.checkReportStatus,
-                              'name':form.value.search
-                              });
-    }else{//点击树根节点，表格显示无数据
-      // return getBoundPqDevList({'planId': '',
-      //                         'checkStateList': [0],
-      //                         'checkResult': form.value.checkResult,
-      //                         'reportState': form.value.checkReportStatus,
-      //                         'name':form.value.search
-      //                         });
-    }
-};
+    return getBoundPqDevList({
+      'planId': props.id,
+      'checkStateList': checkStateList.value,
+      'checkResult': form.value.checkResult,
+      'reportState': form.value.checkReportStatus,
+      'name': form.value.search,
+    })
+  } else {//点击树根节点，表格显示无数据
+    // return getBoundPqDevList({'planId': '',
+    //                         'checkStateList': [0],
+    //                         'checkResult': form.value.checkResult,
+    //                         'reportState': form.value.checkReportStatus,
+    //                         'name':form.value.search
+    //                         });
+  }
+}
 
 // 表格配置项
 const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
-    { type: 'selection', fixed: 'left', width: 70, 
-      isShow:selectionShow ,
-      selectable(row) {
-        if(weiJianTab.value === 4){
-          console.log(row.reportState);
-          return row.reportState === 1 ;
-        }
-        return true ;
-      },
+  {
+    type: 'selection', fixed: 'left', width: 70,
+    isShow: selectionShow,
+    selectable(row) {
+      if (weiJianTab.value === 4) {
+        console.log(row.reportState)
+        return row.reportState === 1
+      }
+      return true
     },
-    { type: 'index', fixed: 'left', width: 70, label: '序号' },
-    {
-      prop: 'name',
-      label: '设备名称',
-      minWidth: 220,
-      //search: { el: 'input' },
-    },
-    {
-      prop: 'devType',
-      label: '设备类型',
-      minWidth: 100,
-      render: (scope) => {
+  },
+  { type: 'index', fixed: 'left', width: 70, label: '序号' },
+  {
+    prop: 'name',
+    label: '设备名称',
+    minWidth: 220,
+    //search: { el: 'input' },
+  },
+  {
+    prop: 'devType',
+    label: '设备类型',
+    minWidth: 100,
+    render: (scope) => {
       // 查找设备类型名称
-      const name = devTypeOptions.value.find(option => option.id === scope.row.devType);
+      const name = devTypeOptions.value.find(option => option.id === scope.row.devType)
       return <span>{name?.name}</span>
     },
+  },
+  {
+    prop: 'devChns',
+    label: '通道数',
+    minWidth: 100,
+    sortable: true,
+  },
+  {
+    prop: 'reCheckNum',
+    label: '检测次数',
+    minWidth: 100,
+    sortable: true,
+    // <template #header>
+    //   <span>检测次数</span>
+    //     <el-tooltip content = "最大检测次数为3次，超过会强制归档" placement="top" style="align-items: bottom;">
+    //     <el-icon><InfoFilled  /></el-icon>
+    //   </el-tooltip>
+    // </template>
+  },
+  {
+    prop: 'checkState',
+    label: '检测状态',
+    minWidth: 100,
+    sortable: true,
+    isShow: checkStateShow,
+    render: scope => {
+      return (
+        scope.row.checkState === 0 ? '未检' : scope.row.checkState === 1 ? '检测中' : '检测完成'
+      )
     },
-    {
-      prop: 'devChns',
-      label: '通道数',
-      minWidth: 100,
-      sortable:true,
-    },
-    {
-      prop: 'reCheckNum',
-      label: '检测次数',
-      minWidth: 100,
-      sortable:true,
-      // <template #header>
-      //   <span>检测次数</span>
-      //     <el-tooltip content = "最大检测次数为3次，超过会强制归档" placement="top" style="align-items: bottom;">
-      //     <el-icon><InfoFilled  /></el-icon>
-      //   </el-tooltip>
-      // </template>
-    },
-    {
-      prop: 'checkState',
-      label: '检测状态',
-      minWidth: 100,
-      sortable:true,
-      isShow:checkStateShow,
-      render: scope => {
-          return (
-            scope.row.checkState === 0 ? '未检' : scope.row.checkState === 1 ? '检测中' : '检测完成'
-          )
-      },
-    },
-    {
-      prop: 'checkResult',
-      label: '检测结果',
-      minWidth: 100,
-      sortable:true,
-      render: (scope) => {
-        if (scope.row.checkResult === 0) 
-        {
-          return <el-tag type='danger'>不符合</el-tag>
-        } 
-        else if (scope.row.checkResult === 1) 
-        {
-            return '符合';
-        } 
-        else if (scope.row.checkResult === 2) 
-        {
-            return '未检';
-        }
-        return '';
-    },
-    },
-    {
-      prop: 'reportState',
-      label: '报告状态',
-      minWidth: 100,
-      sortable:true,
-      render: scope => {
-        if (scope.row.reportState === 0) 
-        {
-          return '未生成';
-        } 
-        else if (scope.row.reportState === 1) 
-        {
-            return '已生成';
-        } 
-        else if (scope.row.reportState === 2) 
-        {
-            return '未检';
-        }
-        return '';
+  },
+  {
+    prop: 'checkResult',
+    label: '检测结果',
+    minWidth: 100,
+    sortable: true,
+    render: (scope) => {
+      if (scope.row.checkResult === 0) {
+        return <el-tag type='danger'>不符合</el-tag>
+      } else if (scope.row.checkResult === 1) {
+        return '符合'
+      } else if (scope.row.checkResult === 2) {
+        return '未检'
       }
+      return ''
     },
-    {
-      prop: 'factorCheckResult',
-      label: '系数校准结果',
-      minWidth: 100,
-      sortable:true,
-      isShow:factorCheckShow,
-      render: scope => {
-        if (scope.row.factorCheckResult === 0) 
-        {
-          return '不合格';
-        } 
-        else if (scope.row.factorCheckResult === 1) 
-        {
-            return '合格';
-        } 
-        else if (scope.row.factorCheckResult === 2) 
-        {
-            return '/';
-        }
-        return '';
+  },
+  {
+    prop: 'reportState',
+    label: '报告状态',
+    minWidth: 100,
+    sortable: true,
+    render: scope => {
+      if (scope.row.reportState === 0) {
+        return '未生成'
+      } else if (scope.row.reportState === 1) {
+        return '已生成'
+      } else if (scope.row.reportState === 2) {
+        return '未检'
       }
+      return ''
     },
-    { prop: 'operation', label: '操作', fixed: 'right', minWidth: 200 ,isShow: operationShow},
-  ])
+  },
+  {
+    prop: 'factorCheckResult',
+    label: '系数校准结果',
+    minWidth: 100,
+    sortable: true,
+    isShow: factorCheckShow,
+    render: scope => {
+      if (scope.row.factorCheckResult === 0) {
+        return '不合格'
+      } else if (scope.row.factorCheckResult === 1) {
+        return '合格'
+      } else if (scope.row.factorCheckResult === 2) {
+        return '/'
+      }
+      return ''
+    },
+  },
+  { prop: 'operation', label: '操作', fixed: 'right', minWidth: 200, isShow: operationShow },
+])
 // 跳转详情页
 const toDetail = () => {
   router.push(
-    `/proTable/useProTable/detail/${Math.random().toFixed(3)}?params=detail-page`
-  );
-};
+    `/proTable/useProTable/detail/${Math.random().toFixed(3)}?params=detail-page`,
+  )
+}
 //重置查询条件
 const resetSearchForm = () => {
   searchForm.value = {
     intervalType: 0,
-    time: ["2024-08-20", "2024-08-27"],
-    searchBeginTime: "",
-    searchEndTime: "",
+    time: ['2024-08-20', '2024-08-27'],
+    searchBeginTime: '',
+    searchEndTime: '',
     checkStatus: 0,
     checkReportStatus: 0,
     checkResult: 0,
-  };
-};
-let testType = "test";//检测还是复检
+  }
+}
+let testType = 'test'//检测还是复检
 
 const handleSelectionChange = (selection: any[]) => {
   channelsSelection.value = selection
-  devNum = selection.length;
-  devChannelsNum = 0;
+  devNum = selection.length
+  devChannelsNum = 0
   for (let i = 0; i < selection.length; i++) {
-    devChannelsNum += selection[i].dev_Chns;
+    devChannelsNum += selection[i].dev_Chns
   }
 
-  devTestedNum = selection.filter((item) => item.checkState === 2).length;
+  devTestedNum = selection.filter((item) => item.checkState === 2).length
   const result = selection.filter((item) => item.checkResult != 0)
-  if(result.length > 0)
-  {
-    testType= "test";    
-  }
-  else
-  {
-    testType= "reTest";
+  if (result.length > 0) {
+    testType = 'test'
+  } else {
+    testType = 'reTest'
   }
   let devices: CheckData.Device[] = selection.map((item: any) => {
     return {
@@ -631,70 +647,70 @@ const handleSelectionChange = (selection: any[]) => {
       deviceType: item.devType,
       chnNum: item.devChns,
     }
-  });
+  })
 
-  if(selection.length > 0){
+  if (selection.length > 0) {
     checkStore.clearDevices()
     checkStore.addDevices(devices)
-  }else{
+  } else {
     checkStore.clearDevices()
   }
 }
 
 //查询
 const handleSearch = () => {
-  proTable.value?.getTableList();
-};
+  proTable.value?.getTableList()
+}
 //重置
 const handleRefresh = () => {
-  form.value.search = null;
-  form.value.checkStatus = null;
-  form.value.checkResult = null;
-  form.value.checkReportStatus = null;
-  proTable.value?.getTableList();
-};
+  form.value.search = null
+  form.value.checkStatus = null
+  form.value.checkResult = null
+  form.value.checkReportStatus = null
+  proTable.value?.getTableList()
+}
 // 表格拖拽排序
 const sortTable = ({
-  newIndex,
-  oldIndex,
-}: {
+                     newIndex,
+                     oldIndex,
+                   }: {
   newIndex?: number;
   oldIndex?: number;
 }) => {
   //console.log(newIndex, oldIndex);
   //console.log(proTable.value?.tableData);
-  ElMessage.success("修改列表排序成功");
-};
+  ElMessage.success('修改列表排序成功')
+}
 
 
 //顶部功能切换时修改activeTabs
-const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => {
+const changeActiveTabs = (val: number, val2: number, tabledata: any[]) => {
 
-  form.value.activeTabs = val;
-  form.value.activeChildTabs= val2;
-  deviceData.value = tabledata;
+  form.value.activeTabs = val
+  form.value.activeChildTabs = val2
+  deviceData.value = tabledata
   tableHeaderInit(val)
-};
+}
 
 //根据当前功能，初始化表头下拉框中的默认值和禁用值
 function tableHeaderInit(val: number) {
   refreshStatusList()
-  weiJianTab.value = val;
+  weiJianTab.value = val
   switch (val) {
     case 0://设备检测
     case 1://手动检测
       //disableCheckStatus("检测中")
-      disableCheckStatus("归档")
+      disableCheckStatus('归档')
       // operationShow.value = false;
       // columns[columns.length - 1].minWidth = 100;
-      checkStateTable.value = [0,1,2]
-      tableKey.value ++;
-      operationShow.value = false;
-      documentStateShow.value = false;
-      checkStateShow.value = true;
-      selectionShow.value = true;
-      factorCheckShow.value = true;
-      break;
+      checkStateTable.value = [0, 1, 2]
+      tableKey.value++
+      operationShow.value = false
+      documentStateShow.value = false
+      checkStateShow.value = true
+      selectionShow.value = true
+      factorCheckShow.value = true
+      break
     case 2://设备复检
       // form.value.checkStatus = 2;//检测状态默认为检测完成
       // form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告
@@ -704,7 +720,7 @@ function tableHeaderInit(val: number) {
       // disableCheckStatus("归档")
       // disablecheckResultList("未出结果")
       // operationShow.value = false;
-    break;
+      break
     case 3://报告生成
       // form.value.checkStatus = 2;//检测状态默认为检测完成
       // form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告
@@ -712,17 +728,17 @@ function tableHeaderInit(val: number) {
       // disableCheckStatus("未检")
       // disableCheckStatus("检测中")
       // disableCheckStatus("归档")
-      checkStateTable.value = [2,3]
-      disablecheckResultList("未检")
-      disableCheckReportStatus("未检")
-      columns[columns.length - 1].minWidth = 180;
-      tableKey.value += 1;
-      operationShow.value = true;
-      documentStateShow.value = true;
-      checkStateShow.value = false;
-      factorCheckShow.value = false;
-      selectionShow.value = true;
-    break;
+      checkStateTable.value = [2, 3]
+      disablecheckResultList('未检')
+      disableCheckReportStatus('未检')
+      columns[columns.length - 1].minWidth = 180
+      tableKey.value += 1
+      operationShow.value = true
+      documentStateShow.value = true
+      checkStateShow.value = false
+      factorCheckShow.value = false
+      selectionShow.value = true
+      break
     case 4://设备归档
       // form.value.checkStatus = 2;//检测状态默认为检测完成
       // form.value.checkReportStatus = 1;//检测报告状态默认为已生成报告
@@ -731,140 +747,139 @@ function tableHeaderInit(val: number) {
       // disableCheckStatus("检测中")
       // disableCheckStatus("归档")
       checkStateTable.value = [2]
-      disablecheckResultList("未检")
-      disableCheckReportStatus("未检")
-      columns[columns.length - 1].minWidth = 100;
-      tableKey.value += 1;
-      operationShow.value = true;
-      documentStateShow.value = false;
-      checkStateShow.value = false;
-      factorCheckShow.value = false;
-      selectionShow.value = true;
-    break;
+      disablecheckResultList('未检')
+      disableCheckReportStatus('未检')
+      columns[columns.length - 1].minWidth = 100
+      tableKey.value += 1
+      operationShow.value = true
+      documentStateShow.value = false
+      checkStateShow.value = false
+      factorCheckShow.value = false
+      selectionShow.value = true
+      break
     case 5://数据查询
-    checkStateTable.value = [2,3]
-    disablecheckResultList("未检")
-    disableCheckReportStatus("未检")
-    columns[columns.length - 1].minWidth = 290;
-    operationShow.value = true;
-    documentStateShow.value = true;
-    checkStateShow.value = false;
-    factorCheckShow.value = false;
-    selectionShow.value = false;
-    columns[0].isShow = false;
-    tableKey.value += 1;
-    break;
+      checkStateTable.value = [2, 3]
+      disablecheckResultList('未检')
+      disableCheckReportStatus('未检')
+      columns[columns.length - 1].minWidth = 290
+      operationShow.value = true
+      documentStateShow.value = true
+      checkStateShow.value = false
+      factorCheckShow.value = false
+      selectionShow.value = false
+      columns[0].isShow = false
+      tableKey.value += 1
+      break
   }
 //console.log("test",columns);
 handleRefresh()
 }
 
-function refreshStatusList(){
+function refreshStatusList() {
   // devNum = 0;
   // devChannelsNum = 0;
   // devTestedNum = 0;
-  devNum = 0;
-  devChannelsNum = 0;
-  devTestedNum = 0;
+  devNum = 0
+  devChannelsNum = 0
+  devTestedNum = 0
   checkStatus.map((item: any, index: any) => {
     if (item.disabled) {
-      item.disabled = false;
+      item.disabled = false
     }
-  });
+  })
   checkReportStatus.map((item: any, index: any) => {
     if (item.disabled) {
-      item.disabled = false;
+      item.disabled = false
     }
-  });
+  })
   checkResult.map((item: any, index: any) => {
     if (item.disabled) {
-      item.disabled = false;
+      item.disabled = false
     }
-  });
+  })
 
-  form.value.checkStatus = null;//检测状态默认为未检
-  form.value.checkReportStatus = null;//检测报告状态默认为未生成报告
-  form.value.checkResult = null;//检测结果默认为未出结果
+  form.value.checkStatus = null//检测状态默认为未检
+  form.value.checkReportStatus = null//检测报告状态默认为未生成报告
+  form.value.checkResult = null//检测结果默认为未出结果
 }
 
-function disableCheckStatus(val: string){
+function disableCheckStatus(val: string) {
   checkStatus.map((item: any, index: any) => {
     if (val == item.label) {
-      item.disabled = true;
+      item.disabled = true
     }
-  });
-}
-function disableCheckReportStatus(val: string){
-  checkReportStatus.map((item: any, index: any) => {
-    if (val == item.label) {
-      item.disabled = true;
-    }
-  });
-}
-function disablecheckResultList(val: string){
-  checkResult.map((item: any, index: any) => {
-    if (val == item.label) {
-      item.disabled = true;
-    }
-  });
+  })
 }
 
-const addDevice = (val:string) => {
+function disableCheckReportStatus(val: string) {
+  checkReportStatus.map((item: any, index: any) => {
+    if (val == item.label) {
+      item.disabled = true
+    }
+  })
+}
+
+function disablecheckResultList(val: string) {
+  checkResult.map((item: any, index: any) => {
+    if (val == item.label) {
+      item.disabled = true
+    }
+  })
+}
+
+const addDevice = (val: string) => {
   router.push({
-    path: "/machine/device",
-  });
-};
-const handleTest = async (val:string) => {
+    path: '/machine/device',
+  })
+}
+const handleTest = async (val: string) => {
 
-    if(devNum == 0)
-    {
-      ElMessageBox.confirm(
-        '请先选择被检设备',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }
-      )
-      return
-    }
+  if (devNum == 0) {
+    ElMessageBox.confirm(
+      '请先选择被检设备',
+      '提示',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+    return
+  }
 
-    const checkDevVolt = channelsSelection.value.map(item => item.devVolt);
-    const isDevVoltConsistent = new Set(checkDevVolt).size === 1;
-    if (!isDevVoltConsistent) {
-      ElMessageBox.confirm(
-        '所勾选设备额定电压不一致，请重新选择',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }
-      )
-      return
-    }
+  const checkDevVolt = channelsSelection.value.map(item => item.devVolt)
+  const isDevVoltConsistent = new Set(checkDevVolt).size === 1
+  if (!isDevVoltConsistent) {
+    ElMessageBox.confirm(
+      '所勾选设备额定电压不一致，请重新选择',
+      '提示',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+    return
+  }
 
-    const checkDevCurr = channelsSelection.value.map(item => item.devCurr);
-    const isDevCurrConsistent = new Set(checkDevCurr).size === 1;
-    if (!isDevCurrConsistent) {
-      ElMessageBox.confirm(
-        '所勾选设备额定电流不一致，请重新选择',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }
-      )
-      return
-    }
+  const checkDevCurr = channelsSelection.value.map(item => item.devCurr)
+  const isDevCurrConsistent = new Set(checkDevCurr).size === 1
+  if (!isDevCurrConsistent) {
+    ElMessageBox.confirm(
+      '所勾选设备额定电流不一致，请重新选择',
+      '提示',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+    return
+  }
 
 
-  if(val==='手动检测'||val==='自动检测'||val==='不合格项复检'||val==='全部复检' )
-  {
-    if(devNum > 6)
-    {
+  if (val === '手动检测' || val === '自动检测' || val === '不合格项复检' || val === '全部复检') {
+    if (devNum > 6) {
       ElMessageBox.confirm(
         '每次检测最多只能选择6台设备，请重新选择',
         '提示',
@@ -872,12 +887,11 @@ const handleTest = async (val:string) => {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
-        }
+        },
       )
       return
     }
-    if(devChannelsNum > 20)
-    {
+    if (devChannelsNum > 20) {
       ElMessageBox.confirm(
         '每次检测最多只能检测20个设备通道，请重新选择',
         '提示',
@@ -885,12 +899,11 @@ const handleTest = async (val:string) => {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
-        }
+        },
       )
       return
     }
-    if(testType === "reTest")
-    {
+    if (testType === 'reTest') {
       ElMessageBox.confirm(
         '请选择复检检测方式',
         '设备复检',
@@ -900,30 +913,28 @@ const handleTest = async (val:string) => {
           cancelButtonText: '全部复检',
           type: 'warning',
         },
-    )
+      )
         .then(() => {
-          ElMessage.success('不合格项复检');
-          dialogTitle.value = val;
-          testPopup.value?.open(channelsSelection.value,dialogTitle.value,props.isTimeCheck)// 打开对话框
+          ElMessage.success('不合格项复检')
+          dialogTitle.value = val
+          testPopup.value?.open(channelsSelection.value, dialogTitle.value, props.isTimeCheck)// 打开对话框
         })
         .catch((action: Action) => {
-          ElMessage.success('全部复检');
-          dialogTitle.value = val;
-          testPopup.value?.open(channelsSelection.value,dialogTitle.value,props.isTimeCheck) // 打开对话框
+          ElMessage.success('全部复检')
+          dialogTitle.value = val
+          testPopup.value?.open(channelsSelection.value, dialogTitle.value, props.isTimeCheck) // 打开对话框
         })
-    }
-    else
-    {
-      dialogTitle.value = val;
-      testPopup.value?.open(channelsSelection.value,dialogTitle.value,props.isTimeCheck)
+    } else {
+      dialogTitle.value = val
+      testPopup.value?.open(channelsSelection.value, dialogTitle.value, props.isTimeCheck)
     }
     return
 
   }
 
-  if(val === '系数校准') {
-    const checkStates = channelsSelection.value.map(item => item.checkState);
-    const allCheckStatesEqual = new Set(checkStates).size <= 1;
+  if (val === '系数校准') {
+    const checkStates = channelsSelection.value.map(item => item.checkState)
+    const allCheckStatesEqual = new Set(checkStates).size <= 1
 
     if (!allCheckStatesEqual) {
       ElMessageBox.confirm(
@@ -933,20 +944,20 @@ const handleTest = async (val:string) => {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
-        }
+        },
       )
       return
     }
 
-    const factorFlagArray = ref<string[]>([]); // 初始化为空数组
+    const factorFlagArray = ref<string[]>([]) // 初始化为空数组
     for (let i = 0; i < channelsSelection.value.length; i++) {
-        const factorFlag = channelsSelection.value[i].factorFlag;
-        if (factorFlag !== undefined && factorFlag !== null && factorFlag === 0) {
-            factorFlagArray.value.push(channelsSelection.value[i].name.toString());
-        }
+      const factorFlag = channelsSelection.value[i].factorFlag
+      if (factorFlag !== undefined && factorFlag !== null && factorFlag === 0) {
+        factorFlagArray.value.push(channelsSelection.value[i].name.toString())
+      }
     }
-    if(factorFlagArray.value.length > 0){
-      const factorFlags = factorFlagArray.value.join(', ');
+    if (factorFlagArray.value.length > 0) {
+      const factorFlags = factorFlagArray.value.join(', ')
       ElMessageBox.confirm(
         factorFlags + '设备不支持系数校准，请重新选择',
         '提示',
@@ -954,16 +965,16 @@ const handleTest = async (val:string) => {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
-        }
+        },
       )
       return
     }
 
-  // // 检查 socketClient.Instance 是否存在
-  // if (!socketClient.Instance) {
-  //       console.error('WebSocket 客户端实例不存在');
-  //       return;
-  //   }
+    // // 检查 socketClient.Instance 是否存在
+    // if (!socketClient.Instance) {
+    //       console.error('WebSocket 客户端实例不存在');
+    //       return;
+    //   }
 
     //开始创建webSocket客户端
     const data = reactive({
@@ -974,22 +985,21 @@ const handleTest = async (val:string) => {
     data.socketServe = socketClient.Instance;
     data.socketServe.registerCallBack('aaa', (res: { code: number; }) => {
       // 处理来自服务器的消息
-      console.log('Received message:', res);
+      console.log('Received message:', res)
       // 根据需要在这里添加更多的处理逻辑
-      if(res.code === 20000){
+      if (res.code === 20000) {
         ElMessage.error(message.message)
         loading.close()
-      }else {
+      } else {
         webMsgSend.value = res
       }
-    });
+    })
 
-    channelsTest.value?.open(channelsSelection.value,props.plan);
-    return;
-}
-  
-  if(devTestedNum == 0)
-  {
+    channelsTest.value?.open(channelsSelection.value, props.plan)
+    return
+  }
+
+  if (devTestedNum == 0) {
     ElMessageBox.confirm(
       '请先选择检测完成状态的被检设备',
       '提示',
@@ -997,19 +1007,17 @@ const handleTest = async (val:string) => {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      }
+      },
     )
     return
   }
-  if(val==='批量下载')
-  {
-     reportDialogVisible.value = true;
-    
-     return
+  if (val === '批量下载') {
+    reportDialogVisible.value = true
+
+    return
   }
 
-  if(val==='批量归档')
-  {
+  if (val === '批量归档') {
     // const loading = ElLoading.service({
     //   lock: true,
     //   text: '归档中...',
@@ -1019,53 +1027,59 @@ const handleTest = async (val:string) => {
     //   loading.close()
     //   ElMessage.success("归档成功");
     // }, 2000)
-    documentedPqDev(checkStore.devices.map(item => {item.deviceId})).then((res) => {
-      if(res.code === ResultEnum.SUCCESS){
-        ElMessage.success("归档成功!");
+    documentedPqDev(checkStore.devices.map(item => {
+      item.deviceId
+    })).then((res) => {
+      if (res.code === ResultEnum.SUCCESS) {
+        ElMessage.success('归档成功!')
       }
     })
   }
 
 
-  
-};
+}
 
 // 打开 drawer(新增、查看、编辑)
 const openDrawer = async (title: string, row: any) => {
-    if (title === '查看')
-    {
-      const link = document.createElement('a');
-      const fileUrl = 'G:/南网数研院非结构化数据生成程序MMS_JSON修改记录.docx'; // 文件路径
-      link.href = fileUrl;
-      link.target = '_blank'; // 在新标签页中打开
-      link.download = 'file.docx'; // 设置下载文件的名称
-      link.click();
-    }
-
-    if(title === '生成')
-    {
-      await useDownload(downloadDevData,'调试报告'+formatDate(new Date()), {planId:checkStore.planId,devId:row.id}, false,'.docx')
-      emit('batchGenerateClicked'); // 触发事件
-    }
-      
-    if(title === '检测数据查询')
-    {
-      dataCheckPopupRef.value?.open(row.id,'-1',null)
-    }
-    if (title === '误差体系更换')
-    {
-      dataCheckChangeErrSysDialogVisible.value = true;
-    }
+  if (title === '查看') {
+    const link = document.createElement('a')
+    const fileUrl = 'G:/南网数研院非结构化数据生成程序MMS_JSON修改记录.docx' // 文件路径
+    link.href = fileUrl
+    link.target = '_blank' // 在新标签页中打开
+    link.download = 'file.docx' // 设置下载文件的名称
+    link.click()
+  }
 
 
-    if (title === '归档')
-    {
-      await documentedPqDev([row.id]).then((res) => {
-        if(res.code === ResultEnum.SUCCESS){
-          ElMessage.success("归档成功!");
-        }
-      })
-      emit('batchGenerateClicked'); // 触发事件
+  if (title === '报告生成') {
+    await generateDevReport({ 'planId': checkStore.planId, 'devId': row.id })
+    emit('batchGenerateClicked') // 触发事件
+    ElMessage.success({ message: `报告生成成功！` })
+  }
+
+  if (title === '报告下载') {
+    await useDownload(downloadDevData, row.createId, {
+      planId: checkStore.planId,
+      devId: row.id,
+    }, false, '.docx')
+    emit('batchGenerateClicked') // 触发事件
+  }
+
+  if (title === '检测数据查询') {
+    dataCheckPopupRef.value?.open(row.id, '-1', null)
+  }
+  if (title === '误差体系更换') {
+    dataCheckChangeErrSysDialogVisible.value = true
+  }
+
+
+  if (title === '归档') {
+    await documentedPqDev([row.id]).then((res) => {
+      if (res.code === ResultEnum.SUCCESS) {
+        ElMessage.success('归档成功!')
+      }
+    })
+    emit('batchGenerateClicked') // 触发事件
     //   const loading = ElLoading.service({
     //   lock: true,
     //   text: '归档中...',
@@ -1075,18 +1089,18 @@ const openDrawer = async (title: string, row: any) => {
     //   loading.close()
     //   ElMessage.success("归档成功");
     // }, 2000)
-    }
+  }
 }
 
-function formatDate(date : Date) {
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1
-  const day = String(date.getDate()).padStart(2, '0');
-  const hours = String(date.getHours()).padStart(2, '0');
-  const minutes = String(date.getMinutes()).padStart(2, '0');
-  const seconds = String(date.getSeconds()).padStart(2, '0');
+function formatDate(date: Date) {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0') // 月份从0开始，需要加1
+  const day = String(date.getDate()).padStart(2, '0')
+  const hours = String(date.getHours()).padStart(2, '0')
+  const minutes = String(date.getMinutes()).padStart(2, '0')
+  const seconds = String(date.getSeconds()).padStart(2, '0')
 
-  return `${year}年${month}月${day}日${hours}时${minutes}分${seconds}秒`;
+  return `${year}年${month}月${day}日${hours}时${minutes}分${seconds}秒`
 }
 
 // 监听 props.id 的变化
@@ -1095,37 +1109,37 @@ watch(
   (newId) => {
     handleRefresh()
     // 调用获取数据的方法
-    //handleSearch();
   },
-  { immediate: true } // 立即执行一次
-);
+  { immediate: true }, // 立即执行一次
+)
 
 onBeforeMount(async () => {
   const response = await getPqDev()
-    devTypeOptions.value = response.data.map(item => ({
-      id: item.id,
-      name: item.name,
-      icd: item.icd,
-      power: item.power,
-      devVolt: item.devVolt,
-      devCurr: item.devCurr,
-      devChns: item.devChns
-    }))
+  devTypeOptions.value = response.data.map(item => ({
+    id: item.id,
+    name: item.name,
+    icd: item.icd,
+    power: item.power,
+    devVolt: item.devVolt,
+    devCurr: item.devCurr,
+    devChns: item.devChns,
+  }))
 })
 
 const handleQuitClicked = () => {
-  emit('batchGenerateClicked'); // 触发事件
-};
+  emit('batchGenerateClicked') // 触发事件
+}
 
-defineExpose({ changeActiveTabs });
+defineExpose({ changeActiveTabs })
 </script>
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 /* 当屏幕宽度小于或等于1300像素时 */
 @media screen and (max-width: 1300px) {
   .el-select {
     width: 130px !important;
   }
 }
+
 @media screen and (min-width: 1300px) {
   .el-select {
     width: 150px !important;
@@ -1136,17 +1150,20 @@ defineExpose({ changeActiveTabs });
   width: 100%;
   display: flex;
   flex-wrap: wrap;
+
   .el-form-item {
     display: flex;
     align-items: center;
     justify-content: space-between;
+
     .el-button {
       margin: 0 !important;
       margin-right: 10px !important;
     }
   }
 }
-:deep(.card){
+
+:deep(.card) {
   border: 0 !important;
 }
 </style>
diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue
index ea95e6cf..52a3d91 100644
--- a/frontend/src/views/machine/device/index.vue
+++ b/frontend/src/views/machine/device/index.vue
@@ -10,8 +10,12 @@
       <template #tableHeader='scope'>
         <el-button v-auth.device="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
         <el-button v-auth.device="'export'" type='primary' :icon='Upload' plain @click='downloadFile()'>导出</el-button>
+<<<<<<< HEAD
         <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click="importFile('')" v-if='modeStore.currentMode != "比对式"'>导入</el-button>
         <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click="importFile('比对式')" v-if='modeStore.currentMode === "比对式"'>导入</el-button>
+=======
+        <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()'>导入</el-button>
+>>>>>>> ab02f8f1b34e2ceeee7cb83be9f6fc79b71116ad
         <el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           删除
@@ -40,10 +44,10 @@ import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/i
 import DevicePopup from '@/views/machine/device/components/devicePopup.vue'
 import { CirclePlus, Delete, EditPen, Download, Upload } from '@element-plus/icons-vue'
 import { useDictStore } from '@/stores/modules/dict'
-import { getPqDevList, deletePqDev, exportPqDev, downloadTemplate, importPqDev,getPqDev } from '@/api/device/device/index.ts'
+import {getPqDevList, deletePqDev, getPqDev, exportCNDev, downloadCNDevTemplate, importCNDev} from '@/api/device/device/index.ts'
 import { ElMessageBox } from 'element-plus'
 import { computed, onBeforeMount, onMounted, reactive, ref } from 'vue'
-import { useModeStore , useAppSceneStore} from '@/stores/modules/mode'; // 引入模式 store
+import { useModeStore , useAppSceneStore} from '@/stores/modules/mode';
 defineOptions({
       name: 'device'
   })
@@ -197,7 +201,7 @@ const downloadFile = async () => {
 
     ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>{
       const patternId  = dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.id//获取数据字典中对应的id
-      useDownload(exportPqDev,'被检设备导出数据', {...proTable.value?.searchParam,pattern:patternId}, false,'.xlsx')
+      useDownload(exportCNDev,'被检设备导出数据', {...proTable.value?.searchParam,pattern:patternId}, false,'.xlsx')
     })
 }
 
@@ -217,11 +221,12 @@ const importFile = async (pattern:string) => {
     deviceImportExcel.value?.acceptParams(params)
   }else{
     const params = {
-        title: '被检设备',
-        showCover: false,
-        tempApi: downloadTemplate,
-        
-        getTableList: proTable.value?.getTableList,
+      title: '被检设备',
+    showCover: false,
+    tempApi: downloadCNDevTemplate,
+    importApi: importCNDev,
+    // importApi: modeStore.currentMode === "比对式"? importContrastPqDev: importCNDev,
+    getTableList: proTable.value?.getTableList,
     }
     deviceImportExcel.value?.acceptParams(params)
   }