签出调整

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

@@ -22,6 +22,7 @@ export namespace Device {
         devId?: string; // 装置id
         scriptId?: string; // 脚本id
         planCode?: string;
+        devIdList?: string[]; // 装置id列表
     }
 
     /**
@@ -69,6 +70,7 @@ export namespace Device {
         icdId: string | null;
         power: string | null;//工作电源
         preinvestmentPlan: string | null;
+        delegate: string | null; //委托方
     }
 
 
@@ -82,7 +84,10 @@ export namespace Device {
         devChns: number,
     }
 
-
+    export interface ResTH {
+        temperature :number | null;//温度
+        humidity:number | null;//湿度
+    }
     /**
      * 被检设备表格查询分页返回的对象；
      */

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

@@ -33,7 +33,9 @@ export namespace ErrorSystem  {
         endFlag?:number;//是否包含结束值
         conditionType?:string;//判断条件值类型（包括值类型，绝对值、相对值）
         maxErrorValue:number;//误差最大值
-        errorValueType:string;//误差值类型（包括值类型，绝对值、相对值1、相对值2）
+        errorValueType:any;//误差值类型（0标称值、1标准值、2值类型）
+        valueType:number;//值类型（1绝对值、2相对值）
+        errorUnit:string;//误差单位
     }
 
     //查看详细误差体系

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

@@ -40,3 +40,12 @@ export const getPqReportAllVersion = (params:any) => {
     return http.get(`/report/listAllVersion?name=${params.name}`)
 }
 
+//被检设备归档
+export const documentedPqDev = (ids: string[]) => {
+    return http.post(`/report/documented`, ids)
+}
+
+//上传报告到云端
+export const uploadReportToCloud = (deviceIds: string[]) => {
+    return http.post(`/report/uploadReportToCloud`, deviceIds)
+}

frontend/src/api/index.ts

