设备类型报告模版只在楼下厂家展示

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列表
     }
 
     /**

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/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/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/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/layouts/components/Header/components/Avatar.vue

@@ -81,7 +81,6 @@ const modeStore = useModeStore();
 const AppSceneStore = useAppSceneStore();
 import { useTheme } from "@/hooks/useTheme";
 import { useI18n } from "vue-i18n";
-import {getPublicKey} from "@/api/user/login"; // 引入 vue-i18n 钩子
 const { changePrimary} = useTheme();
 
 // 初始化 i18n
@@ -99,6 +98,7 @@ const logout = () => {
     // 2.清除 Token
     userStore.setAccessToken("");
     userStore.setRefreshToken("");
+    userStore.setExp(0)
     userStore.setUserInfo({id: "", name: ""});
     userStore.setIsRefreshToken(false)
     dictStore.setDictData([]);

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

@@ -9,6 +9,7 @@ export const useUserStore = defineStore({
     accessToken: "",
     refreshToken: "",
     isRefreshToken:false,
+    exp: Number(0),
     userInfo: {id:"", name: "admin" },
   }),
   getters: {},
@@ -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

@@ -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/home/components/channelsTest.vue

@@ -25,7 +25,9 @@
                   <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_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,7 +58,9 @@
                   <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="结束"/>
@@ -90,14 +98,13 @@
 </template>
 <script lang="tsx" setup name="channelsTest">
 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 {dialogBig} from '@/utils/elementBind'
-import { ElMessage, ElMessageBox, TabsPaneContext } from 'element-plus';
+import {ElMessageBox} from 'element-plus';
 import {getCoefficientCheck} from '@/api/home/channelsTest/index'
 import type {ChannelsTest} from '@/api/home/interface/channelsTest';
 import type {Plan} from '@/api/plan/interface';
-import { fa } from 'element-plus/es/locale';
 import {useUserStore} from "@/stores/modules/user";
 
 
@@ -297,40 +304,59 @@ 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();
+            }
+            break;
+        }
+        break;
       case 'Coefficient_Check':
         console.log("Coefficient_Checkactive", active.value);
         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;
+          case 'big_end'://大电压,电流下装
+            active.value++;
             tableLoading('small', '系数下装')
             break;
         }
         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;
+          case 'small_end'://小电压,电流下装
+            active.value++;
             tableLoading('big', '系数校准')
             break;
         }
         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;
+          case 'big_comp_end'://大电压,电流校准
+            active.value++;
             tableLoading('small', '系数校准')
             break;
         }
         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++) {
@@ -752,8 +778,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"
   }
@@ -906,6 +931,7 @@ const initializeTableData = (templates: ChannelsTest.CoefficientVO[], index: num
   justify-content: space-between;
   margin-bottom: 10px;
 }
+
 .custom-tabs-label .el-icon {
   vertical-align: middle;
 }
@@ -922,6 +948,7 @@ const initializeTableData = (templates: ChannelsTest.CoefficientVO[], index: num
 .el-tabs--border-card {
   height: 470px;
 }
+
 /* .el-icon svg {
   color: #ff7171;
 } */
@@ -929,6 +956,7 @@ const initializeTableData = (templates: ChannelsTest.CoefficientVO[], index: num
 .icon-style {
   color: #ff7171;
 }
+
 .container {
   display: flex;
 }

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

@@ -1,8 +1,8 @@
 <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="数据时间"/>

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

@@ -10,8 +10,8 @@
       <!--      </el-table-column>-->
       <template v-if="phaseT === 0">
         <el-table-column label="A相">
-          <el-table-column prop="stdA" width="105" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="stdA" width="130" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataA" width="105" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="dataA" width="130" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
           <el-table-column prop="isDataA" label="检测结果">
             <template #default="scope">
               <el-tooltip effect="dark" placement="bottom">
@@ -28,8 +28,8 @@
           </el-table-column>
         </el-table-column>
         <el-table-column label="B相">
-          <el-table-column prop="stdB" width="105" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="stdB" width="130" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataB" width="105" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="dataB" width="130" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
           <el-table-column prop="isDataB" label="检测结果">
             <template #default="scope">
               <el-tooltip effect="dark" placement="bottom">
@@ -46,8 +46,8 @@
           </el-table-column>
         </el-table-column>
         <el-table-column label="C相">
-          <el-table-column prop="stdC" width="105" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="stdC" width="130" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
-          <el-table-column prop="dataC" width="105" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="dataC" width="130" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
           <el-table-column prop="isDataC" label="检测结果">
             <template #default="scope">
               <el-tooltip effect="dark" placement="bottom">

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,58 @@ 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 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
   }
