微调

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

@@ -102,6 +102,7 @@ export namespace CheckData {
         devVolt: number; //设备电压
         devCurr: number; //设备电流
         factorFlag: number; //是否支持系数校准
+        checkResult:number; //检测结果
     }
 
     // 用来描述检测脚本类型

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

@@ -4,7 +4,7 @@ import {CheckData} from "@/api/check/interface";
 export const getBigTestItem = (params: {
     reCheckType: number,
     planId: string,
-    devId: string,
+    devIds: string[],
 }) => {
     return http.post(`/adPlan/getBigTestItem`, params, {loading: false});
 }

frontend/src/api/device/device/index.ts

@@ -64,8 +64,3 @@ export const importContrastPqDev = (params: Device.ReqPqDevParams) => {
 export const getPqDev = () => {
     return http.get(`/devType/listAll`)
 }
-
-//被检设备归档
-export const documentedPqDev = (ids: string[]) => {
-    return http.post(`/pqDev/documented`, ids)
-}

frontend/src/api/device/interface/device.ts

@@ -70,6 +70,7 @@ export namespace Device {
         icdId: string | null;
         power: string | null;//工作电源
         preinvestmentPlan: string | null;
+        delegate: string | null; //委托方
     }
 
 
@@ -83,7 +84,10 @@ export namespace Device {
         devChns: number,
     }
 
-
+    export interface ResTH {
+        temperature :number | null;//温度
+        humidity:number | null;//湿度
+    }
     /**
      * 被检设备表格查询分页返回的对象；
      */

frontend/src/api/device/report/index.ts

@@ -40,3 +40,7 @@ export const getPqReportAllVersion = (params:any) => {
     return http.get(`/report/listAllVersion?name=${params.name}`)
 }
 
+//被检设备归档
+export const documentedPqDev = (ids: string[]) => {
+    return http.post(`/report/documented`, ids)
+}

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

@@ -25,7 +25,8 @@ export namespace Plan {
         
         associateReport:number;//是否关联报告模板 0否 1是
         reportTemplateName:string;
-        reportTemplateVersion:string
+        reportTemplateVersion:string;
+        dataRule:string //数据处理原则
     }
 
     // 检测计划 + 分页

frontend/src/api/system/base/interface/index.ts

@@ -8,7 +8,6 @@ export namespace Base {
         id: string;     //系统配置表Id
         autoGenerate:number;//检测报告是否自动生成0 否；1是
         maxTime:number;//最大复检次数，默认3次
-        dataRule:string;//数据处理原则,关联字典（所有值、部分值、cp95值、平均值、任意值），默认任意值
         state: number; //状态
         createBy?: string| null; //创建用户
         createTime?: string| null; //创建时间

frontend/src/layouts/components/Footer/index.vue

@@ -25,7 +25,7 @@
             >数字式模块</el-dropdown-item
           >
           <el-dropdown-item @click="handelOpen('比对式')"
-            >比对式模块</el-dropdown-item
+            disabled>比对式模块</el-dropdown-item
           >
         </el-dropdown-menu>
       </template>
@@ -42,25 +42,12 @@ import { ref, reactive, computed, onMounted, watch } from "vue";
 import { useAuthStore } from "@/stores/modules/auth";
 import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store
 import { useRouter } from "vue-router";
-const title = ref("模拟式模块");
 const router = useRouter();
 const authStore = useAuthStore();
 const modeStore = useModeStore();
 
-onMounted(() => {
-  switch (modeStore.currentMode) {
-    case '模拟式':
-      title.value = '模拟式模块';
-      break;
-    case '数字式':
-      title.value = '数字式模块';
-      break;
-    case '比对式':
-      title.value = '比对式模块';
-      break;
-    default:
-      title.value = '模拟式模块';
-  }
+const title = computed(() => {
+  return modeStore.currentMode=== ''? '模拟式模块' : modeStore.currentMode+'模块';
 });
 
 const handelOpen = async (item: string) => {

frontend/src/stores/modules/check.ts

@@ -3,6 +3,7 @@ import {CHECK_STORE_KEY} from "@/stores/constant";
 import type {CheckData} from "@/api/check/interface";
 import type {Plan} from '@/api/plan/interface'
 import {useAppSceneStore} from "@/stores/modules/mode";
+import { set } from "lodash";
 
 const AppSceneStore = useAppSceneStore()
 export const useCheckStore = defineStore("check", {
@@ -11,10 +12,12 @@ export const useCheckStore = defineStore("check", {
     state: () => ({
         devices: Array<CheckData.Device>(),
         plan: Object<Plan.ResPlan>(),
-        selectTestItems: Object<CheckData.SelectTestItem>({preTest: true, timeTest: true, channelsTest: false, test: true}),
+        selectTestItems: Object<CheckData.SelectTestItem>({preTest: true, timeTest: false, channelsTest: false, test: true}),
         checkType:1, // 0:手动检测 1:自动检测
         reCheckType: 1, // 0:不合格项复检 1:全部复检
-        showDetailType: 0 // 0:数据查询 1:误差体系跟换 2：正式检测
+        showDetailType: 0 ,// 0:数据查询 1:误差体系跟换 2：正式检测
+        temperature: 0,
+        humidity: 0
     }),
 
     getters: {},
@@ -34,7 +37,7 @@ export const useCheckStore = defineStore("check", {
             if (AppSceneStore.currentScene === '1') {
                 this.selectTestItems.channelsTest = true
             } else {
-                this.selectTestItems.timeTest = true
+                this.selectTestItems.channelsTest = false
             }
             this.selectTestItems.test = true
         },
@@ -49,6 +52,12 @@ export const useCheckStore = defineStore("check", {
         },
         setShowDetailType(showDetailType: number) {
             this.showDetailType = showDetailType
+        },
+        setTemperature(temperature: number) {
+            this.temperature = temperature
+        },
+        setHumidity(humidity: number) {
+            this.humidity = humidity
         }
     }
 });

frontend/src/views/authority/resource/components/resourcePopup.vue

@@ -14,10 +14,10 @@
           />
         </el-form-item>
         <el-form-item label="名称" prop="name" :label-width="100">
-          <el-input v-model="formContent.name" />
+          <el-input v-model="formContent.name" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="编码" prop="code" :label-width="100">
-          <el-input v-model="formContent.code" />
+          <el-input v-model="formContent.code" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item v-if="!formContent.type" label="图标" prop="icon" :label-width="100">
           <IconSelect
@@ -27,11 +27,11 @@
           placeholder="选择一个图标"
         />
         </el-form-item>
-        <el-form-item v-if="!formContent.type" label="路由地址" prop="path" :label-width="100">
-          <el-input v-model="formContent.path" />
+        <el-form-item v-if="!formContent.type" label="路由地址" prop="path" :label-width="100" >
+          <el-input v-model="formContent.path" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item v-if="!formContent.type" label="组件地址" prop="component" :label-width="100">
-          <el-input v-model="formContent.component" />
+          <el-input v-model="formContent.component" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="排序" prop="sort" :label-width="100">
           <el-input-number v-model="formContent.sort" :min='1' :max='999' />

frontend/src/views/authority/role/components/rolePopup.vue

@@ -8,11 +8,11 @@
                   :rules='rules'
                   >
         <el-form-item label="名称" prop='name' :label-width="100" >
-          <el-input v-model="formContent.name" placeholder="请输入名称" autocomplete="off" :disabled="rootIsEdit"/>
+          <el-input v-model="formContent.name" placeholder="请输入名称" autocomplete="off" :disabled="rootIsEdit" maxlength="32" show-word-limit/>
         </el-form-item>
 
         <el-form-item label="编码" prop='code' :label-width="100">
-          <el-input v-model="formContent.code" placeholder="请输入编码" autocomplete="off" :disabled="rootIsEdit"/>
+          <el-input v-model="formContent.code" placeholder="请输入编码" autocomplete="off" :disabled="rootIsEdit" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label='类型'  prop='type' :label-width="100">
           <el-select v-model="formContent.type"  clearable placeholder="请选择类型" :disabled="rootIsEdit">

frontend/src/views/authority/role/index.vue

@@ -16,9 +16,9 @@
       </template>
       <!-- 表格操作 -->
       <template #operation='scope'>
-        <el-button v-auth.role="'edit'" type='primary' link :icon='EditPen' @click="openDrawer('edit', scope.row)">编辑</el-button>
-        <el-button v-auth.role="'delete'" v-if="scope.row.type !== 0 && scope.row.type !== 1" type='primary' link :icon='Delete' @click='deleteAccount(scope.row)'>删除</el-button>
-        <el-button v-auth.role="'SetPermissions'" type='primary' link :icon='Share' @click="openDrawer('设置权限', scope.row)">设置权限</el-button>
+        <el-button v-auth.role="'edit'" type='primary' link :icon='EditPen' @click="openDrawer('edit', scope.row)" :disabled="scope.row.code == 'root'">编辑</el-button>
+        <el-button v-auth.role="'delete'"  type='primary' link :icon='Delete' @click='deleteAccount(scope.row)' :disabled="scope.row.code == 'root'">删除</el-button>
+        <el-button v-auth.role="'SetPermissions'" type='primary' link :icon='Share' @click="openDrawer('设置权限', scope.row)" :disabled="scope.row.code == 'root'">设置权限</el-button>
       </template>
 
     </ProTable>

frontend/src/views/authority/user/components/passWordPopup.vue

@@ -7,13 +7,13 @@
                   :rules='rules'
                   >
         <el-form-item label="原密码" prop='oldPassword' :label-width="100">
-          <el-input type="oldPassword" v-model="formContent.oldPassword" show-password placeholder="请输入原密码" autocomplete="off" />
+          <el-input type="oldPassword" v-model="formContent.oldPassword" show-password placeholder="请输入原密码" autocomplete="off" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="新密码" prop='newPassword' :label-width="100">
-          <el-input type="newPassword" v-model="formContent.newPassword" show-password placeholder="请输入新密码" autocomplete="off" />
+          <el-input type="newPassword" v-model="formContent.newPassword" show-password placeholder="请输入新密码" autocomplete="off" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="确认密码" prop='surePassword' :label-width="100">
-          <el-input type="surePassword" v-model="formContent.surePassword" show-password placeholder="请再次输入确认密码" autocomplete="off" />
+          <el-input type="surePassword" v-model="formContent.surePassword" show-password placeholder="请再次输入确认密码" autocomplete="off" maxlength="32" show-word-limit/>
         </el-form-item>
       </el-form>
       </div>

frontend/src/views/authority/user/components/userPopup.vue

@@ -7,13 +7,13 @@
                   :rules='rules'
                   >
         <el-form-item label="用户名" prop='name' :label-width="100">
-          <el-input v-model="formContent.name" placeholder="请输入用户名" autocomplete="off" />
+          <el-input v-model="formContent.name" placeholder="请输入用户名" autocomplete="off" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="登录名" prop='loginName'  :label-width="100" >
-          <el-input v-model="formContent.loginName" placeholder="请输入登录名" autocomplete="off" :disabled="LoginNameIsShow"/>
+          <el-input v-model="formContent.loginName" placeholder="请输入登录名" autocomplete="off" :disabled="LoginNameIsShow" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="密码" prop='password' :label-width="100" v-if="IsPasswordShow">
-          <el-input type="password" v-model="formContent.password" show-password placeholder="请输入密码" autocomplete="off" />
+          <el-input type="password" v-model="formContent.password" show-password placeholder="请输入密码" autocomplete="off" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label='角色' :label-width='100' prop='roles'>
             <el-select v-model="formContent.roleIds"  multiple   placeholder="请选择角色">

frontend/src/views/authority/user/index.vue

@@ -16,9 +16,9 @@
         </template>
         <!-- 表格操作 -->
         <template #operation='scope'>
-          <el-button v-auth.user="'edit'" type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
-          <el-button v-auth.user="'delete'" type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
-          <el-button v-auth.user="'editPassWord'" type='primary' link :icon='Delete' @click='EditPassWord(scope.row)'>修改密码</el-button>
+          <el-button v-auth.user="'edit'" type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)" :disabled="scope.row.loginName == 'root'">编辑</el-button>
+          <el-button v-auth.user="'delete'" type='primary' link :icon='Delete' @click='handleDelete(scope.row)' :disabled="scope.row.loginName == 'root'">删除</el-button>
+          <el-button v-auth.user="'editPassWord'" type='primary' link :icon='Delete' @click='EditPassWord(scope.row)' :disabled="scope.row.loginName == 'root'">修改密码</el-button>
           </template>
 
       </ProTable>
@@ -91,6 +91,7 @@
       render: (scope) => {
       const roleNames = scope.row.roleNames;
       const roleArray = Array.isArray(roleNames) ? roleNames : [roleNames];
+   
       if (roleArray.length > 1) {
         return roleArray.join(', ');
       }

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

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model='dialogVisible' title="系数校准" v-bind="dialogBig" width="1550px" @close="handleCancel">
+  <el-dialog v-model='dialogVisible' title="系数校准" v-bind="dialogBig" width="1550px" @close="handleCancel" :before-close="beforeClose">
     <div class="test-dialog">
       <div class="dialog-content">
         <div class="right-title">
@@ -315,6 +315,13 @@ watch(webMsgSend, function (newValue, oldValue) {
               })
               TableInit();
             }
+            if (newValue.code == 10500) {
+              ElMessageBox.alert(`装置中未找到该icd！`, '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              TableInit();
+            }
             break;
         }
         break;
@@ -756,19 +763,34 @@ const emit = defineEmits<{
 }>();
 
 
-const handleCancel = () => {
 
-  //dataSocket.socketServe.closeWs()
-  // 清空 name, channel, total
-  name.value = [];
-  channel.value = [];
-  total.value = 0;
-  activeIndex.value = 0
-  qualified.value = 0
-  active.value = 0
-  dialogVisible.value = false
-  editableTabsValue.value = '0'
-  emit('quitClicked'); // 触发事件
+const beforeClose = (done: () => void) => {
+ ElMessageBox.confirm('是否退出系数校准?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+    ).then(() => {
+       handleCancel()
+    })
+}
+
+const handleCancel = () => {
+        //dataSocket.socketServe.closeWs()
+        // 清空 name, channel, total
+        name.value = [];
+        channel.value = [];
+        total.value = 0;
+        activeIndex.value = 0
+        qualified.value = 0
+        active.value = 0
+        dialogVisible.value = false
+        editableTabsValue.value = '0'
+        emit('quitClicked'); // 触发事件
+
+
+
+
 }
 
 const getTableDataForChannel = (index: number): any[] => {
@@ -825,65 +847,65 @@ const handleSubmit = async () => {
 
   return;
   // 初始化 currentTableData
-  let isTimer2Completed = false;
+  // let isTimer2Completed = false;
 
 
-  //"80b4b4f52a4c4064a18319525f8ac13c",
-  for (let i = 0; i < channel.value.length; i++) {
-    // 重置状态变量
-    active.value = 0;
-    //activeIndex.value = 0;
-    editableTabsValue.value = i.toString();
-    // 初始化并填充 currentTableData
-    const currentTableData = initializeTableData(dataTemplates2, i);
-    tableDataMap.set(i, currentTableData);
-    //activeIndex.value++;
+  // //"80b4b4f52a4c4064a18319525f8ac13c",
+  // for (let i = 0; i < channel.value.length; i++) {
+  //   // 重置状态变量
+  //   active.value = 0;
+  //   //activeIndex.value = 0;
+  //   editableTabsValue.value = i.toString();
+  //   // 初始化并填充 currentTableData
+  //   const currentTableData = initializeTableData(dataTemplates2, i);
+  //   tableDataMap.set(i, currentTableData);
+  //   //activeIndex.value++;
 
-    // 清除之前的 timer1
-    clearInterval(timer1);
-    // 启动 timer1
-    timer1 = setInterval(() => {
-      active.value++;
-      if (active.value > 5) {
-        clearInterval(timer1);
-      }
-    }, 3000);
+  //   // 清除之前的 timer1
+  //   clearInterval(timer1);
+  //   // 启动 timer1
+  //   timer1 = setInterval(() => {
+  //     active.value++;
+  //     if (active.value > 5) {
+  //       clearInterval(timer1);
+  //     }
+  //   }, 3000);
 
-    // 清除之前的 timer2
-    clearInterval(timer2);
-    // 启动 timer2
-    timer2 = setInterval(() => {
-      // 初始化并填充 currentTableData
-      const currentTableData = initializeTableData(i > 0 ? dataTemplates2 : dataTemplates2, i);
-      tableDataMap.set(i, currentTableData);
-      activeIndex.value++;
+  //   // 清除之前的 timer2
+  //   clearInterval(timer2);
+  //   // 启动 timer2
+  //   timer2 = setInterval(() => {
+  //     // 初始化并填充 currentTableData
+  //     const currentTableData = initializeTableData(i > 0 ? dataTemplates2 : dataTemplates2, i);
+  //     tableDataMap.set(i, currentTableData);
+  //     activeIndex.value++;
 
-      clearInterval(timer2);
-      const currentDataRef = tableDataMap.get(i);
-      if (currentDataRef) {
-        const currentData = currentDataRef.value;
-        // 检查当前数据中有无不合格字段
-        const hasError = checkForErrors(currentData);
-        if (hasError) {
-        } else {
-          qualified.value++;
-        }
-        updateErrorState(i, hasError);
-      }
+  //     clearInterval(timer2);
+  //     const currentDataRef = tableDataMap.get(i);
+  //     if (currentDataRef) {
+  //       const currentData = currentDataRef.value;
+  //       // 检查当前数据中有无不合格字段
+  //       const hasError = checkForErrors(currentData);
+  //       if (hasError) {
+  //       } else {
+  //         qualified.value++;
+  //       }
+  //       updateErrorState(i, hasError);
+  //     }
 
-      // 设置标志变量为 true，表示 timer2 已经完成
-      isTimer2Completed = true;
-    }, 3000);
+  //     // 设置标志变量为 true，表示 timer2 已经完成
+  //     isTimer2Completed = true;
+  //   }, 3000);
 
-    // 等待 timer2 完成
-    while (!isTimer2Completed) {
-      // 这里可以添加一个短暂的等待，避免死循环
-      await new Promise(resolve => setTimeout(resolve, 100));
-    }
+  //   // 等待 timer2 完成
+  //   while (!isTimer2Completed) {
+  //     // 这里可以添加一个短暂的等待，避免死循环
+  //     await new Promise(resolve => setTimeout(resolve, 100));
+  //   }
 
-    // 重置标志变量
-    isTimer2Completed = false;
-  }
+  //   // 重置标志变量
+  //   isTimer2Completed = false;
+  // }
 };
 
 // 提取初始化并填充 currentTableData 的函数

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

@@ -6,17 +6,11 @@
               style="width: 100%;">
       <el-table-column type="index" label="序号" width="70" fixed="left"/>
       <el-table-column prop="time" label="数据时间"/>
-      <template v-if="!isThreePhase && phaseT === 0">
-        <el-table-column prop="dataA" :label="'A相'+(unit==''?'':'（'+unit+'）')"/>
-        <el-table-column prop="dataB" :label="'B相'+(unit==''?'':'（'+unit+'）')"/>
-        <el-table-column prop="dataC" :label="'C相'+(unit==''?'':'（'+unit+'）')"/>
-      </template>
-      <template v-if="!isThreePhase && phaseT === 1">
-        <el-table-column prop="dataT" :label="tableHeader+(unit==''?'':'（'+unit+'）')"/>
-      </template>
-      <template v-if="isThreePhase">
-        <el-table-column prop="dataB" :label="'负序不平衡度'+(unit==''?'':'（'+unit+'）')"/>
-      </template>
+      <el-table-column v-if="!isThreePhase && phaseA==1" prop="dataA" :label="'A相'+(unit==''?'':'（'+unit+'）')"/>
+      <el-table-column v-if="!isThreePhase && phaseB==1" prop="dataB" :label="'B相'+(unit==''?'':'（'+unit+'）')"/>
+      <el-table-column v-if="!isThreePhase && phaseC==1" prop="dataC" :label="'C相'+(unit==''?'':'（'+unit+'）')"/>
+      <el-table-column v-if="!isThreePhase && phaseT === 1" prop="dataT" :label="tableHeader+(unit==''?'':'（'+unit+'）')"/>
+      <el-table-column v-if="isThreePhase" prop="dataB" :label="'负序不平衡度'+(unit==''?'':'（'+unit+'）')"/>
     </el-table>
   </div>
 
@@ -37,6 +31,16 @@ const unit = computed(() => {
   return tableData.length > 0 ? tableData[0].unit : '';
 })
 
+const phaseA = computed(() => {
+  return tableData[0].dataA == '/' ? 0 : 1
+})
+const phaseB = computed(() => {
+  return tableData[0].dataB == '/' ? 0 : 1
+})
+const phaseC = computed(() => {
+  return tableData[0].dataC == '/' ? 0 : 1
+})
+
 const phaseT = computed(() => {
   return tableData[0].dataT == '/' ? 0 : 1
 })

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

@@ -8,92 +8,79 @@
       <!--          {{ '通道' + row.chnNum }}-->
       <!--        </template>-->
       <!--      </el-table-column>-->
-      <template v-if="phaseT === 0">
-        <el-table-column label="A相">
-          <el-table-column prop="stdA" width="130" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataA" width="130" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="isDataA" label="检测结果">
-            <template #default="scope">
-              <el-tooltip effect="dark" placement="bottom">
-                <template #content>
-                  误差范围：{{ scope.row.maxErrorA }} <br/>
-                  误差值：{{ scope.row.errorA }} {{ scope.row.errorA !== '/' ? innerUnitA : '' }}
-                </template>
-                <el-tag type="success" v-if="scope.row.isDataA === 1">符合</el-tag>
-                <el-tag type="danger" v-if="scope.row.isDataA === 2">不符合</el-tag>
-                <el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
-                <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
-              </el-tooltip>
-            </template>
-          </el-table-column>
+      <el-table-column label="A相" v-if="phaseA === 1">
+        <el-table-column prop="stdA" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="dataA" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="isDataA" label="检测结果">
+          <template #default="scope">
+            <el-tooltip effect="dark" placement="bottom">
+              <template #content>
+                误差范围：{{ scope.row.maxErrorA }} <br/>
+                误差值：{{ scope.row.errorA }} {{ scope.row.errorA !== '/' ? innerUnitA : '' }}
+              </template>
+              <el-tag type="success" v-if="scope.row.isDataA === 1">符合</el-tag>
+              <el-tag type="danger" v-if="scope.row.isDataA === 2">不符合</el-tag>
+              <el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
+              <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+            </el-tooltip>
+          </template>
         </el-table-column>
-        <el-table-column label="B相">
-          <el-table-column prop="stdB" width="130" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataB" width="130" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="isDataB" label="检测结果">
-            <template #default="scope">
-              <el-tooltip effect="dark" placement="bottom">
-                <template #content>
-                  误差范围：{{ scope.row.maxErrorB }}<br/>
-                  误差值：{{ scope.row.errorB }} {{ scope.row.errorB !== '/' ? innerUnitB : '' }}
-                </template>
-                <el-tag type="success" v-if="scope.row.isDataB === 1">符合</el-tag>
-                <el-tag type="danger" v-if="scope.row.isDataB === 2">不符合</el-tag>
-                <el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
-                <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
-              </el-tooltip>
-            </template>
-          </el-table-column>
+      </el-table-column>
+      <el-table-column label="B相" v-if="phaseB === 1">
+        <el-table-column prop="stdB" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="dataB" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="isDataB" label="检测结果">
+          <template #default="scope">
+            <el-tooltip effect="dark" placement="bottom">
+              <template #content>
+                误差范围：{{ scope.row.maxErrorB }}<br/>
+                误差值：{{ scope.row.errorB }} {{ scope.row.errorB !== '/' ? innerUnitB : '' }}
+              </template>
+              <el-tag type="success" v-if="scope.row.isDataB === 1">符合</el-tag>
+              <el-tag type="danger" v-if="scope.row.isDataB === 2">不符合</el-tag>
+              <el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
+              <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+            </el-tooltip>
+          </template>
         </el-table-column>
-        <el-table-column label="C相">
-          <el-table-column prop="stdC" width="130" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataC" width="130" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="isDataC" label="检测结果">
-            <template #default="scope">
-              <el-tooltip effect="dark" placement="bottom">
-                <template #content>
-                  误差范围： {{ scope.row.maxErrorC }}<br/>
-                  误差值：{{ scope.row.errorC }} {{ scope.row.errorC !== '/' ? innerUnitC : '' }}
-                </template>
-                <el-tag type="success" v-if="scope.row.isDataC === 1">符合</el-tag>
-                <el-tag type="danger" v-if="scope.row.isDataC === 2">不符合</el-tag>
-                <el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
-                <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
-              </el-tooltip>
-            </template>
-          </el-table-column>
+      </el-table-column>
+      <el-table-column label="C相" v-if="phaseC === 1">
+        <el-table-column prop="stdC" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="dataC" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="isDataC" label="检测结果">
+          <template #default="scope">
+            <el-tooltip effect="dark" placement="bottom">
+              <template #content>
+                误差范围： {{ scope.row.maxErrorC }}<br/>
+                误差值：{{ scope.row.errorC }} {{ scope.row.errorC !== '/' ? innerUnitC : '' }}
+              </template>
+              <el-tag type="success" v-if="scope.row.isDataC === 1">符合</el-tag>
+              <el-tag type="danger" v-if="scope.row.isDataC === 2">不符合</el-tag>
+              <el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
+              <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+            </el-tooltip>
+          </template>
         </el-table-column>
-      </template>
+      </el-table-column>
 
-      <template v-if="phaseT === 1">
-        <el-table-column :label="tableHeader">
-          <el-table-column prop="stdT" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataT" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="isDataT" label="检测结果">
-            <template #default="scope">
-              <el-tooltip effect="dark" placement="bottom">
-                <template #content>
-                  误差范围： {{ scope.row.maxErrorT }}<br/>
-                  误差值：{{ scope.row.errorT }} {{ scope.row.errorT !== '/' ? innerUnitT : '' }}
-                </template>
-                <el-tag type="success" v-if="scope.row.isDataT === 1">符合</el-tag>
-                <el-tag type="danger" v-if="scope.row.isDataT === 2">不符合</el-tag>
-                <el-tag type="warning" v-if="scope.row.isDataT === 4">/</el-tag>
-                <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
-              </el-tooltip>
-            </template>
-          </el-table-column>
+      <el-table-column :label="tableHeader" v-if="phaseT === 1">
+        <el-table-column prop="stdT" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="dataT" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="isDataT" label="检测结果">
+          <template #default="scope">
+            <el-tooltip effect="dark" placement="bottom">
+              <template #content>
+                误差范围： {{ scope.row.maxErrorT }}<br/>
+                误差值：{{ scope.row.errorT }} {{ scope.row.errorT !== '/' ? innerUnitT : '' }}
+              </template>
+              <el-tag type="success" v-if="scope.row.isDataT === 1">符合</el-tag>
+              <el-tag type="danger" v-if="scope.row.isDataT === 2">不符合</el-tag>
+              <el-tag type="warning" v-if="scope.row.isDataT === 4">/</el-tag>
+              <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+            </el-tooltip>
+          </template>
         </el-table-column>
-        <!--        <el-table-column prop="maxError" label="误差范围"/>-->
-        <!--        <el-table-column prop="result" label="检测结果">-->
-        <!--          <template #default="scope">-->
-        <!--            <span v-if="scope.row.result === 1">符合</span>-->
-        <!--            <el-tag type="danger" v-if="scope.row.result === 2">不符合</el-tag>-->
-        <!--            <span v-if="scope.row.result === 4">/</span>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-      </template>
-
+      </el-table-column>
     </el-table>
   </div>
 
@@ -126,12 +113,22 @@ const innerUnitT = computed(() => {
   return tableData.length > 0 ? tableData[0].unitT : '';
 })
 
+const phaseA = computed(() => {
+  return tableData.length <= 0 || tableData[0].dataA == null || tableData[0].dataA == "/" ? 0 : 1
+})
+const phaseB = computed(() => {
+  return tableData.length <= 0 || tableData[0].dataB == null || tableData[0].dataB == "/" ? 0 : 1
+})
+const phaseC = computed(() => {
+  return tableData.length <= 0 || tableData[0].dataC == null || tableData[0].dataC == "/" ? 0 : 1
+})
+
 const phaseT = computed(() => {
-  return tableData[0].dataT == null || tableData[0].dataT == undefined ? 0 : 1
+  return tableData.length <= 0 || tableData[0].dataT == null || tableData[0].dataT == "/" ? 0 : 1
 })
 
 const tableHeader = computed(() => {
-  if (phaseT.value === 1){
+  if (phaseT.value === 1) {
     let index = currentScriptTypeName.indexOf('=');
     return currentScriptTypeName.substring(0, index);
   }

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

@@ -344,6 +344,11 @@ const updateTableData = async () => {
         label = data.resultData[key][0].isData === 1 ? `${key}` : data.resultData[key][0].isData === 4 ? `${key}（/）` : data.resultData[key][0].isData === 5 ? `${key}（-）` : `${key}（不符合）`
         resultData.set(key, data.resultData[key][0])
         checkListLevel.push({label: label, value: key, children: []})
+        let temp = checkListLevel.find(item => item.label.includes('电压幅值'))
+        if (temp) {
+          checkListLevel.splice(checkListLevel.indexOf(temp), 1)
+          checkListLevel.unshift(temp)
+        }
       }
     }
 
@@ -421,11 +426,8 @@ const open = async (_deviceId: string, chnNum: string, _scriptType: string | nul
     //label: item.label == '1' ? `${item.value}` : item.label == '2' ? `${item.value}（不符合）` : `${item.value}`
   }))
 
-  let dataRuleName = dictStore.getDictData('Data_Rule').find(item => item.id == resFormContent.dataRule)?.name
-
   Object.assign(formContent, {
     ...resFormContent,
-    dataRule: dataRuleName,
     chnNum: chnList.length > 0 ? chnList[0].value : '',
   })
   originErrorSysId = formContent.errorSysId

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

@@ -356,6 +356,13 @@ watch(webMsgSend, function (newValue, oldValue) {
                 })
                 TableInit();
               }
+              if (newValue.code == 10500) {
+                ElMessageBox.alert(`装置中未找到该icd!`, '初始化失败', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              }
               break;
           }
           break;

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

@@ -461,6 +461,14 @@ watch(webMsgSend, function (newValue, oldValue) {
               step3.value = 'error'
               ts.value = 'error'
               step5.value = 'error'
+            } else if (newValue.code == 10500) {
+              step3InitLog.value.push({
+                type: 'error',
+                log: `装置中未找到该icd！`,
+              })
+              step3.value = 'error'
+              ts.value = 'error'
+              step5.value = 'error'
             }
             break;
         }
@@ -573,6 +581,30 @@ watch(webMsgSend, function (newValue, oldValue) {
         ts.value = 'error'
         step5.value = 'error'
         break;
+      case 'socket_timeout':
+        ElMessageBox.alert(`设备连接异常，请检查设备连接情况！`, '检测失败', {
+          confirmButtonText: '确定',
+          type: 'error',
+        })
+        ts.value = 'error'
+        step5.value = 'error'
+        break;
+      case 'server_error':
+        ElMessageBox.alert('服务端主动关闭连接!', '初始化失败', {
+          confirmButtonText: '确定',
+          type: 'error',
+        })
+        ts.value = 'error'
+        step5.value = 'error'
+        break;
+      case 'device_error':
+        ElMessageBox.alert('设备主动关闭连接!', '初始化失败', {
+          confirmButtonText: '确定',
+          type: 'error',
+        })
+        ts.value = 'error'
+        step5.value = 'error'
+        break;
     }
   }
 })

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

@@ -51,7 +51,8 @@ const open = async () => {
 
 // 清空表单内容
 const resetFormContent = () => {
-  Object.assign(formContent, {preTest: true, channelsTest: false, timeTest: false, test: false})
+  let hasResult = checkStore.devices.some((device) => device.checkResult === 0)
+  Object.assign(formContent, {preTest: !hasResult, channelsTest: false, timeTest: false, test: hasResult})
 }
 
 const handleStart = () => {
@@ -89,7 +90,8 @@ const handleStart = () => {
     checkStore.setCheckType(0)
     checkStore.setSelectTestItems({...formContent})
     handleClose()
-    emit('openTestDialog')
+    
+    emit('openTestDialog',checkStore.selectTestItems.test)
   }
 }
 

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

@@ -90,9 +90,7 @@
               >报告下载</el-button
             > -->
             <!-- :disabled='!scope.isSelected' -->
-            <!-- <el-button type="primary" :icon="Postcard"   @click="handleTest('批量生成')" v-if="form.activeTabs === 3"
-              >报告生成</el-button
-            > -->
+            <el-button type="primary" :icon="Postcard"   @click="handleTest('批量生成')" v-if="form.activeTabs === 3">报告生成</el-button>
 
             <!-- :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>
@@ -100,7 +98,7 @@
               >设备新增</el-button> -->
 
             <el-button type='primary' v-auth.role="'channelsTest'" :icon='Odometer' @click="handleTest('系数校准')"
-                       v-if='form.activeTabs === 0'
+                       v-if='form.activeTabs === 0 && appSceneStore.currentScene === "1" '
             >系数校准
             </el-button>
           </el-form-item>
@@ -163,7 +161,6 @@
                    :icon='Notebook'
                    @click="openDrawer('归档', scope.row)"
                    v-if='form.activeTabs === 4'
-                   :disabled='scope.row.reportState != 1'
         >归档
         </el-button>
 
@@ -234,6 +231,9 @@
     <ChannelsTest ref='channelsTest' :webMsgSend='webMsgSend' @quitClicked='handleQuitClicked' @submitClicked='handleSubmitClicked'></ChannelsTest>
     <!--  手动检测-勾选检测项弹窗  -->
     <SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog"></SelectTestItemPopup>
+     <!--  省平台-填写温度湿度弹窗  -->
+    <WriteTHPopup ref="writeTHPopupRef" @openTestDialog2="openTestDialog2"></WriteTHPopup>
+    
   </div>
 </template>
 
@@ -271,7 +271,8 @@ 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 {useModeStore,useAppSceneStore} from '@/stores/modules/mode' // 引入模式 store
+
 import {useCheckStore} from '@/stores/modules/check'
 import {CheckData} from '@/api/check/interface'
 import socketClient from '@/utils/webSocketClient'
@@ -279,10 +280,12 @@ 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 {documentedPqDev} from '@/api/device/report'
 import {getPqDev} from '@/api/device/device/index.ts'
 import {ResultEnum} from '@/enums/httpEnum'
 import SelectTestItemPopup from "@/views/home/components/selectTestItemPopup.vue";
+import WriteTHPopup from "@/views/home/components/writeTHPopup.vue";
+import { fa } from 'element-plus/es/locale'
 
 const dictStore = useDictStore()
 const checkStore = useCheckStore()
@@ -299,6 +302,7 @@ const reportDialogVisible = ref(false)
 
 const dataCheckPopupRef = ref<InstanceType<typeof dataCheckPopup>>()
 const selectTestItemPopupRef = ref<InstanceType<typeof SelectTestItemPopup>>()
+const writeTHPopupRef = ref<InstanceType<typeof WriteTHPopup>>()
 
 const matchDialogVisible = ref(false)
 const dialogTitle = ref('手动检测')
@@ -355,6 +359,7 @@ const props = defineProps({
     default: null,
   },
 })
+const appSceneStore = useAppSceneStore()
 
 const emit = defineEmits<{
   (e: 'batchGenerateClicked'): void;
@@ -586,7 +591,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
     label: '系数校准结果',
     minWidth: 100,
     sortable: true,
-    isShow: factorCheckShow,
+    isShow: factorCheckShow && appSceneStore.currentScene === "1" ,
     render: scope => {
       if (scope.row.factorCheckResult === 0) {
         return '不合格'
@@ -646,6 +651,7 @@ const handleSelectionChange = (selection: any[]) => {
       devVolt: item.devVolt,
       devCurr: item.devCurr,
       factorFlag: item.factorFlag,
+      checkResult: item.checkResult,
     }
   })
 
@@ -950,24 +956,37 @@ const handleTest = async (val: string) => {
             })
             .then(() => {
               ElMessage.success('不合格项复检')
-              if (checkStore.devices.length > 1) {
-                checkStore.setReCheckType(1)
-              } else {
+              // if (checkStore.devices.length > 1) {
+              //   checkStore.setReCheckType(1)
+              // } else {
                 checkStore.setReCheckType(0)
+              // }
+              //selectTestItemPopupRef.value?.open()
+              if(appSceneStore.currentScene === '0'){
+                writeTHPopupRef.value?.open()
+              }else{
+                openTestDialog(true)
               }
-              selectTestItemPopupRef.value?.open()
             })
             .catch((action: Action) => {
               if(action === 'cancel'){
                 ElMessage.success('全部复检')
                 checkStore.setReCheckType(1)
-                selectTestItemPopupRef.value?.open()
+                //selectTestItemPopupRef.value?.open()
+                if(appSceneStore.currentScene === '0'){
+                  writeTHPopupRef.value?.open()
+                }else{
+                  openTestDialog(true)
+                }
               }
             })
+        checkStore.setSelectTestItems({preTest: false, timeTest: false, channelsTest: false, test: true})
       } else {
+         
         checkStore.setReCheckType(1)
         selectTestItemPopupRef.value?.open()
       }
+ 
     } else if (val === '系数校准') {
       // 检查 socketClient.Instance 是否存在
       if (!socketClient.Instance) {
@@ -1006,20 +1025,33 @@ const handleTest = async (val: string) => {
             })
             .then(() => {
               ElMessage.success('不合格项复检')
-              if (checkStore.devices.length > 1) {
-                checkStore.setReCheckType(1)
-              } else {
+              // if (checkStore.devices.length > 1) {
+              //   checkStore.setReCheckType(1)
+              // } else {
                 checkStore.setReCheckType(0)
-              }
-              openTestDialog()
+              // }
+              //openTestDialog(false)
+              if(appSceneStore.currentScene === '0'){
+                    writeTHPopupRef.value?.open()
+                }else{
+                    openTestDialog(true)
+                }
             })
             .catch((action: Action) => {
-              ElMessage.success('全部复检')
-              checkStore.setReCheckType(1)
-              openTestDialog()
+              if (action === 'cancel') {
+                ElMessage.success('全部复检')
+                checkStore.setReCheckType(1)
+                //openTestDialog(false)
+                if (appSceneStore.currentScene === '0') {
+                  writeTHPopupRef.value?.open()
+                } else {
+                  openTestDialog(true)
+                }
+              }
             })
+        checkStore.setSelectTestItems({preTest: false, timeTest: false, channelsTest: false, test: true})
       } else {
-        openTestDialog()
+        openTestDialog(true)
       }
     }
   }
@@ -1039,7 +1071,7 @@ const handleTest = async (val: string) => {
     //   ElMessage.success("归档成功");
     // }, 2000)
     documentedPqDev(checkStore.devices.map(item => {
-      item.deviceId
+      return item.deviceId
     })).then((res) => {
       if (res.code === ResultEnum.SUCCESS) {
         ElMessage.success('归档成功!')
@@ -1048,10 +1080,37 @@ const handleTest = async (val: string) => {
 
     emit('batchGenerateClicked') // 触发事件
   }
+  if(val === '批量生成'){
+    let devIdList=checkStore.devices.map(item => {
+      return item.deviceId
+    })
+
+    await generateDevReport({
+      'planId': checkStore.plan.id,
+      'devIdList':devIdList,
+      'scriptId':checkStore.plan.scriptId,
+      'planCode':checkStore.plan.code+''
+    })
+    ElMessage.success({message: `报告生成成功！`})
+  }
 }
 
-const openTestDialog = () => {
-  testPopup.value?.open(dialogTitle.value)
+const openTestDialog = (testData:any) => {
+  if (appSceneStore.currentScene === '0') {
+    if(testData)
+      writeTHPopupRef.value?.open()
+    else
+      testPopup.value?.open(dialogTitle.value)
+  } else {
+    testPopup.value?.open(dialogTitle.value)
+  }
+}
+
+
+
+
+const openTestDialog2 = () => {
+    testPopup.value?.open(dialogTitle.value)
 }
 
 // 打开 drawer(新增、查看、编辑)
@@ -1131,6 +1190,7 @@ watch(
 )
 
 onBeforeMount(async () => {
+ 
   const response = await getPqDev()
   devTypeOptions.value = response.data.map(item => ({
     id: item.id,

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

@@ -13,63 +13,63 @@
             :percentage="percentage"
             :color="customColors"/>
 
-<!--        <div style="width: 15%">-->
-<!--          <el-button type="primary" v-if="testStatus=='test_init'" disabled @click="handlePause()">-->
-<!--            <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">-->
-<!--              <component :is="Refresh"/>-->
-<!--            </el-icon>-->
-<!--            初始化中-->
-<!--          </el-button>-->
+        <!--        <div style="width: 15%">-->
+        <!--          <el-button type="primary" v-if="testStatus=='test_init'" disabled @click="handlePause()">-->
+        <!--            <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">-->
+        <!--              <component :is="Refresh"/>-->
+        <!--            </el-icon>-->
+        <!--            初始化中-->
+        <!--          </el-button>-->
 
-<!--          <el-button-->
-<!--              type="primary"-->
-<!--              v-if="testStatus=='process' && percentage < 100"-->
-<!--              :icon="VideoPause"-->
-<!--              @click="handlePause()">停止检测-->
-<!--          </el-button>-->
-<!--          <el-button type="warning" v-if="testStatus === 'paused_ing' && percentage < 100" disabled>-->
-<!--            <el-icon class="loading-box" style="margin-right: 8px;">-->
-<!--              <component :is="Refresh"/>-->
-<!--            </el-icon>-->
-<!--            暂停中-->
-<!--          </el-button>-->
-<!--          &lt;!&ndash;      <el-button&ndash;&gt;-->
-<!--          &lt;!&ndash;          type="primary"&ndash;&gt;-->
-<!--          &lt;!&ndash;          v-if="testStatus=='test_init'"&ndash;&gt;-->
-<!--          &lt;!&ndash;          :icon="VideoPause"&ndash;&gt;-->
-<!--          &lt;!&ndash;          disabled>初始化中&ndash;&gt;-->
-<!--          &lt;!&ndash;      </el-button>&ndash;&gt;-->
-<!--          &lt;!&ndash;      <el-button&ndash;&gt;-->
-<!--          &lt;!&ndash;          type="danger"&ndash;&gt;-->
-<!--          &lt;!&ndash;          v-if="testStatus=='test_init_fail'"&ndash;&gt;-->
-<!--          &lt;!&ndash;          :icon="Failed"&ndash;&gt;-->
-<!--          &lt;!&ndash;          disabled>初始化失败&ndash;&gt;-->
-<!--          &lt;!&ndash;      </el-button>&ndash;&gt;-->
-<!--          &lt;!&ndash;      <el-button&ndash;&gt;-->
-<!--          &lt;!&ndash;          type="danger"&ndash;&gt;-->
-<!--          &lt;!&ndash;          v-if="testStatus=='connect_timeout'"&ndash;&gt;-->
-<!--          &lt;!&ndash;          :icon="Failed"&ndash;&gt;-->
-<!--          &lt;!&ndash;          disabled>连接超时&ndash;&gt;-->
-<!--          &lt;!&ndash;      </el-button>&ndash;&gt;-->
-<!--          &lt;!&ndash;          <el-button&ndash;&gt;-->
-<!--          &lt;!&ndash;              type="primary"&ndash;&gt;-->
-<!--          &lt;!&ndash;              :icon="RefreshLeft"&ndash;&gt;-->
-<!--          &lt;!&ndash;              v-if="testStatus === 'recheck'"&ndash;&gt;-->
-<!--          &lt;!&ndash;              @click="emit('sendReCheck')">重新检测&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-button>&ndash;&gt;-->
+        <!--          <el-button-->
+        <!--              type="primary"-->
+        <!--              v-if="testStatus=='process' && percentage < 100"-->
+        <!--              :icon="VideoPause"-->
+        <!--              @click="handlePause()">停止检测-->
+        <!--          </el-button>-->
+        <!--          <el-button type="warning" v-if="testStatus === 'paused_ing' && percentage < 100" disabled>-->
+        <!--            <el-icon class="loading-box" style="margin-right: 8px;">-->
+        <!--              <component :is="Refresh"/>-->
+        <!--            </el-icon>-->
+        <!--            暂停中-->
+        <!--          </el-button>-->
+        <!--          &lt;!&ndash;      <el-button&ndash;&gt;-->
+        <!--          &lt;!&ndash;          type="primary"&ndash;&gt;-->
+        <!--          &lt;!&ndash;          v-if="testStatus=='test_init'"&ndash;&gt;-->
+        <!--          &lt;!&ndash;          :icon="VideoPause"&ndash;&gt;-->
+        <!--          &lt;!&ndash;          disabled>初始化中&ndash;&gt;-->
+        <!--          &lt;!&ndash;      </el-button>&ndash;&gt;-->
+        <!--          &lt;!&ndash;      <el-button&ndash;&gt;-->
+        <!--          &lt;!&ndash;          type="danger"&ndash;&gt;-->
+        <!--          &lt;!&ndash;          v-if="testStatus=='test_init_fail'"&ndash;&gt;-->
+        <!--          &lt;!&ndash;          :icon="Failed"&ndash;&gt;-->
+        <!--          &lt;!&ndash;          disabled>初始化失败&ndash;&gt;-->
+        <!--          &lt;!&ndash;      </el-button>&ndash;&gt;-->
+        <!--          &lt;!&ndash;      <el-button&ndash;&gt;-->
+        <!--          &lt;!&ndash;          type="danger"&ndash;&gt;-->
+        <!--          &lt;!&ndash;          v-if="testStatus=='connect_timeout'"&ndash;&gt;-->
+        <!--          &lt;!&ndash;          :icon="Failed"&ndash;&gt;-->
+        <!--          &lt;!&ndash;          disabled>连接超时&ndash;&gt;-->
+        <!--          &lt;!&ndash;      </el-button>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          <el-button&ndash;&gt;-->
+        <!--          &lt;!&ndash;              type="primary"&ndash;&gt;-->
+        <!--          &lt;!&ndash;              :icon="RefreshLeft"&ndash;&gt;-->
+        <!--          &lt;!&ndash;              v-if="testStatus === 'recheck'"&ndash;&gt;-->
+        <!--          &lt;!&ndash;              @click="emit('sendReCheck')">重新检测&ndash;&gt;-->
+        <!--          &lt;!&ndash;          </el-button>&ndash;&gt;-->
 
 
-<!--          <el-button type="success" v-if="percentage >= 100" :icon="Check" disabled>检测完成</el-button>-->
+        <!--          <el-button type="success" v-if="percentage >= 100" :icon="Check" disabled>检测完成</el-button>-->
 
-<!--          <el-button-->
-<!--              type="warning"-->
-<!--              v-if="(testStatus=='paused' || testStatus === 'pause_timeout') && percentage < 100"-->
-<!--              :icon="VideoPlay"-->
-<!--              :disabled="testStatus === 'pause_timeout'"-->
-<!--              @click="emit('sendResume')"-->
-<!--          >继续检测-->
-<!--          </el-button>-->
-<!--        </div>-->
+        <!--          <el-button-->
+        <!--              type="warning"-->
+        <!--              v-if="(testStatus=='paused' || testStatus === 'pause_timeout') && percentage < 100"-->
+        <!--              :icon="VideoPlay"-->
+        <!--              :disabled="testStatus === 'pause_timeout'"-->
+        <!--              @click="emit('sendResume')"-->
+        <!--          >继续检测-->
+        <!--          </el-button>-->
+        <!--        </div>-->
         <el-button style="width: 10%" type="text" :icon="InfoFilled" @click="showTestLog">检测项进度</el-button>
       </div>
 
@@ -86,9 +86,13 @@
               <el-table-column v-for="(chnItem,index2) in item.chnNum" :key="`${item.deviceId}${chnItem}`"
                                :label="'通道'+chnItem" align="center">
                 <template #default="{row}">
-<!--                  <el-tooltip-->
-<!--                      :content="row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.INFO ? '暂无数据' : '点击查看详情'"-->
-<!--                      placement="top">-->
+                  <el-tooltip
+                      :content="row.devices[index1].chnResult[index2].icon==='More' ? '暂无数据'
+                      : row.devices[index1].chnResult[index2].icon==='CircleCheckFilled' ? '符合'
+                      : row.devices[index1].chnResult[index2].icon==='Close' ? '不符合'
+                      : row.devices[index1].chnResult[index2].icon==='WarnTriangleFilled' ? '数据异常'
+                      : row.devices[index1].chnResult[index2].icon==='Loading'? '检测中':'连接中断'"
+                      placement="right">
                     <el-button
                         :disabled="row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.INFO || row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.LOADING"
                         :color="row.devices[index1].chnResult[index2].color"
@@ -105,7 +109,7 @@
                       </el-icon>
                     </el-button>
 
-<!--                  </el-tooltip>-->
+                  </el-tooltip>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -141,7 +145,7 @@
 
     </div>
     <div class="drawer-container">
-      <el-drawer v-model="drawer" title="检测项进度" direction="btt">
+      <el-drawer v-model="drawer" title="检测项进度" direction="btt" :size="'38%'">
         <div ref="scrollContainerRef" style="height: 100%; overflow-y: auto;">
           <p v-for="(item, index) in testLogList"
              :key="index"
@@ -152,15 +156,15 @@
       </el-drawer>
     </div>
 
-<!--    <resultPopup-->
-<!--        :visible="resultDialogVisible"-->
-<!--        @update:visible="resultDialogVisible = $event"-->
-<!--    ></resultPopup>-->
+    <!--    <resultPopup-->
+    <!--        :visible="resultDialogVisible"-->
+    <!--        @update:visible="resultDialogVisible = $event"-->
+    <!--    ></resultPopup>-->
     <dataCheckSingleChannelSingleTestPopup ref="dataCheckSingleChannelSingleTestPopupRef"/>
   </div>
 </template>
 <script lang="tsx" setup name="test">
-import {Check, InfoFilled, Loading, Refresh, VideoPause, VideoPlay} from '@element-plus/icons-vue'
+import {InfoFilled, Loading} from '@element-plus/icons-vue'
 import dataCheckSingleChannelSingleTestPopup from './dataCheckSingleChannelSingleTestPopup.vue'
 import {computed, reactive, ref, toRef, watch} from "vue";
 import {dialogBig} from "@/utils/elementBind";
@@ -194,7 +198,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(['update:testStatus', 'update:webMsgSend', 'sendPause', 'sendResume', 'sendReCheck']);
+const emit = defineEmits(['update:testStatus', 'update:webMsgSend', 'sendPause', 'sendResume', 'sendReCheck', 'closeWebSocket']);
 
 // 用来保存测试项进度抽屉是否打开
 const drawer = ref(false)
@@ -448,11 +452,22 @@ watch(webMsgSend, function (newValue, oldValue) {
         switch (newValue.requestId) {
           case 'server_error':
             if (newValue.operateCode === 'server_error' && count === 0) {
-              ElMessageBox.alert('源连接失败!', '初始化失败', {
+              ElMessageBox.alert('服务端主动关闭连接!', '初始化失败', {
                 confirmButtonText: '确定',
                 type: 'error',
               })
-              testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源连接失败！`})
+              testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：服务端主动关闭连接！`})
+              emit('update:testStatus', 'test_init_fail')
+              count++
+            }
+            break;
+          case 'device_error':
+            if (newValue.operateCode === 'device_error' && count === 0) {
+              ElMessageBox.alert('设备端主动关闭连接!', '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备端主动关闭连接！`})
               emit('update:testStatus', 'test_init_fail')
               count++
             }
@@ -556,7 +571,17 @@ watch(webMsgSend, function (newValue, oldValue) {
                   })
                   testLogList.push({
                     type: 'error',
-                    log: `${new Date().toLocaleString()}：脚本与icd校验失败！icd名称：${newValue.data.icdType} -> 校验项：${newValue.data.dataType}`
+                    log: `${new Date().toLocaleString()}：脚本与icd校验失败！icd名称：${data['icdType']} -> 校验项：${data['dataType']}`
+                  })
+                  emit('update:testStatus', 'test_init_fail')
+                } else if (newValue.code == 10500) {
+                  ElMessageBox.alert(`装置中未找到该icd！`, '初始化失败', {
+                    confirmButtonText: '确定',
+                    type: 'error',
+                  })
+                  testLogList.push({
+                    type: 'error',
+                    log: `${new Date().toLocaleString()}：装置中未找到该icd！`
                   })
                   emit('update:testStatus', 'test_init_fail')
                 }
@@ -668,9 +693,9 @@ const handleStartItem = (code: string, desc: string | undefined) => {
     updateCheckResultView(code, true)
     updateLog(true)
   } else {
-    if (desc.length > 150) {
-      desc = desc.substring(0, 150) + '...'
-    }
+    // if (desc.length > 150) {
+    //   desc = desc.substring(0, 150) + '...'
+    // }
     testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}准确度检测：开始`})
   }
 }
@@ -686,9 +711,9 @@ const handleEndItem = (code: string, desc: string | undefined, devices: CheckDat
     }
   } else {
     let result = getResult(devices)
-    if (desc.length > 150) {
-      desc = desc.substring(0, 150) + '...'
-    }
+    // if (desc.length > 150) {
+    //   desc = desc.substring(0, 150) + '...'
+    // }
     if (result === 1) {
       testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}检测结束：符合`})
     }
@@ -712,12 +737,22 @@ const updatePercentage = async () => {
     let {data: autoGenerate} = await getAutoGenerate()
     if (autoGenerate == 1) {
       //调用自动生成报告接口
-      let deviceIds = checkStore.devices.map(item => item.deviceId)
-      // await generateDevReport({'planId': checkStore.plan.id, 'devId':deviceIds[0] ,'scriptId':checkStore.plan.scriptId,'planCode':checkStore.plan.code+''})
+      let devIdList = checkStore.devices.map(item => {
+        return item.deviceId
+      })
+
+      await generateDevReport({
+        'planId': checkStore.plan.id,
+        'devIdList': devIdList,
+        'scriptId': checkStore.plan.scriptId,
+        'planCode': checkStore.plan.code + ''
+      })
     }
     ElMessageBox.alert('检测全部结束,你可以停留在此页面查看检测结果，或返回首页进行复检、报告生成和归档等操作', '检测完成', {
       confirmButtonText: '确定',
     })
+    // 关闭WebSocket连接
+    emit('closeWebSocket')
     //clear();
   }
 }
@@ -751,7 +786,7 @@ const showTestLog = () => {
 // 初始化检测脚本数据
 const initScriptData = async () => {
 
-  let response: any = await getBigTestItem({reCheckType:checkStore.reCheckType, planId:checkStore.plan.id,devId:checkStore.devices[0].deviceId})
+  let response: any = await getBigTestItem({reCheckType: checkStore.reCheckType, planId: checkStore.plan.id, devIds: checkStore.devices.map(item => item.deviceId)})
 
   let temp = response.data.map(item => {
     return {
@@ -1544,6 +1579,7 @@ defineExpose({
   :deep(header.el-drawer__header) {
     color: #fff !important;
     background-color: var(--el-color-primary) !important;
+
     .el-drawer__close-btn svg:hover {
       color: #ccc !important;
     }

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

@@ -17,7 +17,7 @@
     <!--     <channelsTest v-if="stepsActiveIndex === 3" v-model:testStatus="channelsTestStatus"></channelsTest>-->
     <factorTest v-if="showComponent&&channelsTestSelected" v-show="channelsTestSelected && stepsActiveView==3" v-model:testStatus="channelsTestStatus" :webMsgSend="webMsgSend"/>
     <test v-if="showComponent&&testSelected" ref="testRef" v-show="testSelected && stepsActiveView==4" v-model:testStatus="TestStatus" :webMsgSend="webMsgSend"
-          @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck" :stepsActive="stepsActive"/>
+          @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck" @closeWebSocket="closeWebSocket" :stepsActive="stepsActive"/>
 
     <template #footer>
       <div>
@@ -94,6 +94,7 @@ import socketClient from '@/utils/webSocketClient';
 import {useCheckStore} from "@/stores/modules/check";
 import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket'
 import {useUserStore} from "@/stores/modules/user";
+import { Device } from '@/api/device/interface/device';
 
 const userStore = useUserStore()
 const checkStore = useCheckStore();
@@ -111,6 +112,7 @@ const channelsTestStatus = ref('waiting');//通道系数校准执行状态
 const TestStatus = ref('waiting');//正式检测执行状态
 const webMsgSend = ref();//webSocket推送的数据
 
+
 const dialogTitle = ref('')
 const showComponent = ref(true)
 const preTestRef = ref(null)
@@ -213,7 +215,9 @@ const handleSubmit = () => {
         devIds: deviceIds,
         planId: planId,
         operateType: '1', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-        userId:userStore.userInfo.id
+        userId:userStore.userInfo.id,
+        temperature:checkStore.temperature,
+        humidity:checkStore.humidity
       }).then(res => {
         if (res.code === 'A001014') {
           ElMessageBox.alert('装置配置异常', '检测失败', {
@@ -242,7 +246,9 @@ const handleSubmit = () => {
           devIds: deviceIds,
           planId: planId,
           operateType: checkStore.reCheckType ==1 ?'2':'8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-          userId:userStore.userInfo.id
+          userId:userStore.userInfo.id,
+          temperature:checkStore.temperature,
+        humidity:checkStore.humidity
         }).then(res => {
           console.log(res)
           if (res.code === 'A001014') {
@@ -360,7 +366,9 @@ const sendResume = () => {
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
     operateType: '2', //  0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-    userId:userStore.userInfo.id
+    userId:userStore.userInfo.id,
+    temperature:checkStore.temperature,
+        humidity:checkStore.humidity
   })
   Object.assign(webMsgSend.value, {
     requestId: 'Resume_Success'
@@ -374,7 +382,9 @@ const sendReCheck = () => {
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
     operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-    userId:userStore.userInfo.id
+    userId:userStore.userInfo.id,
+   temperature:checkStore.temperature,
+        humidity:checkStore.humidity
   }).then(res => {
     console.log(res)
     if (res.code === 'A001014') {
@@ -388,6 +398,10 @@ const sendReCheck = () => {
   TestStatus.value = 'start'
 }
 
+const closeWebSocket = () => {
+  dataSocket.socketServe.closeWs()
+}
+
 const nextStep = () => {
   if (stepsActiveIndex.value == stepsTotalNum.value + 1 || ActiveStatue.value === 'error' || ActiveStatue.value === 'test_init_fail' || ActiveStatue.value === 'connect_timeout' || ActiveStatue.value === 'pause_timeout') {
     handleClose()

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

@@ -0,0 +1,95 @@
+<template>
+  <el-dialog title="填写实验室环境" v-model='dialogVisible' @close="handleClose" v-bind="dialogSmall" >
+    <div>
+      <el-form ref="dialogFormRef" :model="formContent"  :rules='rules' >
+       <el-form-item label="温度(℃)" prop="temperature" :label-width="110">
+            <el-input v-model="formContent.temperature" placeholder="请输入温度" maxlength="32" show-word-limit/>
+        </el-form-item>            
+        <el-form-item label="相对湿度(%)" prop="humidity" :label-width="110">
+            <el-input v-model="formContent.humidity" placeholder="请输入湿度" maxlength="32" show-word-limit/>
+        </el-form-item> 
+      </el-form>
+    </div>
+
+    <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleClose">取消</el-button>
+          <el-button type="primary" @click="handleStart">确定</el-button>
+        </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang='tsx' name='selectTestItemPopup'>
+import {dialogSmall} from "@/utils/elementBind";
+import {reactive, Ref, ref} from "vue";
+import type {Device} from "@/api/device/interface/device.ts";
+import {ElMessageBox, FormItemRule} from "element-plus";
+import {useCheckStore} from "@/stores/modules/check";
+
+const emit = defineEmits(['openTestDialog2'])
+const dialogFormRef = ref()
+
+
+const dialogVisible = ref(false)
+const formContent = reactive<Device.ResTH>({temperature:0,humidity:0})
+const checkStore = useCheckStore();
+const open = async () => {
+  resetFormContent()
+  dialogVisible.value = true
+}
+
+// 清空表单内容
+const resetFormContent = () => {
+  Object.assign(formContent,{temperature:'',humidity:''})
+}
+
+
+  //定义校验规则
+  const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+    temperature: [{ required: true, message: '温度必填！', trigger: 'blur' },
+       // 指定正则，此处是数字正则
+       { pattern: /^(?:(?:-50)|-?[1-4][0-9]|-?[0-9]|[1-4][0-9]|50)(\.[0-9]+)?$/,
+      message: '温度必须为 -50 到 50 之间的合法数字',
+       trigger: 'blur' 
+    }],
+    humidity: [{ required: true, message: '湿度必填！', trigger: 'blur' },
+      { pattern: /^(?:100(?:\.0+)?|\d{1,2}(?:\.\d+)?|0?\.\d+)$/  , message: '湿度必须为 0 到 100 之间的合法数字', trigger: 'blur' },
+    ],
+    
+  })
+
+
+const handleStart = () => {
+    try {      
+        dialogFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+           
+            checkStore.setTemperature(formContent.temperature)
+            checkStore.setHumidity(formContent.humidity)
+            emit('openTestDialog2')
+            handleClose()
+        }
+    })
+  } catch (err) {
+    console.error('验证过程中出现错误', err)
+  }
+
+}
+
+// 关闭弹窗
+const handleClose = () => {
+  dialogVisible.value = false
+  // 清空dialogForm中的值
+  resetFormContent()
+  dialogFormRef.value?.resetFields()
+}
+
+defineExpose({open})
+
+</script>
+
+
+<style scoped lang="scss">
+
+</style>

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

@@ -71,7 +71,7 @@ const modeList = [
     code: "数字式",
     subName: "启用数字检测计划",
     img: new URL('/src/assets/images/dashboard/2.svg', import.meta.url).href,
-    isActive: false,
+    isActive: true,
   },
   {
     name: "比对式模块",

frontend/src/views/machine/devType/components/devTypePopup.vue

@@ -4,7 +4,7 @@
     <div>
         <el-form :model="formContent"  ref='dialogFormRef' :rules='rules' class="form-two">
             <el-form-item label="名称" prop="name" >
-                <el-input v-model='formContent.name' placeholder="请输入设备类型名称"/>
+                <el-input v-model='formContent.name' placeholder="请输入设备类型名称" maxlength="32" show-word-limit/>
             </el-form-item>
             <el-form-item label="工作电源" prop="power" >
                 <el-select v-model="formContent.power"  clearable placeholder="请选择工作电源">

frontend/src/views/machine/device/components/devicePopup.vue

@@ -1,159 +1,172 @@
 <template>
-    <el-dialog  :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
-        <el-tabs type="border-card">
-            <el-tab-pane label="设备台账信息">
-                <div >
-                    <el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false" label-width="auto" class="form-three">
-                        <el-divider >设备信息</el-divider>
-                                <el-form-item label="装置编号" prop="createId" >
-                                    <el-input v-model="formContent.createId" placeholder="请输入装置编号" @input="handleInput" />
-                                </el-form-item>   
-                                <el-form-item label="设备名称" prop="name" >
-                                    <el-input v-model='formContent.name' placeholder="请输入设备名称" :disabled="scene === '1'"/>
-                                </el-form-item>           
-                                <el-form-item label='设备类型'  prop='devType' >
-                                    <el-select v-model="formContent.devType" filterable  clearable placeholder="请选择设备类型" @change="handleDevTypeChange">
-                                    <el-option
-                                    v-for="item in devTypeOptions"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                                    />
-                                </el-select>
-                                </el-form-item>  
-                                <el-form-item label='预投计划'  prop='preinvestmentPlan' v-if="scene ==='1'">
-                                   <el-select v-model="formContent.preinvestmentPlan"  clearable placeholder="请选择预投计划">
-                                    <el-option
-                                    v-for="item in dictStore.getDictData('Preinvestment_Plan')"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                                    />
-                                  </el-select>
-                                </el-form-item>         
-<!--                                <el-form-item label='设备模式'  prop='pattern' >-->
-<!--                                    <el-select v-model="formContent.pattern"  clearable placeholder="请选择设备模式" disabled>-->
-<!--                                    <el-option -->
-<!--                                    v-for="item in dictStore.getDictData('Pattern')"-->
-<!--                                    :key="item.id"-->
-<!--                                    :label="item.name"-->
-<!--                                    :value="item.id"-->
-<!--                                    />-->
-<!--                                </el-select>-->
-<!--                                </el-form-item>           -->
-                                <el-form-item label='设备厂家'  prop='manufacturer' v-if="scene != '1'">
-                                    <el-select v-model="formContent.manufacturer"  clearable placeholder="请选择设备厂家">
-                                    <el-option
-                                    v-for="item in dictStore.getDictData('Dev_Manufacturers')"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                                    />
-                                </el-select>
-                                </el-form-item>           
-                                <el-form-item label="出厂日期" prop="createDate"    v-if="scene === '0'">
-                                    <el-date-picker
-                                        v-model="formContent.createDate" 
-                                        placeholder="请选择出厂日期"
-                                        :disabled-date="disabledDate"
-                                        />
-                                </el-form-item>           
-                                        
-                                <el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
-                                    <el-input v-model="formContent.hardwareVersion" placeholder="请输入固件版本"/>
-                                </el-form-item>            
-                                <el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
-                                    <el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
-                                </el-form-item>            
-                        <el-divider >参数信息</el-divider>
-                                <el-form-item label="通道数" prop="devChns" >
-                                  <el-input v-model='formContent.devChns' :disabled="true"/>
-                                </el-form-item>            
-                                <el-form-item label="额定电压(V)" prop="devVolt" >
-                                  <el-input v-model='formContent.devVolt' :disabled="true"/>
-                                </el-form-item>           
-                                <el-form-item label="额定电流(A)" prop="devCurr" >
-                                  <el-input v-model='formContent.devCurr' :disabled="true"/>
-                                </el-form-item>            
-                                <el-form-item label='通讯协议'  prop='protocol' >
-                                    <el-select v-model="formContent.protocol"  clearable placeholder="请选择通讯协议" >
-                                        <el-option
-                                            v-for="item in dictStore.getDictData('Protocol')"
-                                            :key="item.id"
-                                            :label="item.name"
-                                            :value="item.id"
-                                            />
-                                    </el-select>
-                                </el-form-item>         
-                                <el-form-item label="IP地址" prop="ip" >
-                                    <IPAddress v-model:value="formContent.ip"/>
-                                </el-form-item>           
-                                <el-form-item label="端口号" prop="port" placeholder="请输入端口号" >
-                                    <el-input v-model="formContent.port" />
-                                </el-form-item>            
-                                <el-form-item label='是否加密'  prop='encryptionFlag' >
-                                    <el-select v-model="formContent.encryptionFlag"  clearable placeholder="请选择是否加密">
-                                        <el-option label="是" :value="1"></el-option>
-                                        <el-option label="否" :value="0"></el-option>
-                                    </el-select>
-                                </el-form-item>           
-                                <el-form-item label='识别码'  prop='series' clearable  v-if="formContent.encryptionFlag">
-                                    <el-input v-model='formContent.series' placeholder="请输入识别码" show-password/>
-                                </el-form-item>           
-                                <el-form-item label='密钥'  prop='devKey' clearable  v-if="formContent.encryptionFlag">
-                                    <el-input v-model='formContent.devKey' placeholder="请输入密钥" show-password/>
-                                </el-form-item>           
-                                <el-form-item label='样品编号'  prop='sampleId' clearable  v-if="DevIsShow && scene === '0'">
-                                    <el-input v-model='formContent.sampleId' placeholder="请输入样品编号" />
-                                </el-form-item>           
-                                <el-form-item label='送样日期'  prop='arrivedDate' v-if="scene === '0'">
-                                    <el-date-picker 
-                                        v-model="formContent.arrivedDate" 
-                                        placeholder="请选择送样日期"
-                                        :disabled-date="disabledDate"
-                                        />
-                                </el-form-item>           
-                                <el-form-item label='所属地市'  prop='cityName' clearable placeholder="请输入所属地市"  v-if="MonIsShow">
-                                    <el-input v-model='formContent.cityName' />
-                                </el-form-item>           
-                                <el-form-item label='所属供电公司'  prop='gDName' clearable placeholder="请输入所属供电公司" v-if="MonIsShow">
-                                    <el-input v-model='formContent.gDName' />
-                                </el-form-item>           
-                                <el-form-item label='所属电站'  prop='subName' clearable placeholder="请输入所属电站" v-if="MonIsShow">
-                                    <el-input v-model='formContent.subName' />
-                                </el-form-item>    
-                                <el-form-item  v-auth.device="'factorFlag'"  label="是否支持系数校准"  prop='factorFlag'>
-                                  <el-radio-group v-model="formContent.factorFlag" >
-                                    <el-radio :value="1">是</el-radio>
-                                    <el-radio :value="0">否</el-radio>
-                                  </el-radio-group>
-                              </el-form-item>
-                    </el-form>            
-                </div>  
-            </el-tab-pane>
+  <el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
+    <el-tabs type="border-card">
+      <el-tab-pane label="设备台账信息">
+        <div>
+          <el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false" label-width="auto" class="form-three">
+            <el-divider>设备信息</el-divider>
+            <el-form-item label="装置编号" prop="createId">
+              <el-input v-model="formContent.createId" placeholder="请输入装置编号" @input="handleInput" maxlength="32" show-word-limit/>
+            </el-form-item>
+            <el-form-item label="设备名称" prop="name">
+              <el-input v-model='formContent.name' placeholder="请输入设备名称" :disabled="scene === '1'" maxlength="32" show-word-limit/>
+            </el-form-item>
+            <el-form-item label='设备类型' prop='devType'>
+              <el-select v-model="formContent.devType" filterable clearable placeholder="请选择设备类型" @change="handleDevTypeChange">
+                <el-option
+                    v-for="item in devTypeOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label='预投计划' prop='preinvestmentPlan' v-if="scene ==='1'">
+              <el-select v-model="formContent.preinvestmentPlan" clearable placeholder="请选择预投计划">
+                <el-option
+                    v-for="item in dictStore.getDictData('Preinvestment_Plan')"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <!--                                <el-form-item label='设备模式'  prop='pattern' >-->
+            <!--                                    <el-select v-model="formContent.pattern"  clearable placeholder="请选择设备模式" disabled>-->
+            <!--                                    <el-option -->
+            <!--                                    v-for="item in dictStore.getDictData('Pattern')"-->
+            <!--                                    :key="item.id"-->
+            <!--                                    :label="item.name"-->
+            <!--                                    :value="item.id"-->
+            <!--                                    />-->
+            <!--                                </el-select>-->
+            <!--                                </el-form-item>           -->
+            <el-form-item label='设备厂家' prop='manufacturer' v-if="scene != '1'">
+              <el-select v-model="formContent.manufacturer" clearable placeholder="请选择设备厂家">
+                <el-option
+                    v-for="item in dictStore.getDictData('Dev_Manufacturers')"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="出厂日期" prop="createDate" v-if="scene === '0'">
+              <el-date-picker
+                  v-model="formContent.createDate"
+                  placeholder="请选择出厂日期"
+                  :disabled-date="disabledDate"
+              />
+            </el-form-item>
 
-            <!-- 监测点台账信息 tab pane -->
-            <MonitorTable :MonIsShow="MonIsShow"/>
-        </el-tabs>
-        <template #footer>
-            <div >
-                <el-button @click='close()'>取 消</el-button>
-                <el-button type="primary" @click='save()'>保存</el-button>
-            </div>
-        </template>
-    </el-dialog>
+            <el-form-item label="固件版本" prop="hardwareVersion" v-if="scene === '0'">
+              <el-input v-model="formContent.hardwareVersion" placeholder="请输入固件版本"/>
+            </el-form-item>
+            <el-form-item label="软件版本" prop="softwareVersion" v-if="scene === '0'">
+              <el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
+            </el-form-item>
+            <el-divider>参数信息</el-divider>
+            <el-form-item label="通道数" prop="devChns">
+              <el-input v-model='formContent.devChns' :disabled="true"/>
+            </el-form-item>
+            <el-form-item label="额定电压(V)" prop="devVolt">
+              <el-input v-model='formContent.devVolt' :disabled="true"/>
+            </el-form-item>
+            <el-form-item label="额定电流(A)" prop="devCurr">
+              <el-input v-model='formContent.devCurr' :disabled="true"/>
+            </el-form-item>
+            <el-form-item label='通讯协议' prop='protocol'>
+              <el-select v-model="formContent.protocol" clearable placeholder="请选择通讯协议">
+                <el-option
+                    v-for="item in dictStore.getDictData('Protocol')"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="IP地址" prop="ip">
+              <IPAddress v-model:value="formContent.ip"/>
+            </el-form-item> -->
+            <el-form-item label="IP地址" prop="ip" placeholder="请输入IP地址">
+              <el-input v-model="formContent.ip"/>
+            </el-form-item>
+            <el-form-item label="端口号" prop="port" placeholder="请输入端口号">
+              <el-input v-model="formContent.port"/>
+            </el-form-item>
+            <el-form-item label='是否加密' prop='encryptionFlag'>
+              <el-select v-model="formContent.encryptionFlag" clearable placeholder="请选择是否加密">
+                <el-option label="是" :value="1"></el-option>
+                <el-option label="否" :value="0"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label='识别码' prop='series' clearable v-if="formContent.encryptionFlag">
+              <el-input v-model='formContent.series' placeholder="请输入识别码" show-password/>
+            </el-form-item>
+            <el-form-item label='密钥' prop='devKey' clearable v-if="formContent.encryptionFlag">
+              <el-input v-model='formContent.devKey' placeholder="请输入密钥" show-password/>
+            </el-form-item>
+            <el-form-item label='样品编号' prop='sampleId' clearable v-if="DevIsShow && scene === '0'">
+              <el-input v-model='formContent.sampleId' placeholder="请输入样品编号"/>
+            </el-form-item>
+            <el-form-item label='送样日期' prop='arrivedDate' v-if="scene === '0'">
+              <el-date-picker
+                  v-model="formContent.arrivedDate"
+                  placeholder="请选择送样日期"
+                  :disabled-date="disabledDate"
+              />
+            </el-form-item>
+            <el-form-item label='委托方' prop='delegate' v-if="scene === '0'">
+              <el-select v-model="formContent.delegate" clearable placeholder="请选择委托方">
+                <el-option
+                    v-for="item in dictStore.getDictData('Delegate')"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label='所属地市' prop='cityName' clearable placeholder="请输入所属地市" v-if="MonIsShow">
+              <el-input v-model='formContent.cityName'/>
+            </el-form-item>
+            <el-form-item label='所属供电公司' prop='gDName' clearable placeholder="请输入所属供电公司" v-if="MonIsShow">
+              <el-input v-model='formContent.gDName'/>
+            </el-form-item>
+            <el-form-item label='所属电站' prop='subName' clearable placeholder="请输入所属电站" v-if="MonIsShow">
+              <el-input v-model='formContent.subName'/>
+            </el-form-item>
+            <el-form-item v-auth.device="'factorFlag'" label="是否支持系数校准" prop='factorFlag' v-if="scene === '1'">
+              <el-radio-group v-model="formContent.factorFlag">
+                <el-radio :value="1">是</el-radio>
+                <el-radio :value="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-tab-pane>
+
+      <!-- 监测点台账信息 tab pane -->
+      <MonitorTable :MonIsShow="MonIsShow"/>
+    </el-tabs>
+    <template #footer>
+      <div>
+        <el-button @click='close()'>取 消</el-button>
+        <el-button type="primary" @click='save()'>保存</el-button>
+      </div>
+    </template>
+  </el-dialog>
 
 </template>
 <script setup lang='ts'>
 
 import IPAddress from '@/components/IpAddress/index.vue'
-import { dialogBig } 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'
+import {dialogBig} 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 MonitorTable from '@/views/machine/device/components/monitorTab.vue';
@@ -174,195 +187,195 @@ const disabledDate = (time: Date) => {
   return time.getTime() > Date.now()
 }
 
-  function useMetaInfo() {
-    const dialogVisible = ref(false)
-    const titleType = ref('add')
-    const formContent = ref<Device.ResPqDev>({
-      id: '',
-      name: '',
-      pattern:mode.value,
-      devType:'',
-      devChns:1,
-      devVolt:57.74,
-      devCurr:5,
-      manufacturer:'',
-      createDate: dayjs().format('YYYY-MM-DD'),
-      createId: '', 
-      hardwareVersion: '',
-      softwareVersion: '',
-      protocol: 'MMS',
-      ip: '172.17.102.200',
-      port: 102,
-      encryptionFlag: 0,
-      reCheckNum:0,
-      state: 1,
-      factorFlag:1,
-      icdId:'',
-      power:'',
-      preinvestmentPlan:''
-    })
-    return { dialogVisible, titleType, formContent }
-  }
-  
-  const { dialogVisible, titleType, formContent } = useMetaInfo()
-  // 清空formContent
-  const resetFormContent = () => {
-    formContent.value = {
-        id: '',
-        name: '',
-        pattern:mode.value,
-        devType:'',
-        devChns:1,
-        devVolt:57.74,
-        devCurr:5,
-        manufacturer: '',
-        createDate: dayjs().format('YYYY-MM-DD'),
-        createId: '', 
-        hardwareVersion: '',
-        softwareVersion: '',
-        protocol: 'MMS',
-        ip: '172.17.102.200',
-        port: 102,
-        encryptionFlag: 0,
-        reCheckNum:0,
-        state: 1,
-        factorFlag:1,
-        icdId:'',
-        power:'',
-        preinvestmentPlan:''
-    }
-  }
-  
-
-  let dialogTitle = computed(() => {
-    return titleType.value === 'add' ? '新增被检设备' : '编辑被检设备'
+function useMetaInfo() {
+  const dialogVisible = ref(false)
+  const titleType = ref('add')
+  const formContent = ref<Device.ResPqDev>({
+    id: '',
+    name: '',
+    pattern: mode.value,
+    devType: '',
+    devChns: 1,
+    devVolt: 57.74,
+    devCurr: 5,
+    manufacturer: '',
+    createDate: dayjs().format('YYYY-MM-DD'),
+    createId: '',
+    hardwareVersion: '',
+    softwareVersion: '',
+    protocol: 'MMS',
+    ip: '',
+    port: 102,
+    encryptionFlag: 0,
+    reCheckNum: 0,
+    state: 1,
+    factorFlag: 1,
+    icdId: '',
+    power: '',
+    preinvestmentPlan: '',
+    delegate:''
   })
+  return {dialogVisible, titleType, formContent}
+}
+
+const {dialogVisible, titleType, formContent} = useMetaInfo()
+// 清空formContent
+const resetFormContent = () => {
+  formContent.value = {
+    id: '',
+    name: '',
+    pattern: mode.value,
+    devType: '',
+    devChns: 1,
+    devVolt: 57.74,
+    devCurr: 5,
+    manufacturer: '',
+    createDate: dayjs().format('YYYY-MM-DD'),
+    createId: '',
+    hardwareVersion: '',
+    softwareVersion: '',
+    protocol: 'MMS',
+    ip: '',
+    port: 102,
+    encryptionFlag: 0,
+    reCheckNum: 0,
+    state: 1,
+    factorFlag: 1,
+    icdId: '',
+    power: '',
+    preinvestmentPlan: '',
+    delegate:''
+  }
+}
+
+
+let dialogTitle = computed(() => {
+  return titleType.value === 'add' ? '新增被检设备' : '编辑被检设备'
+})
 
 
 // 定义表单校验规则
 const baseRules: Record<string, Array<FormItemRule>> = {
-  devType: [{ required: true, message: '设备类型必选！', trigger: 'change' }],
-  pattern: [{ required: true, message: '设备模式必填！', trigger: 'blur' }],
+  devType: [{required: true, message: '设备类型必选！', trigger: 'change'}],
+  pattern: [{required: true, message: '设备模式必填！', trigger: 'blur'}],
   devChns: [
-    { required: true, message: '设备通道数必填！', trigger: 'blur' },
-    { pattern: /^[1-9]\d*$/, message: '设备通道数为大于1的整数', trigger: 'blur' }
+    {required: true, message: '设备通道数必填！', trigger: 'blur'},
+    {pattern: /^[1-9]\d*$/, message: '设备通道数为大于1的整数', trigger: 'blur'}
   ],
   devVolt: [
-    { required: true, message: '额定电压必填！', trigger: 'blur' },
-    { pattern: /^\d+(\.\d+)?$/, message: '额定电压格式错误', trigger: 'blur' }
+    {required: true, message: '额定电压必填！', trigger: 'blur'},
+    {pattern: /^\d+(\.\d+)?$/, message: '额定电压格式错误', trigger: 'blur'}
   ],
   devCurr: [
-    { required: true, message: '额定电流必填！', trigger: 'blur' },
-    { pattern: /^\d+(\.\d+)?$/, message: '额定电流格式错误', trigger: 'blur' }
+    {required: true, message: '额定电流必填！', trigger: 'blur'},
+    {pattern: /^\d+(\.\d+)?$/, message: '额定电流格式错误', trigger: 'blur'}
   ],
-  createId: [{ required: true, message: '装置编号必填！', trigger: 'blur' }
+  createId: [{required: true, message: '装置编号必填！', trigger: 'blur'}
   ],
   ip: [
-    { required: true, message: 'IP地址必填！', trigger: 'blur' },
-    { pattern: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, message: 'IP地址格式错误', trigger: 'blur' }
+    {required: true, message: 'IP地址必填！', trigger: 'blur'},
+    {pattern: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, message: 'IP地址格式错误', trigger: 'blur'}
   ],
   port: [
-    { required: true, message: '端口号必填！', trigger: 'blur' },
-    { pattern: /^(6553[0-5]|655[0-2][0-9]|64[0-9]{3}|[1-5]?[0-9]{1,4})$/, message: '端口号范围0到65535的整数', trigger: 'blur' }
+    {required: true, message: '端口号必填！', trigger: 'blur'},
+    {pattern: /^(6553[0-5]|655[0-2][0-9]|64[0-9]{3}|[1-5]?[0-9]{1,4})$/, message: '端口号范围0到65535的整数', trigger: 'blur'}
   ],
-  encryptionFlag: [{ required: true, message: '是否加密必选！', trigger: 'change' }],
-  protocol: [{ required: true, message: '通讯协议必选！', trigger: 'change' }],
-  series: [{ required: true, message: '请输入识别码', trigger: 'blur' }],
-  devKey: [{ required: true, message: '请输入密钥', trigger: 'blur' }]
+  encryptionFlag: [{required: true, message: '是否加密必选！', trigger: 'change'}],
+  protocol: [{required: true, message: '通讯协议必选！', trigger: 'change'}],
+  series: [{required: true, message: '请输入识别码', trigger: 'blur'}],
+  devKey: [{required: true, message: '请输入密钥', trigger: 'blur'}]
 };
 
 // 使用计算属性根据 scene 动态生成规则
 const rules = computed(() => {
-  const dynamicRules = { ...baseRules };
+  const dynamicRules = {...baseRules};
 
-  if (scene.value === '0'){//只有电科院需要展示
-    dynamicRules.createDate= [{ required: true, message: '出厂日期必填！', trigger: 'blur' }];
+  if (scene.value === '0') {//只有电科院需要展示
+    dynamicRules.createDate = [{required: true, message: '出厂日期必填！', trigger: 'blur'}];
   }
-  if (scene.value === '1'){//只有楼下出厂需要展示
-    dynamicRules.preinvestmentPlan= [{ required: true, message: '预投计划必选！', trigger: 'change' }];
-    dynamicRules.createId= [{ required: true, message: '装置编号必填！', trigger: 'blur' },
-    { pattern: /^\d+$/, message: '装置编号为数字', trigger: 'blur' }
+  if (scene.value === '1') {//只有楼下出厂需要展示
+    dynamicRules.preinvestmentPlan = [{required: true, message: '预投计划必选！', trigger: 'change'}];
+    dynamicRules.createId = [{required: true, message: '装置编号必填！', trigger: 'blur'},
+      {pattern: /^\d+$/, message: '装置编号为数字', trigger: 'blur'}
     ];
   }
   if (scene.value !== '0') {
-    dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }];
-    dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }];
-    dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填！', trigger: 'blur' }];
-    dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }];
-   
+    dynamicRules.name = [{required: true, message: '设备名称必填！', trigger: 'blur'}];
+    dynamicRules.hardwareVersion = [{required: true, message: '固件版本必填！', trigger: 'blur'}];
+    dynamicRules.softwareVersion = [{required: true, message: '软件版本必填！', trigger: 'blur'}];
+    dynamicRules.manufacturer = [{required: true, message: '生产厂家必选！', trigger: 'change'}];
+
   }
 
   if (scene.value !== '2') {
-    dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }];
-    dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }];
-    
+    dynamicRules.name = [{required: true, message: '设备名称必填！', trigger: 'blur'}];
+    dynamicRules.manufacturer = [{required: true, message: '生产厂家必选！', trigger: 'change'}];
+
   }
 
-  
 
   return dynamicRules;
 });
-  
-  // 关闭弹窗
-  const close = () => {
-    dialogVisible.value = false
-    // 清空dialogForm中的值
-    resetFormContent()
-    // 重置表单
-    dialogFormRef.value?.resetFields()
-    
-  }
-  
-  // 保存数据
-  const save = () => {
-    try {      
-        dialogFormRef.value?.validate(async (valid: boolean) => {
-         
-            if (formContent.value.encryptionFlag === 0) {
-              formContent.value.series = ''
-              formContent.value.devKey = ''
-            }
-        if (valid) {
-          formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD');
-          if (AppSceneStore.currentScene === '1') {
-            formContent.value.name = formContent.value.createId
-          }
 
-          if (formContent.value.arrivedDate) 
-          {
-            formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD');
-          }
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  // 清空dialogForm中的值
+  resetFormContent()
+  // 重置表单
+  dialogFormRef.value?.resetFields()
 
-          //保存时判是否加密，把识别码密钥字段清空
-          if(formContent.value.encryptionFlag === 0){
-              formContent.value.series = null
-              formContent.value.devKey = null
-          }
+}
 
-          if (formContent.value.id) {
-                await updatePqDev(formContent.value);
-                ElMessage.success({ message: `${dialogTitle.value}成功！` })
-            } else {  
-                // 新增需要把设备模式转成字典ID
-                const patternItem = dictStore.getDictData('Pattern').find(item => item.name === formContent.value.pattern);
-                if (patternItem) {
-                    formContent.value.pattern = patternItem.id;
-                }
-                 // 新增需要把通讯协议转成字典ID
-                 const protocolItem = dictStore.getDictData('Protocol').find(item => item.name === formContent.value.protocol);
-                if (protocolItem) {
-                    formContent.value.protocol = protocolItem.id;
-                }
-              await addPqDev(formContent.value);
-              ElMessage.success({ message: `${dialogTitle.value}成功！` })
-                
+// 保存数据
+const save = () => {
+  try {
+    dialogFormRef.value?.validate(async (valid: boolean) => {
+
+      if (formContent.value.encryptionFlag === 0) {
+        formContent.value.series = ''
+        formContent.value.devKey = ''
+      }
+      if (valid) {
+        formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD');
+        if (AppSceneStore.currentScene === '1') {
+          formContent.value.name = formContent.value.createId
+        }
+
+        if (formContent.value.arrivedDate) {
+          formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD');
+        }
+
+        //保存时判是否加密，把识别码密钥字段清空
+        if (formContent.value.encryptionFlag === 0) {
+          formContent.value.series = null
+          formContent.value.devKey = null
+        }
+
+        if (formContent.value.id) {
+          await updatePqDev(formContent.value);
+          ElMessage.success({message: `${dialogTitle.value}成功！`})
+        } else {
+          // 新增需要把设备模式转成字典ID
+          const patternItem = dictStore.getDictData('Pattern').find(item => item.name === formContent.value.pattern);
+          if (patternItem) {
+            formContent.value.pattern = patternItem.id;
           }
-          
-          close()
-          // 刷新表格
-          await props.refreshTable!()
+          // 新增需要把通讯协议转成字典ID
+          const protocolItem = dictStore.getDictData('Protocol').find(item => item.name === formContent.value.protocol);
+          if (protocolItem) {
+            formContent.value.protocol = protocolItem.id;
+          }
+          await addPqDev(formContent.value);
+          ElMessage.success({message: `${dialogTitle.value}成功！`})
 
         }
+
+        close()
+        // 刷新表格
+        await props.refreshTable!()
+
+      }
     })
   } catch (err) {
     console.error('验证过程中出现错误', err)
@@ -371,20 +384,20 @@ const rules = computed(() => {
 
 
 // 打开弹窗，可能是新增，也可能是编辑
-const open = async (sign: string, data: Device.ResPqDev,currentMode: string,currentScene: string,devType:Device.ResDev[] ) => {
-    devTypeOptions.value = devType
-    mode.value = currentMode
-    scene.value = currentScene
-    titleType.value = sign
-    dialogVisible.value = true
+const open = async (sign: string, data: Device.ResPqDev, currentMode: string, currentScene: string, devType: Device.ResDev[]) => {
+  devTypeOptions.value = devType
+  mode.value = currentMode
+  scene.value = currentScene
+  titleType.value = sign
+  dialogVisible.value = true
 
-    if( currentMode ==='比对式'){
-        DevIsShow.value = false
-        MonIsShow.value = true
-    }else{
-        DevIsShow.value = true
-        MonIsShow.value = false
-    }
+  if (currentMode === '比对式') {
+    DevIsShow.value = false
+    MonIsShow.value = true
+  } else {
+    DevIsShow.value = true
+    MonIsShow.value = false
+  }
 
   if (data.encryptionFlag === 1) {
     //handleEncryptionChange(1)
@@ -392,17 +405,17 @@ const open = async (sign: string, data: Device.ResPqDev,currentMode: string,curr
     //handleEncryptionChange(0)
   }
   if (data.id) {
-    formContent.value = { ...data }
+    formContent.value = {...data}
   } else {
     resetFormContent()
-    if(scene.value === '2'){
+    if (scene.value === '2') {
       const manufacturers = dictStore.getDictData('Dev_Manufacturers');
       const nanjingCanxuan = manufacturers.find(item => item.name === '南京灿能');
-      if(nanjingCanxuan){
+      if (nanjingCanxuan) {
         formContent.value.manufacturer = nanjingCanxuan.id;
       }
     }
-   
+
     //handleEncryptionChange(1)
   }
 
@@ -426,50 +439,46 @@ const open = async (sign: string, data: Device.ResPqDev,currentMode: string,curr
 
 const handleDevTypeChange = (value: string) => {
   // 在这里处理选中事件的逻辑
-  const dev = devTypeOptions.value.find(t =>t.id === value)
+  const dev = devTypeOptions.value.find(t => t.id === value)
   if (dev) {
     formContent.value.devChns = dev.devChns; // 默认值为1
     formContent.value.devCurr = dev.devCurr; // 默认值为1
     formContent.value.devVolt = dev.devVolt; // 默认值为1
     formContent.value.icdId = dev.icd
     formContent.value.power = dev.power
-    if(dev.name.includes('882B')){
-      formContent.value.ip = '172.17.102.220'
-    }else if(dev.name.includes('882A')){
-      formContent.value.ip = '172.17.102.221'
-    }else{
-       formContent.value.ip = '172.17.102.200'
-    }
-    
-    
+    // if (dev.name.includes('882B')) {
+    //   formContent.value.ip = '172.17.102.220'
+    // } else if (dev.name.includes('882A')) {
+    //   formContent.value.ip = '172.17.102.221'
+    // } else {
+    //   formContent.value.ip = '172.17.102.200'
+    // }
+
+
   } else {
     formContent.value.devChns = 1; // 默认值为1
     formContent.value.devCurr = 1; // 默认值为1
     formContent.value.devVolt = 57.74; // 默认值为1
-    formContent.value.ip = '172.17.102.200'
+    //formContent.value.ip = '172.17.102.200'
   }
-  
+
 }
 
 
 const handleInput = (value: string) => {
   // 在这里处理选中事件的逻辑
-  if(scene.value === '1'){
+  if (scene.value === '1') {
     formContent.value.name = value
   }
- 
+
 }
 
 
-
-
 // 对外映射
-defineExpose({ open })
+defineExpose({open})
 const props = defineProps<{
   refreshTable: (() => Promise<void>) | undefined;
 }>()
 
 
-
-
 </script>

frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue

@@ -5,7 +5,7 @@
                 <div>
                     <el-form :model="formContent" ref='dialogFormRef' :rules='rules' label-width="auto" class="form-four">
                         <el-form-item  label="标准号" prop="standardName" >
-                            <el-input  v-model='formContent.standardName'   placeholder="请填写标准号"/>
+                            <el-input  v-model='formContent.standardName'   placeholder="请填写标准号" maxlength="32" show-word-limit/>
                         </el-form-item>
                         <el-form-item label="标准推行年份" prop="standardTime" >
                             <el-date-picker

frontend/src/views/machine/icd/components/icdPopup.vue

@@ -4,10 +4,10 @@
     <div>
         <el-form :model="formContent"  ref='dialogFormRef' :rules='rules'>
             <el-form-item label="名称" prop="name" >
-                <el-input v-model='formContent.name' placeholder="请输入icd名称"/>
+                <el-input v-model='formContent.name' placeholder="请输入icd名称" maxlength="32" show-word-limit/>
             </el-form-item>
             <el-form-item label="存储地址" prop="path" >
-                <el-input v-model='formContent.path' placeholder="请输入icd存储地址"/>
+                <el-input v-model='formContent.path' placeholder="请输入icd存储地址" maxlength="32" show-word-limit/>
             </el-form-item>
       </el-form>
       </div>

frontend/src/views/machine/testScript/components/testScriptDetail.vue

@@ -19,6 +19,17 @@
                     <el-tab-pane v-for="tab in tabData" :key="tab.value" :label="tab.label" :name="tab.value">
                         <div v-if="activeName == tab.value">
                             <div class="dialog-footer">
+                                <el-switch  v-model="value1"
+                                            inline-prompt
+                                            :active-value="1"
+                                            :inactive-value="0"
+                                            active-text="禁用"
+                                            inactive-text="启用"
+                                            @change="enableScript"
+                                            size="large"
+                                            width="80px"
+                                            style="margin-right: 10px;"
+                                            />
                                 <el-button :icon="CirclePlus" type="primary" @click="openDialog('add')">新增</el-button>
                             </div>
                             <div style="display: flex">
@@ -241,6 +252,7 @@ const props = defineProps({
         type: Boolean
     }
 })
+const value1 = ref(0) // 假设初始状态为禁用（0）
 const showDialog = ref(false)
 const viewDialog = ref(false)
 const dictStore = useDictStore()
@@ -268,13 +280,13 @@ const column = ref([
 ])
 // 获取树
 const getTree = () => {
-    console.log('props.formContent.id', props.formContent.id)
+  //  console.log('props.formContent.id', props.formContent.id)
     getTreeData({
         scriptId: props.formContent.id
     }).then(res => {
         if (res.code === 'A0000') {
             treeData.value = res.data
-            console.log('tree', treeData.value)
+            //console.log('tree', treeData.value)
             // 添加tab子项
             props.options.forEach((k: any, i: number) => {
                 tabData.value[i].children = []
@@ -317,7 +329,7 @@ const setTab = row => {
 const copyActiveName = ref('')
 // 获取通讯脚本点击
 const getCommunication = () => {
-    console.log('123123', communRef.value[0]?.getData())
+    //console.log('123123', communRef.value[0]?.getData())
     communicationList.value = communRef.value[0]?.getData()
 }
 // 切换大tab控制小tab
@@ -354,8 +366,12 @@ const inquireTable = () => {
             })
 
             tableData.value = res.data
+            // 设置 value1：只要有一个 enable === 1，就启用开关
+            value1.value = tableData.value.some(item => item.enable === 1) ? 1 : 0
         }
     })
+
+   
 }
 // 打开 drawer(新增、编辑)
 const openDialog = (titleType: string, row: Partial<TestScript.ResTestScript> = {}) => {
@@ -404,7 +420,7 @@ const copyRow = async (row: any) => {
 // 查看
 const view = (row: Partial<TestScript.ResTestScript> = {}) => {
     getCommunication()
-    console.log('communicationList', communicationList.value)
+   // console.log('communicationList', communicationList.value)
     //当前点击的一级tab
     const parentTabName = communicationList.value.find(t => t.id === activeName.value)?.name || '未找到对应名称'
     //当前点击的二级tab
@@ -449,6 +465,38 @@ const enableRow = async (row: any) => {
             row.enable = row.enable == 0 ? 1 : 0
         })
 }
+
+
+// 启用/禁用脚本的方法
+const enableScript = async () => {
+    const willEnable = value1.value === 1
+    const confirmText = willEnable ? '启用' : '禁用'
+
+    try {
+        await ElMessageBox.confirm(`是否${confirmText}当前检测脚本?`, '温馨提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            draggable: true
+        })
+
+        // 调用接口更新状态
+        await updateDtls({
+            enable: value1.value,
+            scriptType: activeName.value,
+            scriptId: props.formContent.id
+        })
+
+        ElMessage.success(`${confirmText}成功!`)
+        getTree() // 刷新树数据
+    } catch (error) {
+        // 用户取消或请求失败，回滚状态
+        value1.value = value1.value === 1 ? 0 : 1
+        console.error('操作失败:', error)
+    }
+}
+
+
 // 获取左边树数据
 // 新增保存
 const addTab = (row: any) => {
@@ -458,7 +506,7 @@ const addTab = (row: any) => {
 const saveTheNewsletter = () => {}
 onMounted(() => {
     getTree()
-    console.log('testScriptDetail', props.options)
+    //console.log('testScriptDetail', props.options)
     props.options.forEach((item: any) => {
         tabData.value.push({
             label: item.label.replace(/准确度|检测/g, ''),
@@ -505,6 +553,7 @@ onMounted(() => {
     margin-bottom: 10px;
 }
 
+
 .divider-container {
     display: flex;
 }

frontend/src/views/machine/testScript/components/testScriptInHarmTab.vue

@@ -213,7 +213,7 @@ const onSubmit = () => {
     }
     if (formInline.value.inharm.includes('0')) {
         props.childForm[0].inharmList = []
-        for (let i = 2; i < 51; i++) {
+        for (let i = 0.5; i < 50; i++) {
             props.childForm[0].inharmList.push({
                 inharm: i, //间间谐波次数
                 famp: formInline.value.famp, //间间谐波含有率
@@ -250,7 +250,7 @@ const onSubmit1 = () => {
     }
     if (formInline1.value.inharm.includes('0')) {
         props.childForm[1].inharmList = []
-        for (let i = 2; i < 51; i++) {
+        for (let i = 0.5; i < 50; i++) {
             props.childForm[1].inharmList.push({
                 inharm: i, //间间谐波次数
                 famp: formInline1.value.famp, //间间谐波含有率

frontend/src/views/machine/testScript/components/testScriptPopup.vue

@@ -10,7 +10,7 @@
                 class="form-five"
             >
                 <el-form-item label="脚本名称" prop="name">
-                    <el-input v-model.trim="formContent.name" placeholder="请输入脚本名称" clearable />
+                    <el-input v-model.trim="formContent.name" placeholder="请输入脚本名称" clearable maxlength="32" show-word-limit/>
                 </el-form-item>
                 <el-form-item label="参照标准名称" prop="standardName">
 <!--                    <el-input v-model.trim="formContent.standardName" placeholder="请输入参照标准名称" clearable />-->

frontend/src/views/machine/testSource/components/parameterPopup.vue

@@ -16,10 +16,10 @@
           />
         </el-form-item>
         <el-form-item label="源参数描述" :label-width="100" prop="desc">
-          <el-input v-model="formContent.desc" autocomplete="off"/>
+          <el-input v-model="formContent.desc" autocomplete="off" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="源参数类型" :label-width="100" prop="type">
-          <el-input v-model="formContent.type" autocomplete="off"/>
+          <el-input v-model="formContent.type" autocomplete="off" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item  label="源参数值" :label-width="100"
                       prop="value">

frontend/src/views/plan/planList/components/planPopup.vue

@@ -6,7 +6,7 @@
       <el-col :span="12">
         <el-form :model="formContent" ref='dialogFormRef' :rules='rules'>
           <el-form-item label="名称" prop="name" :label-width="100">
-            <el-input v-model="formContent.name" placeholder="请输入名称" autocomplete="off"/>
+            <el-input v-model="formContent.name" placeholder="请输入名称" autocomplete="off" maxlength="32" show-word-limit/>
           </el-form-item>
           <el-form-item label='检测源' prop='sourceIds' :label-width='100'>
             <el-select v-model="formContent.sourceIds" :multiple="selectByMode" collapse-tags placeholder="请选择检测源" clearable>
@@ -47,6 +47,16 @@
                 :value="option.value"
               />
             </el-select>
+          </el-form-item>
+           <el-form-item label="数据处理原则" prop="dataRule" :label-width="110">
+            <el-select v-model="formContent.dataRule" placeholder="请选择数据处理原则" autocomplete="off" :disabled="isSelectDisabled" clearable>
+              <el-option
+                v-for="item in dictStore.getDictData('Data_Rule')"
+               :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="守时检测" :label-width="100" prop='timeCheck'>
             <el-radio-group v-model="formContent.timeCheck">
@@ -181,6 +191,7 @@ const filterMethod = (query: string, item: { label?: string }) => {
                         associateReport:0,
                         reportTemplateName:'',
                         reportTemplateVersion:'',
+                        dataRule:'',
                       })
     return { dialogVisible, titleType, formContent }
   }
@@ -214,6 +225,7 @@ const filterMethod = (query: string, item: { label?: string }) => {
         associateReport:0,
         reportTemplateName:'',
         reportTemplateVersion:'',
+        dataRule:'',
       }
     )
     
@@ -233,6 +245,7 @@ const baseRules: Record<string, Array<FormItemRule>> = {
     datasourceIds: [{ required: true, message: '数据源必选！', trigger: 'change' }],
     scriptId: [{ required: true, message: '检测脚本必选！', trigger: 'change' }],
     errorSysId: [{ required: true, message: '误差体系必选！', trigger: 'change' }],
+    dataRule: [{ required: true, message: '数据处理原则必选！', trigger: 'change' }],
 };
 
 // 使用计算属性根据 scene 动态生成规则
@@ -278,12 +291,19 @@ const rules = computed(() => {
 
       
           if (formContent.id) {
+                // 把数据处理原则转成字典ID
+                const patternItem = dictStore.getDictData('Data_Rule').find(item => item.name === formContent.dataRule);
+                if (patternItem) {
+                    formContent.dataRule = patternItem.id;
+                }
+
                 if( mode.value === '比对式'){
                   await updatePlan(formContent)
                 }else{
               
                   await updatePlan({...formContent,'sourceIds':[formContent.sourceIds],'datasourceIds':[formContent.datasourceIds]});
                 }
+
                 ElMessage.success({ message: `${dialogTitle.value}成功！` })
 
             } else {  
@@ -292,6 +312,11 @@ const rules = computed(() => {
               if (patternItem) {
                   formContent.pattern = patternItem.id;
               }
+              // 把数据处理原则转成字典ID
+              const patternItem2 = dictStore.getDictData('Data_Rule').find(item => item.name === formContent.dataRule);
+              if (patternItem2) {
+                  formContent.dataRule = patternItem2.id;
+              }
               if( mode.value === '比对式'){
                   await addPlan(formContent);
                 }else{
@@ -363,6 +388,14 @@ const open = async (sign: string,
         // 初始化 boundPqDevList 为空数组
         unboundPqDevList.value = pqDevList.value 
         boundPqDevList.value = [];
+
+        //楼下场景新增下拉框需要默认
+        formContent.scriptId = pqScriptList.value[0].id;
+        formContent.errorSysId = pqErrSysList.value[0].id;
+        formContent.sourceIds = pqSourceList.value[0].id;
+        formContent.datasourceIds = dictStore.getDictData('Datasource')[0].code;
+        formContent.dataRule = dictStore.getDictData('Data_Rule')[0].id;
+
       }else{//编辑时先给表单赋值（这会没接收被检设备），需要手动再给被检设备复制后整体表单赋值
        
         const [pqSource_Result, PqScript_Result, PqErrSys_Result,boundPqDevList_Result, unboundPqDevList_Result,pqReportName_Result] = await Promise.all([

frontend/src/views/plan/planList/index.vue

@@ -71,6 +71,7 @@ import {useDownload} from "@/hooks/useDownload";
 import {getTestConfig } from '@/api/system/base/index'
 import {type  Base } from '@/api/system/base/interface'
 import { getBoundPqDevList ,staticsAnalyse} from '@/api/plan/plan.ts'
+import { kMaxLength } from 'buffer'
 
 // defineOptions({
 // name: 'planList'
@@ -120,18 +121,18 @@ const dataSourceType = computed(() => {
 
 // 表格配置项
 const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
-  { type: 'selection', fixed: 'left', width: 70 },
-  { type: 'index', fixed: 'left', width: 70, label: '序号' },
+  { type: 'selection', fixed: 'left', minWidth: 70 },
+  { type: 'index', fixed: 'left', minWidth: 70, label: '序号' },
   {
     prop: 'name',
     label: '名称',
-    width: 220,
+    minWidth: 220,
     search: { el: 'input' },
   },
   {
     prop: 'testState',
     label: '检测状态',
-    width: 120,
+    minWidth: 120,
     enum:dictTestState,
     search: { el:'select',props: { filterable: true }},
     fieldNames: { label: 'label', value: 'id' },
@@ -144,7 +145,7 @@ const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
   {
     prop: 'reportState',
     label: '检测报告状态',
-    width: 120,
+    minWidth: 120,
     enum:dictReportState,
     search: { el: 'select', props: { filterable: true } },
     fieldNames: { label: 'label', value: 'id' },
@@ -157,7 +158,7 @@ const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
   {
     prop: 'result',
     label: '检测结果',
-    width: 120,
+    minWidth: 120,
     enum:dictResult,
     search: { el: 'select', props: { filterable: true } },
     fieldNames: { label: 'label', value: 'id' },
@@ -171,7 +172,7 @@ const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
   {
     prop: 'createTime',
     label: '创建时间',
-    width: 200,
+    minWidth: 200,
     render: scope => {
       if (scope.row.createTime) {
       const date = new Date(scope.row.createTime);
@@ -217,7 +218,7 @@ const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
   {
     prop: 'scriptId',
     label: '检测脚本',
-    width: 360,
+    minWidth: 360,
     render: scope => {
       return (
           <span>{scope.row.scriptName}</span>
@@ -227,7 +228,7 @@ const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
   {
     prop: 'errorSysId',
     label: '误差体系',
-    width: 240,
+    minWidth: 240,
     render: scope => {
       return (
           <el-link type='primary' link onClick={() => showData(scope.row)}>
@@ -247,24 +248,34 @@ const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
       if (!codes) {
         return '/'
       }
+     
       // 确保 codes 是一个字符串
       const codeString = Array.isArray(codes) ? codes.join(',') : codes
       const codeArray = codeString.split(',')
       if (codeArray.length > 1) {
+      
         // 查找与每个 code 值匹配的 name，然后拼接成逗号分割的字符串
         const names = codeArray.map(code => {
-          const dictItem = dictStore.getDictData(dataSourceType.value).find(item => item.value === code)
+          const dictItem = dictStore.getDictData(dataSourceType.value).find(item => item.code === code)
+           
           return dictItem ? dictItem.name : '/' // 如果找到匹配的项，返回对应的 name
         })
         return names.join(', ') // 用逗号连接所有的 name
       }
       // 查找单个 code 对应的 name
-      const dictItem = dictStore.getDictData(dataSourceType.value).find(item => item.value === codeArray[0])
+      const dictItem = dictStore.getDictData(dataSourceType.value).find(item => item.code === codeArray[0])
       return dictItem ? dictItem.name : '/' // 如果找到匹配的项，返回对应的 name
     },
   },
+  {
+    prop: 'dataRule',
+    label: '数据处理原则',
+    enum: dictStore.getDictData('Data_Rule'),
+    fieldNames: { label: 'name', value: 'id' },
+    minWidth: 120,
+  },
 
-  { prop: 'operation', label: '操作', fixed: 'right', width: 300 },
+  { prop: 'operation', label: '操作', fixed: 'right', minWidth: 300 },
 ])
 
 

frontend/src/views/system/base/index.vue

@@ -20,18 +20,18 @@
                   <el-input number v-model.number='TestConfigForm.maxTime' placeholder="请输入检测最大次数" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label='数据处理原则' prop='dataRule' :label-width="140">
-                  <el-select v-model="TestConfigForm.dataRule" clearable placeholder="请选择数据处理原则">
-                    <el-option
-                        v-for="item in dictStore.getDictData('Data_Rule')"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
+<!--              <el-col :span="8">-->
+<!--                <el-form-item label='数据处理原则' prop='dataRule' :label-width="140">-->
+<!--                  <el-select v-model="TestConfigForm.dataRule" clearable placeholder="请选择数据处理原则">-->
+<!--                    <el-option-->
+<!--                        v-for="item in dictStore.getDictData('Data_Rule')"-->
+<!--                        :key="item.id"-->
+<!--                        :label="item.name"-->
+<!--                        :value="item.id"-->
+<!--                    />-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
             </el-row>
           </el-form>
           <el-form :model="RegResForm" ref='dialogFormRef' :rules='rules'>
@@ -228,7 +228,6 @@ const TestConfigForm = ref<Base.ResTestConfig>({
   id: '',
   autoGenerate: 0,
   maxTime: 3,
-  dataRule: '',
   state: 1, //状态
 })
 

frontend/src/views/system/dictionary/dictData/components/dataPopup.vue

@@ -7,10 +7,10 @@
           <el-input :value="dictTypeName" disabled/>
         </el-form-item>
         <el-form-item label="名称" :label-width="100" prop="name">
-          <el-input v-model="formContent.name" placeholder="请输入" autocomplete="off"/>
+          <el-input v-model="formContent.name" placeholder="请输入" autocomplete="off" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="编码" :label-width="100" prop="code">
-          <el-input v-model="formContent.code" placeholder="请输入" autocomplete="off"/>
+          <el-input v-model="formContent.code" placeholder="请输入" autocomplete="off" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="开启值描述" :label-width="100"  >
           <el-radio-group v-model="formContent.openValue"  @change="handleOpenValueChange">

frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue

@@ -13,7 +13,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label='指标名称'  prop='name'>
-            <el-input v-model='formContent.name' placeholder='请输入指标名称' autocomplete='off'/>
+            <el-input v-model='formContent.name' placeholder='请输入指标名称' autocomplete='off' maxlength="32" show-word-limit/>
           </el-form-item>
           <el-form-item label='相别'  prop='phase'>
             <el-select v-model="formContent.phase" clearable placeholder="请选择相别">

frontend/src/views/system/dictionary/dictTree/components/treePopup.vue

@@ -2,13 +2,13 @@
     <el-dialog v-model='dialogVisible' :title='dialogTitle' v-bind='dialogSmall' @close="close">
         <el-form :model='formContent' ref='dialogFormRef' :rules='rules' >
           <el-form-item label='字典名称' :label-width='100' prop='name'>
-            <el-input v-model='formContent.name' placeholder='请输入字典名称' autocomplete='off' />
+            <el-input v-model='formContent.name' placeholder='请输入字典名称' autocomplete='off' maxlength="32" show-word-limit/>
           </el-form-item>
           <el-form-item label='排序' :label-width='100'>
             <el-input-number v-model='formContent.sort' :min='1' :max='999' />
           </el-form-item>
           <el-form-item label='编码' :label-width='100' prop='code'>
-            <el-input v-model='formContent.code' placeholder='请输入字典编码' autocomplete='off' />
+            <el-input v-model='formContent.code' placeholder='请输入字典编码' autocomplete='off' maxlength="32" show-word-limit/>
           </el-form-item>
           <el-form-item label='描述' :label-width='100' prop='remark'>
             <el-input v-model='formContent.remark' placeholder='请输入字典描述' autocomplete='off'  :rows="2"

frontend/src/views/system/dictionary/dictType/components/typePopup.vue

@@ -3,10 +3,10 @@
     <div>
       <el-form :model='formContent' ref='dialogFormRef' :rules='rules'>
         <el-form-item label='类型名称' :label-width='100' prop='name'>
-          <el-input v-model='formContent.name' placeholder='请输入' autocomplete='off' />
+          <el-input v-model='formContent.name' placeholder='请输入' autocomplete='off' maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label='类型编码' :label-width='100' prop='code'>
-          <el-input v-model='formContent.code' placeholder='请输入' autocomplete='off' />
+          <el-input v-model='formContent.code' placeholder='请输入' autocomplete='off' maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="开启等级" :label-width="100" v-if="false">
           <el-radio-group v-model="formContent.openLevel" >

frontend/src/views/system/template/components/reportPopup.vue

@@ -3,10 +3,10 @@
     <div>
       <el-form ref="dialogFormRef" :model="formContent" :rules="rules">
         <el-form-item label="名称" prop="name">
-          <el-input v-model="formContent.name" placeholder="请输入报告名称"/>
+          <el-input v-model="formContent.name" placeholder="请输入报告名称" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="版本号" prop="version">
-          <el-input v-model="formContent.version" placeholder="请输入版本号"/>
+          <el-input v-model="formContent.version" placeholder="请输入版本号" maxlength="32" show-word-limit/>
         </el-form-item>
         <el-form-item label="基础模板文件" prop="baseFile">
           <el-upload