@@ -76,6 +76,7 @@ class RequestHttp {
               userStore.setAccessToken(result.data.accessToken)
               userStore.setRefreshToken(result.data.refreshToken)
                 userStore.setIsRefreshToken(false)
+                userStore.setExp(1000 * 60 * 60 * 24 * 30)
               response.config.headers.Authorization = `Bearer ${result.data.accessToken}`//重新请求前需要将更新后的新token更换掉之前无效的token,不然会死循环
               const resp = await this.service.request(response.config)
               return resp
@@ -90,6 +91,7 @@ class RequestHttp {
           userStore.setRefreshToken('')
             userStore.setIsRefreshToken(false)
           userStore.setUserInfo({ id:'',name: '' })
+            userStore.setExp(0)
           await router.replace(LOGIN_URL)
             if(isFirst){//临时处理token失效弹窗多次
             ElMessage.error(data.message)
@@ -100,14 +102,29 @@ class RequestHttp {
         // 全局错误信息拦截（防止下载文件的时候返回数据流，没有 code 直接报错）
         if (data.code && data.code !== ResultEnum.SUCCESS) {
           if(data.message.includes('&')){
-            const formattedMessage = data.message.split('&').join('<br>');
+            let formattedMessage = data.message.split('&').join('<br>');
+              if (data.message.includes(':')) {
+                  formattedMessage = formattedMessage.replace(':', '')
+              }
             ElMessage.error({ message: formattedMessage, dangerouslyUseHTMLString: true });
             return Promise.reject(data)
           }
+
           ElMessage.error(data.message)
           return Promise.reject(data)
         }
         // 成功请求（在页面上除非特殊情况，否则不用处理失败逻辑）
+
+          if (userStore.exp <= Date.now() && userStore.exp !== 0) {
+              userStore.setAccessToken('')
+              userStore.setRefreshToken('')
+              userStore.setIsRefreshToken(false)
+              userStore.setUserInfo({ id:'',name: '' })
+              userStore.setExp(0)
+              ElMessage.error('登录已过期，请重新登录!')
+              await router.replace(LOGIN_URL)
+              return Promise.reject(data)
+          }
         return data
       },
       async (error: AxiosError) => {

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/plan/plan.ts

@@ -68,8 +68,8 @@ export const exportPlan = (params: Device.ReqPqDevParams) => {
 }
 
 // 下载模板
-export const downloadTemplate = () => {
+export const downloadTemplate = (params: { patternId: string }) => {
-  return http.download(`/adPlan/downloadTemplate`)
+  return http.download(`/adPlan/downloadTemplate`, params)
 }
 // 导入检测计划
 export const importPlan = (params: Device.ReqPqDevParams) => {

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

@@ -1,3 +1,4 @@
+
 import http from '@/api'
 import {type Base} from '@/api/system/base/interface'
 
@@ -12,6 +13,10 @@ export const updateTestConfig = (params: Base.ResTestConfig) => {
     return http.post(`/sysTestConfig/update`, params)
 }
 
+//场景切换
+export const updateScene = (params: any) => {
+    return http.post(`/sysTestConfig/update`,params)
+}
 
 
 

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

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

frontend/src/api/system/log/index.ts

@@ -9,3 +9,8 @@ import http from '@/api'
 export const getAuditLog = (params: AuditLog.ReqAuditLogParams) => {
   return http.post(`/sysLog/list`, params)
 }
+
+
+export const exportCsv = (params: AuditLog.ReqAuditLogParams) => {
+  return http.download(`/sysLog/exportCSV`, params)
+}

frontend/src/api/user/interface/user.ts

@@ -11,6 +11,7 @@ export namespace Login {
     accessToken: string;
     refreshToken: string;
     userInfo:{
+      id: string;
       name: string;
     }
   }

frontend/src/api/user/login/index.ts

@@ -7,7 +7,7 @@ import type {Dict} from '@/api/interface'
  * @name 登录模块
  */
 // 用户登录
-export const loginApi = (params: { username: string; password: string,checked: boolean }) => {
+export const loginApi = (params: { username: string; password: string}) => {
     return http.post<Login.ResLogin>(`${rePrefix}/login`, params, {loading: false})
     // return http.post<Login.ResLogin>(`/Register1`, params, { loading: false })
 }
@@ -47,8 +47,8 @@ export const getCurrentScene = () => {
 /**
  * 获取RSA公钥
  */
-export const getPublicKey = (username: string, checked: boolean) => {
+export const getPublicKey = (username: string) => {
-    return http.get(`/admin/getPublicKey?username=${username}&checked=${checked}`, {}, {loading: false})
+    return http.get(`/admin/getPublicKey?username=${username}`, {}, {loading: false})
 }
 
 /**

frontend/src/components/ImportExcel/index.vue

@@ -77,7 +77,7 @@ const acceptParams = (params: ExcelParameterProps) => {
 // Excel 导入模板下载
 const downloadTemp = () => {
   if (!parameter.value.tempApi) return
-  useDownload(parameter.value.tempApi, `${parameter.value.title}模板`, {}, false)
+  useDownload(parameter.value.tempApi, `${parameter.value.title}模板`, {'patternId':parameter.value.patternId}, false)
 }
 
 // 文件上传

frontend/src/languages/modules/en.ts

@@ -27,6 +27,7 @@ export default {
     changeMode:"Change Mode",
     versionRegister:"Version Register",
     changeTheme: "Change Theme",
+    changeScene: "Change Scene",
     logout: "Logout"
   }
 };

frontend/src/languages/modules/zh.ts

@@ -27,6 +27,7 @@ export default {
     changeMode:"模式切换",
     versionRegister:"版本注册",
     changeTheme:"主题切换",
+    changeScene: "场景切换",
     logout: "退出登录"
   }
 };

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(() => {
+const title = computed(() => {
-  switch (modeStore.currentMode) {
+  return modeStore.currentMode=== ''? '模拟式模块' : modeStore.currentMode+'模块';
-    case '模拟式':
-      title.value = '模拟式模块';
-      break;
-    case '数字式':
-      title.value = '数字式模块';
-      break;
-    case '比对式':
-      title.value = '比对式模块';
-      break;
-    default:
-      title.value = '模拟式模块';
-  }
 });
 
 const handelOpen = async (item: string) => {

frontend/src/layouts/components/Header/components/Avatar.vue

@@ -33,6 +33,27 @@
         <el-dropdown-item @click="openDialog('versionRegisterRef')">
           <el-icon><SetUp /></el-icon>{{ t("header.versionRegister") }}
         </el-dropdown-item>
+       <el-dropdown trigger="hover" placement="left-start" v-if="userStore.userInfo.loginName == 'root'">
+          <div class="custom-dropdown-trigger">
+            <el-icon><Tools /></el-icon>
+            <span>{{ t("header.changeScene") }}</span>
+          </div>
+          <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item
+                  v-for="item in dictStore.getDictData('app_scene')"
+                  :key="item.value"
+                  :class="{
+                    'custom-dropdown-item': true,
+                    active: item.value === appSceneStore.currentScene
+                  }"
+                  @click="changeScene(item.value?? '')"
+                >
+              {{ item.name }}
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
       </el-dropdown-menu>
     </template>
   </el-dropdown>
@@ -62,7 +83,7 @@ import PasswordDialog from "./PasswordDialog.vue";
 import ThemeDialog from "./ThemeDialog.vue";
 import VersionDialog from "@/views/system/versionRegister/index.vue";
 import { computed } from "vue";
-import { Avatar, Delete, Document, Sunny, Switch } from "@element-plus/icons-vue";
+import { ArrowLeft, Avatar, Delete, Document, Sunny, Switch ,Tools} from "@element-plus/icons-vue";
 import AssemblySize from "./components/AssemblySize.vue";
 import Language from "./components/Language.vue";
 import SearchMenu from "./components/SearchMenu.vue";
@@ -75,13 +96,16 @@ import { useModeStore,useAppSceneStore } from "@/stores/modules/mode";
 const userStore = useUserStore();
 const dictStore = useDictStore();
 const username = computed(() => userStore.userInfo.name);
+
 const router = useRouter();
 const authStore = useAuthStore();
 const modeStore = useModeStore();
 const AppSceneStore = useAppSceneStore();
 import { useTheme } from "@/hooks/useTheme";
 import { useI18n } from "vue-i18n";
-import {getPublicKey} from "@/api/user/login"; // 引入 vue-i18n 钩子
+import {updateScene} from '@/api/system/base/index'
+
+
 const { changePrimary} = useTheme();
 
 // 初始化 i18n
@@ -99,6 +123,7 @@ const logout = () => {
     // 2.清除 Token
     userStore.setAccessToken("");
     userStore.setRefreshToken("");
+    userStore.setExp(0)
     userStore.setUserInfo({id: "", name: ""});
     userStore.setIsRefreshToken(false)
     dictStore.setDictData([]);
@@ -126,7 +151,14 @@ const openDialog = (ref: string) => {
 };
 
 
+const appSceneStore = useAppSceneStore();
 
+const changeScene = async (value: string) => {
+  appSceneStore.setCurrentMode(value);
+  await updateScene({scene :dictStore.getDictData('app_scene').find(item => item.value == value)?.id});
+  // 强制刷新页面
+  window.location.reload();
+};
 
 
 //模式切换
@@ -168,4 +200,18 @@ const changeMode = () => {
     // height: 100%;
   }
 }
+
+.custom-dropdown-trigger {
+  padding: 8px 15px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+:deep(.el-dropdown-menu__item.custom-dropdown-item.active),
+:deep(.el-dropdown-menu__item.custom-dropdown-item.active:hover) {
+  background-color: var(--el-color-primary-light-9) !important; 
+  color: var(--el-color-primary)
+}
 </style>

frontend/src/routers/modules/dynamicRouter.ts

@@ -30,6 +30,7 @@ export const initDynamicRouter = async () => {
       });
       userStore.setAccessToken("");
       userStore.setRefreshToken("");
+      userStore.setExp(0)
       router.replace(LOGIN_URL);
       return Promise.reject("No permission");
     }
@@ -52,6 +53,7 @@ export const initDynamicRouter = async () => {
     // 当按钮 || 菜单请求出错时，重定向到登陆页
     userStore.setAccessToken("");
     userStore.setRefreshToken("");
+    userStore.setExp(0)
     router.replace(LOGIN_URL);
     return Promise.reject(error);
   }

frontend/src/stores/interface/index.ts

@@ -30,7 +30,7 @@ export interface UserState {
     accessToken: string;
     refreshToken: string;
     isRefreshToken: boolean;
-    userInfo: { id: string, name: string };
+    userInfo: { id: string, name: string,loginName:string };
 }
 
 /* tabsMenuProps */

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/stores/modules/user.ts

@@ -9,7 +9,8 @@ export const useUserStore = defineStore({
     accessToken: "",
     refreshToken: "",
     isRefreshToken:false,
-    userInfo: {id:"", name: "admin" },
+    exp: Number(0),
+    userInfo: {id:"", name: "" ,loginName:""},
   }),
   getters: {},
   actions: {
@@ -26,6 +27,9 @@ export const useUserStore = defineStore({
     // Set setUserInfo
     setUserInfo(userInfo: UserState["userInfo"]) {
       this.userInfo = userInfo;
+    },
+    setExp(exp: number) {
+      this.exp = exp;
     }
   },
   persist: piniaPersistConfig(USER_STORE_KEY),

frontend/src/styles/element.scss

@@ -445,7 +445,7 @@
 
 .dialog-small {
   .el-dialog__body {
-    max-height: 340px;
+    max-height: 350px;
   }
 }
 

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-form-item v-if="!formContent.type" label="路由地址" prop="path" :label-width="100" >
-          <el-input v-model="formContent.path" />
+          <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' />
@@ -199,6 +199,8 @@ const displayPid = computed({
     functionList.value = response.data as unknown as Function.ResFunction[]
     titleType.value = sign
     dialogVisible.value = true
+    rules.value.path = [{ required: true, trigger: 'blur', message: '路由地址必填!' }];
+    rules.value.component = [{ required: true, trigger: 'blur', message: '组件地址必填!' }];
 
     if (formContent.value.pid ==='0') {
         formContent.value.pid = '';

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="'edit'" type='primary' link :icon='EditPen' @click="openDrawer('edit', scope.row)" :disabled="scope.row.code == 'root'">编辑</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="'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)">设置权限</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="'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)'>删除</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)'>修改密码</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>
@@ -64,8 +64,8 @@
   // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
   const getTableList = (params: any) => {
   let newParams = JSON.parse(JSON.stringify(params))
-  newParams.searchEndTime = endDate.value
+  // newParams.searchEndTime = endDate.value
-  newParams.searchBeginTime = startDate.value
+  // newParams.searchBeginTime = startDate.value
   return getUserList(newParams)
 }
 
@@ -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(', ');
       }
@@ -111,19 +112,19 @@
       prop: 'loginTime',
       label: '最后一次登录时间',
       minWidth: 180,
-      search: {
+    //   search: {
-      render: () => {
+    //   render: () => {
-        return (
+    //     return (
-            <div class='flx-flex-start'>
+    //         <div class='flx-flex-start'>
-              <TimeControl
+    //           <TimeControl
-                  include={['日', '周', '月', '自定义']}
+    //               include={['日', '周', '月', '自定义']}
-                  default={'月'}
+    //               default={'月'}
-                  onUpdate-dates={handleDateChange}
+    //               onUpdate-dates={handleDateChange}
-              />
+    //           />
-            </div>
+    //         </div>
-        )
+    //     )
-      },
+    //   },
-    },
+    // },
     },
     {
       prop: 'state',

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

@@ -1,6 +1,6 @@
 <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="test-dialog">
       <div class="dialog-content">
         <div class="right-title">
           <!-- <div>系数校准表</div> -->
@@ -18,14 +18,16 @@
         <div class="container">
           <div class="dialog-left">
             <el-steps direction="vertical" :active="active" :process-status="currentStepStatus" finish-status="success">
-                <el-step title="开始"  />
+              <el-step title="开始"/>
               <el-step>
                 <template #title>
                   <span>大电压/电流系数下装</span><br/>
                   <span class="spanStyle">源输出为：</span><br/>
-                      <span class="spanStyle" v-if="active > 0">{{big_V_Download}}</span><br/>
+                  <span class="spanStyle" v-if="active > 0">{{ big_V_Download }}</span><br/>
-                      <span class="spanStyle" v-if="active > 0">{{big_I_Download}}</span>
+                  <span class="spanStyle" v-if="active > 0">{{ big_I_Download }}</span>
-                      <el-icon v-if="active === 1 " class="loading-box"><el-icon-loading /></el-icon>
+                  <el-icon v-if="active === 1 " class="loading-box">
+                    <el-icon-loading/>
+                  </el-icon>
                 </template>
               </el-step>
               <el-step>
@@ -34,7 +36,9 @@
                   <span class="spanStyle">源输出为：</span><br/>
                   <span class="spanStyle" v-if="active > 1">{{ small_V_Download }}</span><br/>
                   <span class="spanStyle" v-if="active > 1">{{ small_I_Download }}</span>
-                      <el-icon v-if="active === 2" class="loading-box"><el-icon-loading /></el-icon>
+                  <el-icon v-if="active === 2" class="loading-box">
+                    <el-icon-loading/>
+                  </el-icon>
                 </template>
               </el-step>
               <el-step>
@@ -43,7 +47,9 @@
                   <span class="spanStyle">源输出为：</span><br/>
                   <span class="spanStyle" v-if="active > 2">{{ big_V_Adjust }}</span><br/>
                   <span class="spanStyle" v-if="active > 2">{{ big_I_Adjust }}</span>
-                      <el-icon v-if="active === 3" class="loading-box"><el-icon-loading /></el-icon>
+                  <el-icon v-if="active === 3" class="loading-box">
+                    <el-icon-loading/>
+                  </el-icon>
                 </template>
               </el-step>
               <el-step>
@@ -52,20 +58,22 @@
                   <span class="spanStyle">源输出为：</span><br/>
                   <span class="spanStyle" v-if="active > 3">{{ small_V_Adjust }}</span><br/>
                   <span class="spanStyle" v-if="active > 3">{{ small_I_Adjust }}</span>
-                      <el-icon v-if="active === 4" class="loading-box"><el-icon-loading /></el-icon>
+                  <el-icon v-if="active === 4" class="loading-box">
+                    <el-icon-loading/>
+                  </el-icon>
                 </template>
               </el-step>
               <el-step title="结束"/>
             </el-steps>
           </div>
           <div class="right-content">
-              <el-tabs type="border-card" v-model="editableTabsValue" :active-index="String(activeIndex)" >
+            <el-tabs type="border-card" v-model="editableTabsValue" :active-index="String(activeIndex)">
               <el-tab-pane v-for="(device, index) in name" :key="index" :label="device">
                 <template #label>
                     <span class="custom-tabs-label">
                       <span>{{ device }}</span>
-                      <el-icon v-if="errorStates[index]" class ="icon-style" >
+                      <el-icon v-if="errorStates[index]" class="icon-style">
-                        <Failed />
+                        <Failed/>
                       </el-icon>
                     </span>
                 </template>
@@ -78,7 +86,7 @@
             </el-tabs>
           </div>
         </div>
-</div>
+      </div>
     </div>
     <template #footer>
       <div class="dialog-footer">
@@ -89,15 +97,14 @@
 
 </template>
 <script lang="tsx" setup name="channelsTest">
-import { type Device } from '@/api/device/interface/device';
+import {type Device} from '@/api/device/interface/device';
-import { SuccessFilled, Failed, Message, MessageBox } from '@element-plus/icons-vue'
+import {Failed} from '@element-plus/icons-vue'
-import { type Ref, ref, toRef, watch } from 'vue'
+import {type Ref, ref, toRef, watch} from 'vue'
 import {dialogBig} from '@/utils/elementBind'
-import { ElMessage, ElMessageBox, TabsPaneContext } from 'element-plus';
+import {ElMessageBox} from 'element-plus';
-import { getCoefficientCheck } from '@/api/home/channelsTest/index'
+import {getCoefficientCheck} from '@/api/home/channelsTest/index'
-import type { ChannelsTest } from '@/api/home/interface/channelsTest';
+import type {ChannelsTest} from '@/api/home/interface/channelsTest';
-import type { Plan } from '@/api/plan/interface';
+import type {Plan} from '@/api/plan/interface';
-import { fa } from 'element-plus/es/locale';
 import {useUserStore} from "@/stores/modules/user";
 
 
@@ -116,7 +123,7 @@ const devIdArray = ref<string[]>([])//系数校准所选设备ID数组
 const select_Plan = ref<Plan.ReqPlan>()
 const planId = ref('')
 const isButtonDisabled = ref(false);
-const CurV= ref<number>()//额定电压
+const CurV = ref<number>()//额定电压
 // 在 setup 函数中
 const errorStates = ref(new Array(name.value.length).fill(false));
 //const loadingStates = ref(new Array(name.value.length).fill(false)); // 初始化 loading 状态
@@ -144,7 +151,7 @@ const tableDataMap = new Map<number, Ref<ChannelsTest.CoefficientVO[]>>([]);
 const currentStepStatus = ref<'error' | 'finish' | 'wait' | 'success' | 'process'>('finish');
 const webMsgSend = toRef(props, 'webMsgSend');
 
-watch(webMsgSend,function (newValue,oldValue){
+watch(webMsgSend, function (newValue, oldValue) {
   if (newValue.code == 10520) {
     ElMessageBox.alert('报文解析异常！', '初始化失败', {
       confirmButtonText: '确定',
@@ -218,17 +225,17 @@ watch(webMsgSend,function (newValue,oldValue){
     })
     TableInit();
   } else {
-    switch (newValue.requestId){
+    switch (newValue.requestId) {
       case 'yjc_ytxjy':
         switch (newValue.operateCode) {
           case'INIT_GATHER':
-          if(newValue.code ==-1){
+            if (newValue.code == -1) {
               ElMessageBox.alert('源未知异常', '初始化失败', {
                 confirmButtonText: '确定',
                 type: 'error',
               })
               TableInit();
-          }else if (newValue.code == 10523) {
+            } else if (newValue.code == 10523) {
               ElMessageBox.alert('源连接失败', '源连接失败', {
                 confirmButtonText: '确定',
                 type: 'error',
@@ -274,7 +281,7 @@ watch(webMsgSend,function (newValue,oldValue){
                 type: 'error',
               })
               TableInit();
-            }else if (newValue.code == 10551) {
+            } else if (newValue.code == 10551) {
               ElMessageBox.alert('设备触发报告异常', '设备触发报告异常', {
                 confirmButtonText: '确定',
                 type: 'error',
@@ -297,40 +304,66 @@ watch(webMsgSend,function (newValue,oldValue){
             break;
         }
         break;
+      case 'yjc_xyjy':
+        switch (newValue.operateCode) {
+          case 'VERIFY_MAPPING$01':
+            if (newValue.code == 10200) {
+              let data = JSON.parse(newValue.data)
+              ElMessageBox.alert(`脚本与icd检验失败! icd名称：${data['icdType']} -> 校验项：${data['dataType']}`, '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              TableInit();
+            }
+            if (newValue.code == 10500) {
+              ElMessageBox.alert(`装置中未找到该icd！`, '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              TableInit();
+            }
+            break;
+        }
+        break;
       case 'Coefficient_Check':
-        console.log("Coefficient_Checkactive",active.value);
+        console.log("Coefficient_Checkactive", active.value);
-        switch (newValue.operateCode){
+        switch (newValue.operateCode) {
-          case 'big_end'://大电压,电流下装
+          case 'big_start'://大电压,电流下装
-                active.value++;
             big_V_Download.value = 'Ua=Ub=Uc=' + newValue.data.devVolt + 'V';
             big_I_Download.value = 'Ia=Ib=Ic=' + newValue.data.devCurr + 'A';
-
+            break;
-                tableLoading('small','系数下装')
+          case 'big_end'://大电压,电流下装
+            active.value++;
+            tableLoading('small', '系数下装')
             break;
         }
-        switch (newValue.operateCode){
+        switch (newValue.operateCode) {
-          case 'small_end'://小电压,电流下装
+          case 'small_start'://小电压,电流下装
-                active.value++;
             small_V_Download.value = 'Ua=Ub=Uc=' + newValue.data.devVolt + 'V';
             small_I_Download.value = 'Ia=Ib=Ic=' + newValue.data.devCurr + 'A';
-
+            break;
-                tableLoading('big','系数校准')
+          case 'small_end'://小电压,电流下装
+            active.value++;
+            tableLoading('big', '系数校准')
             break;
         }
-        switch (newValue.operateCode){
+        switch (newValue.operateCode) {
-          case 'big_comp_end'://大电压,电流校准
+          case 'big_comp_start'://大电压,电流校准
-                active.value++;
             big_V_Adjust.value = 'Ua=Ub=Uc=' + newValue.data.devVolt + 'V';
             big_I_Adjust.value = 'Ia=Ib=Ic=' + newValue.data.devCurr + 'A';
-
+            break;
-                tableLoading('small','系数校准')
+          case 'big_comp_end'://大电压,电流校准
+            active.value++;
+            tableLoading('small', '系数校准')
             break;
         }
-        switch (newValue.operateCode){
+        switch (newValue.operateCode) {
-          case 'small_comp_end'://小电压,电流校准
+          case 'small_comp_start'://小电压,电流校准
-                active.value++;
             small_V_Adjust.value = 'Ua=Ub=Uc=' + newValue.data.devVolt + 'V';
             small_I_Adjust.value = 'Ia=Ib=Ic=' + newValue.data.devCurr + 'A';
+            break;
+          case 'small_comp_end'://小电压,电流校准
+            active.value++;
             active.value++;
 
             for (let i = 0; i < name.value.length; i++) {
@@ -351,7 +384,7 @@ watch(webMsgSend,function (newValue,oldValue){
             isButtonDisabled.value = false; // 恢复按钮
             break;
         }
-        switch (newValue.operateCode){
+        switch (newValue.operateCode) {
           case 'DATA_CHNFACTOR$02'://表格
             // 输出 key 为 0 的数组中的第一条 ChannelsTest.CoefficientVO 对象
             for (let i = 0; i < name.value.length; i++) {
@@ -434,7 +467,7 @@ watch(webMsgSend,function (newValue,oldValue){
         }
         break;
       case 'socket_timeout':
-          switch(newValue.operateCode){
+        switch (newValue.operateCode) {
           case 'VOLTAGE':
             ElMessageBox.alert('连接超时！', '连接超时', {
               confirmButtonText: '确定',
@@ -445,7 +478,7 @@ watch(webMsgSend,function (newValue,oldValue){
         }
         break;
       case 'connect':
-        switch (newValue.operateCode){
+        switch (newValue.operateCode) {
           case "Source":
             ElMessageBox.alert('源服务端连接失败', '源服务端连接失败', {
               confirmButtonText: '确定',
@@ -469,11 +502,11 @@ watch(webMsgSend,function (newValue,oldValue){
 
 //出错系数检测初始化
 const TableInit = () => {
-  console.log("TableInitactive",active.value);
+  console.log("TableInitactive", active.value);
   isButtonDisabled.value = false; // 恢复按钮
   for (let i = 0; i < channel.value.length; i++) {
     const currentTableData = initializeTableData(dataTemplates, i);
-              tableDataMap.set(i,currentTableData)
+    tableDataMap.set(i, currentTableData)
 
     // const targetArrayRef = tableDataMap.get(i);
     //     if (targetArrayRef) {
@@ -501,7 +534,7 @@ const tableLoading = (type: string, desc: string) => {
           const firstCoefficientVO = targetArray.find(item => item.monitorNum === (j + 1).toString() &&
               item.type === type &&
               item.desc === desc);
-                    if (firstCoefficientVO){
+          if (firstCoefficientVO) {
             firstCoefficientVO.loading = true;
           }
         }
@@ -510,13 +543,13 @@ const tableLoading = (type: string, desc: string) => {
   }
 }
 
-const dataTemplates : ChannelsTest.CoefficientVO[]= [
+const dataTemplates: ChannelsTest.CoefficientVO[] = [
   {
     monitorNum: '1',
     desc: '系数下装',
-    type:'big',
+    type: 'big',
     aVuData: '—',
-    aVuXi:'—',
+    aVuXi: '—',
     bVuData: '—',
     bVuXi: '—',
     cVuData: '—',
@@ -527,21 +560,21 @@ const dataTemplates : ChannelsTest.CoefficientVO[]= [
     bIeXi: '—',
     cIeData: '—',
     cIeXi: '—',
-    loading:false,
+    loading: false,
-    devName:'',
+    devName: '',
-    aV:'—',
+    aV: '—',
-    bV:'—',
+    bV: '—',
-    cV:'—',
+    cV: '—',
-    aI:'—',
+    aI: '—',
-    bI:'—',
+    bI: '—',
-    cI:'—',
+    cI: '—',
   },
   {
     monitorNum: '2',
     desc: '系数下装',
-    type:'small',
+    type: 'small',
     aVuData: '—',
-    aVuXi:'—',
+    aVuXi: '—',
     bVuData: '—',
     bVuXi: '—',
     cVuData: '—',
@@ -552,21 +585,21 @@ const dataTemplates : ChannelsTest.CoefficientVO[]= [
     bIeXi: '—',
     cIeData: '—',
     cIeXi: '—',
-    loading:false,
+    loading: false,
-    devName:'',
+    devName: '',
-    aV:'—',
+    aV: '—',
-    bV:'—',
+    bV: '—',
-    cV:'—',
+    cV: '—',
-    aI:'—',
+    aI: '—',
-    bI:'—',
+    bI: '—',
-    cI:'—',
+    cI: '—',
   },
   {
     monitorNum: '3',
     desc: '系数校准',
-    type:'big',
+    type: 'big',
     aVuData: '—',
-    aVuXi:'—',
+    aVuXi: '—',
     bVuData: '—',
     bVuXi: '—',
     cVuData: '—',
@@ -577,21 +610,21 @@ const dataTemplates : ChannelsTest.CoefficientVO[]= [
     bIeXi: '—',
     cIeData: '—',
     cIeXi: '—',
-    loading:false,
+    loading: false,
-    devName:'', 
+    devName: '',
-    aV:'—',
+    aV: '—',
-    bV:'—',
+    bV: '—',
-    cV:'—',
+    cV: '—',
-    aI:'—',
+    aI: '—',
-    bI:'—',
+    bI: '—',
-    cI:'—',
+    cI: '—',
   },
   {
     monitorNum: '4',
     desc: '系数校准',
-    type:'small',
+    type: 'small',
     aVuData: '—',
-    aVuXi:'—',
+    aVuXi: '—',
     bVuData: '—',
     bVuXi: '—',
     cVuData: '—',
@@ -602,25 +635,25 @@ const dataTemplates : ChannelsTest.CoefficientVO[]= [
     bIeXi: '—',
     cIeData: '—',
     cIeXi: '—',
-    loading:false,
+    loading: false,
-    devName:'',
+    devName: '',
-    aV:'—',
+    aV: '—',
-    bV:'—',
+    bV: '—',
-    cV:'—',
+    cV: '—',
-    aI:'—',
+    aI: '—',
-    bI:'—',
+    bI: '—',
-    cI:'—',
+    cI: '—',
   },
 
 ];
 
-const dataTemplates2 : ChannelsTest.CoefficientVO[]= [
+const dataTemplates2: ChannelsTest.CoefficientVO[] = [
   {
     monitorNum: '1',
     desc: '系数下装',
-    type:'big',
+    type: 'big',
     aVuData: '—',
-    aVuXi:'—',
+    aVuXi: '—',
     bVuData: '—',
     bVuXi: '—',
     cVuData: '—',
@@ -631,15 +664,15 @@ const dataTemplates2 : ChannelsTest.CoefficientVO[]= [
     bIeXi: '—',
     cIeData: '—',
     cIeXi: '—',
-    loading:false,
+    loading: false,
-    devName:''
+    devName: ''
   },
   {
     monitorNum: '2',
     desc: '系数下装',
-    type:'small',
+    type: 'small',
     aVuData: '—',
-    aVuXi:'—',
+    aVuXi: '—',
     bVuData: '—',
     bVuXi: '—',
     cVuData: '—',
@@ -650,15 +683,15 @@ const dataTemplates2 : ChannelsTest.CoefficientVO[]= [
     bIeXi: '—',
     cIeData: '—',
     cIeXi: '—',
-    loading:false,
+    loading: false,
-    devName:''
+    devName: ''
   },
   {
     monitorNum: '3',
     desc: '系数校准',
-    type:'big',
+    type: 'big',
     aVuData: '—',
-    aVuXi:'不合格',
+    aVuXi: '不合格',
     bVuData: '—',
     bVuXi: '—',
     cVuData: '—',
@@ -669,15 +702,15 @@ const dataTemplates2 : ChannelsTest.CoefficientVO[]= [
     bIeXi: '—',
     cIeData: '—',
     cIeXi: '—',
-    loading:false,
+    loading: false,
-    devName:''
+    devName: ''
   },
   {
     monitorNum: '4',
     desc: '系数校准',
-    type:'small',
+    type: 'small',
     aVuData: '—',
-    aVuXi:'—',
+    aVuXi: '—',
     bVuData: '—',
     bVuXi: '—',
     cVuData: '—',
@@ -688,8 +721,8 @@ const dataTemplates2 : ChannelsTest.CoefficientVO[]= [
     bIeXi: '—',
     cIeData: '—',
     cIeXi: '—',
-    loading:false,
+    loading: false,
-    devName:''
+    devName: ''
   },
 
 ];
@@ -699,8 +732,8 @@ const updateErrorState = (index: number, hasError: boolean) => {
   errorStates.value[index] = hasError;
 };
 
-  // 打开弹窗，可能是新增，也可能是编辑
+// 打开弹窗，可能是新增，也可能是编辑
-  const open = (selection: Device.ResPqDev[],plan:Plan.ReqPlan) => {
+const open = (selection: Device.ResPqDev[], plan: Plan.ReqPlan) => {
   CurV.value = selection[0]?.devVolt || 57.74;
   isButtonDisabled.value = false; // 恢复按钮
   select_Plan.value = plan
@@ -718,20 +751,31 @@ const updateErrorState = (index: number, hasError: boolean) => {
 
   for (let i = 0; i < channel.value.length; i++) {
     const currentTableData = initializeTableData(dataTemplates, i);
-      tableDataMap.set(i,currentTableData)
+    tableDataMap.set(i, currentTableData)
   }
   //console.log('tableDataMap',tableDataMap);
-  }
+}
 
 
-  const emit = defineEmits<{
+const emit = defineEmits<{
   (e: 'quitClicked'): void;
   (e: 'submitClicked', callback: (resolve: (value: boolean) => void) => void): void;
-  }>();
+}>();
 
 
-  const handleCancel=() => {
 
+const beforeClose = (done: () => void) => {
+ ElMessageBox.confirm('是否退出系数校准?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+    ).then(() => {
+       handleCancel()
+    })
+}
+
+const handleCancel = () => {
         //dataSocket.socketServe.closeWs()
         // 清空 name, channel, total
         name.value = [];
@@ -743,7 +787,11 @@ const updateErrorState = (index: number, hasError: boolean) => {
         dialogVisible.value = false
         editableTabsValue.value = '0'
         emit('quitClicked'); // 触发事件
-  }
+
+
+
+
+}
 
 const getTableDataForChannel = (index: number): any[] => {
   const data = tableDataMap.get(index);
@@ -752,8 +800,7 @@ const getTableDataForChannel = (index: number): any[] => {
 
 
 watch(activeIndex, function (newValue, oldValue) {
-    if(activeIndex.value === 1)
+  if (activeIndex.value === 1) {
-    {
     outputDsc.value = "电压误差为：±0.1Un%； 电流误差为：±0.5%";
     // 当前源输出为：Ua=Ub=Uc=57.74V Ia=Ib=Ic=1A"
   }
@@ -783,15 +830,15 @@ const handleSubmit = async () => {
   }
 
   isButtonDisabled.value = true; // 禁用按钮
-  tableLoading('big','系数下装')
+  tableLoading('big', '系数下装')
   await getCoefficientCheck({
     userPageId: "cdf",
-          devIds:devIdArray.value,  
+    devIds: devIdArray.value,
-          planId:planId.value,
+    planId: planId.value,
-          errorSysId:select_Plan.value?.errorSysId,
+    errorSysId: select_Plan.value?.errorSysId,
-          scriptId:select_Plan.value?.scriptId,
+    scriptId: select_Plan.value?.scriptId,
-          operateType:'0', // '0'为预检测、‘1‘为正式检测
+    operateType: '0', // '0'为预检测、‘1‘为正式检测
-          userId:userStore.userInfo.id
+    userId: userStore.userInfo.id
   })
   active.value++;
 
@@ -800,65 +847,65 @@ const handleSubmit = async () => {
 
   return;
   // 初始化 currentTableData
-  let isTimer2Completed = false;
+  // let isTimer2Completed = false;
 
 
-  //"80b4b4f52a4c4064a18319525f8ac13c",
+  // //"80b4b4f52a4c4064a18319525f8ac13c",
-  for (let i = 0; i < channel.value.length; i++) {
+  // for (let i = 0; i < channel.value.length; i++) {
-    // 重置状态变量
+  //   // 重置状态变量
-    active.value = 0;
+  //   active.value = 0;
-    //activeIndex.value = 0;
+  //   //activeIndex.value = 0;
-    editableTabsValue.value = i.toString();
+  //   editableTabsValue.value = i.toString();
-    // 初始化并填充 currentTableData
+  //   // 初始化并填充 currentTableData
-    const currentTableData = initializeTableData(dataTemplates2, i);
+  //   const currentTableData = initializeTableData(dataTemplates2, i);
-    tableDataMap.set(i, currentTableData);
+  //   tableDataMap.set(i, currentTableData);
-    //activeIndex.value++;
+  //   //activeIndex.value++;
 
-    // 清除之前的 timer1
+  //   // 清除之前的 timer1
-    clearInterval(timer1);
+  //   clearInterval(timer1);
-    // 启动 timer1
+  //   // 启动 timer1
-    timer1 = setInterval(() => {
+  //   timer1 = setInterval(() => {
-      active.value++;
+  //     active.value++;
-      if (active.value > 5) {
+  //     if (active.value > 5) {
-        clearInterval(timer1);
+  //       clearInterval(timer1);
-      }
+  //     }
-    }, 3000);
+  //   }, 3000);
 
-    // 清除之前的 timer2
+  //   // 清除之前的 timer2
-    clearInterval(timer2);
+  //   clearInterval(timer2);
-    // 启动 timer2
+  //   // 启动 timer2
-    timer2 = setInterval(() => {
+  //   timer2 = setInterval(() => {
-      // 初始化并填充 currentTableData
+  //     // 初始化并填充 currentTableData
-      const currentTableData = initializeTableData(i > 0 ? dataTemplates2 : dataTemplates2, i);
+  //     const currentTableData = initializeTableData(i > 0 ? dataTemplates2 : dataTemplates2, i);
-      tableDataMap.set(i, currentTableData);
+  //     tableDataMap.set(i, currentTableData);
-      activeIndex.value++;
+  //     activeIndex.value++;
 
-      clearInterval(timer2);
+  //     clearInterval(timer2);
-      const currentDataRef = tableDataMap.get(i);
+  //     const currentDataRef = tableDataMap.get(i);
-      if (currentDataRef) {
+  //     if (currentDataRef) {
-        const currentData = currentDataRef.value;
+  //       const currentData = currentDataRef.value;
-        // 检查当前数据中有无不合格字段
+  //       // 检查当前数据中有无不合格字段
-        const hasError = checkForErrors(currentData);
+  //       const hasError = checkForErrors(currentData);
-        if (hasError) {
+  //       if (hasError) {
-        } else {
+  //       } else {
-          qualified.value++;
+  //         qualified.value++;
-        }
+  //       }
-        updateErrorState(i, hasError);
+  //       updateErrorState(i, hasError);
-      }
+  //     }
 
-      // 设置标志变量为 true，表示 timer2 已经完成
+  //     // 设置标志变量为 true，表示 timer2 已经完成
-      isTimer2Completed = true;
+  //     isTimer2Completed = true;
-    }, 3000);
+  //   }, 3000);
 
-    // 等待 timer2 完成
+  //   // 等待 timer2 完成
-    while (!isTimer2Completed) {
+  //   while (!isTimer2Completed) {
-      // 这里可以添加一个短暂的等待，避免死循环
+  //     // 这里可以添加一个短暂的等待，避免死循环
-      await new Promise(resolve => setTimeout(resolve, 100));
+  //     await new Promise(resolve => setTimeout(resolve, 100));
-    }
+  //   }
 
-    // 重置标志变量
+  //   // 重置标志变量
-    isTimer2Completed = false;
+  //   isTimer2Completed = false;
-  }
+  // }
 };
 
 // 提取初始化并填充 currentTableData 的函数
@@ -867,7 +914,7 @@ const initializeTableData = (templates: ChannelsTest.CoefficientVO[], index: num
   for (let j = 0; j < channel.value[index]; j++) {
     templates.forEach((template) => {
       // 使用解构赋值排除 id 和 MonitorIdx 属性
-    const { devName,monitorNum: __, ...rest } = template;
+      const {devName, monitorNum: __, ...rest} = template;
       currentTableData.value.push({
         monitorNum: (j + 1).toString(),
         devName: name.value[index],
@@ -879,8 +926,8 @@ const initializeTableData = (templates: ChannelsTest.CoefficientVO[], index: num
 };
 
 
- // 对外映射
+// 对外映射
- defineExpose({ open })
+defineExpose({open})
 </script>
 <style scoped>
 
@@ -906,6 +953,7 @@ const initializeTableData = (templates: ChannelsTest.CoefficientVO[], index: num
   justify-content: space-between;
   margin-bottom: 10px;
 }
+
 .custom-tabs-label .el-icon {
   vertical-align: middle;
 }
@@ -922,13 +970,15 @@ const initializeTableData = (templates: ChannelsTest.CoefficientVO[], index: num
 .el-tabs--border-card {
   height: 470px;
 }
+
 /* .el-icon svg {
   color: #ff7171;
 } */
 
-.icon-style{
+.icon-style {
   color: #ff7171;
 }
+
 .container {
   display: flex;
 }
@@ -941,7 +991,7 @@ const initializeTableData = (templates: ChannelsTest.CoefficientVO[], index: num
   flex: 6;
 }
 
-.spanStyle{
+.spanStyle {
   font-size: 14px;
 }
 

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

@@ -1,22 +1,16 @@
 <template>
   <el-button v-if="tableData.length > 0" type="primary" @click="exportData" style="margin-bottom: 10px">导出</el-button>
-  <div class="table-main">
+  <div class="table-main" max-height="282px">
     <el-table v-if="tableData.length > 0" :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } "
-              :cell-style="{ textAlign: 'center' }" height="315px"
+              :cell-style="{ textAlign: 'center' }" max-height="282px"
               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 v-if="!isThreePhase && phaseA==1" prop="dataA" :label="'A相'+(unit==''?'':'（'+unit+'）')"/>
-        <el-table-column prop="dataA" :label="'A相'+(unit==''?'':'（'+unit+'）')"/>
+      <el-table-column v-if="!isThreePhase && phaseB==1" prop="dataB" :label="'B相'+(unit==''?'':'（'+unit+'）')"/>
-        <el-table-column prop="dataB" :label="'B相'+(unit==''?'':'（'+unit+'）')"/>
+      <el-table-column v-if="!isThreePhase && phaseC==1" prop="dataC" :label="'C相'+(unit==''?'':'（'+unit+'）')"/>
-        <el-table-column prop="dataC" :label="'C相'+(unit==''?'':'（'+unit+'）')"/>
+      <el-table-column v-if="!isThreePhase && phaseT === 1" prop="dataT" :label="tableHeader+(unit==''?'':'（'+unit+'）')"/>
-      </template>
+      <el-table-column v-if="isThreePhase" prop="dataB" :label="'负序不平衡度'+(unit==''?'':'（'+unit+'）')"/>
-      <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>
   </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,10 +8,9 @@
       <!--          {{ '通道' + row.chnNum }}-->
       <!--        </template>-->
       <!--      </el-table-column>-->
-      <template v-if="phaseT === 0">
+      <el-table-column label="A相" v-if="phaseA === 1">
-        <el-table-column label="A相">
+        <el-table-column prop="stdA" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="stdA" width="105" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="dataA" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataA" width="105" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
         <el-table-column prop="isDataA" label="检测结果">
           <template #default="scope">
             <el-tooltip effect="dark" placement="bottom">
@@ -27,9 +26,9 @@
           </template>
         </el-table-column>
       </el-table-column>
-        <el-table-column label="B相">
+      <el-table-column label="B相" v-if="phaseB === 1">
-          <el-table-column prop="stdB" width="105" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="stdB" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataB" width="105" :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">
@@ -45,9 +44,9 @@
           </template>
         </el-table-column>
       </el-table-column>
-        <el-table-column label="C相">
+      <el-table-column label="C相" v-if="phaseC === 1">
-          <el-table-column prop="stdC" width="105" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+        <el-table-column prop="stdC" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataC" width="105" :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">
@@ -63,10 +62,8 @@
           </template>
         </el-table-column>
       </el-table-column>
-      </template>
 
-      <template v-if="phaseT === 1">
+      <el-table-column :label="tableHeader" 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="检测结果">
@@ -84,16 +81,6 @@
           </template>
         </el-table-column>
       </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>
   </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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog :append-to-body="appendToBody" class="dialog" title="数据查询" :model-value='visible' @close="close"
-             v-bind="dialogBig" :draggable="false">
+             v-bind="dialogBig" :draggable="false" width="1400px">
     <div class="data-check-dialog">
       <div class="data-check-head">
         <el-form :model='formContent' label-width="auto" class="form-three ">
@@ -8,7 +8,7 @@
             <el-input v-model='formContent.scriptName' :disabled="true"/>
           </el-form-item>
           <el-form-item label="误差体系">
-            <el-select v-model="formContent.errorSysId" placeholder="请选择误差体系" autocomplete="off" :disabled="checkStore.showDetailType===0"
+            <el-select :disabled="checkStore.showDetailType===2 || checkStore.showDetailType===0" v-model="formContent.errorSysId" placeholder="请选择误差体系" autocomplete="off"
                        @change="handleErrorSysChange">
               <el-option
                   v-for="(option) in pqErrorList"
@@ -53,7 +53,7 @@
                      :props="defaultProps"
                      @node-click="handleNodeClick" class="custom-tree" ref="treeRef">
               <template #default="{ node, data }">
-                <el-tooltip effect="dark" :content="data.scriptTypeName" placement="top">
+                <el-tooltip effect="dark" :content="data.scriptTypeName" placement="right">
                   <span class="custom-tree-node" :style="data.fly===2? 'color: #F56C6C;':data.fly===4? 'color: #e6a23c;':''">{{
                       data.scriptTypeName
                     }}</span>
@@ -65,7 +65,7 @@
 
         <div class="content-right">
           <div class="content-right-title">
-            <div style="width: 750px;">
+            <div style="width: 840px;">
               <span class="content-right-title-text">当前检测项目：
                   <el-popover trigger="hover" :content="currentDesc" :width="popoverWidth" placement="right">
                     <template #reference>
@@ -76,15 +76,13 @@
                   </el-popover>
               </span>
             </div>
-            <!--            <el-form-item style="margin-left: 0px;margin-bottom:0px !important;width: 210px;" v-if="harmNumList.length" label='次数'>-->
+            <el-form-item style="margin-left: 0px;margin-bottom:0px !important;width: 280px;" v-if="checkListLevel.length" label='测试项'>
-            <!--              <el-select v-model="currentHarmNum">-->
+              <el-cascader
-            <!--                <el-option v-for="item in harmNumList" :key="item.value" :label="item.label" :value="item.value"/>-->
+                  v-model="currentCheckItem"
-            <!--              </el-select>-->
+                  :options="checkListLevel"
-            <!--            </el-form-item>-->
+                  :props="{expandTrigger: 'click' as const}"
-            <el-form-item style="margin-left: 0px;margin-bottom:0px !important;width: 230px;" v-if="checkList.length" label='测试项'>
+                  placement="bottom-end"
-              <el-select v-model="currentCheckItem">
+              />
-                <el-option v-for="item in checkList" :key="item.value" :label="item.label" :value="item.value"/>
-              </el-select>
             </el-form-item>
           </div>
           <div class="content-right-Tabs">
@@ -112,7 +110,7 @@ import {CheckData} from "@/api/check/interface";
 import {useDictStore} from "@/stores/modules/dict";
 import {useCheckStore} from "@/stores/modules/check";
 import {changeErrorSystem, deleteTempTable, exportRawData, getFormData, getTableData, getTreeData, reCalculate} from "@/api/check/test";
-import {getPqErrSysList} from '@/api/plan/plan'
+import {generateDevReport, getPqErrSysList} from '@/api/plan/plan'
 import {useDownload} from "@/hooks/useDownload";
 import {Histogram, Postcard} from "@element-plus/icons-vue";
 import {ResultEnum} from "@/enums/httpEnum";
@@ -155,9 +153,11 @@ let planCode: string = ''
 // 谐波次数列表
 // const harmNumList = reactive<{ value: string, label: string }[]>([])
 // 当前选中的检测项
-const currentCheckItem = ref<string>("")
+const currentCheckItem = ref<any>()
 // 检测项列表
-const checkList = reactive<{ value: string, label: string }[]>([])
+// const checkList = reactive<{ value: string, label: string }[]>([])
+// 带有层级的检测项列表
+const checkListLevel = reactive<{ value: string, label: string, children: { value: string, label: string }[] }[]>([])
 
 let deviceId: string = ''
 let originScriptType: string | null = null
@@ -181,14 +181,13 @@ const currentDesc = ref('');
 const activeTab = ref<string>('resultTab')
 
 //存放相应的表格数据
-let resTableData: { resultData: Map<string, any>, rawData: Map<string, any> } = {resultData: new Map(), rawData: new Map()}
+const resTableData = reactive<{ resultData: Map<string, any>, rawData: Map<string, any> }>({resultData: new Map(), rawData: new Map()})
 
 // 检测结果表格数据
 const checkResultData = reactive<CheckData.CheckResult[]>([])
 
 const popoverWidth: ComputedRef<string> = computed(() => {
-  // return `${940 - (currentScriptTypeName.value.length + 7) * 14 - (harmNumList.length || checkList.length ? 160 : 0)}px`
+  return `${1140 - (currentScriptTypeName.value.length + 7 + 3) * 14 - (checkListLevel.length ? 280 : 0)}px`
-  return `${940 - (currentScriptTypeName.value.length + 7) * 14 - (checkList.length ? 220 : 0)}px`
 })
 
 
@@ -275,27 +274,14 @@ const handleChnNumChange = async () => {
 }
 
 
-// watch(currentHarmNum, (newVal, oldVal) => {
-//   console.log("谐波次数", newVal);
-//   if (newVal !== '-1') {
-//     let resCheckResult: CheckData.ResCheckResult = resTableData.resultData.get(newVal.toString())
-//     setCheckResultData(resCheckResult)
-//
-//     let tempRawData = resTableData.rawData.get(newVal.toString())
-//     if (tempRawData) {
-//       setRawData(tempRawData)
-//     } else {
-//       setRawData([])
-//     }
-//   }
-//   activeTab.value = 'resultTab'
-// })
-
-
 watch(currentCheckItem, (newVal, oldVal) => {
-  console.log("当前检测项", newVal);
   if (newVal !== '') {
-    doCurrentCheckItemUpdate(newVal)
+    let key = newVal[0]
+    if (newVal.length == 2) {
+      key += "_" + newVal[1]
+    }
+    console.log("当前检测项", key);
+    doCurrentCheckItemUpdate(key)
   } else {
     activeTab.value = 'resultTab'
   }
@@ -324,6 +310,12 @@ const defaultOperate = () => {
 const updateTableData = async () => {
   console.log("左侧树被选中的叶子节点checkIndex", checkIndex.value);
   if (checkIndex.value !== '') {
+
+    checkListLevel.length = 0
+    checkResultData.length = 0
+    rawTableData.length = 0
+    currentCheckItem.value = ''
+
     //  console.log("更新表格数据");
     // 发起请求，查询该测试项的检测结果
     const {data} = await getTableData({
@@ -338,70 +330,63 @@ const updateTableData = async () => {
     let keys1 = Object.keys(data.resultData)
     let resultData = new Map()
     for (let key of keys1) {
-      resultData.set(key, data.resultData[key])
+      let children = []
+      let label = key
+      if ((key.includes('谐波') || key.includes('简谐波')) && key !== '谐波有功功率') {
+        for (let item of data.resultData[key]) {
+          let num = formatHarmNum(item.harmNum + '')
+          label = item.isData === 1 ? `${num}` : item.isData === 4 ? `${num}（/）` : item.isData === 5 ? `${num}（-）` : `${num}（不符合）`
+          children.push({label: label, value: num})
+          resultData.set(key + "_" + num, item)
         }
+        checkListLevel.push({label: key, value: key, children: children})
+      } else {
+        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)
+        }
+      }
+    }
+
 
     let keys2 = Object.keys(data.rawData)
     let rawData = new Map()
     for (let key of keys2) {
+      if ((key.includes('谐波') || key.includes('简谐波')) && key !== '谐波有功功率') {
+        for (let item of data.rawData[key]) {
+          let num = formatHarmNum(item.harmNum + '')
+          let value = rawData.get(key + "_" + num)
+          if (!value) {
+            rawData.set(key + "_" + num, [item])
+          } else {
+            value.push(item)
+          }
+        }
+      } else {
         rawData.set(key, data.rawData[key])
       }
-
-    resTableData = {
-      resultData,
-      rawData
     }
 
-    let resCheckResult: CheckData.ResCheckResult = {}
-    let resRawData: CheckData.RawDataItem[] = []
 
-    if (keys1.length === 0) {
+    resTableData.resultData = resultData
-      checkList.length = 0
+    resTableData.rawData = rawData
-      checkResultData.length = 0
-      rawTableData.length = 0
-      currentCheckItem.value = ''
-    }
 
-    if (keys1.length === 1) {
+    toAngleLast()
-      resCheckResult = resTableData.resultData.get(keys1[0])
-      resRawData = resTableData.rawData.get(keys2[0])
 
-      resRawData = (resRawData == null || resRawData == undefined ? [] : resRawData)
+    if (checkListLevel.length !== 0) {
-      resCheckResult = (resCheckResult == null || resCheckResult == undefined ? {} : resCheckResult)
+      if (checkListLevel[0].children.length !== 0) {
-      setCheckResultData(resCheckResult)
+        currentCheckItem.value = [checkListLevel[0].value + '', checkListLevel[0].children[0].value + '']
-      setRawData(resRawData)
-      checkList.length = 0
-      let key = formatHarmNum(keys1[0])
-      checkList.push({value: keys1[0], label: resCheckResult.isData === 1 ? `${key}` : resCheckResult.isData === 4 ? `${key}（/）` : resCheckResult.isData === 5? `${key}（-）`:`${key}（不符合）`})
-      if (currentCheckItem.value == checkList[0].value) {
-        doCurrentCheckItemUpdate(checkList[0].value)
       } else {
-        currentCheckItem.value = checkList[0].value
+        currentCheckItem.value = [checkListLevel[0].value + '']
       }
-    } else if (keys1.length != 0) {
-      let tempCheckList = []
-      for (let [key, value] of resTableData.resultData) {
-        let hum = formatHarmNum(key)
-        tempCheckList.push({
-          value: key,
-          label: value.isData === 1 ? `${hum}`: value.isData === 4 ? `${hum}（/）` : value.isData === 5? `${hum}（-）`:`${hum}（不符合）`
-        })
     }
 
-      toAngleLast(tempCheckList)
-      checkList.length = 0
-      Object.assign(checkList, tempCheckList)
 
-      if (currentCheckItem.value == tempCheckList[0].value) {
-        doCurrentCheckItemUpdate(tempCheckList[0].value)
   } else {
-        currentCheckItem.value = tempCheckList[0].value
-      }
-    }
-  }
-
-  // setCheckResultData(resCheckResult)
-  else {
     checkResultData.length = 0
     rawTableData.length = 0
   }
@@ -441,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
@@ -457,8 +439,9 @@ const open = async (_deviceId: string, chnNum: string, _scriptType: string | nul
   visible.value = true;
 }
 
-const handleGenerateReport = () => {
+const handleGenerateReport = async () => {
-  console.log("生成报告", checkStore.plan.id, deviceId)
+  await generateDevReport({'planId': checkStore.plan.id, 'devIdList': [deviceId],'scriptId':checkStore.plan.scriptId,'planCode':planCode})
+  ElMessage.success({message: `报告生成成功！`})
 }
 
 const handleReCalculate = async () => {
@@ -498,7 +481,7 @@ const close = async () => {
   currentCheckItem.value = ''
   checkResultData.length = 0
   rawTableData.length = 0
-  checkList.length = 0
+  //checkList.length = 0
   defaultExpandedKeys = []
   checkIndex.value = ''
   activeTab.value = 'resultTab'
@@ -515,7 +498,6 @@ const close = async () => {
 };
 
 const setCheckResultData = (data: CheckData.ResCheckResult | null) => {
-  // console.log("检测结果", data);
   let result: CheckData.CheckResult[] = []
   if (data == null || data == undefined) {
     Object.assign(checkResultData, [])
@@ -523,21 +505,27 @@ const setCheckResultData = (data: CheckData.ResCheckResult | null) => {
   }
   if (data.dataA != null && data.dataB != null && data.dataC != null) {
     result.push({
-      stdA: numberToFixed(data.dataA.resultData),
+      // stdA: numberToFixed(data.dataA.resultData),
-      dataA: numberToFixed(data.dataA.data),
+      // dataA: numberToFixed(data.dataA.data),
-      errorA: numberToFixed(data.dataA.errorData),
+      stdA: dataToShow(data.dataA.resultData),
+      dataA: dataToShow(data.dataA.data),
+      errorA: data.dataA.errorData == null ? '/' : data.dataA.errorData + '',
       maxErrorA: toMaxErrorStr(data.dataA.radius, data.dataA.unit),
       unitA: data.dataA.unit,
       isDataA: data.dataA.isData,
-      stdB: numberToFixed(data.dataB.resultData),
+      // stdB: numberToFixed(data.dataB.resultData),
-      dataB: numberToFixed(data.dataB.data),
+      // dataB: numberToFixed(data.dataB.data),
-      errorB: numberToFixed(data.dataB.errorData),
+      stdB: dataToShow(data.dataB.resultData),
+      dataB: dataToShow(data.dataB.data),
+      errorB: data.dataB.errorData == null ? '/' : data.dataB.errorData + '',
       maxErrorB: toMaxErrorStr(data.dataB.radius, data.dataB.unit),
       isDataB: data.dataB.isData,
       unitB: data.dataB.unit,
-      stdC: numberToFixed(data.dataC.resultData),
+      // stdC: numberToFixed(data.dataC.resultData),
-      dataC: numberToFixed(data.dataC.data),
+      // dataC: numberToFixed(data.dataC.data),
-      errorC: numberToFixed(data.dataC.errorData),
+      stdC: dataToShow(data.dataC.resultData),
+      dataC: dataToShow(data.dataC.data),
+      errorC: data.dataC.errorData == null ? '/' : data.dataC.errorData + '',
       maxErrorC: toMaxErrorStr(data.dataC.radius, data.dataC.unit),
       isDataC: data.dataC.isData,
       unitC: data.dataC.unit,
@@ -548,11 +536,13 @@ const setCheckResultData = (data: CheckData.ResCheckResult | null) => {
     })
   }
 
-  if (data.dataT != null) {
+  if (data.dataT != null && data.dataA == null && data.dataB == null && data.dataC == null) {
     result.push({
-      stdT: numberToFixed(data.dataT.resultData),
+      // stdT: numberToFixed(data.dataT.resultData),
-      dataT: numberToFixed(data.dataT.data),
+      // dataT: numberToFixed(data.dataT.data),
-      errorT: numberToFixed(data.dataT.errorData),
+      stdT: dataToShow(data.dataT.resultData),
+      dataT: dataToShow(data.dataT.data),
+      errorT: data.dataT.errorData == null ? '/' : data.dataT.errorData + '',
       maxErrorT: toMaxErrorStr(data.dataT.radius, data.dataT.unit),
       isDataT: data.dataT?.isData,
       unitT: data.dataT.unit,
@@ -563,10 +553,11 @@ const setCheckResultData = (data: CheckData.ResCheckResult | null) => {
     })
   }
   Object.assign(checkResultData, result)
+  console.log("检测结果", checkResultData);
 }
 
 const exportRawDataHandler = () => {
-  useDownload(exportRawData, '原始数据.xlsx', {
+  useDownload(exportRawData, '原始数据', {
     scriptType,
     scriptId: checkStore.plan.scriptId,
     devId: deviceId,
@@ -588,15 +579,26 @@ const formatHarmNum = (num: string) => {
 
 const setRawData = (data: CheckData.RawDataItem[]) => {
   data.forEach((item: CheckData.RawDataItem) => {
-    item.dataA = stringToFixed(item.dataA)
+    // item.dataA = stringToFixed(item.dataA)
-    item.dataB = stringToFixed(item.dataB)
+    // item.dataB = stringToFixed(item.dataB)
-    item.dataC = stringToFixed(item.dataC)
+    // item.dataC = stringToFixed(item.dataC)
-    item.dataT = stringToFixed(item.dataT)
+    // item.dataT = stringToFixed(item.dataT)
+    item.dataA = dataToShow(item.dataA)
+    item.dataB = dataToShow(item.dataB)
+    item.dataC = dataToShow(item.dataC)
+    item.dataT = dataToShow(item.dataT)
   })
   rawTableData.length = 0
   Object.assign(rawTableData, data)
   console.log("原始数据", rawTableData)
 }
+const dataToShow = (num: number): string => {
+  if (num == null || num == undefined) {
+    return '/'
+  }
+  return num+''
+}
+
 
 const numberToFixed = (num: number): string => {
   if (num == null || num == undefined) {
@@ -662,18 +664,18 @@ const getDefaultNode = (data: any[]) => {
   return findFirstLeafNode(firstElement);
 }
 
-const toAngleLast = (data: any[]) => {
+const toAngleLast = () => {
   let angleIndex = -1
-  for (let i = 0; i < data.length; i++) {
+  for (let i = 0; i < checkListLevel.length; i++) {
-    if (data[i].value.toString().includes('相角')) {
+    if (checkListLevel[i].value.toString().includes('相角')) {
       angleIndex = i
       break
     }
   }
   if (angleIndex != -1) {
-    let temp = data[angleIndex]
+    let temp = checkListLevel[angleIndex]
-    data.splice(angleIndex, 1)
+    checkListLevel.splice(angleIndex, 1)
-    data.push(temp)
+    checkListLevel.push(temp)
   }
 }
 
@@ -745,7 +747,6 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-
 .dialog {
   display: flex;
   flex-direction: column;

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

@@ -189,6 +189,7 @@ watch(testStatus, function (newValue, oldValue) {
 watch(webMsgSend, function (newValue, oldValue) {
   console.log('webMsgSend---code', newValue.code)
   console.log('webMsgSend---requestId', newValue.requestId)
+  if (testStatus.value !== 'waiting') {
     if (newValue.code == 10520) {
       ElMessageBox.alert('报文解析异常！', '初始化失败', {
         confirmButtonText: '确定',
@@ -261,6 +262,12 @@ watch(webMsgSend, function (newValue, oldValue) {
         type: 'error',
       })
       TableInit();
+    } else if (newValue.code == -1) { //todo 10552之后还会发送消息吗？
+      ElMessageBox.alert('源未知异常', '检测失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
     } else {
       console.log('显示东西code', newValue.code)
       console.log('显示东西requestId', newValue.requestId)
@@ -344,44 +351,66 @@ watch(webMsgSend, function (newValue, oldValue) {
               break;
           }
           break;
+        case 'yjc_xyjy':
+          switch (newValue.operateCode) {
+            case 'VERIFY_MAPPING$01':
+              if (newValue.code == 10200) {
+                let data = JSON.parse(newValue.data)
+                ElMessageBox.alert(`脚本与icd校验失败！icd名称：${data['icdType']} -> 校验项：${data['dataType']}`, '初始化失败', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              }
+              if (newValue.code == 10500) {
+                ElMessageBox.alert(`装置中未找到该icd!`, '初始化失败', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              }
+              break;
+          }
+          break;
         case 'Coefficient_Check':
           console.log("Coefficient_Checkactive", active.value);
           switch (newValue.operateCode) {
-          case 'big_end'://大电压,电流下装
+            case 'big_start'://大电压,电流下装
-            console.log('大电压,电流下装')
-            active.value++;
               big_V_Download.value = 'Ua=Ub=Uc=' + newValue.data.devVolt + 'V';
               big_I_Download.value = 'Ia=Ib=Ic=' + newValue.data.devCurr + 'A';
-
+              break;
+            case 'big_end'://大电压,电流下装
+              active.value++;
               tableLoading('small', '系数下装')
               break;
           }
           switch (newValue.operateCode) {
-          case 'small_end'://小电压,电流下装
+            case 'small_start'://小电压,电流下装
-            console.log('小电压,电流下装')
-            active.value++;
               small_V_Download.value = 'Ua=Ub=Uc=' + newValue.data.devVolt + 'V';
               small_I_Download.value = 'Ia=Ib=Ic=' + newValue.data.devCurr + 'A';
-
+              break;
+            case 'small_end'://小电压,电流下装
+              active.value++;
               tableLoading('big', '系数校准')
               break;
           }
           switch (newValue.operateCode) {
-          case 'big_comp_end'://大电压,电流校准
+            case 'big_comp_start'://大电压,电流校准
-            console.log('大电压,电流校准')
-            active.value++;
               big_V_Adjust.value = 'Ua=Ub=Uc=' + newValue.data.devVolt + 'V';
               big_I_Adjust.value = 'Ia=Ib=Ic=' + newValue.data.devCurr + 'A';
-
+              break;
+            case 'big_comp_end'://大电压,电流校准
+              active.value++;
               tableLoading('small', '系数校准')
               break;
           }
           switch (newValue.operateCode) {
-          case 'small_comp_end'://小电压,电流校准
+            case 'small_comp_start'://小电压,电流校准
-          console.log('小电压,电流校准')
-            active.value++;
               small_V_Adjust.value = 'Ua=Ub=Uc=' + newValue.data.devVolt + 'V';
               small_I_Adjust.value = 'Ia=Ib=Ic=' + newValue.data.devCurr + 'A';
+              break;
+            case 'small_comp_end'://小电压,电流校准
+              active.value++;
               active.value++;
 
               for (let i = 0; i < name.value.length; i++) {
@@ -406,7 +435,7 @@ watch(webMsgSend, function (newValue, oldValue) {
           switch (newValue.operateCode) {
             case 'DATA_CHNFACTOR$02'://表格
               // 输出 key 为 0 的数组中的第一条 ChannelsTest.CoefficientVO 对象
-            console.log('表格',name.value)
+              console.log('表格', name.value)
               for (let i = 0; i < name.value.length; i++) {
                 const targetArrayRef = tableDataMap.get(i);
                 if (targetArrayRef) {
@@ -474,13 +503,13 @@ watch(webMsgSend, function (newValue, oldValue) {
                       console.log(newValue.data.devName + '对象:', firstCoefficientVO);
                       activeIndex.value++;
                     } else {
-                    console.log('未找到匹配的'+ newValue.data.devName+'对象');
+                      console.log('未找到匹配的' + newValue.data.devName + '对象');
                     }
                   } else {
                     console.log(newValue.data.devName + '数组为空');
                   }
                 } else {
-                console.log('未找到'+newValue.data.devName+'对应的数组');
+                  console.log('未找到' + newValue.data.devName + '对应的数组');
                 }
               }
               break;
@@ -518,6 +547,7 @@ watch(webMsgSend, function (newValue, oldValue) {
           break;
       }
     }
+  }
 })
 
 //出错系数检测初始化
@@ -715,7 +745,7 @@ const handleSubmit = async () => {
 
   isButtonDisabled.value = true; // 禁用按钮
   tableLoading('big', '系数下装')
-  await getCoefficientCheck({
+/*  await getCoefficientCheck({
     userPageId: "cdf",
     devIds: devIdArray.value,
     planId: planId.value,
@@ -723,7 +753,7 @@ const handleSubmit = async () => {
     scriptId: select_Plan.value?.scriptId,
     operateType: '0', // '0'为预检测、‘1‘为正式检测
     userId:userStore.userInfo.id
-  })
+  })*/
   active.value++;  
 
   console.log('开始检测active.value', active.value)

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

@@ -4,8 +4,7 @@
       <el-tab-pane label="预检测项目">
         <div class="form-grid">
           <el-checkbox v-for="(item, index) in detectionOptions" v-model="item.selected" :key="index"
-                       :label="item.name"></el-checkbox>
+                       :label="item.name" disabled></el-checkbox>
-          <!-- disabled="true" -->
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -18,7 +17,7 @@
           <el-step :status="step2" title="设备通讯校验"/>
           <el-step :status="step3" title="协议校验"/>
           <el-step :status="step4" title="相序校验"/>
-          <el-step :status="step5" title="检测完成"/>
+          <el-step :status="step5" :title="ts === 'error'? '检测失败':ts === 'process'? '检测中':ts === 'success'? '检测成功':'待检测'"/>
         </el-steps>
       </div>
       <div class="dialog-right">
@@ -234,8 +233,7 @@ const webMsgSend = toRef(props, 'webMsgSend');
 const ts = ref('');
 
 watch(webMsgSend, function (newValue, oldValue) {
-  // console.log(newValue)
+  if (testStatus.value !== 'waiting') {
-
     switch (newValue.requestId) {
       case 'yjc_ytxjy':
         switch (newValue.operateCode) {
@@ -258,9 +256,11 @@ watch(webMsgSend, function (newValue, oldValue) {
               ElMessage.error(newValue.code)
               step1.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
             } else if (newValue.code == 10523) {
               step1.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
               step1InitLog.value = [{
                 type: 'error',
                 log: '源连接失败!',
@@ -268,6 +268,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             } else if (newValue.code == -1) {
               step1.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
               step1InitLog.value = [{
                 type: 'error',
                 log: '源未知异常!',
@@ -301,6 +302,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               })
               step2.value = 'error'
               // ts.value = 'error'
+              // step5.value = 'error'
             } else if (newValue.code == 10551) {
               step2InitLog.value.push({
                 type: 'error',
@@ -308,6 +310,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               })
               step2.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
             } else if (newValue.code == 10552) {
               //ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
               step2InitLog.value = [{
@@ -316,6 +319,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               }];
               step2.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
             } else if (newValue.code == 25001) {
               activeIndex.value = 2
               step2.value = 'success'
@@ -347,6 +351,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               })
               step3.value = 'error'
               // ts.value = 'error'
+              // step5.value = 'error'
             } else if (newValue.code == 10551) {
               step3InitLog.value.push({
                 type: 'error',
@@ -354,6 +359,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               })
               step3.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
             } else if (newValue.code == 10552) {
               step3.value = 'error'
               //ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
@@ -362,6 +368,7 @@ watch(webMsgSend, function (newValue, oldValue) {
                 log: '存在已经初始化步骤,执行自动关闭,请重新发起检测！',
               }];
               ts.value = 'error'
+              step5.value = 'error'
             }
             break;
           case 'INIT_GATHER$02':
@@ -384,6 +391,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               })
               step3.value = 'error'
               // ts.value = 'error'
+              // step5.value = 'error'
             } else if (newValue.code == 10551) {
               step3InitLog.value.push({
                 type: 'error',
@@ -391,6 +399,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               })
               step3.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
             } else if (newValue.code == 10552) {
               step3.value = 'error'
               //ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
@@ -399,6 +408,7 @@ watch(webMsgSend, function (newValue, oldValue) {
                 log: '存在已经初始化步骤,执行自动关闭,请重新发起检测！',
               }];
               ts.value = 'error'
+              step5.value = 'error'
             }
             break;
           case 'INIT_GATHER$03':
@@ -417,6 +427,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               })
               step3.value = 'error'
               // ts.value = 'error'
+              // step5.value = 'error'
             } else if (newValue.code == 10551) {
               step3InitLog.value.push({
                 type: 'error',
@@ -424,6 +435,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               })
               step3.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
             } else if (newValue.code == 10552) {
               //ElMessage.error("当前步骤已经初始化,执行自动关闭,请重新发起检测！")
               step3.value = 'error'
@@ -432,14 +444,34 @@ watch(webMsgSend, function (newValue, oldValue) {
                 log: '存在已经初始化步骤,执行自动关闭,请重新发起检测！',
               }];
               ts.value = 'error'
-          } else if (newValue.code == 25001) {
+              step5.value = 'error'
+            }
+            break;
+          case 'VERIFY_MAPPING$01':
+            if (newValue.code == 25001) {
               activeIndex.value = 3
               step3.value = 'success'
               step4.value = 'process'
+            } else if (newValue.code == 10200) {
+              let data = JSON.parse(newValue.data)
+              step3InitLog.value.push({
+                type: 'error',
+                log: `脚本与icd检验失败! icd名称：${data['icdType']} -> 校验项：${data['dataType']}`,
+              })
+              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;
         }
-
         break;
       case 'YJC_xujy':
         switch (newValue.operateCode) {
@@ -460,6 +492,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
               step4.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
             } else if (newValue.code == 10520) {
               step4.value = 'error'
               step4InitLog.value.push({
@@ -467,6 +500,15 @@ watch(webMsgSend, function (newValue, oldValue) {
                 log: '解析报文异常',
               })
               ts.value = 'error'
+              step5.value = 'error'
+            }else if (newValue.code == -1) {
+              step4.value = 'error'
+              step4InitLog.value = [{
+                type: 'error',
+                log: '源未知异常!',
+              }];
+              ts.value = 'error'
+              step5.value = 'error'
             }
             break;
 
@@ -480,7 +522,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               newValue.data.split('<br/>')
               step4InitLog.value.push({
                 type: type,
-              log:newValue.data,
+                log: newValue.data,
               })
 
             } else if (newValue.code == 10201) {
@@ -496,6 +538,7 @@ watch(webMsgSend, function (newValue, oldValue) {
                 log: '相序校验未通过!',
               })
               ts.value = 'error'
+              step5.value = 'error'
             } else if (newValue.code == 25001) {
               step4.value = 'success'
               step5.value = 'success'
@@ -503,10 +546,10 @@ watch(webMsgSend, function (newValue, oldValue) {
                 type: 'wait',
                 log: '相序校验成功!',
               })
+              ts.value = 'success'
             }
             activeIndex.value = 5
-          ts.value = 'success'
+            console.log("@@@@", ts.value)
-            console.log("@@@@",ts.value)
             break
         }
 
@@ -522,6 +565,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '源服务端连接失败!',
             }];
             ts.value = 'error'
+            step5.value = 'error'
             break;
           case "Dev":
             step2.value = 'error'
@@ -530,6 +574,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '设备服务端连接失败!',
             }];
             ts.value = 'error'
+            step5.value = 'error'
             break;
         }
         break;
@@ -542,9 +587,34 @@ watch(webMsgSend, function (newValue, oldValue) {
           type: 'error',
         })
         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;
     }
-
+  }
 })
 
 watch(activeIndex, function (newValue, oldValue) {

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

@@ -18,7 +18,7 @@
       <template #tableHeader=''>
         <el-form :model='form' :inline='true'>
           <el-form-item label='关键字'>
-            <el-input v-model='form.search' placeholder='请输入设备名称' clearable style='width: 140px;'></el-input>
+            <el-input v-model='form.search' placeholder='请输入设备名称' clearable style='width: 170px;' show-word-limit maxlength="32"></el-input>
           </el-form-item>
           <el-form-item label='检测状态' v-if='form.activeTabs != 3 && form.activeTabs != 4 && form.activeTabs != 5'>
             <el-select v-model='form.checkStatus' clearable>
@@ -90,19 +90,17 @@
               >报告下载</el-button
             > -->
             <!-- :disabled='!scope.isSelected' -->
-            <!-- <el-button type="primary" :icon="Postcard"   @click="handleTest('批量生成')" v-if="form.activeTabs === 3"
+            <el-button type="primary" :icon="Postcard"   @click="handleTest('批量生成')" v-if="form.activeTabs === 3">报告生成</el-button>
-              >报告生成</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>
             <!-- <el-button type="primary" :icon="CirclePlus" @click="addDevice('设备新增')" v-if="form.activeTabs === 0"
               >设备新增</el-button> -->
 
-            <el-button type='primary' v-auth.role="'channelsTest'" :icon='Odometer' @click="handleTest('系数校准')"
+<!--            <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-button>-->
           </el-form-item>
         </el-form>
       </template>
@@ -138,7 +136,7 @@
             link
             :icon='Download'
             @click="openDrawer('报告下载', scope.row)"
-            v-if='form.activeTabs === 3 && form.activeChildTabs === 0 && scope.row.reportState === 1'
+            v-if='form.activeTabs === 3 && form.activeChildTabs === 0 && (scope.row.reportState === 1 ||scope.row.reportState === 3)'
         >报告下载
         </el-button>
 
@@ -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;
@@ -577,6 +582,8 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
         return '已生成'
       } else if (scope.row.reportState === 2) {
         return '未检'
+      }else if(scope.row.reportState === 3){
+        return '已上传'
       }
       return ''
     },
@@ -586,7 +593,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 +653,7 @@ const handleSelectionChange = (selection: any[]) => {
       devVolt: item.devVolt,
       devCurr: item.devCurr,
       factorFlag: item.factorFlag,
+      checkResult: item.checkResult,
     }
   })
 
@@ -950,20 +958,37 @@ const handleTest = async (val: string) => {
             })
             .then(() => {
               ElMessage.success('不合格项复检')
-              if (checkStore.devices.length > 1) {
+              // if (checkStore.devices.length > 1) {
-                checkStore.setReCheckType(1)
+              //   checkStore.setReCheckType(1)
-              } else {
+              // } else {
                 checkStore.setReCheckType(0)
-              }
+              // }
+              //selectTestItemPopupRef.value?.open()
+              if(appSceneStore.currentScene === '0'){
+                writeTHPopupRef.value?.open()
+              }else{
                 selectTestItemPopupRef.value?.open()
+                //openTestDialog(true)
+              }
             })
             .catch((action: Action) => {
+              if(action === 'cancel'){
                 ElMessage.success('全部复检')
                 checkStore.setReCheckType(1)
+                //selectTestItemPopupRef.value?.open()
+                if(appSceneStore.currentScene === '0'){
+                  writeTHPopupRef.value?.open()
+                }else{
                   selectTestItemPopupRef.value?.open()
+                  //openTestDialog(true)
+                }
+              }
             })
+
+        checkStore.setSelectTestItems({preTest: false, timeTest: false, channelsTest: false, test: true})
       } else {
         selectTestItemPopupRef.value?.open()
+        checkStore.setReCheckType(1)
       }
     } else if (val === '系数校准') {
       // 检查 socketClient.Instance 是否存在
@@ -1003,20 +1028,34 @@ const handleTest = async (val: string) => {
             })
             .then(() => {
               ElMessage.success('不合格项复检')
-              if (checkStore.devices.length > 1) {
+              // if (checkStore.devices.length > 1) {
-                checkStore.setReCheckType(1)
+              //   checkStore.setReCheckType(1)
-              } else {
+              // } else {
                 checkStore.setReCheckType(0)
+              // }
+              //openTestDialog(false)
+              if(appSceneStore.currentScene === '0'){
+                    writeTHPopupRef.value?.open()
+                }else{
+                    openTestDialog(true)
                 }
-              openTestDialog()
             })
             .catch((action: Action) => {
+              if (action === 'cancel') {
                 ElMessage.success('全部复检')
                 checkStore.setReCheckType(1)
-              openTestDialog()
+                //openTestDialog(false)
-            })
+                if (appSceneStore.currentScene === '0') {
+                  writeTHPopupRef.value?.open()
                 } else {
-        openTestDialog()
+                  openTestDialog(true)
+                }
+              }
+            })
+        checkStore.setSelectTestItems({preTest: false, timeTest: false, channelsTest: false, test: true})
+      } else {
+        checkStore.setReCheckType(1)
+        openTestDialog(true)
       }
     }
   }
@@ -1036,7 +1075,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('归档成功!')
@@ -1045,9 +1084,36 @@ 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 = () => {
+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)
 }
 
@@ -1064,7 +1130,7 @@ const openDrawer = async (title: string, row: any) => {
 
 
   if (title === '报告生成') {
-    await generateDevReport({'planId': checkStore.plan.id, 'devId': row.id,'scriptId':checkStore.plan.scriptId,'planCode':checkStore.plan.code+''})
+    await generateDevReport({'planId': checkStore.plan.id, 'devIdList': [row.id],'scriptId':checkStore.plan.scriptId,'planCode':checkStore.plan.code+''})
     emit('batchGenerateClicked') // 触发事件
     ElMessage.success({message: `报告生成成功！`})
   }
@@ -1128,6 +1194,7 @@ watch(
 )
 
 onBeforeMount(async () => {
+
   const response = await getPqDev()
   devTypeOptions.value = response.data.map(item => ({
     id: item.id,

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

@@ -12,64 +12,6 @@
             style="width: 82%; margin-right: 3%;"
             :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>-->
-
-<!--          <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="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>
 
@@ -87,8 +29,12 @@
                                :label="'通道'+chnItem" align="center">
                 <template #default="{row}">
                   <el-tooltip
-                      :content="row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.INFO ? '暂无数据' : '点击查看详情'"
+                      :content="row.devices[index1].chnResult[index2].icon==='More' ? '暂无数据'
-                      placement="top">
+                      : 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"
@@ -141,7 +87,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 +98,15 @@
       </el-drawer>
     </div>
 
-<!--    <resultPopup-->
+    <!--    <resultPopup-->
-<!--        :visible="resultDialogVisible"-->
+    <!--        :visible="resultDialogVisible"-->
-<!--        @update:visible="resultDialogVisible = $event"-->
+    <!--        @update:visible="resultDialogVisible = $event"-->
-<!--    ></resultPopup>-->
+    <!--    ></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 +140,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)
@@ -331,19 +277,19 @@ const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(()
 
 watch(testStatus, function (newValue, oldValue) {
   if (newValue == 'start') {
+    if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest) {
       ElMessage.success('初始化开始!')
+      emit('update:testStatus', 'test_init')
+      testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化开始！`})
+    } else {
+      emit('update:testStatus', 'process')
+    }
     startTimeCount()
 
     showTestLog()
-
-    // if (oldValue == 'recheck' || oldValue == 'error' || oldValue == 'test_init_fail' || oldValue == 'connect_timeout' || oldValue == 'pause_timeout' || oldValue == 'error_flow_end') {
-    //   handleReCheck()
-    // }
-    emit('update:testStatus', 'test_init')
     //startTimer() // todo 可移除
     startData.value = new Date();
     timeDifference.value = 0;
-    testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化开始！`})
   }
 
   if (newValue == 'recheck' || newValue == 'error' || newValue == 'test_init_fail' || newValue == 'connect_timeout' || newValue == 'pause_timeout' || oldValue == 'error_flow_end') {
@@ -355,6 +301,7 @@ watch(testStatus, function (newValue, oldValue) {
 let count = 0
 
 watch(webMsgSend, function (newValue, oldValue) {
+  if (testStatus.value !== 'waiting') {
     if (props.stepsActive === 4) {
       if (newValue.code == 10520) {
         ElMessageBox.alert('报文解析异常！', '初始化失败', {
@@ -443,15 +390,36 @@ watch(webMsgSend, function (newValue, oldValue) {
         })
         // emit('update:testStatus', 'recheck')
         emit('update:testStatus', 'test_init_fail')
+      } else if (newValue.code == -1) {
+        ElMessageBox.alert('源未知异常！', '检测失败！', {
+          confirmButtonText: '确定',
+          type: 'error',
+        })
+        testLogList.push({
+          type: 'error',
+          log: `${new Date().toLocaleString()}：源未知异常！`
+        })
+        emit('update:testStatus', 'error')
       } else {
         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++
             }
@@ -512,14 +480,14 @@ watch(webMsgSend, function (newValue, oldValue) {
                   testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：源初始化成功！`})
                   percentage.value = 1
                 }
-              if (newValue.code == -1) {
+                // if (newValue.code == -1) {
-                ElMessageBox.alert('源未知异常！', '初始化失败', {
+                //   ElMessageBox.alert('源未知异常！', '初始化失败', {
-                  confirmButtonText: '确定',
+                //     confirmButtonText: '确定',
-                  type: 'error',
+                //     type: 'error',
-                })
+                //   })
-                testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未知异常！`})
+                //   testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未知异常！`})
-                emit('update:testStatus', 'test_init_fail')
+                //   emit('update:testStatus', 'test_init_fail')
-              }
+                // }
                 break;
             }
             break;
@@ -535,7 +503,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             break;
           case 'yjc_xyjy':
             switch (newValue.operateCode) {
-            case 'INIT_GATHER$03':
+              case 'VERIFY_MAPPING$01':
                 if (newValue.code == 25001) {
                   ElMessage.success('初始化成功!')
                   testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：协议校验成功！`})
@@ -543,11 +511,31 @@ watch(webMsgSend, function (newValue, oldValue) {
                   testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化成功！`})
                   percentage.value = 3
 
-
                   activeIndex = getNextActiveIndex() + 2
                   //startTimer()
 
                   emit('update:testStatus', 'process')
+                } else if (newValue.code == 10200) {
+                  let data = JSON.parse(newValue.data)
+                  ElMessageBox.alert(`脚本与icd校验失败！icd名称：${data['icdType']} -> 校验项：${data['dataType']}`, '初始化失败', {
+                    confirmButtonText: '确定',
+                    type: 'error',
+                  })
+                  testLogList.push({
+                    type: 'error',
+                    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')
                 }
                 break;
             }
@@ -648,6 +636,7 @@ watch(webMsgSend, function (newValue, oldValue) {
         }
       }
     }
+  }
 }, {deep: true})
 
 const handleStartItem = (code: string, desc: string | undefined) => {
@@ -656,9 +645,9 @@ const handleStartItem = (code: string, desc: string | undefined) => {
     updateCheckResultView(code, true)
     updateLog(true)
   } else {
-    if (desc.length > 150) {
+    // if (desc.length > 150) {
-      desc = desc.substring(0, 150) + '...'
+    //   desc = desc.substring(0, 150) + '...'
-    }
+    // }
     testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}准确度检测：开始`})
   }
 }
@@ -674,9 +663,9 @@ const handleEndItem = (code: string, desc: string | undefined, devices: CheckDat
     }
   } else {
     let result = getResult(devices)
-    if (desc.length > 150) {
+    // if (desc.length > 150) {
-      desc = desc.substring(0, 150) + '...'
+    //   desc = desc.substring(0, 150) + '...'
-    }
+    // }
     if (result === 1) {
       testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}检测结束：符合`})
     }
@@ -700,12 +689,22 @@ const updatePercentage = async () => {
     let {data: autoGenerate} = await getAutoGenerate()
     if (autoGenerate == 1) {
       //调用自动生成报告接口
-      let deviceIds = checkStore.devices.map(item => item.deviceId)
+      let devIdList = checkStore.devices.map(item => {
-      // await generateDevReport({'planId': checkStore.plan.id, 'devId':deviceIds[0] ,'scriptId':checkStore.plan.scriptId,'planCode':checkStore.plan.code+''})
+        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();
   }
 }
@@ -739,9 +738,9 @@ 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 => {
+  let temp = response.data.map((item: any) => {
     return {
       ...item,
       scriptName: item.scriptName
@@ -1532,6 +1531,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

@@ -2,10 +2,12 @@
   <el-dialog :title="dialogTitle" width="1550px" :model-value="dialogVisible" :before-close="beforeClose" @close="handleClose" height="1000px" draggable>
 
     <div class="steps-container">
-      <el-steps class="test-head-steps" simple :active="stepsActiveIndex" process-status="finish" finish-status="success">
+      <el-steps v-if="showSteps" class="test-head-steps" simple :active="stepsActiveIndex" process-status="finish" finish-status="success">
         <el-step v-if="preTestSelected" title="预检测" :icon="stepsActive > 1 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Edit" @click="handleStepClick(1)"/>
-        <el-step v-if="timeTestSelected" title="守时检测" :icon="stepsActive > 2 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :UploadFilled" @click="handleStepClick(2)"/>
+        <el-step v-if="timeTestSelected" title="守时检测" :icon="stepsActive > 2 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :UploadFilled"
-        <el-step v-if="channelsTestSelected" title="系数校准" :icon="stepsActive > 3 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Odometer" @click="handleStepClick(3)"/>
+                 @click="handleStepClick(2)"/>
+        <el-step v-if="channelsTestSelected" title="系数校准" :icon="stepsActive > 3 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Odometer"
+                 @click="handleStepClick(3)"/>
         <el-step v-if="testSelected" title="正式检测" :icon="stepsActive > 4 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Coin" @click="handleStepClick(4)"/>
         <el-step title="检测完成" :icon="stepsActiveIndex > stepsTotalNum-1 ? SuccessFilled :Key"/>
       </el-steps>
@@ -15,32 +17,16 @@
              :webMsgSend="webMsgSend"/>
     <timeTest v-if="showComponent&&timeTestSelected" v-show="timeTestSelected && stepsActiveView==2" v-model:testStatus="timeTestStatus"/>
     <!--     <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"/>
+    <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>
-<!--        <el-button type="primary" :icon="DArrowRight" v-if="stepsActiveIndex < stepsTotalNum && ActiveStatue != 'success'" @click="nextStep">跳过</el-button>-->
+        <!--        <el-button type="primary" :icon="DArrowRight" v-if="stepsActiveIndex < stepsTotalNum && ActiveStatue != 'success'" @click="nextStep">跳过</el-button>-->
-        <el-button type="primary" :icon="VideoPlay" v-if="ActiveStatue === 'waiting'" @click="handleSubmit">开始检测</el-button>
+        <el-button type="primary" :icon="VideoPlay" v-if="ActiveStatue === 'waiting'" @click="handleSubmitFast">开始检测</el-button>
-<!--        <el-button type="primary"-->
-<!--                   v-if="(stepsActiveIndex <= stepsTotalNum - 1) && (ActiveStatue !== 'success' &&ActiveStatue !== 'test_init' && ActiveStatue !=='paused_ing' && ActiveStatue !=='paused' && ActiveStatue !== 'waiting' && ActiveStatue !== 'error' && ActiveStatue !== 'test_init_fail' && ActiveStatue !== 'connect_timeout' && ActiveStatue!=='pause_timeout')"-->
-<!--                   disabled>-->
-<!--          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">-->
-<!--            <component :is="Refresh"/>-->
-<!--          </el-icon>-->
-<!--          检测中-->
-<!--        </el-button>-->
-
-
-        <!--        <el-button type="primary" v-if="ActiveStatue === 'process'" disabled>-->
-        <!--          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">-->
-        <!--            <component :is="Refresh"/>-->
-        <!--          </el-icon>-->
-        <!--          检测中-->
-        <!--        </el-button>-->
-<!--        <el-button type="warning" :icon="VideoPlay" v-if="TestStatus === 'paused'" @click="handleSubmit">继续检测</el-button>-->
-        <!--        <el-button type="primary" :icon="RefreshLeft" v-if="ActiveStatue === 'recheck' || ActiveStatue ==='error' || ActiveStatue ==='test_init_fail' || ActiveStatue === 'pause_timeout' || ActiveStatue === 'connect_timeout'" @click="handleSubmit">重新检测</el-button>-->
         <el-button type="primary" v-if="TestStatus === 'test_init'" disabled>
           <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
             <component :is="Refresh"/>
@@ -85,7 +71,7 @@
 <script lang="tsx" setup name="testPopup">
 import {reactive, ref, watch} from 'vue';
 import {ElMessage, ElMessageBox} from 'element-plus'
-import {Coin, DArrowRight, Edit, Key, Odometer, Refresh, Right, SuccessFilled, UploadFilled, VideoPlay,VideoPause} from '@element-plus/icons-vue'
+import {Coin, Edit, Key, Odometer, Refresh, Right, SuccessFilled, UploadFilled, VideoPause, VideoPlay} from '@element-plus/icons-vue'
 import preTest from './preTest.vue'
 import timeTest from './timeTest.vue'
 import factorTest from './factorTest.vue'
@@ -100,6 +86,7 @@ const checkStore = useCheckStore();
 const nextStepText = ref('下一步');
 const dialogVisible = ref(false)
 
+const showSteps = ref(false)
 const stepsTotalNum = ref(-1);//步骤总数
 const stepsActiveIndex = ref(1); //当前正在执行的步骤索引
 const stepsActiveView = ref(-1); //当前正在执行的步骤在（预处理、守时校验、系数校准、正式检测）中的排序，仅用于页面显示
@@ -111,6 +98,7 @@ const channelsTestStatus = ref('waiting');//通道系数校准执行状态
 const TestStatus = ref('waiting');//正式检测执行状态
 const webMsgSend = ref();//webSocket推送的数据
 
+
 const dialogTitle = ref('')
 const showComponent = ref(true)
 const preTestRef = ref(null)
@@ -172,6 +160,7 @@ const initOperate = () => {
 }
 
 const open = (title: string) => {
+  showSteps.value = true
   initOperate()
   dialogTitle.value = title;
   dialogVisible.value = true;
@@ -196,8 +185,7 @@ const open = (title: string) => {
   });
 }
 
-// let loading;
+const handleSubmitFast = () => {
-const handleSubmit = () => {
   let deviceIds = checkStore.devices.map((item) => item.deviceId)
   let planId = checkStore.plan.id
 
@@ -205,15 +193,20 @@ const handleSubmit = () => {
     ElMessage.error('webSocket连接中断！')
     return
   }
-  console.log("handleSubmit",stepsActive.value,TestStatus.value)
+  console.log("handleSubmit", stepsActive.value, TestStatus.value)
   switch (stepsActive.value) {
     case 1:
+      if (preTestStatus.value == 'waiting') {
+        if (checkStore.selectTestItems.preTest) {
           startPreTest({
             userPageId: "cdf",
             devIds: deviceIds,
             planId: planId,
-        operateType: '1', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+            operateType: checkStore.reCheckType == 1 ? '1' : '2',
-        userId:userStore.userInfo.id
+            userId: userStore.userInfo.id,
+            temperature: checkStore.temperature,
+            humidity: checkStore.humidity,
+            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
           }).then(res => {
             if (res.code === 'A001014') {
               ElMessageBox.alert('装置配置异常', '检测失败', {
@@ -224,27 +217,51 @@ const handleSubmit = () => {
             }
           })
           preTestStatus.value = 'start'
-      // setTimeout(() => {
+        }
-      //   preTestStatus.value = 'success'
+      }
-      // }, 5000)
       break;
     case 2:
       timeTestStatus.value = 'start'
       break;
     case 3:
-      // 调用系数校准组件的handleSubmit方法
+      if (channelsTestStatus.value == 'waiting') {
-      channelsTestStatus.value = 'start'
+        if (!checkStore.selectTestItems.preTest && checkStore.selectTestItems.channelsTest) {
-      break;
-    case 4:
-      if (TestStatus.value == "waiting") {
           startPreTest({
             userPageId: "cdf",
             devIds: deviceIds,
             planId: planId,
-          operateType: checkStore.reCheckType ==1 ?'2':'8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+            operateType: checkStore.reCheckType == 1 ? '1' : '2',
-          userId:userStore.userInfo.id
+            userId: userStore.userInfo.id,
+            temperature: checkStore.temperature,
+            humidity: checkStore.humidity,
+            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
+          }).then(res => {
+            if (res.code === 'A001014') {
+              ElMessageBox.alert('装置配置异常', '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              channelsTestStatus.value = 'test_init_fail'
+            }
+          })
+          // 调用系数校准组件的handleSubmit方法
+        }
+        channelsTestStatus.value = 'start'
+      }
+      break;
+    case 4:
+      if (TestStatus.value == "waiting") {
+        if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) {
+          startPreTest({
+            userPageId: "cdf",
+            devIds: deviceIds,
+            planId: planId,
+            operateType: checkStore.reCheckType == 1 ? '1' : '2',
+            userId: userStore.userInfo.id,
+            temperature: checkStore.temperature,
+            humidity: checkStore.humidity,
+            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
           }).then(res => {
-          console.log(res)
             if (res.code === 'A001014') {
               ElMessageBox.alert('装置配置异常', '初始化失败', {
                 confirmButtonText: '确定',
@@ -253,6 +270,7 @@ const handleSubmit = () => {
               TestStatus.value = 'test_init_fail'
             }
           })
+        }
         TestStatus.value = 'start'
       } else if (TestStatus.value == 'paused') {
         // 发送继续指令
@@ -269,7 +287,7 @@ const handleSubmit = () => {
     default:
       break;
   }
-};
+}
 
 
 const emit = defineEmits<{
@@ -299,7 +317,7 @@ watch(TestStatus, function (newValue, oldValue) {
 
 watch(ActiveStatue, function (newValue, oldValue) {
   if (newValue === 'error') {
-    // stepsActiveIndex.value = stepsTotalNum.value + 2
+    stepsActiveIndex.value = stepsTotalNum.value + 1
     nextStepText.value = '检测失败'
   }
   if (newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value - 1) {
@@ -321,22 +339,24 @@ watch(ActiveStatue, function (newValue, oldValue) {
   }
   if (newValue === 'success' && stepsActiveIndex.value < stepsTotalNum.value - 1) {
     nextStep() // 实现自动点击，进入下一个测试内容
-    handleSubmit()
+    //handleSubmit()
+    handleSubmitFast()
   }
 
 })
 
 const handleQuit = () => {
-  console.log('handleQuit',ActiveStatue.value)
+  console.log('handleQuit', ActiveStatue.value)
   if (ActiveStatue.value !== 'success' && ActiveStatue.value !== 'waiting' && ActiveStatue.value !== 'paused' && ActiveStatue.value !== 'test_init_fail' && ActiveStatue.value !== 'connect_timeout' && ActiveStatue.value !== 'pause_timeout') {
-    beforeClose(() => {})
+    beforeClose(() => {
+    })
   } else {
     handleClose()
   }
 }
 
 
-const handlePause=()=>{
+const handlePause = () => {
   sendPause()
   testRef.value?.handlePause()
 }
@@ -344,12 +364,7 @@ const sendPause = () => {
   console.log('发起暂停请求')
 
   TestStatus.value = 'paused_ing'
-  pauseTest().then(res => {
+  pauseTest()
-    Object.assign(webMsgSend.value, {
-      requestId: 'preStopTest',
-      operateCode: 'stop'
-    })
-  })
   // setTimeout(() => {
   //   Object.assign(webMsgSend.value, {
   //     requestId: 'preStopTest',
@@ -365,7 +380,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'
@@ -379,7 +396,10 @@ 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,
+    testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
   }).then(res => {
     console.log(res)
     if (res.code === 'A001014') {
@@ -393,6 +413,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()
@@ -466,6 +490,7 @@ const beforeClose = (done: () => void) => {
 }
 
 const handleClose = () => {
+  showSteps.value = false
   dataSocket.socketServe.closeWs()
   dialogVisible.value = false;
   clearData()
@@ -485,7 +510,8 @@ defineExpose({open})
     .el-step__head.is-success {
       color: #91cc75;
     }
-    .el-step__title.is-success{
+
+    .el-step__title.is-success {
       color: #91cc75;
     }
   }

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

@@ -5,6 +5,8 @@
         placeholder='请输入计划名称'
         clearable
         v-model='searchForm.planName'
+        show-word-limit
+        maxlength="32"
       ></el-input>
       <el-tooltip content="检测计划列表" placement="top">
       <Menu style='width: 26px;height: 26px; margin-left: 8px;cursor: pointer;color:var(--el-color-primary)'

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/log/index.vue

@@ -4,13 +4,11 @@
         ref='proTable'
         :columns='columns'
         :request-api='getTableList'
-      @selection-change='handleSelectionChange'
-      type='selection'
     >
       <!-- 表格 header 按钮 -->
       <template #tableHeader>
-        <el-button type='primary' :icon='DataAnalysis' >分析</el-button>
+        <el-button type='primary' :icon='DataAnalysis'>分析</el-button>
-        <el-button type='primary' :icon='Upload'>导出csv</el-button>
+        <el-button type='primary' :icon='Upload' @click='handleExport'>导出csv</el-button>
       </template>
     </ProTable>
 
@@ -21,14 +19,14 @@
 <script setup lang='tsx' name='useProTable'>
 // 根据实际路径调整
 import TimeControl from '@/components/TimeControl/index.vue'
-import { type  AuditLog} from '@/api/system/log/interface/log.ts'
+import {type  AuditLog} from '@/api/system/log/interface/log.ts'
 import ProTable from '@/components/ProTable/index.vue'
-import { Upload ,DataAnalysis} from '@element-plus/icons-vue'
+import {DataAnalysis, Upload} from '@element-plus/icons-vue'
-import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
+import type {ColumnProps, ProTableInstance} from '@/components/ProTable/interface'
-import { reactive,ref,watch } from 'vue'
+import {reactive, ref} from 'vue'
-import {
+import {getAuditLog, exportCsv} from '@/api/system/log/index.ts'
-  getAuditLog,
+import {useDownload} from "@/hooks/useDownload";
-} from '@/api/system/log/index.ts'
+import {exportPqDev} from "@/api/device/device";
 
 
 // defineOptions({
@@ -50,12 +48,12 @@ const getTableList = async (params: any) => {
 
 // 表格配置项
 const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
-  { type: 'selection', fixed: 'left', width: 70 },
+  {type: 'selection', fixed: 'left', width: 70},
-  { type: 'index', fixed: 'left', width: 70, label: '序号' },
+  {type: 'index', fixed: 'left', width: 70, label: '序号'},
   {
-    prop: 'createBy',
+    prop: 'userName',
     label: '操作用户',
-    search: { el: 'input' },
+    search: {el: 'input'},
     minWidth: 100,
   },
   {
@@ -64,7 +62,7 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
     minWidth: 120,
   },
   {
-    prop: 'createTime',
+    prop: 'logTime',
     label: '记录时间',
     minWidth: 180,
     search: {
@@ -82,9 +80,11 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
     },
   },
   {
-    prop: 'remark',
     label: '事件描述',
-    minWidth: 400,
+    minWidth: 450,
+    render: (scope) => {
+      return (scope.row.userName + '在' + scope.row.logTime + '执行了' + scope.row.operateType + scope.row.operate + '操作，结果为' + scope.row.result + '。')
+    }
   },
   {
     prop: 'result',
@@ -97,7 +97,7 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
     minWidth: 100,
     render: scope => {
       return (
-           <el-tag type={scope.row.warn ? 'danger' : 'success'}>{scope.row.warn ? '告警' : '未告警'}</el-tag>
+          <el-tag type={scope.row.warn == 1 ? 'danger' : 'success'}>{scope.row.warn == 1 ? '已告警' : '未告警'}</el-tag>
       )
     },
   },
@@ -108,13 +108,22 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
   },
 ])
 
-  // 处理日期变化的回调函数
+// 处理日期变化的回调函数
 const handleDateChange = (startDateTemp: string, endDateTemp: string) => {
   startDate.value = startDateTemp
   endDate.value = endDateTemp
 }
 
+const handleExport = () => {
+  // 获取当前的搜索参数
+  let searchParam = proTable.value?.searchParam || {}
 
+  // 将开始时间和结束时间添加到搜索参数中
+  searchParam.searchBeginTime = startDate.value
+  searchParam.searchEndTime = endDate.value
+
+  useDownload(exportCsv, '日志列表', searchParam, false, '.csv')
+}
 
 </script>
 

frontend/src/views/login/components/LoginForm.vue

@@ -80,7 +80,6 @@ const tabsStore = useTabsStore()
 const keepAliveStore = useKeepAliveStore()
 
 const dictStore = useDictStore()
-const isAutoLogin = ref(false)
 let publicKey: any = null;
 
 
@@ -105,31 +104,22 @@ const login = (formEl: FormInstance | undefined) => {
     if (!valid) return
     loading.value = true
     try {
-      if (!isAutoLogin.value) {
+      let {data: publicKeyBase64}: { data: string } = await getPublicKey(loginForm.username)
-        let {data: publicKeyBase64}: { data: string } = await getPublicKey(loginForm.username, loginForm.checked)
       //将base64格式的公钥转换为Forge可以使用的格式
       const publicKeyDer = forge.util.decode64(publicKeyBase64);
       publicKey = forge.pki.publicKeyFromPem(forge.pki.publicKeyToPem(forge.pki.publicKeyFromAsn1(forge.asn1.fromDer(publicKeyDer))));
-      }
 
       // 1.执行登录接口
       const {data} = await loginApi({
         username: forge.util.encode64(loginForm.username),
-        password: isAutoLogin.value ? loginForm.password : encryptPassword(loginForm.password),
+        password: encryptPassword(loginForm.password),
-        checked: loginForm.checked
       })
-      if (loginForm.checked) {
-        localStorage.setItem("loginInfo", JSON.stringify({
-          username: forge.util.encode64(loginForm.username),
-          password: isAutoLogin.value ? loginForm.password : encryptPassword(loginForm.password),
-          exp: Date.now() + 1000 * 60 * 60 * 24 * 30
-        }))
-      } else {
-        localStorage.removeItem("loginInfo")
-      }
       userStore.setAccessToken(data.accessToken)
       userStore.setRefreshToken(data.refreshToken)
       userStore.setUserInfo(data.userInfo)
+      if(loginForm.checked){
+        userStore.setExp(Date.now() + 1000 * 60 * 60 * 24 * 30)
+      }
       const response = await getDictList()
       const dictData = response.data as unknown as Dict[]
       await dictStore.initDictData(dictData)
@@ -179,20 +169,6 @@ const encryptPassword = (password: string) => {
   return forge.util.encode64(encrypted);
 }
 
-onBeforeMount(async () => {
-  let loginInfoJSON = localStorage.getItem("loginInfo")
-  if (loginInfoJSON) {
-    const loginInfo = JSON.parse(loginInfoJSON)
-    if (loginInfo.exp < Date.now()) {
-      localStorage.removeItem("loginInfo")
-    } else {
-      isAutoLogin.value = true
-      loginForm.username = forge.util.decode64(loginInfo.username)
-      loginForm.password = loginInfo.password
-      loginForm.checked = true
-    }
-  }
-})
 </script>
 
 <style scoped lang='scss'>

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="请选择工作电源">
@@ -46,7 +46,7 @@
                     />
                 </el-select>
             </el-form-item> 
-            <el-form-item label="报告模版名称" prop="reportName" >
+            <el-form-item label="报告模版名称" prop="reportName" v-if="scene == '1'">
                 <el-select v-model="formContent.reportName"  clearable placeholder="请选择报告模版">
                     <el-option
                         v-for="item in dictStore.getDictData('Report_Template')"
@@ -93,6 +93,7 @@
   const dictStore = useDictStore()
   // 定义弹出组件元信息
   const dialogFormRef = ref()
+  const scene = ref('')
   const icdOptions = ref<ICD.ResICD[]>([])
  function useMetaInfo() {
     const dialogVisible = ref(false)
@@ -138,8 +139,19 @@ const resetFormContent = () => {
 
   //定义规则
   const formRuleRef = ref<FormInstance>()
+
+  // 使用计算属性根据 scene 动态生成规则
+  const rules = computed(() => {
+    const dynamicRules = { ...baseRules };
+    
+    if (scene.value === '1'){//只有楼下出厂需要展示
+      dynamicRules.reportName = [{ required: true, message: '报告模版名称必选！', trigger: 'change' }];
+    }
+    return dynamicRules;
+  });
+
   //定义校验规则
-  const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+  const baseRules: Record<string, Array<FormItemRule>> = {
     name: [{ required: true, message: '设备类型名称必填！', trigger: 'blur' }],
     power: [
     { required: true, message: '工作电源必选！', trigger: 'change' }
@@ -153,13 +165,10 @@ const resetFormContent = () => {
   devCurr: [
     { required: true, message: '额定电流必选！', trigger: 'change' }
   ],
-  reportName: [
-    { required: true, message: '报告模版名称必选！', trigger: 'change' }
-  ],
   icd: [
     { required: true, message: '设备关联ICD必选！', trigger: 'change' }
-  ],
+  ]
-  })
+};
 
   
 // 关闭弹窗
@@ -193,12 +202,12 @@ const close = () => {
   }
   
   // 打开弹窗，可能是新增，也可能是编辑
-  const open = async (sign: string, data: DevType.ResPqDevType,icd: ICD.ResICD[]) => {
+  const open = async (sign: string, data: DevType.ResPqDevType,icd: ICD.ResICD[],currentScene: string) => {
     // 重置表单
     dialogFormRef.value?.resetFields()
     titleType.value = sign
     dialogVisible.value = true
-
+    scene.value = currentScene
     icdOptions.value  = icd
 
     if (data.id) {

frontend/src/views/machine/devType/index.vue

@@ -51,6 +51,7 @@ import type { ICD } from '@/api/device/interface/icd'
   // })
   const modeStore = useModeStore()
   const dictStore = useDictStore()
+  const appSceneStore = useAppSceneStore()
   // ProTable 实例
   const proTable = ref<ProTableInstance>()
   const devTypePopup = ref()
@@ -96,6 +97,7 @@ import type { ICD } from '@/api/device/interface/icd'
       prop: 'reportName',
       label: '报告模版名称',
       minWidth: 150,
+      isShow: appSceneStore.currentScene == '1',
       enum: dictStore.getDictData('Report_Template'),
       fieldNames: { label: 'name', value: 'id' },
     },
@@ -134,7 +136,7 @@ import type { ICD } from '@/api/device/interface/icd'
 
   // 打开 drawer(新增、编辑)
   const openDialog = (titleType: string, row: Partial<DevType.ResPqDevType> = {}) => {
-    devTypePopup.value?.open(titleType, row,icdOptions.value)
+    devTypePopup.value?.open(titleType, row,icdOptions.value,appSceneStore.currentScene)
   }
   
   

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

@@ -2,16 +2,16 @@
   <el-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
     <el-tabs type="border-card">
       <el-tab-pane label="设备台账信息">
-                <div >
+        <div>
           <el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false" label-width="auto" class="form-three">
-                        <el-divider >设备信息</el-divider>
+            <el-divider>设备信息</el-divider>
-                                <el-form-item label="装置编号" prop="createId" >
+            <el-form-item label="装置编号" prop="createId">
-                                    <el-input v-model="formContent.createId" placeholder="请输入装置编号" @input="handleInput" />
+              <el-input v-model="formContent.createId" placeholder="请输入装置编号" @input="handleInput" maxlength="32" show-word-limit/>
             </el-form-item>
-                                <el-form-item label="设备名称" prop="name" >
+            <el-form-item label="设备名称" prop="name">
-                                    <el-input v-model='formContent.name' placeholder="请输入设备名称" :disabled="scene === '1'"/>
+              <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-form-item label='设备类型' prop='devType'>
               <el-select v-model="formContent.devType" filterable clearable placeholder="请选择设备类型" @change="handleDevTypeChange">
                 <el-option
                     v-for="item in devTypeOptions"
@@ -31,16 +31,16 @@
                 />
               </el-select>
             </el-form-item>
-<!--                                <el-form-item label='设备模式'  prop='pattern' >-->
+            <!--                                <el-form-item label='设备模式'  prop='pattern' >-->
-<!--                                    <el-select v-model="formContent.pattern"  clearable placeholder="请选择设备模式" disabled>-->
+            <!--                                    <el-select v-model="formContent.pattern"  clearable placeholder="请选择设备模式" disabled>-->
-<!--                                    <el-option -->
+            <!--                                    <el-option -->
-<!--                                    v-for="item in dictStore.getDictData('Pattern')"-->
+            <!--                                    v-for="item in dictStore.getDictData('Pattern')"-->
-<!--                                    :key="item.id"-->
+            <!--                                    :key="item.id"-->
-<!--                                    :label="item.name"-->
+            <!--                                    :label="item.name"-->
-<!--                                    :value="item.id"-->
+            <!--                                    :value="item.id"-->
-<!--                                    />-->
+            <!--                                    />-->
-<!--                                </el-select>-->
+            <!--                                </el-select>-->
-<!--                                </el-form-item>           -->
+            <!--                                </el-form-item>           -->
             <el-form-item label='设备厂家' prop='manufacturer' v-if="scene != '1'">
               <el-select v-model="formContent.manufacturer" clearable placeholder="请选择设备厂家">
                 <el-option
@@ -65,18 +65,18 @@
             <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-divider>参数信息</el-divider>
-                                <el-form-item label="通道数" prop="devChns" >
+            <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-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-form-item label="额定电流(A)" prop="devCurr">
               <el-input v-model='formContent.devCurr' :disabled="true"/>
             </el-form-item>
-                                <el-form-item label='通讯协议'  prop='protocol' >
+            <el-form-item label='通讯协议' prop='protocol'>
-                                    <el-select v-model="formContent.protocol"  clearable placeholder="请选择通讯协议" >
+              <el-select v-model="formContent.protocol" clearable placeholder="请选择通讯协议">
                 <el-option
                     v-for="item in dictStore.getDictData('Protocol')"
                     :key="item.id"
@@ -85,13 +85,16 @@
                 />
               </el-select>
             </el-form-item>
-                                <el-form-item label="IP地址" prop="ip" >
+            <!-- <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-form-item label="端口号" prop="port" placeholder="请输入端口号">
-                                    <el-input v-model="formContent.port" />
+              <el-input v-model="formContent.port"/>
             </el-form-item>
-                                <el-form-item label='是否加密'  prop='encryptionFlag' >
+            <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>
@@ -104,7 +107,7 @@
               <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-input v-model='formContent.sampleId' placeholder="请输入样品编号"/>
             </el-form-item>
             <el-form-item label='送样日期' prop='arrivedDate' v-if="scene === '0'">
               <el-date-picker
@@ -113,17 +116,27 @@
                   :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-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-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-input v-model='formContent.subName'/>
             </el-form-item>
-                                <el-form-item  v-auth.device="'factorFlag'"  label="是否支持系数校准"  prop='factorFlag'>
+            <el-form-item v-auth.device="'factorFlag'" label="是否支持系数校准" prop='factorFlag' v-if="scene === '1'">
-                                  <el-radio-group v-model="formContent.factorFlag" >
+              <el-radio-group v-model="formContent.factorFlag">
                 <el-radio :value="1">是</el-radio>
                 <el-radio :value="0">否</el-radio>
               </el-radio-group>
@@ -136,7 +149,7 @@
       <MonitorTable :MonIsShow="MonIsShow"/>
     </el-tabs>
     <template #footer>
-            <div >
+      <div>
         <el-button @click='close()'>取 消</el-button>
         <el-button type="primary" @click='save()'>保存</el-button>
       </div>
@@ -146,18 +159,18 @@
 </template>
 <script setup lang='ts'>
 
-import IPAddress from '@/components/IpAddress/index.vue'
+import {dialogBig} from '@/utils/elementBind'
-import { dialogBig } from '@/utils/elementBind'
+import {type Device} from '@/api/device/interface/device'
-import { type Device } from '@/api/device/interface/device'
+import {ElMessage, type FormItemRule} from 'element-plus'
-import { ElMessage, type FormItemRule } from 'element-plus'
+import {addPqDev, updatePqDev} from '@/api/device/device'
-import { addPqDev, updatePqDev } from '@/api/device/device'
+import {computed, ref} from 'vue'
-import { computed, reactive, type Ref, ref } from 'vue'
+import {useDictStore} from '@/stores/modules/dict'
-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';
+import {useAppSceneStore} from "@/stores/modules/mode";
 
+const AppSceneStore = useAppSceneStore()
 const MonIsShow = ref(false)
 const DevIsShow = ref(false)
 // 存储设备类型选项
@@ -172,147 +185,148 @@ const disabledDate = (time: Date) => {
   return time.getTime() > Date.now()
 }
 
-  function useMetaInfo() {
+function useMetaInfo() {
   const dialogVisible = ref(false)
   const titleType = ref('add')
   const formContent = ref<Device.ResPqDev>({
     id: '',
     name: '',
-      pattern:mode.value,
+    pattern: mode.value,
-      devType:'',
+    devType: '',
-      devChns:1,
+    devChns: 1,
-      devVolt:57.74,
+    devVolt: 57.74,
-      devCurr:5,
+    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',
+    ip: '172.17.102.222',
     port: 102,
     encryptionFlag: 0,
-        reCheckNum:0,
+    reCheckNum: 0,
     state: 1,
-        factorFlag:1,
+    factorFlag: 1,
-        icdId:'',
+    icdId: '',
-        power:'',
+    power: '',
-        preinvestmentPlan:''
+    preinvestmentPlan: '',
-    }
+    delegate: ''
-  }
-  
-
-  let dialogTitle = computed(() => {
-    return titleType.value === 'add' ? '新增被检设备' : '编辑被检设备'
   })
+  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.222',
+    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' }],
+  devType: [{required: true, message: '设备类型必选！', trigger: 'change'}],
-  pattern: [{ required: true, message: '设备模式必填！', trigger: 'blur' }],
+  pattern: [{required: true, message: '设备模式必填！', trigger: 'blur'}],
   devChns: [
-    { required: true, message: '设备通道数必填！', trigger: 'blur' },
+    {required: true, message: '设备通道数必填！', trigger: 'blur'},
-    { pattern: /^[1-9]\d*$/, message: '设备通道数为大于1的整数', trigger: 'blur' }
+    {pattern: /^[1-9]\d*$/, message: '设备通道数为大于1的整数', trigger: 'blur'}
   ],
   devVolt: [
-    { required: true, message: '额定电压必填！', trigger: 'blur' },
+    {required: true, message: '额定电压必填！', trigger: 'blur'},
-    { pattern: /^\d+(\.\d+)?$/, message: '额定电压格式错误', trigger: 'blur' }
+    {pattern: /^\d+(\.\d+)?$/, message: '额定电压格式错误', trigger: 'blur'}
   ],
   devCurr: [
-    { required: true, message: '额定电流必填！', trigger: 'blur' },
+    {required: true, message: '额定电流必填！', trigger: 'blur'},
-    { pattern: /^\d+(\.\d+)?$/, 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' },
+    {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' }
+    {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' },
+    {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' }
+    {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' }],
+  encryptionFlag: [{required: true, message: '是否加密必选！', trigger: 'change'}],
-  protocol: [{ required: true, message: '通讯协议必选！', trigger: 'change' }],
+  protocol: [{required: true, message: '通讯协议必选！', trigger: 'change'}],
-  series: [{ required: true, message: '请输入识别码', trigger: 'blur' }],
+  series: [{required: true, message: '请输入识别码', trigger: 'blur'}],
-  devKey: [{ 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'){//只有电科院需要展示
+  if (scene.value === '0') {//只有电科院需要展示
-    dynamicRules.createDate= [{ required: true, message: '出厂日期必填！', trigger: 'blur' }];
+    dynamicRules.createDate = [{required: true, message: '出厂日期必填！', trigger: 'blur'}];
   }
-  if (scene.value === '1'){//只有楼下出厂需要展示
+  if (scene.value === '1') {//只有楼下出厂需要展示
-    dynamicRules.preinvestmentPlan= [{ required: true, message: '预投计划必选！', trigger: 'change' }];
+    dynamicRules.preinvestmentPlan = [{required: true, message: '预投计划必选！', trigger: 'change'}];
-    dynamicRules.createId= [{ required: true, message: '装置编号必填！', trigger: 'blur' },
+    dynamicRules.createId = [{required: true, message: '装置编号必填！', trigger: 'blur'},
-    { pattern: /^\d+$/, message: '装置编号为数字', trigger: 'blur' }
+      {pattern: /^\d+$/, message: '装置编号为数字', trigger: 'blur'}
     ];
   }
   if (scene.value !== '0') {
-    dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }];
+    dynamicRules.name = [{required: true, message: '设备名称必填！', trigger: 'blur'}];
-    dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }];
+    dynamicRules.hardwareVersion = [{required: true, message: '固件版本必填！', trigger: 'blur'}];
-    dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填！', trigger: 'blur' }];
+    dynamicRules.softwareVersion = [{required: true, message: '软件版本必填！', trigger: 'blur'}];
-    dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }];
+    dynamicRules.manufacturer = [{required: true, message: '生产厂家必选！', trigger: 'change'}];
 
   }
 
   if (scene.value !== '2') {
-    dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }];
+    dynamicRules.name = [{required: true, message: '设备名称必填！', trigger: 'blur'}];
-    dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }];
+    dynamicRules.manufacturer = [{required: true, message: '生产厂家必选！', trigger: 'change'}];
 
   }
 
 
-
   return dynamicRules;
 });
 
-  // 关闭弹窗
+// 关闭弹窗
-  const close = () => {
+const close = () => {
   dialogVisible.value = false
   // 清空dialogForm中的值
   resetFormContent()
   // 重置表单
   dialogFormRef.value?.resetFields()
 
-  }
+}
 
-  // 保存数据
+// 保存数据
-  const save = () => {
+const save = () => {
   try {
     dialogFormRef.value?.validate(async (valid: boolean) => {
 
@@ -322,21 +336,23 @@ const rules = computed(() => {
       }
       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) 
+        }
-          {
+
+        if (formContent.value.arrivedDate) {
           formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD');
         }
 
         //保存时判是否加密，把识别码密钥字段清空
-          if(formContent.value.encryptionFlag === 0){
+        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}成功！` })
+          ElMessage.success({message: `${dialogTitle.value}成功！`})
         } else {
           // 新增需要把设备模式转成字典ID
           const patternItem = dictStore.getDictData('Pattern').find(item => item.name === formContent.value.pattern);
@@ -349,7 +365,7 @@ const rules = computed(() => {
             formContent.value.protocol = protocolItem.id;
           }
           await addPqDev(formContent.value);
-              ElMessage.success({ message: `${dialogTitle.value}成功！` })
+          ElMessage.success({message: `${dialogTitle.value}成功！`})
 
         }
 
@@ -366,17 +382,17 @@ const rules = computed(() => {
 
 
 // 打开弹窗，可能是新增，也可能是编辑
-const open = async (sign: string, data: Device.ResPqDev,currentMode: string,currentScene: string,devType:Device.ResDev[] ) => {
+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 ==='比对式'){
+  if (currentMode === '比对式') {
     DevIsShow.value = false
     MonIsShow.value = true
-    }else{
+  } else {
     DevIsShow.value = true
     MonIsShow.value = false
   }
@@ -387,13 +403,13 @@ 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;
       }
     }
@@ -421,27 +437,29 @@ 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')){
+    if(scene.value === '1'){
-      formContent.value.ip = '172.17.102.220'
+      if (dev.name.includes('NPQS-581') || dev.name.includes('NPQS-580') || dev.name.includes('PQ-COM')) {
-    }else if(dev.name.includes('882A')){
+        formContent.value.encryptionFlag = 1
-      formContent.value.ip = '172.17.102.221'
+        formContent.value.series = 'Pqs&cn870299'
-    }else{
+        formContent.value.devKey = '!qaz@wsx3edc4rfv'
-       formContent.value.ip = '172.17.102.200'
+      } else {
+        formContent.value.encryptionFlag = 0
+        formContent.value.series = null
+        formContent.value.devKey = null
+      }
     }
-    
-    
   } 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'
   }
 
 }
@@ -449,22 +467,18 @@ const handleDevTypeChange = (value: string) => {
 
 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/device/index.vue

@@ -16,6 +16,7 @@
         <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click="importFile('比对式')"
                    v-if='modeStore.currentMode === "比对式"'>导入
         </el-button>
+        <el-button type='primary' :icon='Upload' plain @click='uploadFile()' v-if='appSceneStore.currentScene === "1"'>报告上传</el-button>
         <el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           删除
@@ -28,6 +29,8 @@
         </el-button>
         <el-button v-auth.device="'delete'" type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除
         </el-button>
+
+
       </template>
 
     </ProTable>
@@ -38,7 +41,7 @@
 
 <script setup lang='tsx' name='useRole'>
 import TimeControl from '@/components/TimeControl/index.vue'
-import {type Device} from '@/api/device/interface/device.ts'
+import {type Device} from '@/api/device/interface/device'
 import {useHandleData} from '@/hooks/useHandleData'
 import {useDownload} from '@/hooks/useDownload'
 import ProTable from '@/components/ProTable/index.vue'
@@ -47,8 +50,9 @@ import {type ColumnProps, type ProTableInstance} from '@/components/ProTable/int
 import DevicePopup from '@/views/machine/device/components/devicePopup.vue'
 import {CirclePlus, Delete, Download, EditPen, Upload} from '@element-plus/icons-vue'
 import {useDictStore} from '@/stores/modules/dict'
-import {deletePqDev, downloadTemplate, exportPqDev, getPqDev, getPqDevList, importPqDev} from '@/api/device/device/index.ts'
+import {deletePqDev, downloadTemplate, exportPqDev, getPqDev, getPqDevList, importPqDev} from '@/api/device/device/index'
-import {ElMessageBox} from 'element-plus'
+import {uploadReportToCloud} from '@/api/device/report/index'
+import {ElMessage, ElMessageBox} from 'element-plus'
 import {onBeforeMount, reactive, ref} from 'vue'
 import {useAppSceneStore, useModeStore} from '@/stores/modules/mode'
 
@@ -151,6 +155,11 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
     minWidth: 130,
 
   },
+  {
+    prop: 'ip',
+    label: 'IP',
+    minWidth: 130,
+  },
   {
     prop: 'manufacturer',
     label: '设备厂家',
@@ -258,6 +267,40 @@ const importFile = async (pattern: string) => {
 
 }
 
+// 报告上传
+const uploadFile = async () => {
+  const selectedRows = proTable.value?.selectedList || []
+  
+  if (selectedRows.length === 0) {
+    // 没有选择设备，弹出确认框询问是否处理全部
+    ElMessageBox.confirm('未选择被检设备，是否对全部设备进行报告上传？', '提示', {
+      type: 'warning',
+      confirmButtonText: '全部上传',
+      cancelButtonText: '取消'
+    }).then(() => {
+      // 用户确认全部上传，传递空数组或特殊标识
+      handleReportUpload([])
+    }).catch(() => {
+      // 用户取消
+    })
+  } else {
+    // 有选择设备，使用选中的设备ID
+    const selectedIds = selectedRows.map(row => row.id)
+    handleReportUpload(selectedIds)
+  }
+}
+
+// 处理报告上传
+const handleReportUpload = async (deviceIds: string[]) => {
+  try {
+    await uploadReportToCloud(deviceIds)
+    ElMessage.success('报告上传成功')
+  } catch (error) {
+    ElMessage.error('报告上传失败')
+    console.error('报告上传错误:', error)
+  }
+}
+
 onBeforeMount(async () => {
   const response = await getPqDev()
   devTypeOptions.value = (response.data as Device.ResDev[]).map(item => ({

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

@@ -10,8 +10,8 @@
               style="width: 100%"
               :style="{ height: '400px',maxHeight: '400px',overflow:'hidden'}"
               @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
+      <el-table-column type="selection" width="55"/>
-                    <el-table-column prop="sort" label="序号" width="60" />
+      <el-table-column prop="sort" label="序号" width="60"/>
       <el-table-column prop="type" label="误差类型" min-width="180">
         <template #default="{ row }">
           <el-cascader style="min-width: 180px;"
@@ -29,10 +29,10 @@
                        v-model="row.scriptType"
                        :props="{ checkStrictly: false, emitPath: false }"
                        placeholder="请选择脚本类型"
-                                        />
+                       @change="handleScriptTypeChange(row)"/>
         </template>
       </el-table-column>
-                    <el-table-column label="起止范围" >
+      <el-table-column label="起止范围">
         <el-table-column label="起始" width="150">
           <template #default="{ row }">
             <el-row type="flex" :gutter="24">
@@ -44,7 +44,7 @@
                 </el-select>
               </el-col>
               <el-col :span="12">
-                                        <el-input v-model= "row.startValue" style="width: 60px;"  :disabled="isStartValueDisabled[row.sort]"
+                <el-input v-model="row.startValue" style="width: 60px;" :disabled="isStartValueDisabled[row.sort]"
                 />
               </el-col>
             </el-row>
@@ -52,7 +52,7 @@
         </el-table-column>
         <el-table-column label="结束" width="150">
           <template #default="{ row }">
-                                <el-row type="flex" :gutter="24" >
+            <el-row type="flex" :gutter="24">
               <el-col :span="12">
                 <el-select v-model="row.endFlag" placeholder="选择结束值" style="width: 70px;" @change="(value) => handleEndFlagChange(row, value)">
                   <el-option label="无" :value="2"></el-option>
@@ -61,7 +61,7 @@
                 </el-select>
               </el-col>
               <el-col :span="12">
-                                        <el-input v-model= "row.endValue" style="width: 60px;" :disabled="isEndValueDisabled[row.sort]"/>
+                <el-input v-model="row.endValue" style="width: 60px;" :disabled="isEndValueDisabled[row.sort]"/>
               </el-col>
             </el-row>
           </template>
@@ -70,7 +70,7 @@
           <template #default="{ row }">
             <el-select v-model="row.conditionType" placeholder="选择单位">
               <el-option
-                                v-for="item in dictStore.getDictData('Condition_Type')"
+                  v-for="item in conditionTypes"
                   :key="item.id"
                   :label="item.name"
                   :value="Number(item.value)"
@@ -82,19 +82,19 @@
       <el-table-column label="最大误差">
         <el-table-column prop="maxErrorValue" label="最大误差值" width="100">
           <template #default="{ row }">
-                                <el-input v-model= "row.maxErrorValue" style="width: 70px;"/>
+            <el-input v-model="row.maxErrorValue" style="width: 70px;"/>
           </template>
         </el-table-column>
-                        <el-table-column label="误差类型" width="180">
+        <el-table-column label="误差类型" width="170">
           <template #default="{ row }">
-                            <el-select v-model="row.errorValueType" placeholder="选择误差类型">
+            <el-cascader :options="errorValueTypeOptions"
-                                <el-option
+                         v-model="row.errorValueType"
-                                 v-for="item in dictStore.getDictData('Error_Value_Type')"
+                         @change="handleErrorValueTypeChange(row)"/>
-                                :key="item.id"
+          </template>
-                                :label="item.name"
+        </el-table-column>
-                                :value="Number(item.value)"
+        <el-table-column label="误差单位" width="100" prop="errorUnit">
-                                />
+          <template #default="{ row }">
-                            </el-select>
+            <span>{{ row.errorUnit }}</span>
           </template>
         </el-table-column>
       </el-table-column>
@@ -109,19 +109,18 @@
 </template>
 
 <script setup lang="ts">
-  import { type ErrorSystem } from '@/api/device/interface/error';
+import {type ErrorSystem} from '@/api/device/interface/error';
-  import { useDictStore, } from '@/stores/modules/dict'
+import {useDictStore,} from '@/stores/modules/dict'
-  import {CirclePlus, Delete, EditPen,CopyDocument} from '@element-plus/icons-vue'
+import {CirclePlus, CopyDocument, Delete} from '@element-plus/icons-vue'
-  import { type CascaderOption, type FormItemRule } from 'element-plus';
+import {type CascaderOption} from 'element-plus';
-import { el } from 'element-plus/es/locale';
+import {defineEmits, type PropType, reactive, ref, watch} from 'vue';
-  import { type PropType, type Ref, ref, watch } from 'vue';
+
-  import { defineEmits } from 'vue';
+const emit = defineEmits(['updateTableData']);
-  const emit = defineEmits(['updateTableData']);
+const multipleSelection = ref<number[]>([])
-  const multipleSelection = ref<number[]>([])
+const dictStore = useDictStore()
-  const dictStore = useDictStore()
+const isStartValueDisabled = ref<{ [key: number]: boolean }>({});
-  const isStartValueDisabled = ref<{ [key: number]: boolean }>({});
+const isEndValueDisabled = ref<{ [key: number]: boolean }>({});
-  const isEndValueDisabled = ref<{ [key: number]: boolean }>({});
+const props = defineProps({
-  const props = defineProps({
   errorOptions: {
     type: Array as PropType<CascaderOption[]>,
     required: true
@@ -138,32 +137,25 @@ import { el } from 'element-plus/es/locale';
   }
 });
 
+const errorValueTypeOptions = reactive<{ value: number, label: string, children: { value: number, label: string }[] }[]>([])
+const conditionTypes = dictStore.getDictData('Condition_Type')
+const errorValueTypes = dictStore.getDictData('Error_Value_Type')
+const valueTypes = dictStore.getDictData('Script_Value_Type')
 
-// 定义一个 Map 来存储误差和脚本系统信息
-const errSysAndScriptMap = new Map<string, string>([
-  ['Freq_Deviation_Freq','FREQ'],//频率偏差/频率---频率
-  ['Vol_Deviation_Vol','VRMS'],//电压偏差/电压---电压/相电压有效值
-  ['MSQI_V','V_UNBAN'],//三相不平衡/电压---电压/三相电压负序不平衡度
-  ['MSQI_CUR','I_UNBAN'],//三相不平衡/电流---电流/三相电流负序不平衡度
-  ['Voltage Fluctuation_Voltage Amplitude',''],//电压波动/电压幅值---
-  ['Voltage Fluctuation_Duration',''],//电压波动/持续时间---
-  ['Short Time Flicker Item','PST'],//闪变/短时间闪变---闪变/短时间闪变
-  ['Harmonic_Voltage','V2-50'],//谐波/电压---谐波/谐波电压含有率
-  ['Harmonic_Current','I2-50'],//谐波/电流---谐波/谐波电流幅值
-  ['Harmonic_Angle','VA2-50'],//谐波/相角---谐波/谐波电压相角
-  ['Harmonic_Angle','IA2-50'],//谐波/相角---谐波/谐波电流相角
-  ['Harmonic_Power','P2-50'],//谐波/功率---谐波/谐波有功功率
-  ['Interharmonic_Voltage','SV_1-49'],//间谐波/电压---谐波/间谐波电压含有率
-  ['Interharmonic_Current','SI_1-49'],//间谐波/电流---谐波/间谐波电流幅值
-  ['High Frequency Harmonic_Voltage',''],//高频次谐波/电压
-  ['High Frequency Harmonic_Current',''],//高频次谐波/电流
-  ['Power Item','P'],//功率/功率---功率
-  ['Current Item','IRMS'],//电流/电流---电流/电流有效值
-  ['Dip & Swell & Short duration interruption_Voltage','MAG'],//暂态/电压幅值/电压---暂态/电压幅值
-  ['Dip & Swell & Short duration interruption_Duration','DUR'],//暂态/持续时间/时间---暂态/持续时间
-]);
 
-const handleErrorTypeChange = (value: any, row: any) =>{
+onBeforeMount(() => {
+  valueTypes.forEach(item1 => {
+    let children = []
+    for (let i = 0; i < errorValueTypes.length; i++) {
+      if (item1.value === '2' && errorValueTypes[i].value === '2') {
+        continue
+      }
+      children.push({label: errorValueTypes[i].name, value: Number(errorValueTypes[i].value)})
+    }
+    errorValueTypeOptions.push({label: item1.name, value: Number(item1.value), children: children})
+  })
+})
+const handleErrorTypeChange = (value: any, row: any) => {
 
   // const matchedRow = findRowById(row.errorType, props.errorOptions);//选中误差id找对应结构中的含chilren的code
   // console.log('matchedRow.code',matchedRow.code)
@@ -182,6 +174,31 @@ const handleErrorTypeChange = (value: any, row: any) =>{
   // }
 }
 
+const handleScriptTypeChange = (row: any) => {
+  handleErrorValueTypeChange(row)
+}
+
+const handleErrorValueTypeChange = (row: any) => {
+  let scriptType = findRowById(row.scriptType, props.scriptOptions)
+  if (scriptType) {
+    const errorValueType = row.errorValueType
+    let level1 = errorValueType[0]
+
+    switch (level1) {
+      case 1: // 绝对值
+        row.valueType = 1
+        row.errorUnit = scriptType.remark
+        break;
+      case 2: // 相对值
+        row.valueType = 2
+        row.errorUnit = "%"
+        break;
+      default:
+        break;
+    }
+  }
+}
+
 
 // 假设 props.errorOptions 是一个数组，每个元素可能包含 children 属性
 const findRowById = (id: string, options: any[]): any | null => {
@@ -236,7 +253,7 @@ watch(() => props.tableData, async (newTableData) => {
   props.tableData.forEach(row => {
     isEndValueDisabled.value[row.sort] = row.endFlag === 2;
   });
-}, { immediate: true });
+}, {immediate: true});
 
 
 // 处理 startFlag 变化的方法
@@ -259,41 +276,43 @@ const handleEndFlagChange = (row: ErrorSystem.ErrorSystemDetail, value: number)
   }
 };
 
- //选中
+//选中
-   const handleSelectionChange = (selection: ErrorSystem.ErrorSystemDetail[]) => {
+const handleSelectionChange = (selection: ErrorSystem.ErrorSystemDetail[]) => {
   multipleSelection.value = selection.map(row => row.sort); // 更新选中的行
-  };
+};
-  //新增
+//新增
-  const openAddDialog = () => {
+const openAddDialog = () => {
   // 获取字典数据
-     const conditionTypes = dictStore.getDictData('Condition_Type');
+
-     const errorValueTypes = dictStore.getDictData('Error_Value_Type');
+
   const newRow = {
     sort: props.tableData.length + 1,
     id: '',
-      startFlag:2,
+    startFlag: 2,
-      endFlag:2,
+    endFlag: 2,
-      conditionType: conditionTypes.length > 0 ? Number(conditionTypes[3].value) : 0, // 设置默认值为第一个选项的值
+    conditionType: conditionTypes.length > 0 ? Number(conditionTypes[0].value) : 0, // 设置默认值为第一个选项的值
-      errorValueType:errorValueTypes.length > 0 ? Number(errorValueTypes[0].value) : 0, // 设置默认值为第一个选项的值
+    valueType: valueTypes.length > 0 ? Number(valueTypes[0].value) : 1,
+    errorValueType: [errorValueTypeOptions[0].value, errorValueTypeOptions[0].children[0].value],
     errorSysId: "",
     errorType: "",
     scriptType: "",
     maxErrorValue: 0
   };
 
+
   emit('updateTableData', [...props.tableData, newRow]);
 
 };
 
 const copyRow = (row: ErrorSystem.ErrorSystemDetail) => {
   // 深拷贝行数据
-  const newRow = { ...row };
+  const newRow = {...row};
   const maxNextId = Math.max(...props.tableData.map(item => item.sort), 0);
   newRow.sort = maxNextId + 1;
   emit('updateTableData', [...props.tableData, newRow]);
 };
 //删除行
-const deleteRow = (row:ErrorSystem.ErrorSystemDetail) => {
+const deleteRow = (row: ErrorSystem.ErrorSystemDetail) => {
   const index = props.tableData.indexOf(row);
   if (index !== -1) {
     const newTableData = [...props.tableData];
@@ -322,6 +341,7 @@ const deleteSelectedRows = () => {
 .el-table th, .el-table td {
   text-align: center; /* 所有单元格文字居中 */
 }
+
 .table-container {
   max-height: 400px; /* 根据需要调整高度 */
   overflow-y: auto; /* 允许垂直滚动 */

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

@@ -1,11 +1,11 @@
 <template>
-    <el-dialog  :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig" width="1500px">
+    <el-dialog  :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig" width="1660px">
         <el-tabs type="border-card">
             <el-tab-pane label="基础信息">
-                <div >
+                <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
@@ -137,6 +137,9 @@ const handleTableDataUpdate = (newTableData: ErrorSystem.ErrorSystemDetail[]) =>
                 }
             
                 formContent.value.pqErrSysDtlsList = tableData.value
+              formContent.value.pqErrSysDtlsList.forEach((item) => {
+                item.errorValueType=item.errorValueType[1]
+              })
                 if (formContent.value.id) {
                     await updatePqErrSys(formContent.value);
                     ElMessage.success({ message: `${dialogTitle.value}成功！` })
@@ -212,7 +215,8 @@ const loadSecondLevelOptions = async () => {
         value: item.id,
         label: item.name,
         code: item.code,
-        children: item.children ? convertToOptions(item.children) : undefined
+        children: item.children ? convertToOptions(item.children) : undefined,
+        remark: item.remark
     }));
     };
 
@@ -230,6 +234,9 @@ const open = async (sign: string, data: ErrorSystem.ErrorSystemList) => {
   if (result && result.data) {
     formContent.value = result.data as ErrorSystem.ErrorSystemList;
     tableData.value = formContent.value.pqErrSysDtlsList || [];
+    tableData.value.forEach((item) => {
+      item.errorValueType=[item.valueType,item.errorValueType]
+    })
   } else {
     resetFormContent();
   }

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/communication.vue

@@ -140,7 +140,7 @@ const info = async () => {
                     name: k.name,
                     disabled: false,
                     pname: item.name,
-                    dataType: '谐波有功功率'
+                    dataType: item.name =='谐波有功功率'
                         ? 'avg'
                         : item.name == '闪变'
                           ? 'avg'

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

@@ -20,7 +20,7 @@
             <el-table-column prop="name" label="参考设定值子类型" width="250">
                 <template #default="{ row }">{{ row.harmNum ? `(${row.harmNum}次)` : '' }} {{ row.name }}</template>
             </el-table-column>
-            <el-table-column prop="dataType" label="值类型">
+            <!-- <el-table-column prop="dataType" label="值类型">
                 <template #default="{ row }">
                     <el-select v-model="row.dataType" v-if="!row.show">
                         <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
@@ -29,7 +29,7 @@
                         {{ typeList.find(item => item.value == row.dataType)?.label || row.dataType }}
                     </span>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="phase" label="相别" />
             <el-table-column prop="value" label="参考设定值">
                 <template #default="{ row }">

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

@@ -31,7 +31,11 @@
                                 :show-header="false"
                                 :span-method="arraySpanMethod"
                                 :cell-style="tableStyle.cellStyle"
-                                :header-cell-style="{ textAlign: 'center', backgroundColor: 'var(--el-color-primary)', color: '#fff' }"
+                                :header-cell-style="{
+                                    textAlign: 'center',
+                                    backgroundColor: 'var(--el-color-primary)',
+                                    color: '#fff'
+                                }"
                                 @cell-click="handleRowClick"
                                 :key="key"
                             >
@@ -85,22 +89,32 @@
                                         <el-checkbox-button
                                             v-model="form.channelList[$index].channelFlag"
                                             label="通道使能"
+                                            :disabled="
+                                                form.channelList[$index].harmFlag ||
+                                                form.channelList[$index].inHarmFlag ||
+                                                form.channelList[$index].flickerFlag ||
+                                                form.channelList[$index].dipFlag
+                                            "
                                         />
                                         <el-checkbox-button
                                             v-model="form.channelList[$index].harmFlag"
                                             label="谐波使能"
+                                            @change="handleHarmFlag($event, $index)"
                                         />
                                         <el-checkbox-button
                                             v-model="form.channelList[$index].inHarmFlag"
                                             label="间谐波使能"
+                                            @change="handleHarmFlag($event, $index)"
                                         />
                                         <el-checkbox-button
                                             v-model="form.channelList[$index].flickerFlag"
                                             label="闪变使能"
+                                            @change="handleHarmFlag($event, $index)"
                                         />
                                         <el-checkbox-button
                                             v-model="form.channelList[$index].dipFlag"
                                             label="暂态使能"
+                                            @change="handleHarmFlag($event, $index)"
                                         />
                                     </template>
                                 </el-table-column>
@@ -114,7 +128,13 @@
                                 <div class="form-item-container">
                                     <el-form-item label="频率：" prop="name">
                                         <div class="input-label-container">
-                                            <el-input type="number" style="width: 100px" v-model="form.ffreq" />
+                                            <el-input
+                                                type="number"
+                                                style="width: 100px"
+                                                v-model="form.ffreq"
+                                                onkeypress="return (/[\d\.]/.test(String.fromCharCode(event.keyCode)))"
+                                                @change="validateFreq"
+                                            />
                                             <label>Hz</label>
                                         </div>
                                     </el-form-item>
@@ -142,7 +162,7 @@
                             <TestScriptFlickerTab :childForm="childForm" />
                         </el-tab-pane>
                         <el-tab-pane label="暂态编辑" v-if="childForm[0].dipFlag || childForm[1].dipFlag">
-                            <TestScriptDipTab :childForm="childForm" />
+                            <TestScriptDipTab :childForm="childForm" @setRetainTime="setRetainTime" />
                         </el-tab-pane>
                     </el-tabs>
                 </div>
@@ -154,7 +174,7 @@
                     :formContent="props.formContent"
                     :form="form"
                     :key="initial"
-                    :valueCode=valueCode
+                    :valueCode="valueCode"
                     @recalculation="recalculation"
                 />
             </el-carousel-item>
@@ -277,6 +297,12 @@ const close = () => {
     dialogVisible.value = false
     emit('close')
 }
+// 设置持续时间
+const setRetainTime = (val: any) => {
+    form.value.channelList.forEach((item: any) => {
+        item.dipData.retainTime = val
+    })
+}
 
 // 保存数据
 const save = () => {
@@ -318,7 +344,7 @@ const next = () => {
             return
         }
         let { flag, message } = checkFlags()
-        // // 判断够选通道
+        // // 判断勾选通道
         if (!flag) {
             ElMessage.warning({
                 message: message,
@@ -341,7 +367,7 @@ const recalculation = () => {
     setValueTableRef.value?.open(props.communicationList, {})
 }
 
-// 判断够选通道
+// 判断勾选通道
 const checkFlags = () => {
     let list: any = []
     let flag = true
@@ -362,7 +388,7 @@ const checkFlags = () => {
                     form.value.channelList[2].channelFlag == false &&
                     form.value.channelList[4].channelFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了电压,请选择电压通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了电压,请选择电压通道使能' }
 
                 break
             case '谐波电压':
@@ -371,7 +397,7 @@ const checkFlags = () => {
                     form.value.channelList[2].harmFlag == false &&
                     form.value.channelList[4].harmFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了谐波电压,请选择谐波电压通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了谐波电压,请选择谐波电压通道使能' }
                 break
             case '谐波电流':
                 if (
@@ -379,7 +405,7 @@ const checkFlags = () => {
                     form.value.channelList[3].harmFlag == false &&
                     form.value.channelList[5].harmFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了谐波电流,请选择谐波电流通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了谐波电流,请选择谐波电流通道使能' }
                 break
             case '谐波有功功率':
                 if (
@@ -390,7 +416,7 @@ const checkFlags = () => {
                     form.value.channelList[4].harmFlag == false &&
                     form.value.channelList[5].harmFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了谐波有功功率,请选择间电压、电流谐波通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了谐波有功功率,请选择间电压、电流谐波通道使能' }
                 break
             case '间谐波电压':
                 if (
@@ -398,7 +424,7 @@ const checkFlags = () => {
                     form.value.channelList[2].inHarmFlag == false &&
                     form.value.channelList[4].inHarmFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了间谐波电压,请选择间谐波电压通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了间谐波电压,请选择间谐波电压通道使能' }
                 break
             case '间谐波电流':
                 if (
@@ -406,7 +432,7 @@ const checkFlags = () => {
                     form.value.channelList[3].inHarmFlag == false &&
                     form.value.channelList[5].inHarmFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了间谐波电流,请选择间谐波电流通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了间谐波电流,请选择间谐波电流通道使能' }
                 break
             case '暂态':
                 if (
@@ -414,7 +440,7 @@ const checkFlags = () => {
                     form.value.channelList[2].dipFlag == false &&
                     form.value.channelList[4].dipFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了暂态,请选择电压暂态通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了暂态,请选择电压暂态通道使能' }
                 break
             case '电流':
                 if (
@@ -422,7 +448,7 @@ const checkFlags = () => {
                     form.value.channelList[3].channelFlag == false &&
                     form.value.channelList[5].channelFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了电压,请选择电压通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了电流,请选择电流通道使能' }
                 break
             case '三相电压不平衡度':
                 if (
@@ -430,7 +456,7 @@ const checkFlags = () => {
                     form.value.channelList[2].channelFlag == false ||
                     form.value.channelList[4].channelFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了三相电压不平衡度,请选择电压A、B、C通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了三相电压不平衡度,请选择电压A、B、C通道使能' }
                 break
             case '三相电流不平衡度':
                 if (
@@ -438,7 +464,7 @@ const checkFlags = () => {
                     form.value.channelList[3].channelFlag == false ||
                     form.value.channelList[5].channelFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了三相电流不平衡度,请选择电流A、B、C通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了三相电流不平衡度,请选择电流A、B、C通道使能' }
                 break
             case '闪变':
                 if (
@@ -446,7 +472,7 @@ const checkFlags = () => {
                     form.value.channelList[2].flickerFlag == false &&
                     form.value.channelList[4].flickerFlag == false
                 )
-                    return { flag: false, message: '通讯脚本中够选了闪变,请选择电压闪变通道使能' }
+                    return { flag: false, message: '通讯脚本中勾选了闪变,请选择电压闪变通道使能' }
                 break
         }
     }
@@ -601,7 +627,7 @@ const copyRow = (num: number, index: number) => {
     form.value.channelList[0].channelType = 'Ua'
     form.value.channelList[1].channelType = 'Ia'
     form.value.channelList[2].channelType = 'Ub'
-    form.value.channelList[3].channelType = 'Ia'
+    form.value.channelList[3].channelType = 'Ib'
     form.value.channelList[4].channelType = 'Uc'
     form.value.channelList[5].channelType = 'Ic'
     key.value += 1
@@ -611,6 +637,21 @@ const copyRow = (num: number, index: number) => {
     })
 }
 
+const validateFreq = () => {
+    if (form.value.ffreq < 40) {
+        ElMessage.warning('频率不能低于40Hz')
+        form.value.ffreq = 40
+    } else if (form.value.ffreq > 60) {
+        ElMessage.warning('频率不能高于60Hz')
+        form.value.ffreq = 60
+    }
+}
+// 点击使能按钮
+const handleHarmFlag = (e: boolean, i: number) => {
+    if (e) {
+        form.value.channelList[i].channelFlag = true
+    }
+}
 
 // 打开 drawer(新增、编辑)
 const openDialog = () => {}
@@ -677,4 +718,8 @@ defineExpose({ open })
 :deep(.el-table__body) {
     border-top: var(--el-table-border);
 }
+:deep(.el-checkbox-button.is-disabled .el-checkbox-button__inner) {
+    background-color: var(--el-color-primary);
+    color: var(--el-color-white);
+}
 </style>

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/testScriptDipTab.vue

@@ -33,14 +33,17 @@
                     v-model="form[0].dipData.ftransValue"
                     style="width: 150px"
                     :disabled="!form[0].dipFlag"
+                    onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
                 />
             </el-form-item>
             <el-form-item label-width="120px" label="持续时间(周波)">
                 <el-input
                     type="number"
                     v-model="form[0].dipData.retainTime"
+                    @input="handleInputRetainTime"
                     style="width: 150px"
                     :disabled="!form[0].dipFlag"
+                    onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
                 />
             </el-form-item>
         </div>
@@ -61,13 +64,33 @@ const form: any = computed({
     },
     set(value) {}
 })
+const emit = defineEmits(['setRetainTime'])  
 const handleInput = value => {
     if (value < 0) {
+      ElMessage.warning("设定幅度不能小于0%")
         props.childForm[0].dipData.ftransValue = 0
-    } else if (value > 200) {
+    } else if (value > 180) {
-        props.childForm[0].dipData.ftransValue = 200
+      ElMessage.warning("设定幅度不能大于180%")
+        props.childForm[0].dipData.ftransValue = 180
     }
 }
+
+const handleInputRetainTime = value => {
+    if (value < 0) {
+      ElMessage.warning("持续时间不能小于0周波")
+      props.childForm[0].dipData.retainTime = 0
+      emit('setRetainTime', 0 )
+    }else if (value > 300) {
+      ElMessage.warning("持续时间不能大于300周波")
+      props.childForm[0].dipData.retainTime = 300
+      emit('setRetainTime', 300 )
+    }else{
+     console.log(props);
+     
+        emit('setRetainTime', value )
+    }
+}
+
 </script>
 
 <style lang="scss" scoped>

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

@@ -204,6 +204,10 @@ const waveList = [
             {
                 fchagFre: '2400',
                 fchagValue: '0.77'
+            },
+          {
+            fchagFre: '4000',
+            fchagValue: '2.4'
           }
         ]
     },

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

@@ -13,8 +13,8 @@
                 filterable
                 clearable
             >
-                            <el-option label="全部" value="0" />
+              <el-option label="全部" value="0"/>
-                            <el-option v-for="item in 49" :key="item" :label="item + 1" :value="item + 1" />
+              <el-option v-for="item in 49" :key="item" :label="item + 1" :value="item + 1"/>
             </el-select>
           </el-form-item>
           <el-form-item label="含有率">
@@ -23,6 +23,8 @@
                 type="number"
                 placeholder="含有率"
                 style="width: 80px"
+                onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
+                @input="validateInput('famp',0)"
                 clearable
             />
           </el-form-item>
@@ -32,6 +34,8 @@
                 type="number"
                 placeholder="相角"
                 style="width: 80px"
+                onkeypress="return (/[\d-]/.test(String.fromCharCode(event.keyCode)))"
+                @input="validateInput('fphase',0)"
                 clearable
             />
           </el-form-item>
@@ -43,16 +47,16 @@
         <!-- 电压通道内容 -->
         <div class="table-container">
           <el-table :data="form[0].harmList" border stripe size="small">
-                        <el-table-column prop="harm" align="center" label="次数" width="60" />
+            <el-table-column prop="harm" align="center" label="次数" width="60"/>
             <el-table-column prop="famp" align="center" label="谐波含有率">
               <template #default="{ row }">
-                                <el-input type="number" v-if="row.show" v-model="row.famp" />
+                <el-input type="number" v-if="row.show" v-model="row.famp"/>
                 <span v-else>{{ row.famp }}%</span>
               </template>
             </el-table-column>
             <el-table-column prop="fphase" label="谐波相角" align="center">
               <template #default="{ row }">
-                                <el-input type="number" v-if="row.show" v-model="row.fphase" />
+                <el-input type="number" v-if="row.show" v-model="row.fphase"/>
                 <span v-else>{{ row.fphase }}°</span>
               </template>
             </el-table-column>
@@ -92,8 +96,8 @@
                 filterable
                 clearable
             >
-                            <el-option label="全部" value="0" />
+              <el-option label="全部" value="0"/>
-                            <el-option v-for="item in 49" :key="item" :label="item + 1" :value="item + 1" />
+              <el-option v-for="item in 49" :key="item" :label="item + 1" :value="item + 1"/>
             </el-select>
           </el-form-item>
           <el-form-item label="含有率">
@@ -102,6 +106,8 @@
                 type="number"
                 placeholder="含有率"
                 style="width: 80px"
+                onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
+                @input="validateInput('famp',1)"
                 clearable
             />
           </el-form-item>
@@ -111,6 +117,8 @@
                 type="number"
                 placeholder="相角"
                 style="width: 80px"
+                onkeypress="return (/[\d-]/.test(String.fromCharCode(event.keyCode)))"
+                @input="validateInput('fphase',1)"
                 clearable
             />
           </el-form-item>
@@ -122,16 +130,16 @@
         <!-- 电流通道内容 -->
         <div class="table-container">
           <el-table :data="form[1].harmList" border stripe size="small">
-                        <el-table-column prop="harm" align="center" label="次数" width="60" />
+            <el-table-column prop="harm" align="center" label="次数" width="60"/>
             <el-table-column prop="famp" align="center" label="谐波含有率">
               <template #default="{ row }">
-                                <el-input type="number" v-if="row.show" v-model="row.famp" />
+                <el-input type="number" v-if="row.show" v-model="row.famp"/>
                 <span v-else>{{ row.famp }}%</span>
               </template>
             </el-table-column>
             <el-table-column prop="fphase" label="谐波相角" align="center">
               <template #default="{ row }">
-                                <el-input type="number" v-if="row.show" v-model="row.fphase" />
+                <el-input type="number" v-if="row.show" v-model="row.fphase"/>
                 <span v-else>{{ row.fphase }}°</span>
               </template>
             </el-table-column>
@@ -162,8 +170,9 @@
 </template>
 
 <script setup lang="ts">
-import { Check, Delete, EditPen, CopyDocument } from '@element-plus/icons-vue'
+import {Check, Delete, EditPen} from '@element-plus/icons-vue'
-import { ref } from 'vue'
+import {ref} from 'vue'
+
 const props = defineProps({
   childForm: {
     type: Array as any,
@@ -175,7 +184,8 @@ const form: any = computed({
   get() {
     return props.childForm
   },
-    set(value) {}
+  set(value) {
+  }
 })
 const formInline = ref({
   harm: [],
@@ -187,6 +197,7 @@ const formInline1 = ref({
   famp: '',
   fphase: ''
 })
+
 // 定义表格数据项的类型
 interface TableItem {
   date: string
@@ -194,6 +205,7 @@ interface TableItem {
   harmonicPhase?: string
   name?: string
 }
+
 const empty = (index: number) => {
   props.childForm[index].harmList = []
 }
@@ -276,6 +288,48 @@ const onSubmit1 = () => {
 const HarmFlagDelete = (index: number, number: number) => {
   props.childForm[index].harmList.splice(number, 1)
 }
+
+const validateInput = (type: string, index: number) => {
+  if (type == 'famp') {
+    if (Number(formInline.value.famp) < 0 || Number(formInline1.value.famp) < 0) {
+      ElMessage.warning("含有率不能低于0")
+      if (index == 0) {
+        formInline.value.famp = '0'
+      }
+      if (index == 1) {
+        formInline1.value.famp = '0'
+      }
+    }
+    if (Number(formInline.value.famp) > 200 || Number(formInline1.value.famp) > 200) {
+      ElMessage.warning("含有率不能高于200")
+      if (index == 0) {
+        formInline.value.famp = '200'
+      }
+      if (index == 1) {
+        formInline1.value.famp = '200'
+      }
+    }
+  }
+  if (type == 'fphase') {
+    if (Number(formInline.value.fphase) < -360 || Number(formInline1.value.fphase) < -360) {
+      ElMessage.warning("相角不能低于-360°")
+      if (index == 0) {
+        formInline.value.fphase = '-360';
+      }
+      if (index == 1) {
+        formInline1.value.fphase = '-360';
+      }
+    } else if (Number(formInline.value.fphase) > 360 || Number(formInline1.value.fphase) > 360) {
+      ElMessage.warning("相角不能高于360°")
+      if (index == 0) {
+        formInline.value.fphase = '360';
+      }
+      if (index == 1) {
+        formInline1.value.fphase = '360';
+      }
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -317,6 +371,7 @@ const HarmFlagDelete = (index: number, number: number) => {
 .input-label-container label {
   margin-left: 5px; /* 添加标签与输入框之间的间距 */
 }
+
 // 全局css 加上以下代码，可以隐藏上下箭头
 
 // 取消input的上下箭头

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

@@ -23,6 +23,8 @@
                             type="number"
                             placeholder="含有率"
                             style="width: 80px"
+                            onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))"
+                            @input="validateInput('famp',0)"
                             clearable
                         />
                     </el-form-item>
@@ -32,6 +34,8 @@
                             type="number"
                             placeholder="相角"
                             style="width: 80px"
+                            onkeypress="return (/[\d-]/.test(String.fromCharCode(event.keyCode)))"
+                            @input="validateInput('fphase',0)"
                             clearable
                         />
                     </el-form-item>
@@ -102,6 +106,8 @@
                             type="number"
                             placeholder="含有率"
                             style="width: 80px"
+                            onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
+                            @input="validateInput('famp',1)"
                             clearable
                         />
                     </el-form-item>
@@ -111,6 +117,8 @@
                             type="number"
                             placeholder="相角"
                             style="width: 80px"
+                            onkeypress="return (/[\d-]/.test(String.fromCharCode(event.keyCode)))"
+                            @input="validateInput('fphase',1)"
                             clearable
                         />
                     </el-form-item>
@@ -205,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, //间间谐波含有率
@@ -242,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, //间间谐波含有率
@@ -276,6 +284,48 @@ const onSubmit1 = () => {
 const inHarmFlagDelete = (index: number, number: number) => {
     props.childForm[index].inharmList.splice(number, 1)
 }
+
+const validateInput = (type: string, index: number) => {
+  if (type == 'famp') {
+    if (Number(formInline.value.famp) < 0 || Number(formInline1.value.famp) < 0) {
+      ElMessage.warning("含有率不能低于0")
+      if (index == 0) {
+        formInline.value.famp = '0'
+      }
+      if (index == 1) {
+        formInline1.value.famp = '0'
+      }
+    }
+    if (Number(formInline.value.famp) > 200 || Number(formInline1.value.famp) > 200) {
+      ElMessage.warning("含有率不能高于200")
+      if (index == 0) {
+        formInline.value.famp = '200'
+      }
+      if (index == 1) {
+        formInline1.value.famp = '200'
+      }
+    }
+  }
+  if (type == 'fphase') {
+    if (Number(formInline.value.fphase) < -360 || Number(formInline1.value.fphase) < -360) {
+      ElMessage.warning("相角不能低于-360°")
+      if (index == 0) {
+        formInline.value.fphase = '-360';
+      }
+      if (index == 1) {
+        formInline1.value.fphase = '-360';
+      }
+    } else if (Number(formInline.value.fphase) > 360 || Number(formInline1.value.fphase) > 360) {
+      ElMessage.warning("相角不能高于360°")
+      if (index == 0) {
+        formInline.value.fphase = '360';
+      }
+      if (index == 1) {
+        formInline1.value.fphase = '360';
+      }
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

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/testScript/components/testScriptVolCurTab.vue

@@ -9,17 +9,17 @@
             <!-- 右侧编辑区域内容 -->
             <el-form :inline="true" label-width="auto" :model="form" class="form-two">
                 <el-form-item :label="`电压有效值(${valueCode == 'Absolute' ? 'V' : '%'})`">
-                    <el-input type="number" v-model="form[0].famp" :disabled="!form[0].channelFlag" />
+                    <el-input type="number" v-model="form[0].famp" :disabled="!form[0].channelFlag" onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))" @input="validateInput(0, 'famp')"/>
                 </el-form-item>
                 <el-form-item label="电压相角(°)">
-                    <el-input type="number" v-model="form[0].fphase" :disabled="!form[0].channelFlag" />
+                    <el-input type="number" v-model="form[0].fphase" :disabled="!form[0].channelFlag" onkeypress="return (/[\d-]/.test(String.fromCharCode(event.keyCode)))" @input="validateInput(0, 'fphase')"/>
                 </el-form-item>
                 <el-form-item :label="`电流有效值(${valueCode == 'Absolute' ? 'A' : '%'})`">
-                    <el-input type="number" v-model="form[1].famp" :disabled="!form[1].channelFlag" />
+                    <el-input type="number" v-model="form[1].famp" :disabled="!form[1].channelFlag" onkeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))" @input="validateInput(1, 'famp')"/>
                 </el-form-item>
 
                 <el-form-item label="电流相角(°)">
-                    <el-input type="number" v-model="form[1].fphase" :disabled="!form[1].channelFlag" />
+                    <el-input type="number" v-model="form[1].fphase" :disabled="!form[1].channelFlag" onkeypress="return (/[\d-]/.test(String.fromCharCode(event.keyCode)))" @input="validateInput(1, 'fphase')"/>
                 </el-form-item>
             </el-form>
         </div>
@@ -109,6 +109,50 @@ function drawSineWave() {
         }
     }
 }
+
+const validateInput = (index: number, field: string) => {
+  const value = form.value[index][field];
+  if (index === 0) {
+    if (field === 'famp') {
+      if (value < 0) {
+        ElMessage.warning("电压不能低于0V")
+        form.value[index][field] = 0;
+      } else if (value > 380) {
+        ElMessage.warning("电压不能高于380V")
+        form.value[index][field] = 380;
+      }
+    }
+  }
+  if (index === 1) {
+    if (field === 'famp') {
+      if (value < 0) {
+        if(valueCode=== 'Absolute') {
+          ElMessage.warning("电流不能低于0A")
+        }else{
+          ElMessage.warning("电流不能低于0%")
+        }
+        form.value[index][field] = 0;
+      } else if (value > 20) {
+        if(valueCode=== 'Absolute') {
+          ElMessage.warning("电流不能高于20A")
+          form.value[index][field] = 20;
+        }else if(value > 200){
+          ElMessage.warning("电流不能高于200%")
+          form.value[index][field] = 200;
+        }
+      }
+    }
+  }
+  if (field === 'fphase') {
+    if (value < -360) {
+      ElMessage.warning("相角不能低于-360°")
+      form.value[index][field] = -360;
+    } else if (value > 360) {
+      ElMessage.warning("相角不能高于360°")
+      form.value[index][field] = 360;
+    }
+  }
+}
 </script>
 
 <style scoped>

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">
@@ -93,8 +93,8 @@ function useMetaInfo() {
 }
 
 const rules: reactive<Record<string, Array<FormItemRule>>> = reactive({
-  desc: [{required: true, message: '源参数描述必填！', trigger: 'blur'}],
+  desc: [{required: true, message: '源参数描述必填！', trigger: 'blur'},{min: 1, max: 32, message: '长度为1~32个字符', trigger: 'blur'}],
-  type: [{required: true, message: '源参数类型必填！', trigger: 'blur'}],
+  type: [{required: true, message: '源参数类型必填！', trigger: 'blur'},{min: 1, max: 32, message: '长度为1~32个字符', trigger: 'blur'}],
   sort: [{required: true, message: '排序必填！', trigger: 'blur'}]
 })
 

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

@@ -6,10 +6,10 @@
       <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="请选择检测源">
+            <el-select v-model="formContent.sourceIds" :multiple="selectByMode" collapse-tags placeholder="请选择检测源" clearable>
               <el-option
                 v-for="(option, index) in pqSourceArray"
                 :key="index"
@@ -19,17 +19,17 @@
             </el-select>
           </el-form-item>
           <el-form-item label="数据源" prop="datasourceIds" :label-width="100">
-            <el-select v-model="formContent.datasourceIds" :multiple="selectByMode" collapse-tags placeholder="请选择数据源" autocomplete="off">
+            <el-select v-model="formContent.datasourceIds" :multiple="selectByMode" collapse-tags placeholder="请选择数据源" autocomplete="off" clearable>
               <el-option
                 v-for="item in dictStore.getDictData(dataSourceType)"
                 :key="item.id"
                 :label="item.name"
-                :value="item.value || ''"
+                :value="item.code || ''"
               />
             </el-select>
           </el-form-item>
           <el-form-item label="检测脚本" prop="scriptId" :label-width="100">
-            <el-select v-model="formContent.scriptId" placeholder="请选择检测脚本" autocomplete="off" :disabled="isSelectDisabled ">
+            <el-select v-model="formContent.scriptId" placeholder="请选择检测脚本" autocomplete="off" :disabled="isSelectDisabled" clearable>
               <el-option
                 v-for="(option, index) in pqScriptArray"
                 :key="index"
@@ -39,7 +39,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="误差体系" prop="errorSysId" :label-width="100">
-            <el-select v-model="formContent.errorSysId" placeholder="请选择误差体系" autocomplete="off" :disabled="isSelectDisabled">
+            <el-select v-model="formContent.errorSysId" placeholder="请选择误差体系" autocomplete="off" :disabled="isSelectDisabled" clearable>
               <el-option
                 v-for="(option, index) in pqErrorArray"
                 :key="index"
@@ -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">
@@ -54,12 +64,12 @@
               <el-radio :value="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="关联报告模版" :label-width="100" prop='associateReport'>
+          <!-- <el-form-item label="关联报告模版" :label-width="100" prop='associateReport'>
             <el-radio-group v-model="formContent.associateReport">
               <el-radio :value="1">是</el-radio>
               <el-radio :value="0">否</el-radio>
             </el-radio-group>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="模版名称" prop="reportTemplateName" :label-width="100" v-if="formContent.associateReport === 1">
             <el-select v-model="formContent.reportTemplateName" placeholder="请选择报告模版" autocomplete="off"  >
               <el-option
@@ -82,9 +92,7 @@
             :data="allData"
             :titles="['未绑定设备', '已绑定设备']">
             <template #default="{ option }">
-              <el-tooltip :content="option.tips" placement="top" :show-after=1000>
               <span>{{ option.label }}</span>
-              </el-tooltip>
             </template>
           </el-transfer>
       </el-col>
@@ -111,6 +119,12 @@
   import { type ErrorSystem } from '@/api/device/interface/error';
   import { type Device } from '@/api/device/interface/device';
   import {getPqReportAllName,getPqReportAllVersion} from '@/api/device/report/index.ts'
+  import {useAppSceneStore} from "@/stores/modules/mode";
+import { fromPairs } from 'lodash';
+import { el } from 'element-plus/es/locale';
+
+
+  const AppSceneStore = useAppSceneStore()
   const dictStore = useDictStore()
   // 定义弹出组件元信息
   const dialogFormRef = ref()
@@ -183,6 +197,7 @@ const filterMethod = (query: string, item: { label?: string }) => {
                         associateReport:0,
                         reportTemplateName:'',
                         reportTemplateVersion:'',
+                        dataRule:'',
                       })
     return { dialogVisible, titleType, formContent }
   }
@@ -216,6 +231,7 @@ const filterMethod = (query: string, item: { label?: string }) => {
         associateReport:0,
         reportTemplateName:'',
         reportTemplateVersion:'',
+        dataRule:'',
       }
     )
     
@@ -235,6 +251,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 动态生成规则
@@ -280,12 +297,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 {  
@@ -294,6 +318,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{
@@ -325,22 +354,10 @@ const open = async (sign: string,
      mode.value = currentMode
      titleType.value = sign
      isSelectDisabled.value = false
-      if (data.id) {
-          if(data.testState === 0){
-            isSelectDisabled.value = false
-          }else{
-            isSelectDisabled.value = true
-          }
-          
-          Object.assign(formContent,{ ...data })
-      } else {
-        resetFormContent()
-      }
-      // 重置表单
-      dialogFormRef.value?.resetFields()
 
      if(sign == 'add')
       {
+        resetFormContent()
         const [pqSource_Result, PqScript_Result, PqErrSys_Result,pqDevList_Result,pqReportName_Result] = await Promise.all([
             getTestSourceList(data),
             getPqScriptList(data),
@@ -350,8 +367,6 @@ const open = async (sign: string,
            
         ]);
        
-
-       
         if (Array.isArray(pqReportName_Result.data)) {
           pqReportName.value = pqReportName_Result.data.map(item => ({ name: item }));
         } else {
@@ -365,8 +380,25 @@ 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{//编辑时先给表单赋值（这会没接收被检设备），需要手动再给被检设备复制后整体表单赋值
        
+
+        if(data.testState === 0){
+            isSelectDisabled.value = false
+        }else{
+            isSelectDisabled.value = true
+        }
+          
+        Object.assign(formContent,{ ...data })
+
         const [pqSource_Result, PqScript_Result, PqErrSys_Result,boundPqDevList_Result, unboundPqDevList_Result,pqReportName_Result] = await Promise.all([
             getTestSourceList(data),
             getPqScriptList(data),
@@ -413,6 +445,13 @@ const open = async (sign: string,
       }
 
       value.value = boundPqDevList.value.map((i: { id: { toString: () => any } }) => i.id.toString());
+      
+      if(AppSceneStore.currentScene == "1"){//楼下场景不用报告模版
+        formContent.associateReport = 0
+      }else{
+        formContent.associateReport = 1
+      }
+
        // 所有数据加载完成后显示对话框
        dialogVisible.value = true;
 }

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'
@@ -93,7 +94,7 @@ const planList = ref<Plan.ResPlan[]>([]);
 const getTableList = async(params: any) => {
   let newParams = JSON.parse(JSON.stringify(params))
   const patternId   = dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.id//获取数据字典中对应的id
-  newParams.pattern = patternId
+  newParams.patternId = patternId
 
   try {
     const result = await getPlanList(newParams);
@@ -120,18 +121,18 @@ const dataSourceType = computed(() => {
 
 // 表格配置项
 const columns = reactive<ColumnProps<Plan.ReqPlan>[]>([
-  { type: 'selection', fixed: 'left', width: 70 },
+  { type: 'selection', fixed: 'left', minWidth: 70 },
-  { type: 'index', fixed: 'left', width: 70, label: '序号' },
+  { 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 },
 ])
 
 
@@ -356,7 +367,7 @@ const exportClick = () => {
 
   ElMessageBox.confirm('确认导出检测计划?', '温馨提示', { type: 'warning' }).then(() =>{
     const patternId  = dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.id//获取数据字典中对应的id
-    useDownload(exportPlan,'检测计划导出数据', {...proTable.value?.searchParam,pattern:patternId}, false,'.xlsx')
+    useDownload(exportPlan,'检测计划导出数据', {...proTable.value?.searchParam,patternId:patternId}, false,'.xlsx')
   })
 }
 

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

@@ -1,58 +1,65 @@
 <template>
-    <div class='table-box' >
+  <div class='table-box'>
     <el-tabs type="border-card">
       <el-tab-pane label="检测相关配置">
-                <div >
+        <div>
-                  <el-divider >检测配置</el-divider>
+          <el-form :model="TestConfigForm" ref='testConfigFormRef' :rules='rules'>
-                        <el-row  :gutter="24" >
+            <el-divider>检测配置</el-divider>
+            <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label='一键检测方式' prop='autoGenerate' :label-width="140">
-                                    <el-select v-model="TestConfigForm.autoGenerate"  clearable placeholder="请选择一键检测方式" >
+                  <el-select v-model="TestConfigForm.autoGenerate" clearable placeholder="请选择一键检测方式">
                     <el-option label="只检测,报告后续手动生成" :value="0"></el-option>
                     <el-option label="检测和生成报告同时进行" :value="1"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                                <el-form-item label='检测最大次数'  prop='maxTime' :label-width="110">
+                <el-form-item label='检测最大次数' prop='maxTime' :label-width="140">
-                                  <el-input-number  v-model='TestConfigForm.maxTime' :min='1' :max='999' />
+<!--                  <el-input-number v-model='TestConfigForm.maxTime' :min='1' :max='999' onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"/>-->
+                  <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-form-item label='误差保留小数位' prop='scale' :label-width="140">
-                                    <el-select v-model="TestConfigForm.dataRule"  clearable placeholder="请选择数据处理原则" >
+                  <el-input number v-model.number='TestConfigForm.scale' placeholder="请输入误差保留小数位" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"/>
-                                    <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 :model="RegResForm" ref='dialogFormRef' :rules='rules' >      
+          </el-form>
-                        <el-divider >有效数据配置</el-divider>
+          <el-form :model="RegResForm" ref='dialogFormRef' :rules='rules'>
-                        <el-row  :gutter="24" >
+            <el-divider>有效数据配置</el-divider>
+            <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="录波数据有效组数" prop="waveRecord" :label-width="140">
                   <el-input v-model.number='RegResForm.waveRecord' :placeholder="placeholder" :disabled="IsMode"/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                              <el-form-item label="实时数据有效组数" prop="realTime" :label-width="140" >
+                <el-form-item label="实时数据有效组数" prop="realTime" :label-width="140">
-                                    <el-input number v-model.number='RegResForm.realTime' placeholder="请输入实时数据有效组数"/>
+                  <el-input number v-model.number='RegResForm.realTime' placeholder="请输入实时数据有效组数" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                              <el-form-item label="统计数据有效组数" prop="statistics" :label-width="140" >
+                <el-form-item label="统计数据有效组数" prop="statistics" :label-width="140">
-                                    <el-input number v-model.number='RegResForm.statistics' placeholder="请输入统计数据有效组数"/>
+                  <el-input number v-model.number='RegResForm.statistics' placeholder="请输入统计数据有效组数" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                              <el-form-item label="闪变数据有效组数" prop="flicker" :label-width="140" >
+                <el-form-item label="闪变数据有效组数" prop="flicker" :label-width="140">
-                                    <el-input number v-model.number='RegResForm.flicker' placeholder="请输入闪变数据有效组数"/>
+                  <el-input number v-model.number='RegResForm.flicker' placeholder="请输入闪变数据有效组数" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -63,11 +70,11 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="日志配置">
-              <div >
+        <div>
-                        <el-row  :gutter="24" >
+          <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label='调试日志配置' :label-width="140">
-                                    <el-select  clearable placeholder="请选择调试日志配置" >
+                <el-select clearable placeholder="请选择调试日志配置">
                   <el-option label="开启" :value="0"></el-option>
                   <el-option label="关闭" :value="1"></el-option>
                 </el-select>
@@ -75,7 +82,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label='调试日志记录等级' :label-width="140">
-                                    <el-select  clearable placeholder="请选择日志记录等" >
+                <el-select clearable placeholder="请选择日志记录等">
                   <el-option label="FATAL(致命错误)及以上" :value="0"></el-option>
                   <el-option label="ERROR(一般错误)及以上" :value="1"></el-option>
                   <el-option label="WARN(警告)及以上" :value="2"></el-option>
@@ -86,7 +93,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label='操作日志配置' :label-width="140">
-                                    <el-select  clearable placeholder="请选择操作日志配置" >
+                <el-select clearable placeholder="请选择操作日志配置">
                   <el-option label="开启" :value="0"></el-option>
                   <el-option label="关闭" :value="1"></el-option>
                 </el-select>
@@ -99,11 +106,11 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="数据删除备份配置">
-              <div >
+        <div>
-                        <el-row  :gutter="24" >
+          <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label='原始数据备份频率' :label-width="140">
-                                    <el-select  clearable placeholder="请选择原始数据备份频率" >
+                <el-select clearable placeholder="请选择原始数据备份频率">
                   <el-option label="每月" :value="0"></el-option>
                   <el-option label="每三月" :value="1"></el-option>
                   <el-option label="每年" :value="1"></el-option>
@@ -114,7 +121,7 @@
             <el-col :span="8">
               <el-form-item label='原始数据备份路径' :label-width="140">
                 <el-col :span="16">
-                                    <el-input />
+                  <el-input/>
                 </el-col>
                 <el-col :span="8">
                   <el-button type='primary'>立即进行备份</el-button>
@@ -122,17 +129,17 @@
               </el-form-item>
             </el-col>
           </el-row>
-                        <el-row  :gutter="24" >
+          <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label='原始数据备份时间' :label-width="140">
-                                    <el-select  clearable placeholder="请选择原始数据备份时间" >
+                <el-select clearable placeholder="请选择原始数据备份时间">
                   <el-option label="03:00" :value="0"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label='原始数据删除配置' :label-width="140">
-                                    <el-select  clearable placeholder="请选择原始数据删除配置" >
+                <el-select clearable placeholder="请选择原始数据删除配置">
                   <el-option label="从不" :value="0"></el-option>
                   <el-option label="大于半年进行删除" :value="1"></el-option>
                   <el-option label="大于一年进行删除" :value="2"></el-option>
@@ -143,16 +150,16 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label='原始数据删除时间' :label-width="140">
-                                    <el-select  clearable placeholder="请选择原始数据删除时间" >
+                <el-select clearable placeholder="请选择原始数据删除时间">
                   <el-option label="05:00" :value="0"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-                        <el-row  :gutter="24" >
+          <el-row :gutter="24">
             <el-col :span="8">
               <el-form-item label='调试日志保存策略' :label-width="140">
-                                    <el-select  clearable placeholder="请选择调试日志保存策略" >
+                <el-select clearable placeholder="请选择调试日志保存策略">
                   <el-option label="一个月" :value="0"></el-option>
                   <el-option label="三个月" :value="1"></el-option>
                   <el-option label="六个月" :value="2"></el-option>
@@ -162,7 +169,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label='操作日志保存策略' :label-width="140">
-                                    <el-select  clearable placeholder="请选择操作日志保存策略" >
+                <el-select clearable placeholder="请选择操作日志保存策略">
                   <el-option label="三个月" :value="0"></el-option>
                   <el-option label="六个月或大于100万条" :value="1"></el-option>
                   <el-option label="从不" :value="2"></el-option>
@@ -177,63 +184,60 @@
       </el-tab-pane>
     </el-tabs>
   </div>
-  </template>
+</template>
 
-  <script setup lang='tsx''>
+<script setup lang='tsx'>
-  import { type Dict } from '@/api/system/dictionary/interface'
+import {useDictStore} from '@/stores/modules/dict'
-  import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
+import {computed, onMounted, Ref, ref} from 'vue'
-  import PqPopup from '@/views/system/dictionary/dictPq/components/pqPopup.vue'
+import {type  Base} from '@/api/system/base/interface'
-  import { useDictStore } from '@/stores/modules/dict'
+import {type VersionRegister} from '@/api/system/versionRegister/interface'
-  import { useHandleData } from '@/hooks/useHandleData'
+import {getTestConfig, updateTestConfig} from '@/api/system/base/index'
-  import { computed, onMounted, reactive, Ref, ref, watch } from 'vue'
+import {getRegRes, updateRegRes} from '@/api/system/versionRegister/index'
-  import {type  Base } from '@/api/system/base/interface'
+import {ElMessage, FormItemRule} from 'element-plus'
-  import {type VersionRegister } from '@/api/system/versionRegister/interface'
+import {useModeStore} from '@/stores/modules/mode'; // 引入模式 store
-  import {getTestConfig,updateTestConfig } from '@/api/system/base/index'
+defineOptions({
-  import {getRegRes,updateRegRes } from '@/api/system/versionRegister/index'
-  import { ElMessage, FormItemRule } from 'element-plus'
-  import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store
-  defineOptions({
   name: 'base'
-  })
+})
 
-  const modeStore = useModeStore();
+const modeStore = useModeStore();
-  const dictStore = useDictStore()
+const dictStore = useDictStore()
-  const dialogFormRef = ref()
+const testConfigFormRef = ref()
-  const mode = ref()
+const dialogFormRef = ref()
-  const IsMode = ref(false)
+const mode = ref()
-  const placeholder = ref()
+const IsMode = ref(false)
-  const TestConfigList = ref<Base.ResTestConfig>()
+const placeholder = ref()
-  const RegResList = ref<VersionRegister.ResSys_Reg_Res>()
+const TestConfigList = ref<Base.ResTestConfig>()
+const RegResList = ref<VersionRegister.ResSys_Reg_Res>()
 
 
 // 初始化时获取
 onMounted(async () => {
-    mode.value =modeStore.currentMode;//pinia中获取当前是那个模块进来的
+  mode.value = modeStore.currentMode;//pinia中获取当前是那个模块进来的
   const response = await getTestConfig()
   TestConfigForm.value = response.data as unknown as Base.ResTestConfig
-    const patternId  = dictStore.getDictData('Pattern').find(item=>item.name=== mode.value)?.id//获取数据字典中对应的id
+  const patternId = dictStore.getDictData('Pattern').find(item => item.name === mode.value)?.id//获取数据字典中对应的id
   RegResForm.value.type = patternId || '';
   const response2 = await getRegRes(RegResForm.value)
   RegResForm.value = response2.data as unknown as VersionRegister.ResSys_Reg_Res
   //只有比对式有录波
-    if(mode.value == '比对式'){
+  if (mode.value == '比对式') {
     placeholder.value = '请输入录波数据有效组数'
     IsMode.value = false
-    }else{
+  } else {
     placeholder.value = '/'
     IsMode.value = true
   }
-  })
+})
 
-  const TestConfigForm = ref<Base.ResTestConfig>({
+const TestConfigForm = ref<Base.ResTestConfig>({
   id: '',
   autoGenerate: 0,
   maxTime: 3,
-    dataRule: '',
   state: 1, //状态
-  })
+  scale:4,
+})
 
-  const RegResForm = ref<VersionRegister.ResSys_Reg_Res>({
+const RegResForm = ref<VersionRegister.ResSys_Reg_Res>({
   id: '',     //版本注册表Id
   type: '', //版本类型（模拟式、数字式、比对式）
   code: '', //注册码
@@ -246,72 +250,86 @@ onMounted(async () => {
   state: 1, //状态
 })
 
-  const RegResForm2 = ref<VersionRegister.Sys_Reg_Res>({
+const RegResForm2 = ref<VersionRegister.Sys_Reg_Res>({
-          id:'',
+  id: '',
   waveRecord: 0,
   realTime: 20,
   statistics: 5,
   flicker: 1,
-  })
+})
 
-   // 定义弹出组件元信息
+// 定义弹出组件元信息
-   const rules = computed(() =>{
+const rules = computed(() => {
-    const baseRules : Ref<Record<string, Array<FormItemRule>>> = ref({
+  const baseRules: Ref<Record<string, Array<FormItemRule>>> = ref({
-          realTime :[
+    maxTime: [
-            {required:true,trigger:'blur',message:'实时数据有效组数必填!'},
+      {required: true, trigger: 'blur', message: '检测最大次数必填!'},
-            { pattern: /^[0-9]\d*$/, message: '实时数据有效组数为含0的正整数', trigger: 'blur' }
+      {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '检测最大次数为1~999的正整数', trigger: 'blur'}
     ],
-          statistics :[
+    scale: [
-            {required:true,trigger:'blur',message:'统计数据有效组数必填!'},
+      {required: true, trigger: 'blur', message: '误差保留小数位必填!'},
-            { pattern: /^[0-9]\d*$/, message: '统计数据有效组数为含0的正整数', trigger: 'blur' }
+      {pattern: /^[4-6]$/, message: '误差保留小数位为4~6的整数', trigger: 'blur'}
     ],
-          flicker :[
+    realTime: [
-            {required:true,trigger:'blur',message:'闪变数据有效组数必填!'},
+      {required: true, trigger: 'blur', message: '实时数据有效组数必填!'},
-            { pattern: /^[0-9]\d*$/, message: '闪变数据有效组数为含0的正整数', trigger: 'blur' }
+      {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '实时数据有效组数为1~999的正整数', trigger: 'blur'}
     ],
+    statistics: [
+      {required: true, trigger: 'blur', message: '统计数据有效组数必填!'},
+      {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '统计数据有效组数为1~999的正整数', trigger: 'blur'}
+    ],
+    flicker: [
+      {required: true, trigger: 'blur', message: '闪变数据有效组数必填!'},
+      {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '闪变数据有效组数为1~999的正整数', trigger: 'blur'}
+    ],
+
   });
 
 
-          if(mode.value == '比对式'){
+  if (mode.value == '比对式') {
     baseRules.value.waveRecord = [
-              {required:true,trigger:'blur',message:'录波数据有效组数必填!'},
+      {required: true, trigger: 'blur', message: '录波数据有效组数必填!'},
-              { pattern: /^[0-9]\d*$/, message: '录波数据有效组数为含0的正整数', trigger: 'blur' }
+      {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '录波数据有效组数为1~999的正整数', trigger: 'blur'}
     ];
   }
 
   return baseRules;
-   })
+})
 
 
-
+const submitForm = async () => {
-  
-
-  const submitForm = async () => {
   try {
-      dialogFormRef.value?.validate(async (valid: boolean) => {
+    testConfigFormRef.value?.validate(async (valid: boolean) => {
       if (valid) {
         await updateTestConfig(TestConfigForm.value);
 
-               // 提取并传递 4 个参数
+        dialogFormRef.value?.validate(async (valid: boolean) => {
-              const { id,waveRecord, realTime, statistics, flicker } = RegResForm.value
+          if (valid) {
-              RegResForm2.value = { id,waveRecord, realTime, statistics, flicker }
+            //await updateTestConfig(TestConfigForm.value);
 
-              if(RegResForm.value.waveRecord == null){
+            // 提取并传递 4 个参数
+            const {id, waveRecord, realTime, statistics, flicker} = RegResForm.value
+            RegResForm2.value = {id, waveRecord, realTime, statistics, flicker}
+
+            if (RegResForm.value.waveRecord == null) {
               RegResForm2.value.waveRecord = -1
             }
             await updateRegRes(RegResForm2.value);
 
-              ElMessage.success({ message: `保存配置成功！` })
+            ElMessage.success({message: `保存配置成功！`})
           }
         })
+      }
+    })
+
+
   } catch (err) {
     console.error('验证过程中出现错误', err)
   }
-  }
+}
 
-  </script>
+</script>
-    <style scoped>
+<style scoped>
-    .dialog-footer {
+.dialog-footer {
   float: right;
-    }
+}
-    </style>
+</style>

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

@@ -1,11 +1,12 @@
 <template>
   <el-dialog :title="dialogTitle" v-model="dialogVisible" @close="close" v-bind="dialogSmall">
-        <el-form ref="dialogFormRef" :model="formContent" :rules="rules" style="height: 330px; overflow: hidden;"  >
+    <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
@@ -17,6 +18,7 @@
               :on-exceed="BaseHandleExceed"
               :on-remove="BaseHandleRemove"
               style="width: 100% !important;"
+              accept=".docx"
               class="upload-container"
           >
             <el-button type="primary">选择文件</el-button>
@@ -33,6 +35,7 @@
               :on-exceed="DataHandleExceed"
               :on-remove="DataHandleRemove"
               style="width: 100% !important;"
+              accept=".docx"
               class="upload-container"
           >
             <el-button type="primary">选择文件</el-button>
@@ -40,9 +43,10 @@
           仅支持上传大小不超过5MB的.docx文件
         </el-form-item>
         <el-form-item label="描述信息" prop="description">
-                <el-input v-model="formContent.description" type="textarea" placeholder="请输入描述信息" />
+          <el-input v-model="formContent.description" type="textarea" placeholder="请输入描述信息"/>
         </el-form-item>
       </el-form>
+    </div>
     <template #footer>
       <div>
         <el-button @click="close()">取 消</el-button>
@@ -53,11 +57,11 @@
 </template>
 
 <script setup lang="ts">
-import {  dialogSmall } from '@/utils/elementBind'
+import {dialogSmall} from '@/utils/elementBind'
-import { type PqReport } from '@/api/device/interface/report'
+import {type PqReport} from '@/api/device/interface/report'
-import { ElMessage,  UploadFile } from 'element-plus'
+import {ElMessage, UploadFile} from 'element-plus'
-import { updatePqReport, addPqReport, getPqReportById } from '@/api/device/report'
+import {addPqReport, getPqReportById, updatePqReport} from '@/api/device/report'
-import { computed, reactive, ref } from 'vue'
+import {computed, reactive, ref} from 'vue'
 
 // 定义弹出组件元信息
 const dialogFormRef = ref()
@@ -70,14 +74,14 @@ const detailFileUrl = ref('')
 
 const baseFileList = computed(() => {
   if (baseFileName.value && baseFileUrl.value) {
-        return [{ name: baseFileName.value, url: baseFileUrl.value }];
+    return [{name: baseFileName.value, url: baseFileUrl.value}];
   }
   return [];
 });
 
 const detailFileList = computed(() => {
   if (detailFileName.value && detailFileUrl.value) {
-        return [{ name: detailFileName.value, url: detailFileUrl.value }];
+    return [{name: detailFileName.value, url: detailFileUrl.value}];
   }
   return [];
 });
@@ -90,14 +94,14 @@ function useMetaInfo() {
     name: '',
     version: '', // 版本号
     description: '', // 描述信息
-        detailFile:'',//检测项模版文件路径
+    detailFile: '',//检测项模版文件路径
-        baseFile:'',
+    baseFile: '',
     state: 1,
   })
-    return { dialogVisible, titleType, formContent }
+  return {dialogVisible, titleType, formContent}
 }
 
-const { dialogVisible, titleType, formContent } = useMetaInfo()
+const {dialogVisible, titleType, formContent} = useMetaInfo()
 
 // 清空formContent
 const resetFormContent = () => {
@@ -106,8 +110,8 @@ const resetFormContent = () => {
     name: '',
     version: '', // 版本号
     description: '', // 描述信息
-        detailFile:'',//检测项模版文件路径
+    detailFile: '',//检测项模版文件路径
-        baseFile:'',
+    baseFile: '',
     state: 1,
   }
 
@@ -127,10 +131,10 @@ const close = () => {
 
 // 表单验证规则
 const rules = reactive({
-    name: [{ required: true, message: '请输入报告名称', trigger: 'blur' }],
+  name: [{required: true, message: '请输入报告名称', trigger: 'blur'}],
-    version: [{ required: true, message: '请输入版本号', trigger: 'blur' }],
+  version: [{required: true, message: '请输入版本号', trigger: 'blur'}],
-    baseFile: [{ required: true, message: '请上传基础模板文件', trigger: 'change' }],
+  baseFile: [{required: true, message: '请上传基础模板文件', trigger: 'change'}],
-    detailFile: [{ required: true, message: '请上传检测项模版文件', trigger: 'change' }],
+  detailFile: [{required: true, message: '请上传检测项模版文件', trigger: 'change'}],
 })
 
 // 保存数据
@@ -147,14 +151,19 @@ const save = () => {
         excelFormData.append('name', formContent.value.name)
         excelFormData.append('version', formContent.value.version)
         excelFormData.append('description', formContent.value.description)
+        let baseFileFlag = handleFileLimit(excelFormData.get('baseFile') as File)
+        let detailFileFlag = handleFileLimit(excelFormData.get('detailFile') as File)
+        if (!baseFileFlag || !detailFileFlag) {
+          return
+        }
         if (formContent.value.id) {
 
           excelFormData.append('id', formContent.value.id)
           await updatePqReport(excelFormData);
-                    ElMessage.success({ message: `${dialogTitle.value}成功！` })
+          ElMessage.success({message: `${dialogTitle.value}成功！`})
         } else {
           await addPqReport(excelFormData);
-                    ElMessage.success({ message: `${dialogTitle.value}成功！` })
+          ElMessage.success({message: `${dialogTitle.value}成功！`})
 
         }
 
@@ -183,14 +192,14 @@ const open = async (sign: string, data?: PqReport.ResReport) => {
 
       // 处理文件信息
       if (res.data.baseFileVO) {
-                baseFileName.value= res.data.baseFileVO.name;
+        baseFileName.value = res.data.baseFileVO.name;
-                baseFileUrl.value= res.data.baseFileVO.url;
+        baseFileUrl.value = res.data.baseFileVO.url;
 
         formContent.value.baseFile = res.data.baseFileVO.name
       }
       if (res.data.detailFileVO) {
-                detailFileName.value= res.data.detailFileVO.name;
+        detailFileName.value = res.data.detailFileVO.name;
-                detailFileUrl.value= res.data.detailFileVO.url;
+        detailFileUrl.value = res.data.detailFileVO.url;
 
         formContent.value.detailFile = res.data.detailFileVO.name
       }
@@ -198,7 +207,7 @@ const open = async (sign: string, data?: PqReport.ResReport) => {
 
     })
   } else {
-        baseFileName.value =''
+    baseFileName.value = ''
     baseFileUrl.value = ''
     detailFileName.value = ''
     detailFileUrl.value = ''
@@ -250,7 +259,7 @@ const DataHandleExceed = (files: File[]) => {
 
 };
 
-const BaseHandleChange = async(param : UploadFile) => {
+const BaseHandleChange = async (param: UploadFile) => {
   baseFileName.value = param.name;
   baseFileUrl.value = URL.createObjectURL(param.raw as Blob);
   excelFormData.append('baseFile', param.raw as Blob, param.name);
@@ -258,7 +267,7 @@ const BaseHandleChange = async(param : UploadFile) => {
   formContent.value.baseFile = param.name;
 };
 
-const DataHandleChange = async(param: UploadFile) => {
+const DataHandleChange = async (param: UploadFile) => {
   detailFileName.value = param.name;
   detailFileUrl.value = URL.createObjectURL(param.raw as Blob);
   excelFormData.append('detailFile', param.raw as Blob, param.name);
@@ -266,10 +275,23 @@ const DataHandleChange = async(param: UploadFile) => {
   formContent.value.detailFile = param.name;
 };
 
+const fileSizeLimit = 5 * 1024 * 1024; // 5MB
+
+const handleFileLimit = (file: File) => {
+  if (file) {
+    if (file.size > fileSizeLimit) {
+      ElMessage.error({message: `文件大小不能超过${fileSizeLimit / 1024 / 1024}MB`});
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return true;
+}
 
 
 // 对外映射
-defineExpose({ open })
+defineExpose({open})
 const props = defineProps<{
   refreshTable: (() => Promise<void>) | undefined
 }>()
@@ -279,7 +301,4 @@ const props = defineProps<{
   display: flex;
   align-items: center;
 }
-
-
-
 </style>

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

@@ -84,6 +84,11 @@
           return scope.row.detailFileVO.url
       }
     },
+    {
+      prop:'description',
+      label: '描述',
+      minWidth: 150
+    },
     {
     prop: 'createTime',
     label: '创建时间',