@@ -457,8 +437,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 +479,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 +496,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 +503,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 +534,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 +551,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 +577,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 +662,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 +745,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: '确定',
@@ -344,44 +345,59 @@ 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();
+              }
+              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++) {
@@ -518,6 +534,7 @@ watch(webMsgSend, function (newValue, oldValue) {
           break;
       }
     }
+  }
 })
 
 //出错系数检测初始化

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,26 @@ 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'
             }
             break;
         }
-
         break;
       case 'YJC_xujy':
         switch (newValue.operateCode) {
@@ -460,6 +484,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 +492,7 @@ watch(webMsgSend, function (newValue, oldValue) {
                 log: '解析报文异常',
               })
               ts.value = 'error'
+              step5.value = 'error'
             }
             break;
 
@@ -496,6 +522,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,9 +530,9 @@ watch(webMsgSend, function (newValue, oldValue) {
                 type: 'wait',
                 log: '相序校验成功!',
               })
+              ts.value = 'success'
             }
             activeIndex.value = 5
-          ts.value = 'success'
             console.log("@@@@", ts.value)
             break
         }
@@ -522,6 +549,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '源服务端连接失败!',
             }];
             ts.value = 'error'
+            step5.value = 'error'
             break;
           case "Dev":
             step2.value = 'error'
@@ -530,6 +558,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '设备服务端连接失败!',
             }];
             ts.value = 'error'
+            step5.value = 'error'
             break;
         }
         break;
@@ -542,9 +571,10 @@ watch(webMsgSend, function (newValue, oldValue) {
           type: 'error',
         })
         ts.value = 'error'
+        step5.value = 'error'
         break;
     }
-
+  }
 })
 
 watch(activeIndex, function (newValue, oldValue) {

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>
@@ -958,11 +958,14 @@ const handleTest = async (val: string) => {
               selectTestItemPopupRef.value?.open()
             })
             .catch((action: Action) => {
+              if(action === 'cancel'){
                 ElMessage.success('全部复检')
                 checkStore.setReCheckType(1)
                 selectTestItemPopupRef.value?.open()
+              }
             })
       } else {
+        checkStore.setReCheckType(1)
         selectTestItemPopupRef.value?.open()
       }
     } else if (val === '系数校准') {
@@ -1064,7 +1067,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: `报告生成成功！`})
   }

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

@@ -86,9 +86,9 @@
               <el-table-column v-for="(chnItem,index2) in item.chnNum" :key="`${item.deviceId}${chnItem}`"
                                :label="'通道'+chnItem" align="center">
                 <template #default="{row}">
-                  <el-tooltip
+<!--                  <el-tooltip-->
-                      :content="row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.INFO ? '暂无数据' : '点击查看详情'"
+<!--                      :content="row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.INFO ? '暂无数据' : '点击查看详情'"-->
-                      placement="top">
+<!--                      placement="top">-->
                     <el-button
                         :disabled="row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.INFO || row.devices[index1].chnResult[index2].color===CheckData.ButtonColorEnum.LOADING"
                         :color="row.devices[index1].chnResult[index2].color"
@@ -105,7 +105,7 @@
                       </el-icon>
                     </el-button>
 
-                  </el-tooltip>
+<!--                  </el-tooltip>-->
                 </template>
               </el-table-column>
             </el-table-column>
@@ -355,6 +355,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('报文解析异常！', '初始化失败', {
@@ -535,7 +536,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 +544,21 @@ 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名称：${newValue.data.icdType} -> 校验项：${newValue.data.dataType}`
+                  })
+                  emit('update:testStatus', 'test_init_fail')
                 }
                 break;
             }
@@ -648,6 +659,7 @@ watch(webMsgSend, function (newValue, oldValue) {
         }
       }
     }
+  }
 }, {deep: true})
 
 const handleStartItem = (code: string, desc: string | undefined) => {

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

@@ -299,7 +299,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) {
@@ -344,12 +344,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',

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/tabs/model.vue

@@ -84,6 +84,7 @@ const modeList = [
 const handelOpen = async (item: any) => {
   modeStore.setCurrentMode(item.code); // 将模式code存入 store
   const {data:scene} = await getCurrentScene(); // 获取当前场景
+
   // AppSceneStore.setCurrentMode(scene+'');//0：省级平台，1：设备出厂，2：研发自测
   AppSceneStore.setCurrentMode(scene+'');//0：省级平台，1：设备出厂，2：研发自测
   await authStore.setShowMenu();

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='Upload'>导出csv</el-button>
+        <el-button type='primary' :icon='Upload' @click='handleExport'>导出csv</el-button>
       </template>
     </ProTable>
 
@@ -23,12 +21,12 @@
 import TimeControl from '@/components/TimeControl/index.vue'
 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 { 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({
@@ -53,7 +51,7 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
   {type: 'selection', fixed: 'left', width: 70},
   {type: 'index', fixed: 'left', width: 70, label: '序号'},
   {
-    prop: 'createBy',
+    prop: 'userName',
     label: '操作用户',
     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>
       )
     },
   },
@@ -114,7 +114,16 @@ const handleDateChange = (startDateTemp: string, endDateTemp: string) => {
   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

@@ -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

@@ -157,7 +157,9 @@ 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)
 // 存储设备类型选项
@@ -322,7 +324,10 @@ 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) 
           {
             formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD');

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

@@ -29,7 +29,7 @@
                        v-model="row.scriptType"
                        :props="{ checkStrictly: false, emitPath: false }"
                        placeholder="请选择脚本类型"
-                                        />
+                       @change="handleScriptTypeChange(row)"/>
         </template>
       </el-table-column>
       <el-table-column label="起止范围">
@@ -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)"
@@ -85,16 +85,16 @@
             <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>
@@ -111,11 +111,10 @@
 <script setup lang="ts">
 import {type ErrorSystem} from '@/api/device/interface/error';
 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 multipleSelection = ref<number[]>([])
 const dictStore = useDictStore()
@@ -138,31 +137,24 @@ 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'],//暂态/持续时间/时间---暂态/持续时间
-]);
 
+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
@@ -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 => {
@@ -266,21 +283,23 @@ const handleEndFlagChange = (row: ErrorSystem.ErrorSystemDetail, value: number)
 //新增
 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,
     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]);
 
 };
@@ -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,5 +1,5 @@
 <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>
@@ -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/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/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/testScriptHarmTab.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>
@@ -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'
+
 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>
@@ -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/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

@@ -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

@@ -9,7 +9,7 @@
             <el-input v-model="formContent.name" placeholder="请输入名称" autocomplete="off"/>
           </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"
@@ -82,9 +82,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>

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

@@ -93,7 +93,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);
@@ -356,7 +356,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

@@ -3,6 +3,7 @@
     <el-tabs type="border-card">
       <el-tab-pane label="检测相关配置">
         <div>
+          <el-form :model="TestConfigForm" ref='testConfigFormRef' :rules='rules'>
             <el-divider>检测配置</el-divider>
             <el-row :gutter="24">
               <el-col :span="8">
@@ -15,7 +16,8 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label='检测最大次数' prop='maxTime' :label-width="110">
-                                  <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">
@@ -30,8 +32,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-                            
             </el-row>
+          </el-form>
           <el-form :model="RegResForm" ref='dialogFormRef' :rules='rules'>
             <el-divider>有效数据配置</el-divider>
             <el-row :gutter="24">
@@ -42,17 +44,17 @@
               </el-col>
               <el-col :span="8">
                 <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-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-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>
@@ -179,13 +181,9 @@
   </div>
 </template>
 
-  <script setup lang='tsx''>
+<script setup lang='tsx'>
-  import { type Dict } from '@/api/system/dictionary/interface'
-  import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
-  import PqPopup from '@/views/system/dictionary/dictPq/components/pqPopup.vue'
 import {useDictStore} from '@/stores/modules/dict'
-  import { useHandleData } from '@/hooks/useHandleData'
+import {computed, onMounted, Ref, ref} from 'vue'
-  import { computed, onMounted, reactive, Ref, ref, watch } from 'vue'
 import {type  Base} from '@/api/system/base/interface'
 import {type VersionRegister} from '@/api/system/versionRegister/interface'
 import {getTestConfig, updateTestConfig} from '@/api/system/base/index'
@@ -198,6 +196,7 @@
 
 const modeStore = useModeStore();
 const dictStore = useDictStore()
+const testConfigFormRef = ref()
 const dialogFormRef = ref()
 const mode = ref()
 const IsMode = ref(false)
@@ -257,17 +256,21 @@ onMounted(async () => {
 // 定义弹出组件元信息
 const rules = computed(() => {
   const baseRules: Ref<Record<string, Array<FormItemRule>>> = ref({
+    maxTime: [
+      {required: true, trigger: 'blur', message: '检测最大次数必填!'},
+      {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '检测最大次数为1~999的正整数', trigger: 'blur'}
+    ],
     realTime: [
       {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: /^[0-9]\d*$/, message: '统计数据有效组数为含0的正整数', trigger: 'blur' }
+      {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '统计数据有效组数为1~999的正整数', trigger: 'blur'}
     ],
     flicker: [
       {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'}
     ],
   });
 
@@ -275,7 +278,7 @@ onMounted(async () => {
   if (mode.value == '比对式') {
     baseRules.value.waveRecord = [
       {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'}
     ];
   }
 
@@ -283,15 +286,16 @@ onMounted(async () => {
 })
 
 
-
-  
-
 const submitForm = async () => {
   try {
-      dialogFormRef.value?.validate(async (valid: boolean) => {
+    testConfigFormRef.value?.validate(async (valid: boolean) => {
       if (valid) {
         await updateTestConfig(TestConfigForm.value);
 
+        dialogFormRef.value?.validate(async (valid: boolean) => {
+          if (valid) {
+            //await updateTestConfig(TestConfigForm.value);
+
             // 提取并传递 4 个参数
             const {id, waveRecord, realTime, statistics, flicker} = RegResForm.value
             RegResForm2.value = {id, waveRecord, realTime, statistics, flicker}
@@ -304,6 +308,10 @@ onMounted(async () => {
             ElMessage.success({message: `保存配置成功！`})
           }
         })
+      }
+    })
+
+
   } catch (err) {
     console.error('验证过程中出现错误', err)
   }

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

@@ -1,6 +1,7 @@
 <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-form-item>
@@ -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>
@@ -43,6 +46,7 @@
           <el-input v-model="formContent.description" type="textarea" placeholder="请输入描述信息"/>
         </el-form-item>
       </el-form>
+    </div>
     <template #footer>
       <div>
         <el-button @click="close()">取 消</el-button>
@@ -56,7 +60,7 @@
 import {dialogSmall} from '@/utils/elementBind'
 import {type PqReport} from '@/api/device/interface/report'
 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'
 
 // 定义弹出组件元信息
@@ -147,6 +151,11 @@ 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)
@@ -266,6 +275,19 @@ 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;
+}
 
 
 // 对外映射
@@ -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: '创建时间',