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

# Conflicts:
#	frontend/src/views/machine/controlSource/index.vue

.merge_file_uAPEJh

@@ -1,112 +0,0 @@
-import axios, { AxiosInstance, AxiosError, AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse } from "axios";
-import { showFullScreenLoading, tryHideFullScreenLoading } from "@/components/Loading/fullScreen";
-import { LOGIN_URL } from "@/config";
-import { ElMessage } from "element-plus";
-import { ResultData } from "@/api/interface";
-import { ResultEnum } from "@/enums/httpEnum";
-import { checkStatus } from "./helper/checkStatus";
-import { useUserStore } from "@/stores/modules/user";
-import router from "@/routers";
-
-export interface CustomAxiosRequestConfig extends InternalAxiosRequestConfig {
-  loading?: boolean;
-}
-
-const config = {
-  // 默认地址请求地址，可在 .env.** 文件中修改
-  baseURL: import.meta.env.VITE_API_URL as string,
-  // 设置超时时间
-  timeout: ResultEnum.TIMEOUT as number,
-  // 跨域时候允许携带凭证
-  withCredentials: true,
-  // post请求指定数据类型以及编码
-  headers: { 'Content-Type': 'application/json;charset=utf-8' }
-};
-
-class RequestHttp {
-  service: AxiosInstance;
-  public constructor(config: AxiosRequestConfig) {
-    // 创建实例
-    this.service = axios.create(config);
-
-    /**
-     * @description 请求拦截器
-     * 客户端发送请求 -> [请求拦截器] -> 服务器
-     * token校验(JWT) : 接受服务器返回的 token,存储到 vuex/pinia/本地储存当中
-     */
-    this.service.interceptors.request.use(
-      (config: CustomAxiosRequestConfig) => {
-        const userStore = useUserStore();
-        // 当前请求不需要显示 loading，在 api 服务中通过指定的第三个参数: { loading: false } 来控制
-        config.loading ?? (config.loading = true);
-        config.loading && showFullScreenLoading();
-        if (config.headers && typeof config.headers.set === "function") {
-          config.headers.set("x-access-token", userStore.token);
-        }
-        return config;
-      },
-      (error: AxiosError) => {
-        return Promise.reject(error);
-      }
-    );
-
-    /**
-     * @description 响应拦截器
-     *  服务器换返回信息 -> [拦截统一处理] -> 客户端JS获取到信息
-     */
-    this.service.interceptors.response.use(
-      (response: AxiosResponse) => {
-        const { data } = response;
-        const userStore = useUserStore();
-        tryHideFullScreenLoading();
-        // 登陆失效
-        if (data.code == ResultEnum.OVERDUE) {
-          userStore.setToken("");
-          router.replace(LOGIN_URL);
-          ElMessage.error(data.message);
-          return Promise.reject(data);
-        }
-        // 全局错误信息拦截（防止下载文件的时候返回数据流，没有 code 直接报错）
-        if (data.code && data.code !== ResultEnum.SUCCESS) {
-          ElMessage.error(data.message);
-          return Promise.reject(data);
-        }
-        // 成功请求（在页面上除非特殊情况，否则不用处理失败逻辑）
-        return data;
-      },
-      async (error: AxiosError) => {
-        const { response } = error;
-        tryHideFullScreenLoading();
-        // 请求超时 && 网络错误单独判断，没有 response
-        if (error.message.indexOf("timeout") !== -1) ElMessage.error("请求超时！请您稍后重试");
-        if (error.message.indexOf("Network Error") !== -1) ElMessage.error("网络错误！请您稍后重试");
-        // 根据服务器响应的错误状态码，做不同的处理
-        if (response) checkStatus(response.status);
-        // 服务器结果都没有返回(可能服务器错误可能客户端断网)，断网处理:可以跳转到断网页面
-        if (!window.navigator.onLine) router.replace("/500");
-        return Promise.reject(error);
-      }
-    );
-  }
-
-  /**
-   * @description 常用请求方法封装
-   */
-  get<T>(url: string, params?: object, _object = {}): Promise<ResultData<T>> {
-    return this.service.get(url, { params, ..._object });
-  }
-  post<T>(url: string, params?: object | string, _object = {}): Promise<ResultData<T>> {
-    return this.service.post(url, params, _object);
-  }
-  put<T>(url: string, params?: object, _object = {}): Promise<ResultData<T>> {
-    return this.service.put(url, params, _object);
-  }
-  delete<T>(url: string, params?: any, _object = {}): Promise<ResultData<T>> {
-    return this.service.delete(url, { params, ..._object });
-  }
-  download(url: string, params?: object, _object = {}): Promise<BlobPart> {
-    return this.service.post(url, params, { ..._object, responseType: "blob" });
-  }
-}
-
-export default new RequestHttp(config);

.vscode/settings.json

@@ -1,5 +1,8 @@
 {
     "cSpell.words": [
+        "Analyse",
+        "CHNFACTOR",
+        "CHNPACTOR",
         "Chns",
         "Combox",
         "Datasource",
@@ -14,6 +17,7 @@
         "Pids",
         "plandata",
         "PQDIF",
+        "Preinvestment",
         "resourcedata",
         "resourcename",
         "rmark",

frontend/.env.development

@@ -19,6 +19,7 @@ VITE_API_URL=/api
 
 # 开发环境跨域代理，支持配置多个
 
+#VITE_PROXY=[["/api","http://127.0.0.1:18092/"]]
 VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
 #VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
 # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文

frontend/.env.production

@@ -22,4 +22,5 @@ VITE_DROP_CONSOLE=true
 VITE_PWA=true
 
 # 线上环境接口地址
+#VITE_API_URL="/api" # 打包时用
 VITE_API_URL="http://192.168.1.125:18092/"

frontend/.prettierrc

@@ -0,0 +1,11 @@
+{
+    "singleQuote": true,
+    "trailingComma": "none",
+    "tabWidth": 4,
+    "printWidth": 120,
+    "useTabs": false,
+    "semi": false,
+    "arrowParens": "avoid",
+    "endOfLine": "lf",
+    "htmlWhitespaceSensitivity": "ignore"
+}

frontend/package.json

@@ -22,9 +22,11 @@
     "echarts": "^5.4.3",
     "echarts-liquidfill": "^3.1.0",
     "element-plus": "^2.7.8",
+    "html2canvas": "^1.4.1",
     "md5": "^2.3.0",
     "mitt": "^3.0.1",
     "mkdirp": "^3.0.1",
+    "node-forge": "^1.3.1",
     "nprogress": "^0.2.0",
     "pinia": "^2.2.1",
     "pinia-plugin-persistedstate": "^3.2.1",
@@ -41,11 +43,14 @@
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.8.0",
     "@tsconfig/node20": "^20.1.4",
+    "@types/html2canvas": "^1.0.0",
     "@types/md5": "^2.3.2",
     "@types/node": "^20.14.14",
+    "@types/node-forge": "^1.3.11",
     "@types/nprogress": "^0.2.0",
     "@types/qs": "^6.9.8",
     "@types/sortablejs": "^1.15.2",
+    "@types/xlsx": "^0.0.36",
     "@typescript-eslint/eslint-plugin": "^6.7.0",
     "@typescript-eslint/parser": "^6.7.0",
     "@vitejs/plugin-vue": "^5.0.5",
@@ -71,7 +76,7 @@
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
-    "vite-plugin-node-polyfills": "^0.22.0",
+    "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-pwa": "^0.16.5",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-tsc": "^2.0.21"

frontend/src/App.vue

@@ -5,7 +5,7 @@
     :size='assemblySize'
     :button='buttonConfig'
   >
-    <router-view :key='$route.fullPath' />
+    <router-view  />
   </el-config-provider>
 </template>
 

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

@@ -1,61 +1,142 @@
 export namespace CheckData {
     export interface DataCheck {
         scriptName: string,
-        errorSysName: string,
+        errorSysId: string,
         dataRule: string,
         deviceName: string,
-        monitorIdx: string,
+        chnNum: string,
+    }
+
+    export interface PhaseCheckResult {
+        // 检测源定值-标准值
+        resultData: number,
+        // 装置原始数据-被检值
+        data: number,
+
+        // 误差值
+        errorData: number,
+        // 第几次谐波
+        num?: number,
+        //符合、不符合
+        isData?: number,
+        //最大误差值
+        radius?: string,
+        unit?: string,
     }
 
     /**
-     * 用于定义 查看（设备）通道检测结果 类型
+     * 用于定义 查看（设备）通道检测结果响应数据 类型
+     */
+    export interface ResCheckResult {
+        dataA?: PhaseCheckResult | null,
+        dataB?: PhaseCheckResult | null,
+        dataC?: PhaseCheckResult | null,
+        dataT?: PhaseCheckResult | null,
+
+        // 第几次谐波
+        //num: number | null,
+        //符合、不符合
+        isData?: number,
+        //最大误差值
+        radius?: string,
+        //单位
+        unit?: string,
+    }
+
+    /**
+     * 用于定义 查看（设备）通道检测结果表格展示数据 类型
      */
     export interface CheckResult {
-        chnNum: string,
-        standardValue: number,
-        A?: number,
-        A_errValue?: number,
-        B?: number,
-        B_errValue?: number,
-        C?: number,
-        C_errValue?: number,
-        T?: number,
-        T_errValue?: number,
-        maxErrVaule: number,
-        result: string,
+        stdA?: string,
+        dataA?: string,
+        errorA?: string,
+        maxErrorA?: string,
+        isDataA?: number,
+        unitA?: string,
+        stdB?: string,
+        dataB?: string,
+        errorB?: string,
+        maxErrorB?: string,
+        isDataB?: number,
+        unitB?: string,
+        stdC?: string,
+        dataC?: string,
+        errorC?: string,
+        maxErrorC?: string,
+        isDataC?: number,
+        unitC?: string,
+        stdT?: string,
+        dataT?: string,
+        errorT?: string,
+        maxErrorT?: string,
+        isDataT?: number,
+        unitT?: string,
+
+        //最大误差值
+        maxError?: string,
+        unit?: string,
+        //符合、不符合
+        result?: number,
     }
 
     /**
      * 用于定义 具体通道的原始数据类型
      */
     export interface RawDataItem {
-        updateTime: string,
-        A?: number,
-        B?: number,
-        C?: number
-        T?: number
+        time?: string,
+        harmNum?: number | null,
+        dataA?: string,
+        dataB?: string,
+        dataC?: string,
+        dataT?: string,
+        unit?: string | null
     }
 
     export interface Device {
         deviceId: string;     //装置序号Id
         deviceName: string; //设备名称
         chnNum: number;   //设备通道数
+
+        planId: string; //计划Id
+        devType: string; //设备类型
+        devVolt: number; //设备电压
+        devCurr: number; //设备电流
+        factorFlag: number; //是否支持系数校准
     }
 
     // 用来描述检测脚本类型
     export interface ScriptItem {
+        id: string,
+        code: string,
         scriptName: string,
-        scriptType?: string,
-        children?: ScriptItem1[]
     }
+
+    // 用来描述 检测数据-左侧树结构
+    export interface TreeItem {
+        id: string | null,
+        scriptTypeName: string | null,
+        sourceDesc: string | null,
+        harmNum: number | null,
+        index: number | null,
+        fly: number | null,
+        children: TreeItem[] | null,
+    }
+
     // 用来描述 通道检测结果
     export enum ChnCheckResultEnum {
         UNKNOWN = -1,
         LOADING = 0,
         SUCCESS = 1,
         FAIL = 2,
-        UNCONNECTED = 3,
-        ERRORDATA = 4
+        TIMEOUT = 3,
+        ERRORDATA = 4,
+        NOT_PART_IN_ERROR = 5
+    }
+
+    export interface DeviceCheckResult {
+        deviceId: string,
+        deviceName: string,
+        chnResult: ChnCheckResultEnum[] //通道检测结果
     }
 
     //用来描述 某个脚本测试项对所有通道的检测结果
@@ -64,17 +145,13 @@ export namespace CheckData {
         scriptName?: string  //可以不要该属性，有点多余
 
         // 设备
-        devices: Array<{
-            deviceId: string,
-            deviceName: string,
-            chnResult: ChnCheckResultEnum[] //通道检测结果
-        }>
+        devices: Array<DeviceCheckResult>
     }
 
     export enum ButtonColorEnum {
         INFO = '#909399',
-        LOADING = '#607eab',
-        SUCCESS = '#67c23a',
+        LOADING = 'var(--el-color-primary)',
+        SUCCESS = '#91cc75',
         WARNING = '#e6a23c',
         DANGER = '#f56c6c',
     }
@@ -84,7 +161,7 @@ export namespace CheckData {
      */
     export interface ButtonResult {
         color: ButtonColorEnum
-        icon: 'Minus' | 'Loading' | 'Close' | 'CircleCheckFilled' | 'Link' | 'WarnTriangleFilled'
+        icon: 'More' | 'Loading' | 'Close' | 'CircleCheckFilled' | 'Link' | 'WarnTriangleFilled' | 'Minus'
     }
 
     /**
@@ -110,6 +187,16 @@ export namespace CheckData {
         type: 'info' | 'warning' | 'error'
         log: string
     }
+
+    /**
+     * 定义手动检测时，勾选的测试项
+     */
+    export interface SelectTestItem {
+        preTest: boolean,
+        timeTest: boolean,
+        channelsTest: boolean,
+        test: boolean
+    }
 }
 
 

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

@@ -1,7 +1,12 @@
 import http from "@/api";
+import {CheckData} from "@/api/check/interface";
 
-export const getBigTestItem = (planId: string) => {
-    return http.get(`/adPlan/getBigTestItem?planId=${planId}`, {loading: false});
+export const getBigTestItem = (params: {
+    reCheckType: number,
+    planId: string,
+    devId: string,
+}) => {
+    return http.post(`/adPlan/getBigTestItem`, params, {loading: false});
 }
 
 /**
@@ -22,13 +27,13 @@ export const getFormData = (params: {
  * @param params
  */
 export const getTreeData = (params: {
-    scriptId: string,
-    deviceId: string,
-    devNum: string,
-    scriptType: string | null,
-    code: string
+    scriptId?: string,
+    devId?: string,
+    devNum?: string,
+    scriptType?: string | null,
+    code?: string,
 }) => {
-    return http.post("/result/treeData/", params, {loading: false});
+    return http.post<CheckData.TreeItem[]>("/result/treeData/", params, {loading: false});
 }
 
 /**
@@ -36,10 +41,59 @@ export const getTreeData = (params: {
  * @param params
  */
 export const getTableData = (params: {
+    scriptType: string | null,
     scriptId: string,
-    deviceId: string,
-    chnNum: string,
-    scriptType: string | null
+    devId: string,
+    devNum: string,
+    code: string,
+    index: number,
 }) => {
-    return http.post("/result/tableData/", params, {loading: false});
+    return http.post("/result/resultData/", params, {loading: false});
+}
+
+export const exportRawData = (params: {
+    scriptType: string | null,
+    scriptId: string,
+    devId: string,
+    devNum: string,
+    code: string,
+    index: number,
+}) => {
+    return http.download("/result/exportRawData", params, {loading: false});
+}
+
+/**
+ * 重新计算
+ * @param params
+ */
+export const reCalculate = (params: {
+    planId: string,
+    scriptId: string,
+    errorSysId: string,
+    deviceId: string,
+    code: string
+}) => {
+    return http.post("/result/reCalculate", params, {loading: true});
+}
+
+/**
+ * 更换误差体系
+ * @param params
+ */
+export const changeErrorSystem = (params: {
+    planId: string,
+    scriptId: string,
+    errorSysId: string,
+    deviceId: string,
+    code: string
+}) => {
+    return http.post("/result/changeErrorSystem", params, {loading: true});
+}
+
+/**
+ * 删除（误差体系切换时产生的）临时表
+ * @param code
+ */
+export const deleteTempTable = (code: string) => {
+    return http.get(`/result/deleteTempTable?code=${code}`, null, {loading: false})
 }

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

@@ -0,0 +1,24 @@
+
+import type { controlSource } from '@/api/device/interface/controlSource'
+import http from '@/api'
+
+/**
+ * @name 程控源管理模块
+ */
+
+//通讯校验
+export const checkSimulate = (params: controlSource.ResControl) => {
+  return http.post(`/prepare/ytxCheckSimulate`,params)
+}
+
+//启动
+export const startSimulateTest = (params: controlSource.ResControl) => {
+  return http.post(`prepare/startSimulateTest`,params,{loading:false})
+}
+
+//停止
+export const closeSimulateTest = (params: controlSource.ResControl) => {
+  return http.post(`/prepare/closeSimulateTest`,params,{loading:false})
+}
+
+

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

@@ -0,0 +1,29 @@
+import type { DevType } from '@/api/device/interface/devType'
+import http from '@/api'
+
+/**
+ * @name 设备类型管理模块
+ */
+
+//获取设备类型
+export const getDevTypeList = (params: DevType.ReqPqDevTypeParams) => {
+  return http.post(`/devType/list`, params)
+}
+
+//添加设备类型
+export const addDevType = (params: DevType.ResPqDevType) => {
+    return http.post(`/devType/add`, params)
+  }
+  
+  //编辑设备类型
+  export const updateDevType = (params: DevType.ResPqDevType) => {
+    return http.post(`/devType/update`, params)
+  }
+  
+  //删除设备类型
+  export const deleteDevType = (params: string[]) => {
+    return http.post(`/devType/delete`, params)
+  }
+
+
+

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

@@ -29,11 +29,43 @@ export const deletePqDev = (params: string[]) => {
 export const exportPqDev = (params: Device.ReqPqDevParams) => {
     return http.download(`/pqDev/export`, params)
 }
+// 下载导入文件模板
 export const downloadTemplate = () => {
     return http.download(`/pqDev/downloadTemplate`)
 }
+
 //导入被检设备
 export const importPqDev = (params: Device.ReqPqDevParams) => {
-  return http.upload(`/pqDev/import`, params)
+    return http.uploadExcel(`/pqDev/import`, params)
 }
 
+//导入比对式被检设备
+export const importContrastPqDev = (params: Device.ReqPqDevParams) => {
+    return http.upload(`/pqDev/importContrast`, params)
+}
+
+// //导出灿能二楼设备
+// export const exportCNDev = (params: Device.ReqPqDevParams) => {
+//     return http.download(`/pqDev/exportCNDev`, params)
+// }
+//
+// // 下载灿能二楼设备导入文件模板
+// export const downloadCNDevTemplate = () => {
+//     return http.download(`/pqDev/downloadCNDevTemplate`)
+// }
+//
+// //导入灿能二楼设备
+// export const importCNDev = (params: Device.ReqPqDevParams) => {
+//     return http.uploadExcel(`/pqDev/importCNDev`, params)
+// }
+
+
+//根据设备类型决定（电源、icd、模板、通道数、额定电压、额定电流）；
+export const getPqDev = () => {
+    return http.get(`/devType/listAll`)
+}
+
+//被检设备归档
+export const documentedPqDev = (ids: string[]) => {
+    return http.post(`/pqDev/documented`, ids)
+}

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

@@ -30,5 +30,7 @@ export const deletePqErrSys = (params: string[]) => {
   return http.post(`/pqErrSys/delete`, params)
 }
 
-
-
+//复制误差体系
+export const copyPqErrSys = (params: ErrorSystem.ErrorSystemList) => {
+  return http.get(`/pqErrSys/copy?id=${params.id}`)
+}

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

@@ -0,0 +1,38 @@
+import type { ICD } from '@/api/device/interface/icd'
+import http from '@/api'
+import { pa } from 'element-plus/es/locale/index.mjs'
+
+/**
+ * @name ICD管理模块
+ */
+
+
+
+//获取ICD分页
+export const getICDList = (params: ICD.ReqICDParams) => {
+    return http.post(`/icd/list`,params)
+}
+
+
+//获取ICD
+export const getICDAllList = (params: ICD.ResICD) => {
+    return http.get(`/icd/listAll`,params)
+}
+
+//添加ICD
+export const addICD = (params: ICD.ResICD) => {
+    return http.post(`/icd/add`, params)
+  }
+  
+  //编辑ICD
+  export const updateICD = (params: ICD.ResICD) => {
+    return http.post(`/icd/update`, params)
+  }
+  
+  //删除ICD
+  export const deleteICD = (params: string[]) => {
+    return http.post(`/icd/delete`, params)
+  }
+
+
+

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

@@ -0,0 +1,15 @@
+import type { ReqPage,ResPage } from '@/api/interface'
+
+// 被检设备模块
+export namespace controlSource {
+  
+    /**
+   * 被检设备新增、修改、根据id查询返回的对象
+   */
+    export interface ResControl {
+        userPageId: string;   
+        scriptId: string;  
+        scriptIndex: number;  
+        sourceId: string;
+    }
+  }

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

@@ -0,0 +1,40 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
+// 设备类型模块
+export namespace DevType {
+
+  /**
+   * 设备类型数据表格分页查询参数
+   */
+  export interface ReqPqDevTypeParams extends ReqPage {
+    id: string; // 装置序号id 必填
+    devType?: string; // 设备名称
+    createTime?: string; //创建时间
+  }
+
+  /**
+   * 设备类型新增、修改、根据id查询返回的对象
+   */
+  export interface ResPqDevType {
+    id: string;     //设备类型ID
+    name: string;//设备类型名称
+    icd: string| null;//设备关联的ICD
+    power: string| null;//工作电源
+    devVolt: number;   //额定电压（V）
+    devCurr: number;   //额定电流（A）
+    devChns: number;   //设备通道数
+    reportName: string| null;//报告模版名称
+    state: number;
+    createBy?: string| null; //创建用户
+    createTime?: string| null; //创建时间
+    updateBy?: string| null; //更新用户
+    updateTime?: string| null; //更新时间
+  }
+
+  /**
+   * 设备类型表格查询分页返回的对象；
+   */
+  export interface ResPqDevTypePage extends ResPage<ResPqDevType> {
+
+  }
+}

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

@@ -14,6 +14,17 @@ export namespace Device {
         pattern: string;
     }
 
+    /**
+     *  被检设备表格分页查询参数
+     */
+    export interface ReqDevReportParams extends ReqPage {
+        planId?: string; // 计划id
+        devId?: string; // 装置id
+        scriptId?: string; // 脚本id
+        planCode?: string;
+        devIdList?: string[]; // 装置id列表
+    }
+
     /**
      * 被检设备新增、修改、根据id查询返回的对象
      */
@@ -25,7 +36,7 @@ export namespace Device {
         devChns: number;   //设备通道数
         devVolt: number;   //额定电压（V）
         devCurr: number;   //额定电流（A）
-        manufacturer: string;//生产厂家
+        manufacturer?: string | null;//生产厂家
         createDate: string; //生产日期
         createId: string; //出厂编号
         hardwareVersion: string; //固件版本
@@ -36,7 +47,7 @@ export namespace Device {
         encryptionFlag: number; //装置是否为加密版本
         series?: string | null; //装置识别码（3ds加密）
         devKey?: string | null; //装置秘钥（3ds加密）
-        sampleID?: string| null; //样品编号
+        sampleId?: string | null; //样品编号
         arrivedDate?: string; //送样日期
         cityName?: string | null; //所属地市名称
         gDName?: string | null; //所属供电公司名称
@@ -44,22 +55,35 @@ export namespace Device {
         checkState?: number | null; //检测状态
         checkResult?: number | null; //检测结果
         reportState?: number | null; //报告状态
-        documentState?: number| null; //归档状态
         reportPath?: string | null; //报告路径
         qRCode?: string | null; //设备关键信息二维码
         reCheckNum: number; //复检次数
         planId?: string;//检测计划Id
         timeCheckResult?: number;//守时检测结果(0:不符合1:符合)
         factorFlag?: number;//是否支持系数校准(0:不支持,1:支持)
-        factorCheckResult?: number;//系数校准结果(0:不符合1:符合)
+        factorCheckResult?: number;//系数校准结果(0:不合格，1:合格，2：/表示没有做系数校准)
         state: number; //状态
         createBy?: string | null; //创建用户
         createTime?: string | null; //创建时间
         updateBy?: string | null; //更新用户
         updateTime?: string | null; //更新时间
-        
+        icdId: string | null;
+        power: string | null;//工作电源
+        preinvestmentPlan: string | null;
     }
 
+
+    export interface ResDev {
+        id: string;
+        name: string,
+        icd: string,
+        power: string,
+        devVolt: number,
+        devCurr: number,
+        devChns: number,
+    }
+
+
     /**
      * 被检设备表格查询分页返回的对象；
      */

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

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

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

@@ -0,0 +1,35 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
+// ICD模块
+export namespace ICD {
+
+  /**
+   * ICD表格分页查询参数
+   */
+  export interface ReqICDParams extends ReqPage {
+    id: string; // 装置序号id 必填
+    devType?: string; // 设备名称
+    createTime?: string; //创建时间
+  }
+
+  /**
+   * ICD新增、修改、根据id查询返回的对象
+   */
+  export interface ResICD {
+    id: string;     //icdID
+    name: string;//icd名称
+    path: string;//icd存储地址
+    state: number;
+    createBy?: string| null; //创建用户
+    createTime?: string| null; //创建时间
+    updateBy?: string| null; //更新用户
+    updateTime?: string| null; //更新时间
+  }
+
+  /**
+   * ICD表格查询分页返回的对象；
+   */
+  export interface ResICDPage extends ResPage<ResICD> {
+
+  }
+}

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

@@ -0,0 +1,39 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+import type { UploadFile } from 'element-plus';
+
+// 报告模版接口
+export namespace PqReport {
+
+  /**
+   * 报告模版表格分页查询参数
+   */
+  export interface ReqReportParams extends ReqPage {
+    id: string; // 装置序号id 必填
+    name?: string; // 设备名称
+    createTime?: string; //创建时间
+  }
+
+  /**
+   * 报告模版新增、修改、根据id查询返回的对象
+   */
+  export interface ResReport {
+    id: string;     //报告模板id
+    name: string;//报告模板名称
+    version:string;//版本号
+    baseFile?:string;//基础模板文件路径
+    detailFile?:string;//检测项模版文件路径
+    description:string;//描述信息
+    state:number;//状态:8-删除 1-正常
+    createBy?: string| null; //创建用户
+    createTime?: string| null; //创建时间
+    updateBy?: string| null; //更新用户
+    updateTime?: string| null; //更新时间
+  }
+
+  /**
+   * 报告模版表格查询分页返回的对象；
+   */
+  export interface ResReportPage extends ResPage<ResReport> {
+
+  }
+}

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

@@ -2,38 +2,37 @@ import type { ReqPage, ResPage } from '@/api/interface'
 
 // 检测脚本模块
 export namespace TestScript {
-
-
     /**
      * 检测脚本表格分页查询参数
      */
     export interface ReqTestScriptParams extends ReqPage {
-    id: string; // 装置序号id 必填
-    name: string; 
-    type: string;  
-    pattern:string;
+        id: string // 装置序号id 必填
+        name: string
+        type: string
+        pattern: string
     }
 
     // 检测脚本接口
     export interface ResTestScript {
-        id?: string;     //检测脚本ID
-        name: string;   //检测脚本名称
-        type: string;   //设定0为脚本，1为模板
-        pattern: string;//检测脚本模式(字典表Code字段，数字、模拟、比对)
-        valueType?: string;//脚本值类型(字典表Code字段，相对值脚本、绝对值脚本、无)
-        standardName: string;//参照标准名称
-        standardTime: string;//标准推行时间
-        state:number;//
-        createBy?: string;
-        createTime?: string;
-        updateBy?: string;
-        updateTime?: string;
+        id?: string //检测脚本ID
+        name: string //检测脚本名称
+        type: string //设定0为脚本，1为模板
+        pattern: string //检测脚本模式(字典表Code字段，数字、模拟、比对)
+        valueType?: string //脚本值类型(字典表Code字段，相对值脚本、绝对值脚本、无)
+        standardName: string //参照标准名称
+        standardTime: string //标准推行时间
+        state?: number //
+        createBy?: string
+        createTime?: string
+        updateBy?: string
+        updateTime?: string
+        selectedValue?: string
+        ratedCurr?: number
+        ratedVolt?: number
     }
 
     /**
      * 检测脚本查询分页返回的对象；
      */
-  export interface ResTestScriptPage extends ResPage<ResTestScript> {
-
-  }
+    export interface ResTestScriptPage extends ResPage<ResTestScript> {}
 }

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

@@ -0,0 +1,42 @@
+import type {PqReport} from '@/api/device/interface/report'
+import http from '@/api'
+
+/**
+ * @name 报告模版模块
+ */
+
+//获取报告模版
+export const getPqReportList = (params: PqReport.ReqReportParams) => {
+    return http.post(`/report/list`, params)
+}
+
+//新增报告模版
+export const addPqReport = (params: PqReport.ResReport) => {
+    return http.upload(`/report/add`, params)
+}
+
+//删除报告模版
+export const deletePqReport = (params: string[]) => {
+    return http.post(`/report/delete`, params)
+}
+
+//查询报告模板详情
+export const getPqReportById = (params: PqReport.ResReport) => {
+    return http.get(`/report/getById?id=${params.id}`)
+}
+
+//修改报告模板
+export const updatePqReport = (params: PqReport.ResReport) => {
+    return http.upload(`/report/update`, params)
+}
+
+//查询所有报告模板名称
+export const getPqReportAllName = () => {
+    return http.get(`/report/listAllName`)
+}
+
+//根据名称查询指定报告模板的所有版本
+export const getPqReportAllVersion = (params:any) => {
+    return http.get(`/report/listAllVersion?name=${params.name}`)
+}
+

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

@@ -1,15 +1,23 @@
 import type { TestScript } from '@/api/device/interface/testScript'
 import http from '@/api'
+import { Loading } from '@element-plus/icons-vue'
 
 /**
  * @name 检测脚本管理模块
  */
+// 新增脚本
+export const pqScriptAdd = (params: TestScript.ResTestScript) => {
+    return http.post(`/pqScript/add`, params)
+}
+// 修改脚本
+export const pqScriptUpdate = (params: TestScript.ResTestScript) => {
+    return http.post(`/pqScript/update`, params)
+}
 // 获取检测脚本列表
 export const getPqScriptList = (params: TestScript.ReqTestScriptParams) => {
     return http.post(`/pqScript/list`, params)
 }
 
-
 //升级为模版
 export const updatePqScript = (params: TestScript.ResTestScript) => {
     return http.get(`/pqScript/upgradeToTemplate?id=${params.id}`)
@@ -19,3 +27,27 @@ export const updatePqScript = (params: TestScript.ResTestScript) => {
 export const deletePqScript = (params: string[]) => {
     return http.post(`/pqScript/delete`, params)
 }
+//添加检测脚本
+export const addScriptDtls = (params: any) => {
+    return http.post(`/pqScript/addScriptDtls`, params)
+}
+//根据脚本id查询检测脚本详情
+export const dlsDetails = (params: any) => {
+    return http.post(`/pqScript/dlsDetails`, params)
+}
+// 删除脚本
+export const deleteDtls = (params: any) => {
+    return http.post(`/pqScript/deleteDtls`, params)
+}
+// 启用关闭脚本
+export const updateDtls = (params: any) => {
+    return http.post(`/pqScript/updateDtls`, params)
+}
+// 根据通讯参数生成装置下发原始数据公式
+export const scriptDtlsCheckDataList = (params: any) => {
+    return http.post(`/pqScript/scriptDtlsCheckDataList`, params,{loading: false})
+}
+// 通讯脚本回显
+export const checkDataList = (params: any) => {
+    return http.post(`/pqScript/checkDataList`, params, { loading: true })
+}

frontend/src/api/helper/checkStatus.ts

@@ -10,9 +10,9 @@ export const checkStatus = (status: number) => {
     case 400:
       ElMessage.error("请求失败！请您稍后重试");
       break;
-    case 401:
-      ElMessage.error("登录失效！请您重新登录");
-      break;
+    // case 401:
+    //   ElMessage.error("登录失效！请您重新登录");
+    //   break;
     case 403:
       ElMessage.error("当前账号无权限访问！");
       break;

frontend/src/api/home/channelsTest/index.ts

@@ -0,0 +1,6 @@
+import http from "@/api";
+
+//系数校准发送基本信息
+export const getCoefficientCheck = (params: any) => {
+    return http.post(`/prepare/coefficientCheck`, params,{loading: false})
+  }

frontend/src/api/home/interface/channelsTest.ts

@@ -0,0 +1,31 @@
+// 系数校准模块
+export namespace ChannelsTest  {
+
+  // 系数校准列表
+  export interface CoefficientVO {
+  devName?: string;//设备名称
+    type?:string;//区分大小电压
+    monitorNum: string;//监测点序号
+    desc: string;//描述
+    aVuData:string;//电压通道A数据
+    aVuXi:string;//电压通道A系数
+    bVuData:string;//电压通道B数据
+    bVuXi:string;//电压通道B系数
+    cVuData:string;//电压通道C数据
+    cVuXi:string;//电压通道C系数
+    aIeData:string;//电流通道A数据
+    aIeXi:string;//电流通道A系数
+    bIeData:string;//电流通道B数据
+    bIeXi:string;//电流通道B系数
+    cIeData:string;//电流通道C数据
+    cIeXi:string;//电流通道C系数
+    loading: boolean;
+    aV:string;
+    bV:string;
+    cV:string;
+    aI:string;
+    bI:string;
+    cI:string;
+  }
+
+}

frontend/src/api/index.ts

@@ -1,3 +1,4 @@
+import { ElMessage, ElTreeSelect } from 'element-plus';
 import axios, { AxiosInstance, AxiosError, AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse } from 'axios'
 import { showFullScreenLoading, tryHideFullScreenLoading } from '@/components/Loading/fullScreen'
 import { LOGIN_URL } from '@/config'
@@ -7,6 +8,7 @@ import { ResultEnum } from '@/enums/httpEnum'
 import { checkStatus } from './helper/checkStatus'
 import { useUserStore } from '@/stores/modules/user'
 import router from '@/routers'
+import {refreshToken} from '@/api/user/login'
 
 export interface CustomAxiosRequestConfig extends InternalAxiosRequestConfig {
   loading?: boolean;
@@ -37,12 +39,14 @@ class RequestHttp {
      */
     this.service.interceptors.request.use(
       (config: CustomAxiosRequestConfig) => {
+          isFirst = true
         const userStore = useUserStore()
         // 当前请求不需要显示 loading，在 api 服务中通过指定的第三个参数: { loading: false } 来控制
         config.loading ?? (config.loading = true)
         config.loading && showFullScreenLoading()
         if (config.headers && typeof config.headers.set === 'function') {
-          config.headers.set('Authorization', 'Bearer '+userStore.token)
+          config.headers.set('Authorization', 'Bearer ' + userStore.accessToken)
+          config.headers.set('Is-Refresh-Token', userStore.isRefreshToken+"")
         }
         return config
       },
@@ -51,34 +55,82 @@ class RequestHttp {
       },
     )
 
+    let isFirst = true
     /**
      * @description 响应拦截器
      *  服务器换返回信息 -> [拦截统一处理] -> 客户端JS获取到信息
      */
     this.service.interceptors.response.use(
-      (response: AxiosResponse) => {
+      async (response: AxiosResponse) => {
         const { data } = response
         const userStore = useUserStore()
         tryHideFullScreenLoading()
+
+        if(data.code === ResultEnum.ACCESSTOKEN_EXPIRED){
+            // 用长token去换短token
+            userStore.setAccessToken(userStore.refreshToken)
+            userStore.setIsRefreshToken(true)
+            const result = await refreshToken()
+            if (result) { //获取新token成功的话
+              // 有新的token后，重新请求
+              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
+            } else {
+              // 刷新失效，跳转登录页
+            }
+         }
         // 登陆失效
-        if (data.code == ResultEnum.OVERDUE) {
-          userStore.setToken('')
-            userStore.setUserInfo({name: ''})
-          router.replace(LOGIN_URL)
+        if (data.code === ResultEnum.OVERDUE) {
+          console.log("登陆失效")
+          userStore.setAccessToken('')
+          userStore.setRefreshToken('')
+            userStore.setIsRefreshToken(false)
+          userStore.setUserInfo({ id:'',name: '' })
+            userStore.setExp(0)
+          await router.replace(LOGIN_URL)
+            if(isFirst){//临时处理token失效弹窗多次
             ElMessage.error(data.message)
+            isFirst = false
+          }
           return Promise.reject(data)
         }
         // 全局错误信息拦截（防止下载文件的时候返回数据流，没有 code 直接报错）
         if (data.code && data.code !== ResultEnum.SUCCESS) {
+          if(data.message.includes('&')){
+            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) => {
         const { response } = error
         tryHideFullScreenLoading()
+        console.log('error', error.message)
         // 请求超时 && 网络错误单独判断，没有 response
         if (error.message.indexOf('timeout') !== -1) ElMessage.error('请求超时！请您稍后重试')
         if (error.message.indexOf('Network Error') !== -1) ElMessage.error('网络错误！请您稍后重试')
@@ -115,9 +167,24 @@ class RequestHttp {
   }
 
   upload(url: string, params?: object, _object = {}): Promise<BlobPart> {
-    return this.service.post(url, params, { ..._object, headers: { 'Content-Type': 'multipart/form-data' } })
+    return this.service.post(url, params, {
+      ..._object,
+      headers: { 'Content-Type': 'multipart/form-data' }
+    })
   }
 
+  /**
+   * 针对excel的上传，默认返回的是blob类型，Excel没问题时返回json特殊处理
+   */
+  uploadExcel(url: string, params?: object, _object = {}): Promise<BlobPart> {
+    return this.service.post(url, params, {
+      ..._object,
+      headers: { 'Content-Type': 'multipart/form-data' },
+      responseType: 'blob',
+    })
+  }
+
+
 }
 
 export default new RequestHttp(config)

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

@@ -7,7 +7,7 @@ export namespace Plan {
     export interface ResPlan {
         id: string;     //检测计划ID
         name: string; //检测计划名称
-        pattern: string; //模式，字典表（数字、模拟、比对）
+        pattern?: string; //模式，字典表（数字、模拟、比对）
         fatherPlanId?: string;   //父计划ID
         dataSourceId: string;   //数据源ID
         scriptId: string;   //检测脚本ID
@@ -22,6 +22,10 @@ export namespace Plan {
         createTime?:string; //创建时间
         updateBy?:string; //更新用户
         updateTime?:string; //更新时间
+        
+        associateReport:number;//是否关联报告模板 0否 1是
+        reportTemplateName:string;
+        reportTemplateVersion:string
     }
 
     // 检测计划 + 分页

frontend/src/api/plan/plan.ts

@@ -1,10 +1,8 @@
-import type { ResPage } from '@/api/interface'
 import type { Plan } from './interface'
 import http from '@/api'
-import type { TestSource } from '../device/interface/testSource'
-import type { TestScript } from '../device/interface/testScript'
 import type { ErrorSystem } from '../device/interface/error'
 import type { Device } from '../device/interface/device'
+import { ReqDevReportParams } from '@/api/device/interface/device'
 
 /**
  * @name 检测计划管理模块
@@ -70,10 +68,25 @@ export const exportPlan=(params: Device.ReqPqDevParams)=>{
 }
 
 // 下载模板
-export const downloadTemplate = () => {
-  return http.download(`/adPlan/downloadTemplate`)
+export const downloadTemplate = (params: { patternId: string }) => {
+  return http.download(`/adPlan/downloadTemplate`, params)
 }
 // 导入检测计划
 export const importPlan = (params: Device.ReqPqDevParams) => {
-  return http.upload(`/adPlan/import`, params)
+  return http.uploadExcel(`/adPlan/import`, params)
 }
+
+// 装置检测报告生成
+export const generateDevReport = (params: Device.ReqDevReportParams) => {
+  return http.post(`/report/generateReport`, params)
+}
+
+// 装置检测报告下载
+export const downloadDevData = (params: Device.ReqDevReportParams) => {
+  return http.download(`/report/downloadReport`, params)
+}
+
+export const staticsAnalyse = (params: { id: string[] }) => {
+  return http.download('/adPlan/analyse', params)
+}
+

frontend/src/api/socket/socket.ts

@@ -13,16 +13,16 @@ export const closePreTest = (params) => {
  * 开始正式检测
  * @param params
  */
-export const startTest = (params) => {
-    return http.post(`/prepare/startTest`, params, {loading: false})
-}
+// export const startTest = (params) => {
+//     return http.post(`/prepare/startTest`, params, {loading: false})
+// }
 
 /**
  * 暂停正式检测
  * @param params
  */
-export const pauseTest = (params) => {
-    return http.post(`/test/pauseTest`, params, {loading: false})
+export const pauseTest = () => {
+    return http.get(`/prepare/closePreTest`, {loading: false})
 }
 
 /**
@@ -30,5 +30,5 @@ export const pauseTest = (params) => {
  * @param params
  */
 export const resumeTest = (params) => {
-    return http.post(`/test/resumeTest`, params, {loading: false})
+    return http.post(`/prepare/restartTemTest/`, params, {loading: false})
 }

frontend/src/api/system/dictionary/dictTree/index.ts

@@ -1,10 +1,16 @@
 import http from '@/api'
 import { type Dict } from '@/api/system/dictionary/interface'
+import { c } from 'vite/dist/node/types.d-aGj9QkWt'
 
 //获取字典类型
-export const getDictTreeList = (params: Dict.ResDictTree) => {
-    const name = params.name || '';
-    return http.get(`/dictTree/getTree?keyword=${name}`, params)
+export const getDictTreeByCode = (params: Dict.ResDictTree) => {
+    const code = params.code || ''
+    return http.get(`/dictTree/getTreeByCode?code=${code}`, { loading: true })
+}
+
+export const getDictTreeByName = (params: Dict.ResDictTree) => {
+    const name = params.name || ''
+    return http.get(`/dictTree/getTreeByName?name=${name}`)
 }
 
 //添加字典类型
@@ -21,4 +27,3 @@ export const updateDictTree = (params: Dict.ResDictTree) => {
 export const deleteDictTree = (params: Dict.ResDictTree) => {
     return http.post(`/dictTree/delete?id=${params.id}`)
 }
-

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

@@ -62,6 +62,7 @@ export namespace Dict {
     name: string; // 名称
     code: string; // 编码
     sort: number; // 排序
+    openValue?: number | null;
     level?: number | null; // 事件等级：0-普通；1-中等；2-严重 (默认为0)
     algoDescribe?: number | null; // 与高级算法内部Id描述对应
     value?: string | null; // 字典针对电压等级

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

@@ -0,0 +1,16 @@
+import type {AuditLog  } from '@/api/system/log/interface/log.ts'
+import http from '@/api'
+
+/**
+ * @name 审计日志管理模块
+ */
+
+//获取审计日志
+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/system/log/interface/log.ts

@@ -1,15 +1,36 @@
+import type { ReqPage, ResPage } from '@/api/interface'
+
 // 审计日志管理模块
-export namespace Sys_Log_Audit {
-    // 日志列表
-    export interface Audit_LogList {
-      id: string;//日志表Id
-      operate_Type:string;//日志类型
+export namespace AuditLog {
+
+  /**
+   * 设备类型数据表格分页查询参数
+   */
+  export interface ReqAuditLogParams extends ReqPage {
+    id: string; //审计日志Id 必填
+    createTime?: string; //创建时间
+  }
+
+  /**
+   * 设备类型新增、修改、根据id查询返回的对象
+   */
+  export interface ResAuditLog {
+    id: string;//审计日志Id
+    operate_Type:string;//操作类型
     ip:string;//操作IP
     result: string;//事件结果
     remark: string;//事件描述
+    level:number;//告警等级
     warn:number;//告警标志
     create_By:string;//创建用户
     create_Time:string;//创建时间
+    sort:number;//排序
   }
 
+  /**
+   * 设备类型表格查询分页返回的对象；
+   */
+  export interface ResAuditLogPage extends ResPage<ResAuditLog> {
+
+  }
 }

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

@@ -5,10 +5,13 @@ export namespace Login {
   export interface ReqLoginForm {
     username: string;
     password: string;
+    checked: boolean;
   }
   export interface ResLogin {
     accessToken: string;
+    refreshToken: string;
     userInfo:{
+      id: string;
       name: string;
     }
   }

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

@@ -2,11 +2,12 @@ import type { Login } from '@/api/user/interface/user'
 import {ADMIN as rePrefix} from '@/api/system/config/serviceName'
 import http from '@/api'
 import type {Dict} from '@/api/interface'
+
 /**
  * @name 登录模块
  */
 // 用户登录
-export const loginApi = (params: Login.ReqLoginForm) => {
+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 })
 }
@@ -30,3 +31,29 @@ export const getDictList = () =>{
     return http.get<Dict>('/dictData/dictDataCache')
 }
 
+//token刷新
+export const refreshToken = () => {
+    return http.get<Login.ResLogin>(`${rePrefix}/refreshToken`,
+        {},
+        {loading: false}
+    )
+}
+
+//获取场景
+export const getCurrentScene = () => {
+    return http.get('/sysTestConfig/getCurrentScene', {}, {loading: false})
+}
+
+/**
+ * 获取RSA公钥
+ */
+export const getPublicKey = (username: string) => {
+    return http.get(`/admin/getPublicKey?username=${username}`, {}, {loading: false})
+}
+
+/**
+ * 获取是否在检测中自动生成报告
+ */
+export const getAutoGenerate = () => {
+    return http.get('/sysTestConfig/getAutoGenerate', {}, {loading: false})
+}

frontend/src/components/ImportExcel/index.vue

@@ -1,49 +1,48 @@
 <template>
-  <el-dialog v-model="dialogVisible" :title="`批量添加${parameter.title}`" :destroy-on-close="true" width="580px" draggable>
-    <el-form class="drawer-multiColumn-form" label-width="100px">
-      <el-form-item label="模板下载 :">
-        <el-button type="primary" :icon="Download" @click="downloadTemp"> 点击下载 </el-button>
+  <el-dialog v-model='dialogVisible' :title='`批量添加${parameter.title}`' :destroy-on-close='true' width='580px'
+             draggable>
+    <el-form class='drawer-multiColumn-form' label-width='100px'>
+      <el-form-item label='模板下载 :'>
+        <el-button type='primary' :icon='Download' @click='downloadTemp'> 点击下载</el-button>
       </el-form-item>
-      <el-form-item label="文件上传 :">
+      <el-form-item label='文件上传 :'>
         <el-upload
-          action="#"
-          class="upload"
-          :drag="true"
-          :limit="excelLimit"
-          :multiple="true"
-          :show-file-list="true"
-          :http-request="uploadExcel"
-          :before-upload="beforeExcelUpload"
-          :on-exceed="handleExceed"
-          :on-success="excelUploadSuccess"
-          :on-error="excelUploadError"
+          action='#'
+          class='upload'
+          :drag='true'
+          :limit='excelLimit'
+          :multiple='true'
+          :show-file-list='true'
+          :http-request='uploadExcel'
+          :before-upload='beforeExcelUpload'
+          :on-exceed='handleExceed'
           :accept="parameter.fileType!.join(',')"
         >
-          <slot name="empty">
-            <el-icon class="el-icon--upload">
+          <slot name='empty'>
+            <el-icon class='el-icon--upload'>
               <upload-filled />
             </el-icon>
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class='el-upload__text'>将文件拖到此处，或<em>点击上传</em></div>
           </slot>
           <template #tip>
-            <slot name="tip">
-              <div class="el-upload__tip">请上传 .xls , .xlsx 标准格式文件，文件最大为 {{ parameter.fileSize }}M</div>
+            <slot name='tip'>
+              <div class='el-upload__tip'>请上传 .xls , .xlsx 标准格式文件，文件最大为 {{ parameter.fileSize }}M</div>
             </slot>
           </template>
         </el-upload>
       </el-form-item>
-      <el-form-item v-if="parameter.showCover" label="数据覆盖 :">
-        <el-switch v-model="isCover" />
+      <el-form-item v-if='parameter.showCover' label='数据覆盖 :'>
+        <el-switch v-model='isCover' />
       </el-form-item>
     </el-form>
   </el-dialog>
 </template>
 
-<script setup lang="ts" name="ImportExcel">
-import { ref } from "vue";
-import { useDownload } from "@/hooks/useDownload";
-import { Download } from "@element-plus/icons-vue";
-import { ElNotification, UploadRequestOptions, UploadRawFile } from "element-plus";
+<script setup lang='ts' name='ImportExcel'>
+import { ref } from 'vue'
+import { useDownload } from '@/hooks/useDownload'
+import { Download } from '@element-plus/icons-vue'
+import { ElNotification, UploadRequestOptions, UploadRawFile, ElMessage } from 'element-plus'
 
 export interface ExcelParameterProps {
   title: string; // 标题
@@ -57,98 +56,132 @@ export interface ExcelParameterProps {
 }
 
 // 是否覆盖数据
-const isCover = ref(false);
+const isCover = ref(false)
 // 最大文件上传数
-const excelLimit = ref(1);
+const excelLimit = ref(1)
 // dialog状态
-const dialogVisible = ref(false);
+const dialogVisible = ref(false)
 // 父组件传过来的参数
 const parameter = ref<ExcelParameterProps>({
-  title: "",
+  title: '',
   fileSize: 5,
-  fileType: ["application/vnd.ms-excel", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"]
-});
+  fileType: ['application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
+})
 
 // 接收父组件参数
 const acceptParams = (params: ExcelParameterProps) => {
-  parameter.value = { ...parameter.value, ...params };
-  dialogVisible.value = true;
-};
+  parameter.value = { ...parameter.value, ...params }
+  dialogVisible.value = true
+}
 
 // Excel 导入模板下载
 const downloadTemp = () => {
-  if (!parameter.value.tempApi) return;
-  useDownload(parameter.value.tempApi, `${parameter.value.title}模板`,{},false);
-};
+  if (!parameter.value.tempApi) return
+  useDownload(parameter.value.tempApi, `${parameter.value.title}模板`, {'patternId':parameter.value.patternId}, false)
+}
 
 // 文件上传
 const uploadExcel = async (param: UploadRequestOptions) => {
-  let excelFormData = new FormData();
-  excelFormData.append("file", param.file);
+  let excelFormData = new FormData()
+  excelFormData.append('file', param.file)
   if (parameter.value.patternId) {
-    excelFormData.append("patternId",parameter.value.patternId)
+    excelFormData.append('patternId', parameter.value.patternId)
+  }
+  isCover.value && excelFormData.append('isCover', isCover.value as unknown as Blob)
+  //await parameter.value.importApi!(excelFormData);
+  await parameter.value.importApi!(excelFormData)
+    .then(res => handleImportResponse(res))
+  parameter.value.getTableList && parameter.value.getTableList()
+  dialogVisible.value = false
+}
+
+
+async function handleImportResponse(res: any) {
+  console.log(res)
+
+  if (res.type === 'application/json') {
+    const fileReader = new FileReader()
+    fileReader.onloadend = () => {
+      try {
+        const jsonData = JSON.parse(fileReader.result)
+        if (jsonData.code === 'A0000') {
+          ElMessage.success('导入成功')
+        } else {
+          ElMessage.error(jsonData.message)
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    }
+    fileReader.readAsText(res)
+  } else {
+    ElMessage.error('导入失败，请查看下载附件！')
+    let blob = new Blob([res], { type: 'application/vnd.ms-excel' })
+    const url = window.URL.createObjectURL(blob)
+    const link = document.createElement('a')
+    link.href = url
+    link.download = '导入失败数据'
+    document.body.appendChild(link)
+    link.click()
+    link.remove()
+  }
 }
-  isCover.value && excelFormData.append("isCover", isCover.value as unknown as Blob);
-  await parameter.value.importApi!(excelFormData);
-  parameter.value.getTableList && parameter.value.getTableList();
-  dialogVisible.value = false;
-};
 
 /**
  * @description 文件上传之前判断
  * @param file 上传的文件
  * */
 const beforeExcelUpload = (file: UploadRawFile) => {
-  const isExcel = parameter.value.fileType!.includes(file.type as File.ExcelMimeType);
-  const fileSize = file.size / 1024 / 1024 < parameter.value.fileSize!;
+  const isExcel = parameter.value.fileType!.includes(file.type as File.ExcelMimeType)
+  const fileSize = file.size / 1024 / 1024 < parameter.value.fileSize!
   if (!isExcel)
     ElNotification({
-      title: "温馨提示",
-      message: "上传文件只能是 xls / xlsx 格式！",
-      type: "warning"
-    });
+      title: '温馨提示',
+      message: '上传文件只能是 xls / xlsx 格式！',
+      type: 'warning',
+    })
   if (!fileSize)
     setTimeout(() => {
       ElNotification({
-        title: "温馨提示",
+        title: '温馨提示',
         message: `上传文件大小不能超过 ${parameter.value.fileSize}MB！`,
-        type: "warning"
-      });
-    }, 0);
-  return isExcel && fileSize;
-};
+        type: 'warning',
+      })
+    }, 0)
+  return isExcel && fileSize
+}
 
 // 文件数超出提示
 const handleExceed = () => {
   ElNotification({
-    title: "温馨提示",
-    message: "最多只能上传一个文件！",
-    type: "warning"
-  });
-};
+    title: '温馨提示',
+    message: '最多只能上传一个文件！',
+    type: 'warning',
+  })
+}
 
 // 上传错误提示
-const excelUploadError = () => {
-  ElNotification({
-    title: "温馨提示",
-    message: `批量添加${parameter.value.title}失败，请您重新上传！`,
-    type: "error"
-  });
-};
+// const excelUploadError = () => {
+//   ElNotification({
+//     title: '温馨提示',
+//     message: `批量添加${parameter.value.title}失败，请您重新上传！`,
+//     type: 'error',
+//   })
+// }
 
 // 上传成功提示
-const excelUploadSuccess = () => {
-  ElNotification({
-    title: "温馨提示",
-    message: `批量添加${parameter.value.title}成功！`,
-    type: "success"
-  });
-};
+// const excelUploadSuccess = () => {
+//   ElNotification({
+//     title: '温馨提示',
+//     message: `批量添加${parameter.value.title}成功！`,
+//     type: 'success',
+//   })
+// }
 
 defineExpose({
-  acceptParams
-});
+  acceptParams,
+})
 </script>
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 @import "./index.scss";
 </style>

frontend/src/components/IpAddress/index.vue

@@ -313,7 +313,7 @@
     border: 1px solid #dcdfe6;
     border-radius: 4px;
     line-height: 40px;
-    width: 110%;
+    width: 100%;
     height: 35px;
     padding-inline-start: 0px;
     padding-left: 10px;

frontend/src/components/echarts/line/index.vue

@@ -0,0 +1,282 @@
+<template>
+    <div class="chart">
+        <div ref="chartRef" class="my-chart" />
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, ref, defineExpose, watch, nextTick } from 'vue'
+// import echarts from './echarts'
+import * as echarts from 'echarts' // 全引入
+// import 'echarts/lib/component/dataZoom'
+
+const color = [
+    'var(--el-color-primary)',
+    '#07CCCA',
+    '#00BFF5',
+    '#FFBF00',
+    '#77DA63',
+    '#D5FF6B',
+    '#Ff6600',
+    '#FF9100',
+    '#5B6E96',
+    '#66FFCC',
+    '#B3B3B3'
+]
+
+const chartRef = ref<HTMLDivElement>()
+
+const props = defineProps(['options', 'isInterVal', 'pieInterVal'])
+let chart: echarts.ECharts | any = null
+const resizeHandler = () => {
+    // 不在视野中的时候不进行resize
+    if (!chartRef.value) return
+    if (chartRef.value.offsetHeight == 0) return
+    chart.getZr().painter.getViewportRoot().style.display = 'none'
+    requestAnimationFrame(() => {
+        chart.resize()
+        chart.getZr().painter.getViewportRoot().style.display = ''
+    })
+}
+const initChart = () => {
+    if (!props.isInterVal && !props.pieInterVal) {
+        chart?.dispose()
+    }
+    // chart?.dispose()
+    chart = echarts.init(chartRef.value as HTMLDivElement)
+    const options = {
+        title: {
+            left: 'center',
+            // textStyle: {
+            color: '#000',
+            fontSize: 18,
+            // },
+            ...(props.options?.title || null)
+        },
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'shadow',
+                label: {
+                    color: '#fff',
+                    fontSize: 16
+                }
+            },
+            textStyle: {
+                color: '#fff',
+                fontStyle: 'normal',
+                opacity: 0.35,
+                fontSize: 14
+            },
+            backgroundColor: 'rgba(0,0,0,0.55)',
+            borderWidth: 0,
+            confine: true,
+            ...(props.options?.tooltip || null)
+        },
+
+        legend: {
+            right: 20,
+            top: 0,
+            itemGap: 10,
+            itemStyle: {},
+            // textStyle: {
+            fontSize: 12,
+            padding: [2, 0, 0, 0], //[上、右、下、左]
+            // },
+            itemWidth: 15,
+            itemHeight: 10,
+            ...(props.options?.legend || null)
+        },
+        grid: {
+            top: '60px',
+            left: '30px',
+            right: '70px',
+            bottom: props.options?.options?.dataZoom === null ? '10px' : '40px',
+            containLabel: true,
+            ...(props.options?.grid || null)
+        },
+        xAxis: props.options?.xAxis ? handlerXAxis() : null,
+        yAxis: props.options?.yAxis ? handlerYAxis() : null,
+        dataZoom: props.options?.dataZoom || [
+            {
+                type: 'inside',
+                height: 13,
+                start: 0,
+                bottom: '20px',
+                end: 100
+            },
+            {
+                start: 0,
+                height: 13,
+                bottom: '20px',
+                end: 100
+            }
+        ],
+        color: props.options?.color || color,
+        series: props.options?.series,
+        ...props.options?.options
+    }
+    // console.log(options.series,"获取x轴");
+    handlerBar(options)
+
+    // 处理柱状图
+    chart.setOption(options, true)
+
+    setTimeout(() => {
+        chart.resize()
+    }, 0)
+}
+const handlerBar = (options: any) => {
+    if (Array.isArray(options.series)) {
+        options.series.forEach((item: any) => {
+            if (item.type === 'bar') {
+                item.barMinHeight = 10
+                item.barMaxWidth = 20
+                item.itemStyle = Object.assign(
+                    {
+                        color: (params: any) => {
+                            if (params.value == 0 || params.value == 3.14159) {
+                                return '#ccc'
+                            } else {
+                                return props.options?.color
+                                    ? props.options?.color[params.seriesIndex]
+                                    : color[params.seriesIndex]
+                            }
+                        }
+                    },
+                    item.itemStyle
+                )
+            }
+        })
+    }
+}
+const handlerYAxis = () => {
+    let temp = {
+        type: 'value',
+        nameGap: 15,
+        nameTextStyle: {
+            color: '#000'
+        },
+        splitNumber: 5,
+        minInterval: 1,
+        axisLine: {
+            show: true,
+            lineStyle: {
+                color: '#000'
+            }
+        },
+        axisLabel: {
+            color: '#000',
+            fontSize: 14,
+            formatter: function (value) {
+                return value.toFixed(0) // 格式化显示为一位小数
+            }
+        },
+        splitLine: {
+            lineStyle: {
+                // 使用深浅的间隔色
+                color: ['#ccc'],
+                type: 'dashed',
+                opacity: 0.5
+            }
+        }
+    }
+    // props.options?.xAxis 是数组还是对象
+    if (Array.isArray(props.options?.yAxis)) {
+        return props.options?.yAxis.map((item: any) => {
+            return {
+                ...temp,
+                ...item
+            }
+        })
+    } else {
+        return {
+            ...temp,
+            ...props.options?.yAxis
+        }
+    }
+}
+const handlerXAxis = () => {
+    let temp = {
+        type: 'category',
+        axisTick: { show: false },
+        nameTextStyle: {
+            color: '#000'
+        },
+        axisLine: {
+            // lineStyle: {
+            color: '#000'
+            // }
+        },
+        axisLabel: {
+            // textStyle: {
+            fontFamily: 'dinproRegular',
+            color: '#000',
+            fontSize: '12'
+            // }
+        }
+        // boundaryGap: false,
+    }
+    // props.options?.xAxis 是数组还是对象
+    if (Array.isArray(props.options?.xAxis)) {
+        return props.options?.xAxis.map((item: any) => {
+            return {
+                ...temp,
+                ...item
+            }
+        })
+    } else {
+        return {
+            ...temp,
+            ...props.options?.xAxis
+        }
+    }
+}
+
+let throttle: ReturnType<typeof setTimeout>
+// 动态计算table高度
+const resizeObserver = new ResizeObserver(entries => {
+    for (const entry of entries) {
+        if (throttle) {
+            clearTimeout(throttle)
+        }
+        throttle = setTimeout(() => {
+            resizeHandler()
+        }, 100)
+    }
+})
+onMounted(() => {
+    initChart()
+    resizeObserver.observe(chartRef.value!)
+})
+defineExpose({ initChart })
+onBeforeUnmount(() => {
+    resizeObserver.unobserve(chartRef.value!)
+    chart?.dispose()
+})
+watch(
+    () => props.options,
+    (newVal, oldVal) => {
+        initChart()
+    }
+)
+</script>
+
+<style lang="scss" scoped>
+.chart {
+    width: 100%;
+    height: 100%;
+    position: relative;
+
+    .el-button {
+        position: absolute;
+        right: 0px;
+        top: -60px;
+    }
+
+    .my-chart {
+        height: 100%;
+        width: 100%;
+    }
+}
+</style>

frontend/src/components/echarts/pie/default.vue

@@ -22,11 +22,16 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
+  
 });
 const customData: any = ref({}),
   legendData: any = ref({}),
   chart: any = ref();
+
+ const labelIsShow = ref(true)//引导线台数和鼠标点击饼图是否弹出提示显示
 const init = () => {
+
+
   customData.value = {
     title: "", //标题
     textAlign: "left", //标题位置可选属性left 可选属性值 left,right,center
@@ -35,7 +40,10 @@ const init = () => {
     isRadius: false, //是否圆角
     isSpace: false, //是否显示间隔
     isLabelLine: true, //是否显示引导线
+    titleFontSize: '14px', //标题字体大小
+    
     ...props.customData,
+    
   };
   legendData.value = {
     icon: "roundRect", // 图例项的icon,类型包括 circle(圆形),rect(正方形),//roundRect(圆角正方形),triangle(三角形),diamond(菱形),//pin(大头针行),arrow(箭头形),none(无图例项的icon)
@@ -49,6 +57,9 @@ const init = () => {
     title: {
       text: customData.value.title,
       left: customData.value.textAlign,
+      textStyle: {
+        fontSize: customData.value.titleFontSize, // 使用 titleFontSize 属性
+      },
     },
     legend:legendData.value,
     // legend: {
@@ -66,7 +77,7 @@ const init = () => {
     //                 },
     // },    
     tooltip: {
-      show: true,
+      show: labelIsShow.value,
       trigger: "item",
       formatter: customData.value.ratio ? `{b} : {c} ({d}%)` : "{b} :{c} ",
       borderWidth: 1,
@@ -82,7 +93,7 @@ const init = () => {
           if(item)
           return item[0].value;
           },
-        center: ["55%", "50%"], // 设置饼图的中心位置
+        center: ["55%", "55%"], // 设置饼图的中心位置
         // padAngle: 2,
         minAngle: 15, //最小角度
         startAngle: 270, //起始角度
@@ -95,14 +106,14 @@ const init = () => {
         },
         label: {
           normal: {
-            show: true,
+            show: labelIsShow.value,
             position: "outside",
             textStyle: {
               //color: "#fff",
               fontSize: 12,
             },
             formatter: function (data) {
-                                return data.value +'台'
+                              return labelIsShow.value ? data.value + '台' : '';
                             }
           },
         },
@@ -117,6 +128,7 @@ const init = () => {
       },
     ],
   };
+
   option && chart.value && chart.value.setOption(option);
   setTimeout(() => {
     chart.value.resize();
@@ -152,6 +164,12 @@ watch(
   () => props.chartsData,
   (val, oldVal) => {
     if (val) {
+      const item = props.chartsData.find(item => item.value === 0);
+      if(item != undefined){
+        labelIsShow.value = false;
+      }else{
+        labelIsShow.value = true;
+      }
       init();
     }
   },

frontend/src/config/index.ts

@@ -3,11 +3,13 @@
 // 首页地址（默认）
 export const HOME_URL: string = "/home/index";
 
+// export const HOME_URL: string = "/machine/controlSource";
+
 // 登录页地址（默认）
 export const LOGIN_URL: string = "/login";
 
 // 默认主题颜色
-export const DEFAULT_PRIMARY: string = "#003078";
+export const DEFAULT_PRIMARY: string = "#526ADE";
 
 // 路由白名单地址（本地存在的路由 staticRouter.ts 中）
 export const ROUTER_WHITE_LIST: string[] = ["/500"];
@@ -17,3 +19,5 @@ export const AMAP_MAP_KEY: string = "";
 
 // 百度地图 key
 export const BAIDU_MAP_KEY: string = "";
+
+

frontend/src/directives/modules/auth.ts

@@ -13,9 +13,11 @@ const auth: Directive = {
       // console.log('1234',authStore.routeName)
       // console.log('123',currentPageRoles)
     if (value instanceof Array && value.length) { 
+      //console.log('123456',value)     
       const hasPermission = value.every(item => currentPageRoles.includes(item))
       if (!hasPermission) el.remove()
     } else {
+      //console.log('12345',value)
       if (!currentPageRoles.includes(value)) el.remove()
     }
   },

frontend/src/enums/httpEnum.ts

@@ -4,7 +4,8 @@
 export enum ResultEnum {
   SUCCESS = "A0000",
   ERROR = 500,
-  OVERDUE = "401",
+  ACCESSTOKEN_EXPIRED = "A0024",
+  OVERDUE = "A0025",
   TIMEOUT = 30000,
   TYPE = "success"
 }

frontend/src/hooks/useTheme.ts

@@ -27,6 +27,7 @@ export const useTheme = () => {
 
   // 修改主题颜色
   const changePrimary = (val: string | null) => {
+ 
     if (!val) {
       val = DEFAULT_PRIMARY;
       ElMessage({ type: "success", message: `主题颜色已重置为 ${DEFAULT_PRIMARY}` });
@@ -40,10 +41,13 @@ export const useTheme = () => {
     for (let i = 1; i <= 9; i++) {
       const primaryColor = isDark.value ? `${getDarkColor(val, i / 10)}` : `${getLightColor(val, i / 10)}`;
       document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, primaryColor);
+
+      // const colorValue = document.documentElement.style.getPropertyValue(`--el-color-primary-light-${i}`).trim();
+      // console.log(`--el-color-primary-light-${i}: ${colorValue}`);
     }
     globalStore.setGlobalState("primary", val);
-  };
  
+  }
   // 灰色和弱色切换
   const changeGreyOrWeak = (type: Theme.GreyOrWeakType, value: boolean) => {
     const body = document.body as HTMLElement;

frontend/src/languages/modules/en.ts

@@ -26,6 +26,7 @@ export default {
     changePassword: "Change Password",
     changeMode:"Change Mode",
     versionRegister:"Version Register",
+    changeTheme: "Change Theme",
     logout: "Logout"
   }
 };

frontend/src/languages/modules/zh.ts

@@ -26,6 +26,7 @@ export default {
     changePassword: "修改密码",
     changeMode:"模式切换",
     versionRegister:"版本注册",
+    changeTheme:"主题切换",
     logout: "退出登录"
   }
 };

frontend/src/layouts/LayoutTransverse/index.scss

@@ -39,7 +39,9 @@
       }
       .el-menu-item:hover {
         color: #fff; //一级导航划过颜色
-        background-color: #5274a5 !important; //一级导航划过背景色
+        //background-color: #5274a5 !important; //一级导航划过背景色
+        background-color:var(--el-color-primary-light-3) !important; 
+
       }
       .el-sub-menu__hide-arrow {
         width: 65px;
@@ -47,7 +49,9 @@
       }
       .el-menu-item.is-active {
         color: #fff !important; //一级导航文字选中颜色
-        background-color: #5274a5 !important; //一级导航选中背景色
+        //background-color: #5274a5 !important; //一级导航选中背景色
+        background-color: var(--el-color-primary-light-3) !important; 
+
         border-bottom: 0 !important;
       }
       .el-sub-menu__title {
@@ -67,7 +71,9 @@
           color: #fff !important; //二级导航文字选中颜色
           // background-color: var(--el-color-primary) !important;
           // background-color: #5274a5 !important;//二级导航选中背景色
-          background-color: #5274a5 !important;
+      
+          //background-color: #7588e5 !important; 
+          background-color: var(--el-color-primary-light-3) !important; 
           border-bottom-color: var(--el-color-primary) !important;
         }
       }

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

@@ -66,12 +66,14 @@ onMounted(() => {
 const handelOpen = async (item: string) => {
   await authStore.setShowMenu();
   modeStore.setCurrentMode(item); // 将模式code存入 store
-  if (router.currentRoute.value.path === '/home/index') {
+  
+  //if (router.currentRoute.value.path === '/home/index') {
         // 强制刷新页面
         window.location.reload();
-      } else {
-        router.push({ path: '/home/index' });
-      }
+      //} else {
+      //  router.push({ path: '/home/index' });
+      //}
+
 };
 
 </script>
@@ -115,10 +117,11 @@ const handelOpen = async (item: string) => {
     position: absolute;
     width: 100%;
     height: 100%;
-    text-align: center;
+    text-align: right;
     line-height: 40px;
     a {
       color: #fff;
+      margin-right: 25px; // 增加右边距
     }
   }
 }

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

@@ -1,4 +1,12 @@
 <template>
+<!--  <div class="userInfo">-->
+<!--    <div class="icon">-->
+<!--      <Avatar/>-->
+<!--    </div>-->
+<!--    <div class="username">-->
+<!--      {{ username }}-->
+<!--    </div>-->
+<!--  </div>-->
   <el-dropdown trigger="click">
     <div class="userInfo">
       <div class="icon">
@@ -10,17 +18,20 @@
     </div>
     <template #dropdown>
       <el-dropdown-menu>
+        <el-dropdown-item @click="openDialog('themeRef')">
+          <el-icon><Sunny /></el-icon>{{ t("header.changeTheme") }}
+        </el-dropdown-item>
         <el-dropdown-item @click="openDialog('infoRef')">
-          <el-icon><User /></el-icon>{{ $t("header.personalData") }}
+          <el-icon><User /></el-icon>{{ t("header.personalData") }}
         </el-dropdown-item>
         <el-dropdown-item @click="openDialog('passwordRef')">
-          <el-icon><Edit /></el-icon>{{ $t("header.changePassword") }}
+          <el-icon><Edit /></el-icon>{{ t("header.changePassword") }}
         </el-dropdown-item>
         <el-dropdown-item @click="changeMode">
-          <el-icon><Edit /></el-icon>{{ $t("header.changeMode") }}
+          <el-icon><Switch /></el-icon>{{ t("header.changeMode") }}
         </el-dropdown-item>
         <el-dropdown-item @click="openDialog('versionRegisterRef')">
-          <el-icon><SetUp /></el-icon>{{ $t("header.versionRegister") }}
+          <el-icon><SetUp /></el-icon>{{ t("header.versionRegister") }}
         </el-dropdown-item>
       </el-dropdown-menu>
     </template>
@@ -34,6 +45,9 @@
   <PasswordDialog ref="passwordRef"></PasswordDialog>
    <!-- versionRegisterDialog -->
    <VersionDialog ref="versionRegisterRef"></VersionDialog>
+    <!-- ThemeDialog -->
+    <ThemeDialog ref="themeRef"></ThemeDialog>
+
 </template>
 
 <script setup lang="ts">
@@ -42,12 +56,13 @@ import { LOGIN_URL } from "@/config";
 import { useRouter } from "vue-router";
 import { logoutApi } from "@/api/user/login";
 import { useUserStore } from "@/stores/modules/user";
-import { ElMessageBox, ElMessage } from "element-plus";
+import { ElMessageBox, ElMessage, CHANGE_EVENT } from "element-plus";
 import InfoDialog from "./InfoDialog.vue";
 import PasswordDialog from "./PasswordDialog.vue";
+import ThemeDialog from "./ThemeDialog.vue";
 import VersionDialog from "@/views/system/versionRegister/index.vue";
 import { computed } from "vue";
-import { Avatar } from "@element-plus/icons-vue";
+import { Avatar, Delete, Document, Sunny, Switch } from "@element-plus/icons-vue";
 import AssemblySize from "./components/AssemblySize.vue";
 import Language from "./components/Language.vue";
 import SearchMenu from "./components/SearchMenu.vue";
@@ -56,13 +71,20 @@ import Message from "./components/Message.vue";
 import Fullscreen from "./components/Fullscreen.vue";
 import { useAuthStore } from "@/stores/modules/auth";
 import {useDictStore} from "@/stores/modules/dict";
-import { useModeStore } from "@/stores/modules/mode";
+import { useModeStore,useAppSceneStore } from "@/stores/modules/mode";
 const userStore = useUserStore();
 const dictStore = useDictStore();
 const username = computed(() => userStore.userInfo.name);
 const router = useRouter();
 const authStore = useAuthStore();
 const modeStore = useModeStore();
+const AppSceneStore = useAppSceneStore();
+import { useTheme } from "@/hooks/useTheme";
+import { useI18n } from "vue-i18n";
+const { changePrimary} = useTheme();
+
+// 初始化 i18n
+const { t } = useI18n(); // 使用 t 方法替代 $t
 
 // 退出登录
 const logout = () => {
@@ -74,10 +96,14 @@ const logout = () => {
     // 1.执行退出登录接口
     await logoutApi();
     // 2.清除 Token
-    userStore.setToken("");
-    userStore.setUserInfo({name: ""});
+    userStore.setAccessToken("");
+    userStore.setRefreshToken("");
+    userStore.setExp(0)
+    userStore.setUserInfo({id: "", name: ""});
+    userStore.setIsRefreshToken(false)
     dictStore.setDictData([]);
     modeStore.setCurrentMode('');
+    AppSceneStore.setCurrentMode('');
     // 3.重定向到登陆页
     router.replace(LOGIN_URL);
     ElMessage.success("退出登录成功！");
@@ -90,12 +116,19 @@ const logout = () => {
 const infoRef = ref<InstanceType<typeof InfoDialog> | null>(null);
 const passwordRef = ref<InstanceType<typeof PasswordDialog> | null>(null);
 const versionRegisterRef = ref<InstanceType<typeof VersionDialog> | null>(null);
-  
+const themeRef = ref<InstanceType<typeof ThemeDialog> | null>(null);
 const openDialog = (ref: string) => {
   if (ref == "infoRef") infoRef.value?.openDialog();
   if (ref == "passwordRef") passwordRef.value?.openDialog();
   if (ref == "versionRegisterRef") versionRegisterRef.value?.openDialog();
+  if (ref == "themeRef") themeRef.value?.openDialog();
+  
 };
+
+
+
+
+
 //模式切换
 const changeMode = () => {
   authStore.changeModel();

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

@@ -0,0 +1,45 @@
+<template>
+    <el-dialog v-model="dialogVisible" title="主题切换" width="500px" draggable>
+        <el-divider content-position="center">主题颜色</el-divider>
+        <div style="display: flex; justify-content: center;">
+            <el-color-picker v-model="color" />
+        </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="sure">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </template>
+  
+  <script setup lang="ts">
+  import { onMounted, ref } from "vue";
+  import { useTheme } from "@/hooks/useTheme";
+import { on } from "events";
+  const color = ref('')
+  const { changePrimary} = useTheme();
+
+  const dialogVisible = ref(false);
+  const openDialog = () => {
+      // 修复：使用可选链和空值合并运算符确保不会出现 null 或 undefined
+    const storedColor = JSON.parse(localStorage.getItem('cn-global') ?? '{}').primary;
+    color.value = storedColor ?? '#526ADE'; // 默认值为 '#526ADE'
+    dialogVisible.value = true;
+  };
+
+  const sure = () => {
+    changePrimary(color.value); // 切换主题
+    dialogVisible.value = false;
+  };
+
+  // onMounted(() => {
+  //  // 修复：使用可选链和空值合并运算符确保不会出现 null 或 undefined
+  // const storedColor = JSON.parse(localStorage.getItem('cn-global') ?? '{}').primary;
+  // console.log('123',storedColor)
+  // color.value = storedColor ?? '#526ADE'; // 默认值为 '#526ADE'
+  // })
+  
+  defineExpose({ openDialog });
+  </script>
+  

frontend/src/layouts/components/Main/index.scss

@@ -1,7 +1,7 @@
 .el-main {
   box-sizing: border-box;
-  padding: 20px;//主体padding
-  overflow-x: hidden;
+  padding: 15px;//主体padding
+  overflow: hidden;
   background-color: var(--el-bg-color-page);
 }
 .el-footer {

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

@@ -2,21 +2,16 @@
   <Maximize v-show="maximize" />
   <Tabs v-if="tabs && showMenuFlag" />
   <el-main>
-    <!-- style="height: calc(100vh - 157px);overflow-y:auto; overflow-x:hidden;" :style='{height:showMenuFlag?"calc(100vh - 157px)":" calc(100vh - 120px)"}' -->
     <router-view v-slot="{ Component, route }" style="height:100%;">
-      <transition appear name="fade-transform" mode="out-in">
-        <keep-alive :include="keepAliveName">
-          <component
-            :is="Component"
-            v-if="isRouterShow"
-            :key="route.fullPath"
-          />
+      <!-- {{ keepAliveName}} -->
+      <!-- <transition  name="slide-right" mode="out-in"> -->
+        <keep-alive :include="tabsMenuList" >
+          <component :is="Component" :key="route.fullPath" />
         </keep-alive>
-      </transition>
+      <!-- </transition> -->
     </router-view>
   </el-main>
   <el-footer>
-    <!-- v-show="footer" -->
     <Footer />
   </el-footer>
 </template>
@@ -31,12 +26,15 @@ import Maximize from "./components/Maximize.vue";
 import Tabs from "@/layouts/components/Tabs/index.vue";
 import Footer from "@/layouts/components/Footer/index.vue";
 import { useAuthStore } from "@/stores/modules/auth";
+import { useTabsStore } from '@/stores/modules/tabs'
+const tabStore = useTabsStore()
 const globalStore = useGlobalStore();
+const tabsMenuList = computed(() => tabStore.tabsMenuList.map(item => item.name))
 const authStore = useAuthStore();
 const { maximize, isCollapse, layout, tabs, footer } = storeToRefs(globalStore);
-
 const keepAliveStore = useKeepAliveStore();
 const { keepAliveName } = storeToRefs(keepAliveStore);
+// console.log("🚀 ~ keepAliveName:", keepAliveName)
 //是否显示导航栏
 const showMenuFlag = computed(() => authStore.showMenuFlagGet);
 // 注入刷新页面方法
@@ -65,6 +63,7 @@ watch(
   { immediate: true }
 );
 
+
 // 监听窗口大小变化，折叠侧边栏
 const screenWidth = ref(0);
 const listeningWindow = useDebounceFn(() => {

frontend/src/layouts/components/Menu/SubMenu.vue

@@ -33,14 +33,19 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => {
   // color: var(--el-menu-hover-text-color) !important;
   // background-color: transparent !important;
   color: #fff !important;//一级导航文字选中颜色
-  background-color: #5274a5 !important; //一级导航选中背景色
+  //background-color: #5274a5 !important; //一级导航选中背景色
+  
+  background-color: var(--el-color-primary-light-3) !important; 
+
 }
 .el-menu--collapse {
   .is-active {
     .el-sub-menu__title {
       color: #ffffff !important;
       // background-color: var(--el-color-primary) !important;
-      background-color: #5274a5 !important;
+      //background-color: #5274a5 !important;
+      background-color: var(--el-color-primary-light-3) !important; 
+
       border-bottom: 0 !important;
     }
   }
@@ -53,7 +58,9 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => {
     // color: var(--el-menu-active-color) !important;
     // background-color: var(--el-menu-active-bg-color) !important;
     color: #fff !important;//一级导航文字选中颜色
-    background-color: #5274a5 !important; //一级导航选中背景色
+    //background-color: #5274a5 !important; //一级导航选中背景色
+    background-color: var(--el-color-primary-light-3) !important; 
+
     &::before {
       position: absolute;
       top: 0;

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

@@ -1,12 +1,17 @@
 <template>
-  <div class='tabs-box'>
-    <div class='tabs-menu'>
-      <el-tabs v-model='tabsMenuValue' type='card' @tab-click='tabClick' @tab-remove='tabRemove'>
-        <el-tab-pane v-for='item in tabsMenuList' :key='item.path' :label='item.title' :name='item.path'
-                     :closable='item.close'>
+    <div class="tabs-box">
+        <div class="tabs-menu">
+            <el-tabs v-model="tabsMenuValue" type="card" @tab-click="tabClick" @tab-remove="tabRemove">
+                <el-tab-pane
+                    v-for="item in tabsMenuList"
+                    :key="item.path"
+                    :label="item.title"
+                    :name="item.path"
+                    :closable="item.close"
+                >
                     <template #label>
-            <el-icon v-show='item.icon && tabsIcon' class='tabs-icon'>
-              <component :is='item.icon'></component>
+                        <el-icon v-show="item.icon && tabsIcon" class="tabs-icon">
+                            <component :is="item.icon"></component>
                         </el-icon>
                         {{ item.title }}
                     </template>
@@ -17,7 +22,7 @@
     </div>
 </template>
 
-<script setup lang='ts'>
+<script setup lang="ts">
 import Sortable from 'sortablejs'
 import { ref, computed, watch, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -42,7 +47,6 @@ onMounted(() => {
     initTabs()
 })
 
-
 // 监听路由的变化（防止浏览器后退/前进不变化 tabsMenuValue）
 watch(
     () => route.fullPath,
@@ -58,12 +62,12 @@ watch(
                 path: route.fullPath,
                 name: route.name as string,
                 close: !route.meta.isAffix,
-        isKeepAlive: route.meta.isKeepAlive as boolean,
+                isKeepAlive: route.meta.isKeepAlive as boolean
             }
             tabStore.addTabs(tabsParams)
         }
     },
-  { immediate: true },
+    { immediate: true }
 )
 
 // 初始化需要固定的 tabs
@@ -77,6 +81,7 @@ const initTabs = () => {
                 name: item.name,
                 close: !item.meta.isAffix,
                 isKeepAlive: item.meta.isKeepAlive,
+                unshift: true
             }
             tabStore.addTabs(tabsParams)
         }
@@ -93,22 +98,25 @@ const tabsDrop = () => {
             const currRow = tabsList.splice(oldIndex as number, 1)[0]
             tabsList.splice(newIndex as number, 0, currRow)
             tabStore.setTabs(tabsList)
-    },
+        }
     })
 }
 
 // Tab Click
 const tabClick = (tabItem: TabsPaneContext) => {
     const fullPath = tabItem.props.name as string
+    // console.log("🚀 ~ tabClick ~ fullPath:", tabItem)
     router.push(fullPath)
 }
 
 // Remove Tab
 const tabRemove = (fullPath: TabPaneName) => {
-  tabStore.removeTabs(fullPath as string, fullPath == route.fullPath)
+
+
+    tabStore.removeTabs(fullPath as string, fullPath == route.fullPath || '/machine/testScriptAdd' == route.fullPath)
 }
 </script>
 
-<style scoped lang='scss'>
-@import "./index.scss";
+<style scoped lang="scss">
+@import './index.scss';
 </style>

frontend/src/layouts/components/ThemeDrawer/index.scss

@@ -46,7 +46,7 @@
       border-radius: 3px;
     }
     .layout-light {
-      background-color: var(--el-color-primary-light-5);
+      background-color: var(--el-color-primary-light-3);
       border-radius: 3px;
     }
     .layout-content {

frontend/src/main.ts

@@ -65,5 +65,6 @@ const setupAll = async () => {
 
 //挂载app
 setupAll().then(() => {
+ 
     app.mount('#app')
 })

frontend/src/routers/index.ts

@@ -30,6 +30,7 @@ const routerMode = {
  * @param meta.isKeepAlive ==> 当前路由是否缓存
  * */
 const router = createRouter({
+  
   history: routerMode[mode](),
   routes: [...staticRouter],
   // 不区分路由大小写，非严格模式下提供了更宽松的路径匹配
@@ -46,14 +47,13 @@ router.beforeEach(async (to, from, next) => {
   const authStore = useAuthStore()
   // 1.NProgress 开始
   NProgress.start()
-
   // 2.动态设置标题
   const title = import.meta.env.VITE_GLOB_APP_TITLE
   document.title = to.meta.title ? `${to.meta.title} - ${title}` : title
 
   // 3.判断是访问登陆页，有 Token 就在当前页面，没有 Token 重置路由到登陆页
   if (to.path.toLocaleLowerCase() === LOGIN_URL) {
-    if (userStore.token) return next(from.fullPath)
+    if (userStore.accessToken) return next(from.fullPath)
     resetRouter()
     return next()
   }
@@ -62,17 +62,16 @@ router.beforeEach(async (to, from, next) => {
   if (ROUTER_WHITE_LIST.includes(to.path)) return next()
 
   // 5.判断是否有 Token，没有重定向到 login 页面
-  if (!userStore.token) return next({ path: LOGIN_URL, replace: true })
+  if (!userStore.accessToken) return next({ path: LOGIN_URL, replace: true })
 
   // 6.如果没有菜单列表，就重新请求菜单列表并添加动态路由
   if (!authStore.authMenuListGet.length) {
     await initDynamicRouter()
     return next({ ...to, replace: true })
   }
-  //console.log(to)
+
   // 7.存储 routerName 做按钮权限筛选
   authStore.setRouteName(to.name as string)
-
   // 8.正常访问页面
   next()
 })

frontend/src/routers/modules/dynamicRouter.ts

@@ -28,7 +28,9 @@ export const initDynamicRouter = async () => {
         type: "warning",
         duration: 3000
       });
-      userStore.setToken("");
+      userStore.setAccessToken("");
+      userStore.setRefreshToken("");
+      userStore.setExp(0)
       router.replace(LOGIN_URL);
       return Promise.reject("No permission");
     }
@@ -36,9 +38,11 @@ export const initDynamicRouter = async () => {
     // 3.添加动态路由
     authStore.flatMenuListGet.forEach(item => {
       item.children && delete item.children;
+ 
       if (item.component && typeof item.component == "string") {
         item.component = modules["/src/views" + item.component + ".vue"];
       }
+
       if (item.meta.isFull) {
         router.addRoute(item as unknown as RouteRecordRaw);
       } else {
@@ -47,7 +51,9 @@ export const initDynamicRouter = async () => {
     });
   } catch (error) {
     // 当按钮 || 菜单请求出错时，重定向到登陆页
-    userStore.setToken("");
+    userStore.setAccessToken("");
+    userStore.setRefreshToken("");
+    userStore.setExp(0)
     router.replace(LOGIN_URL);
     return Promise.reject(error);
   }

frontend/src/routers/modules/staticRouter.ts

@@ -1,122 +1,139 @@
-import { RouteRecordRaw } from "vue-router";
-import { HOME_URL, LOGIN_URL } from "@/config";
-export const Layout = () => import('@/layouts/index.vue');
+import { RouteRecordRaw } from 'vue-router'
+import { HOME_URL, LOGIN_URL } from '@/config'
+export const Layout = () => import('@/layouts/index.vue')
 /**
  * staticRouter (静态路由)
  */
 export const staticRouter: RouteRecordRaw[] = [
     {
-    path: "/",
-    redirect: HOME_URL,
+        path: '/',
+        redirect: HOME_URL
     },
     {
         path: LOGIN_URL,
-    name: "login",
-    component: () => import("@/views/login/index.vue"),
+        name: 'login',
+        component: () => import('@/views/login/index.vue'),
         meta: {
-      title: "登录",
-    },
+            title: '登录'
+        }
     },
     {
-    path: "/layout",
-    name: "layout",
+        path: '/layout',
+        name: 'layout',
         component: Layout,
         children: [
             {
-        path: "/plan",
-        name: "plan",
-        redirect: "/plan/planList",
+                path: '/plan',
+                name: 'plan',
+                redirect: '/plan/planList',
                 children: [
-          {
-            path: "/plan/planList",
-            name: "planList",
-            component: () => import("@/views/plan/planList/index.vue"),
-            meta: {
-              title: "检测计划列表",
-              icon: "List",
-              isLink: "",
-              isHide: false,
-              isFull: false,
-              isAffix: false,
-              isKeepAlive: false,
-            },
-          },
-          {
-            path: "/plan/singlePlanList",
-            name: "singlePlanList",
-            component: () => import("@/views/plan/singlePlanList/index.vue"),
-            meta: {
-              title: "单个计划列表",
-              icon: "List",
-              isLink: "",
-              isHide: false,
-              isFull: false,
-              isAffix: false,
-              isKeepAlive: false,
-            },
-          },
-          {
-            path: "/plan/preTest",
-            name: "preTest",
-            component: () => import("@/views/plan/preTest/index.vue"),
-            meta: {
-              title: "预检测",
-              icon: "List",
-              isLink: "",
-              isHide: false,
-              isFull: false,
-              isAffix: false,
-              isKeepAlive: false,
-            },
-          },
-          {
-            path: "/plan/autoTest",
-            name: "autoTest",
-            component: () => import("@/views/plan/autoTest/index.vue"),
-            meta: {
-              title: "自动检测",
-              icon: "List",
-              isLink: "",
-              hideTab:true,
-              parentPath:'/system/proTable',
-              isHide: false,
-              isFull: false,
-              isAffix: false,
-              isKeepAlive: false,
-            },
-          },
+                    // {
+                    //   path: "/plan/planList",
+                    //   name: "planList",
+                    //   component: () => import("@/views/plan/planList/index.vue"),
+                    //   meta: {
+                    //     title: "检测计划列表",
+                    //     icon: "List",
+                    //     isLink: "",
+                    //     isHide: false,
+                    //     isFull: false,
+                    //     isAffix: false,
+                    //     isKeepAlive: true,//缓存改成true
+                    //   },
+                    // },
+                    // {
+                    //   path: "/plan/singlePlanList",
+                    //   name: "singlePlanList",
+                    //   component: () => import("@/views/plan/singlePlanList/index.vue"),
+                    //   meta: {
+                    //     title: "单个计划列表",
+                    //     icon: "List",
+                    //     isLink: "",
+                    //     isHide: false,
+                    //     isFull: false,
+                    //     isAffix: false,
+                    //     isKeepAlive: true,
+                    //   },
+                    // },
+                    // {
+                    //   path: "/plan/preTest",
+                    //   name: "preTest",
+                    //   component: () => import("@/views/plan/preTest/index.vue"),
+                    //   meta: {
+                    //     title: "预检测",
+                    //     icon: "List",
+                    //     isLink: "",
+                    //     isHide: false,
+                    //     isFull: false,
+                    //     isAffix: false,
+                    //     isKeepAlive: false,
+                    //   },
+                    // },
+                    // {
+                    //   path: "/plan/autoTest",
+                    //   name: "autoTest",
+                    //   component: () => import("@/views/plan/autoTest/index.vue"),
+                    //   meta: {
+                    //     title: "自动检测",
+                    //     icon: "List",
+                    //     isLink: "",
+                    //     hideTab:true,
+                    //     parentPath:'/system/proTable',
+                    //     isHide: false,
+                    //     isFull: false,
+                    //     isAffix: false,
+                    //     isKeepAlive: true,
+                    //   },
+                    // },
+
                     // 错误页面路由
                     {
-            path: "/403",
-            name: "403",
-            component: () => import("@/components/ErrorMessage/403.vue"),
+                        path: '/403',
+                        name: '403',
+                        component: () => import('@/components/ErrorMessage/403.vue'),
                         meta: {
-              title: "403页面",
-            },
+                            title: '403页面'
+                        }
                     },
                     {
-            path: "/404",
-            name: "404",
-            component: () => import("@/components/ErrorMessage/404.vue"),
+                        path: '/404',
+                        name: '404',
+                        component: () => import('@/components/ErrorMessage/404.vue'),
                         meta: {
-              title: "404页面",
-            },
+                            title: '404页面'
+                        }
                     },
                     {
-            path: "/500",
-            name: "500",
-            component: () => import("@/components/ErrorMessage/500.vue"),
+                        path: '/500',
+                        name: '500',
+                        component: () => import('@/components/ErrorMessage/500.vue'),
                         meta: {
-              title: "500页面",
-            },
+                            title: '500页面'
+                        }
                     },
                     // Resolve refresh page, route warnings
                     {
-            path: "/:pathMatch(.*)*",
-            component: () => import("@/components/ErrorMessage/404.vue"),
-          },
-        ],
+                        path: '/:pathMatch(.*)*',
+                        component: () => import('@/components/ErrorMessage/404.vue')
                     }
-    ],
+                ]
             },
-];
+            {
+                path: '/machine/testScriptAdd',
+                name: 'testScriptAdd',
+                component: () => import('@/views/machine/testScript/components/testScriptPopup.vue'),
+                meta: {
+                    title: '检测脚本配置',
+                    icon: 'List',
+                    isLink: '',
+                    hideTab: true,
+                    parentPath: '/machine/testScript',
+                    isHide: false,
+                    isFull: false,
+                    isAffix: false,
+                    isKeepAlive: true
+                }
+            }
+        ]
+    }
+]

frontend/src/stores/interface/index.ts

@@ -27,8 +27,10 @@ export interface GlobalState {
 
 /* UserState */
 export interface UserState {
-  token: string;
-  userInfo: { name: string };
+    accessToken: string;
+    refreshToken: string;
+    isRefreshToken: boolean;
+    userInfo: { id: string, name: string };
 }
 
 /* tabsMenuProps */
@@ -39,6 +41,7 @@ export interface TabsMenuProps {
     name: string;
     close: boolean;
     isKeepAlive: boolean;
+    unshift?: boolean;
 }
 
 /* TabsState */

frontend/src/stores/modules/check.ts

@@ -1,16 +1,20 @@
 import {defineStore} from "pinia";
 import {CHECK_STORE_KEY} from "@/stores/constant";
 import type {CheckData} from "@/api/check/interface";
+import type {Plan} from '@/api/plan/interface'
+import {useAppSceneStore} from "@/stores/modules/mode";
 
-
+const AppSceneStore = useAppSceneStore()
 export const useCheckStore = defineStore("check", {
     id: CHECK_STORE_KEY,
 
     state: () => ({
         devices: Array<CheckData.Device>(),
-        planId: String(""),
-        planCode: String(""),
-        scriptId: String(""),
+        plan: Object<Plan.ResPlan>(),
+        selectTestItems: Object<CheckData.SelectTestItem>({preTest: true, timeTest: true, channelsTest: false, test: true}),
+        checkType:1, // 0:手动检测 1:自动检测
+        reCheckType: 1, // 0:不合格项复检 1:全部复检
+        showDetailType: 0 // 0:数据查询 1:误差体系跟换 2：正式检测
     }),
 
     getters: {},
@@ -19,21 +23,32 @@ export const useCheckStore = defineStore("check", {
         addDevices(device: CheckData.Device[]) {
             this.devices.push(...device);
         },
-
+        setPlan(plan: Plan.ResPlan) {
+            this.plan = plan
+        },
         clearDevices() {
             this.devices = [];
         },
-
-        setPlanId(planId: string) {
-            this.planId = planId
+        initSelectTestItems() {
+            this.selectTestItems.preTest = true
+            if (AppSceneStore.currentScene === '1') {
+                this.selectTestItems.channelsTest = true
+            } else {
+                this.selectTestItems.timeTest = true
+            }
+            this.selectTestItems.test = true
         },
-
-        setPlanCode(planCode: string) {
-            this.planCode = planCode
+        setSelectTestItems(selectTestItems: CheckData.SelectTestItem) {
+            this.selectTestItems = selectTestItems
         },
-
-        setScriptId(scriptId: string) {
-            this.scriptId = scriptId
+        setCheckType(checkType: number) {
+            this.checkType = checkType
+        },
+        setReCheckType(reCheckType: number) {
+            this.reCheckType = reCheckType
+        },
+        setShowDetailType(showDetailType: number) {
+            this.showDetailType = showDetailType
         }
     }
 });

frontend/src/stores/modules/global.ts

@@ -31,7 +31,7 @@ export const useGlobalStore = defineStore({
     // 折叠菜单
     isCollapse: false,
     // 菜单手风琴
-    accordion: true,
+    accordion: false,
     // 面包屑导航
     breadcrumb: true,
     // 面包屑导航图标
@@ -42,12 +42,14 @@ export const useGlobalStore = defineStore({
     tabsIcon: true,
     // 页脚
     footer: false
+  
   }),
   getters: {},
   actions: {
     // Set GlobalState
     setGlobalState(...args: ObjToKeyValArray<GlobalState>) {
       this.$patch({ [args[0]]: args[1] });
+      console.log(DEFAULT_PRIMARY);
     }
   },
   persist: piniaPersistConfig(GLOBAL_STORE_KEY)

frontend/src/stores/modules/mode.ts

@@ -24,3 +24,16 @@ export const useModeStore = defineStore('mode', {
       },
     },
   });
+
+  export const useAppSceneStore = defineStore('scene', {
+    state: () => ({
+      currentScene: localStorage.getItem('currentScene') || '' as string,
+    }),
+    actions: {
+      setCurrentMode(sceneName: string) {
+        this.currentScene = sceneName;
+        localStorage.setItem('currentScene', sceneName); // 保存到 localStorage
+      },
+    },
+  });
+

frontend/src/stores/modules/tabs.ts

@@ -16,8 +16,14 @@ export const useTabsStore = defineStore({
   actions: {
     // Add Tabs
     async addTabs(tabItem: TabsMenuProps) {
+
       if (this.tabsMenuList.every(item => item.path !== tabItem.path)) {
+        if (tabItem?.unshift) {
+          this.tabsMenuList.unshift(tabItem);
+        }else{
           this.tabsMenuList.push(tabItem);
+
+        }
       }
       if (!keepAliveStore.keepAliveName.includes(tabItem.name) && tabItem.isKeepAlive) {
         keepAliveStore.addKeepAliveName(tabItem.name);

frontend/src/stores/modules/user.ts

@@ -6,19 +6,31 @@ import { USER_STORE_KEY } from "@/stores/constant";
 export const useUserStore = defineStore({
   id: USER_STORE_KEY,
   state: (): UserState => ({
-    token: "",
-    userInfo: { name: "admin" },
+    accessToken: "",
+    refreshToken: "",
+    isRefreshToken:false,
+    exp: Number(0),
+    userInfo: {id:"", name: "admin" },
   }),
   getters: {},
   actions: {
     // Set Token
-    setToken(token: string) {
-      this.token = token;
+    setAccessToken(accessToken: string) {
+      this.accessToken = accessToken;
+    },
+    setRefreshToken(refreshToken: string) {
+      this.refreshToken = refreshToken;
+    },
+    setIsRefreshToken(isRefreshToken: boolean) {
+      this.isRefreshToken = isRefreshToken;
     },
     // 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;
   }
 }
 
@@ -578,6 +578,26 @@
     }
   }
 }
+.form-four {
+  display: flex;
+  flex-wrap: wrap;
+  // justify-content: space-between;
+  .el-form-item {
+    display: flex;
+    width: 24%;
+
+    .el-form-item__content {
+      flex: 1;
+
+      .el-select,
+      .el-cascader,
+      .el-input__inner,
+      .el-date-editor {
+        width: 100%;
+      }
+    }
+  }
+}
 
 .el-table__cell {
   border-right: 1px solid #ebeef5 !important;

frontend/src/utils/color.ts

@@ -37,6 +37,7 @@ export function rgbToHex(r: any, g: any, b: any) {
  * @returns {String} 返回处理后的颜色值
  */
 export function getDarkColor(color: string, level: number) {
+
   let reg = /^\#?[0-9A-Fa-f]{6}$/;
   if (!reg.test(color)) return ElMessage.warning("输入错误的hex颜色值");
   let rgb = hexToRgb(color);
@@ -51,6 +52,7 @@ export function getDarkColor(color: string, level: number) {
  * @returns {String} 返回处理后的颜色值
  */
 export function getLightColor(color: string, level: number) {
+ 
   let reg = /^\#?[0-9A-Fa-f]{6}$/;
   if (!reg.test(color)) return ElMessage.warning("输入错误的hex颜色值");
   let rgb = hexToRgb(color);

frontend/src/utils/errorHandler.ts

@@ -4,24 +4,24 @@ import { ElNotification } from "element-plus";
  * @description 全局代码错误捕捉
  * */
 const errorHandler = (error: any) => {
-  // 过滤 HTTP 请求错误
-  if (error.status || error.status == 0) return false;
-  let errorMap: { [key: string]: string } = {
-    InternalError: "Javascript引擎内部错误",
-    ReferenceError: "未找到对象",
-    TypeError: "使用了错误的类型或对象",
-    RangeError: "使用内置对象时，参数超范围",
-    SyntaxError: "语法错误",
-    EvalError: "错误的使用了Eval",
-    URIError: "URI错误"
-  };
-  let errorName = errorMap[error.name] || "未知错误";
-  ElNotification({
-    title: errorName,
-    message: error,
-    type: "error",
-    duration: 3000
-  });
+  // // 过滤 HTTP 请求错误
+  // if (error.status || error.status == 0) return false;
+  // let errorMap: { [key: string]: string } = {
+  //   InternalError: "Javascript引擎内部错误",
+  //   ReferenceError: "未找到对象",
+  //   TypeError: "使用了错误的类型或对象",
+  //   RangeError: "使用内置对象时，参数超范围",
+  //   SyntaxError: "语法错误",
+  //   EvalError: "错误的使用了Eval",
+  //   URIError: "URI错误"
+  // };
+  // let errorName = errorMap[error.name] || "未知错误";
+  // ElNotification({
+  //   title: errorName,
+  //   message: error,
+  //   type: "error",
+  //   duration: 3000
+  // });
 };
 
 export default errorHandler;

frontend/src/utils/webSocketClient.ts

@@ -1,5 +1,6 @@
 import {ElMessage} from "element-plus";
 
+
 export default class SocketService {
     static instance = null;
     static get Instance() {
@@ -18,18 +19,26 @@ export default class SocketService {
     sendRetryCount = 0;
     // 重新连接尝试的次数
     connectRetryCount = 0;
+    work:any;
+    workerBlobUrl:any;
+    lastActivityTime= 0; // 上次活动时间戳
+    lastResponseHeartTime = Date.now();//最后一次收到心跳回复时间
+
+    reconnectDelay= 5000; // 重新连接延迟，单位毫秒
+
     //  定义连接服务器的方法
-    connect(url) {
+    connect() {
 
         // 连接服务器
         if (!window.WebSocket) {
             return console.log('您的浏览器不支持WebSocket');
         }
-        console.log(url)
+
         // let token = $.cookie('123');
         // let token = '4E6EF539AAF119D82AC4C2BC84FBA21F';
 
 
+        const url = 'ws://127.0.0.1:7777/hello?name=cdf'
         this.ws = new WebSocket(url);
         // 连接成功的事件
         this.ws.onopen = () => {
@@ -38,35 +47,108 @@ export default class SocketService {
             this.connected = true;
             // 重置重新连接的次数
             this.connectRetryCount = 0;
+            this.updateLastActivityTime();
+            this.startHeartbeat();
         };
         // 1.连接服务端失败
         // 2.当连接成功之后, 服务器关闭的情况
         this.ws.onclose = () => {
-            console.log('连接服务端失败');
+            console.log('连接webSocket服务端关闭');
             this.connected = false;
             this.connectRetryCount++;
-            setTimeout(() => {
-               // this.connect();
-            }, 500 * this.connectRetryCount);
+            this.clearHeartbeat();
+           /* setTimeout(() => {
+                this.connect();
+            }, 500 * this.connectRetryCount);*/
+
+
         };
+
+        this.ws.onerror = () => {
+            ElMessage.error("webSocket连接异常！");
+
+
+        };
+
+
         // 得到服务端发送过来的数据
         this.ws.onmessage = (event) => {
+            // console.log('🚀 ~ SocketService ~ connect ~ event:', event)
+            if(event.data == 'over') {
+                //心跳消息处理
+                this.lastResponseHeartTime = Date.now();
+                this.updateLastActivityTime(); // 收到心跳响应时更新活动时间
+            }else {
                 let message: { [key: string]: any };
                 try {
+                    console.log('Received message:',event.data)
                     message = JSON.parse(event.data);
                 } catch (e) {
                     return console.error("消息解析失败", event.data, e);
                 }
-            //console.log(message, "从服务端获取到了数据");
+
                 /* 通过接受服务端发送的type字段来回调函数 */
                 if (message?.type && this.callBackMapping[message.type]) {
                     this.callBackMapping[message.type](message);
                 } else {
-                console.log("抛弃====>"+message)
+                    console.log("抛弃====>")
+                    console.log(event.data)
                     /* 丢弃或继续写你的逻辑 */
                 }
+            }
+
+
         };
     }
+
+
+
+
+
+    startHeartbeat() {
+        this.lastResponseHeartTime = Date.now();
+        const  _this = this
+        _this.workerBlobUrl  = window.URL.createObjectURL(new Blob(['(function(e){setInterval(function(){this.postMessage(null)},9000)})()']));
+
+        this.work = new Worker(_this.workerBlobUrl);
+        this.work.onmessage = function(e){
+            //判断多久没收到心跳响应
+
+            if(_this.lastActivityTime - _this.lastResponseHeartTime > 30000){
+                //说明已经三轮心跳没收到回复了，关闭检测，提示用户。
+                ElMessage.error("业务主体模块发生未知异常，请尝试重新启动！");
+                _this.clearHeartbeat();
+                return;
+            }
+            _this.sendHeartbeat();
+		}
+
+    }
+    sendHeartbeat() {
+        console.log(new Date()+"进入心跳消息发送。。。。。。。。。。。。。")
+        this.ws.send('alive');
+        this.updateLastActivityTime(); // 发送心跳后更新活动时间
+    }
+
+
+    updateLastActivityTime() {
+        this.lastActivityTime = Date.now();
+    }
+
+    clearHeartbeat() {
+        const  _this = this
+        if (_this.work) {
+            _this.work.terminate();
+            _this.work = null;
+        }
+        if (_this.workerBlobUrl) {
+            window.URL.revokeObjectURL(_this.workerBlobUrl); // 释放临时的Blob URL
+            _this.workerBlobUrl = null;
+        }
+    }
+
+
+
     // 回调函数的注册
     registerCallBack(socketType, callBack) {
         this.callBackMapping[socketType] = callBack;
@@ -98,6 +180,6 @@ export default class SocketService {
         if (this.connected) {
             this.ws.close()
         }
-        console.log('WS关闭中..');
+        console.log('执行WS关闭命令..');
     }
 }

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

@@ -34,6 +34,9 @@
   import ResourcePopup from './components/resourcePopup.vue'
   import {deleteFunction,getFunctionList} from '@/api/user/function/index'
   import * as Icons from '@element-plus/icons-vue'
+  defineOptions({
+      name: 'resource'
+  })
   const dictStore = useDictStore()
   const resourcePopup = ref()
   // ProTable 实例

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

@@ -8,7 +8,7 @@
       <!-- :requestApi="getRoleList" -->
       <!-- 表格 header 按钮 -->
       <template #tableHeader='scope'>
-        <el-button v-auth.role="'add'" type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
+        <el-button v-auth.role="'add'" type='primary' :icon='CirclePlus' @click="openDrawer('add')">新增</el-button>
                 <el-button v-auth.role="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           删除
@@ -16,7 +16,7 @@
       </template>
       <!-- 表格操作 -->
       <template #operation='scope'>
-        <el-button v-auth.role="'edit'" type='primary' link :icon='EditPen' @click="openDrawer('编辑角色', scope.row)">编辑</el-button>
+        <el-button v-auth.role="'edit'" type='primary' link :icon='EditPen' @click="openDrawer('edit', scope.row)">编辑</el-button>
         <el-button v-auth.role="'delete'" v-if="scope.row.type !== 0 && scope.row.type !== 1" type='primary' link :icon='Delete' @click='deleteAccount(scope.row)'>删除</el-button>
         <el-button v-auth.role="'SetPermissions'" type='primary' link :icon='Share' @click="openDrawer('设置权限', scope.row)">设置权限</el-button>
       </template>
@@ -39,6 +39,9 @@ import RolePopup from './components/rolePopup.vue'
 import RoleResourcePopup from './components/roleResourcePopup.vue'
 import { onMounted, reactive, ref } from 'vue'
 import {useDictStore} from '@/stores/modules/dict'
+defineOptions({
+      name: 'role'
+  })
 const rolePopup = ref()
 const roleResourcePopup = ref()
 const dictStore = useDictStore()

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

@@ -43,6 +43,9 @@
   import {getUserList, deleteUser,getRoleList} from '@/api/user/user'
   import { onMounted, reactive, ref } from 'vue'
   import { type Role } from '@/api/user/interface/role'
+  defineOptions({
+      name: 'user'
+  })
   const roleList = ref<Role.RoleBO[]>([])
   const dictStore = useDictStore()
   const userPopup = ref()

frontend/src/views/demo/proTable/doubleColumn.vue

@@ -1,80 +0,0 @@
-<!--双列-->
-<template>
-  <el-dialog v-model='dialogVisible' :title='title' v-bind='dialogMiddle' >
-    <el-scrollbar>
-      <el-form :inline="false"  label-width="auto"  ref="formRef" class='form-two'>
-        <el-form-item label="姓名" prop="username" >
-          <el-input
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="性别" prop="gender">
-          <el-input
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="年龄" prop="age">
-          <el-input
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="身份证号" prop="id">
-          <el-input
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="邮箱" prop="email">
-          <el-input
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="居住地址" prop="address">
-          <el-input
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="手机" prop="phone">
-          <el-input
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="来源" prop="source">
-          <el-input
-          ></el-input>
-        </el-form-item>
-
-      </el-form>
-    </el-scrollbar>
-
-    <template #footer>
-      <div class='dialog-footer'>
-        <el-button @click='close()'>取消</el-button>
-        <el-button type='primary' @click='confirmForm()'>确定</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-<script setup lang='ts'>
-import { dialogMiddle } from '@/utils/elementBind'
-
-const dialogVisible = ref(false)
-const title = ref('单列弹出框')
-const open = (textTitle: string) => {
-  dialogVisible.value = true
-  title.value = textTitle
-}
-
-const close = () => {
-  dialogVisible.value = false
-}
-
-const confirmForm = () => {
-  ElMessage.info('业务数据提交')
-}
-
-defineExpose({ open })
-
-</script>
-<style>
-
-</style>

frontend/src/views/demo/proTable/index.vue

@@ -1,200 +0,0 @@
-<template>
-  <div class='table-box' ref='popupBaseView'>
-    <ProTable
-        ref='proTable'
-        :columns='columns'
-        :data='userData'
-    >
-      <!-- 表格 header 按钮 -->
-      <template #tableHeader='scope'>
-        <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增')">新增用户</el-button>
-        <el-button type='primary' :icon='Upload' plain @click='batchAdd'>批量添加用户</el-button>
-        <el-button type='primary' :icon='Download' plain @click='downloadFile'>导出用户数据</el-button>
-        <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
-                   @click='batchDelete(scope.selectedListIds)'>
-          删除用户
-        </el-button>
-      </template>
-      <!-- 表格操作 -->
-      <template #operation='scope'>
-        <el-button type='primary' link :icon='View'
-                   @click="openDrawer('查看', scope.row)">查看
-        </el-button>
-        <el-button type='primary' link :icon='EditPen' @click="openDrawer('编辑', scope.row)">编辑</el-button>
-        <el-button type='primary' link :icon='Refresh' @click='resetPass(scope.row)'>重置密码</el-button>
-        <el-button type='primary' link :icon='CirclePlus' @click='deleteAccount()'>下钻</el-button>
-      </template>
-    </ProTable>
-  </div>
-  <single-column ref='singleColumn' />
-  <double-column ref='doubleColumn' />
-  <open :width='viewWidth' :height='viewHeight' ref='openView' />
-</template>
-<script setup lang='tsx' name='useProTable'>
-import { ref, reactive } from 'vue'
-import { useHandleData } from '@/hooks/useHandleData'
-import { useAuthButtons } from '@/hooks/useAuthButtons'
-import ProTable from '@/components/ProTable/index.vue'
-import ImportExcel from '@/components/ImportExcel/index.vue'
-import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
-import { CirclePlus, Delete, EditPen, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
-import { useDictStore } from '@/stores/modules/dict'
-import SingleColumn from '@/views/demo/proTable/singleColumn.vue'
-import Open from '@/views/demo/proTable/Open.vue'
-import DoubleColumn from '@/views/demo/proTable/doubleColumn.vue'
-import { useViewSize } from '@/hooks/useViewSize'
-
-const { popupBaseView, viewWidth, viewHeight } = useViewSize()
-
-const dictStore = useDictStore()
-import {
-  getUserList,
-  deleteUser,
-} from '@/api/user/user'
-import { ElMessageBox } from 'element-plus'
-
-const userData = userDataList
-const singleColumn = ref()
-const doubleColumn = ref()
-const openView = ref()
-// ProTable 实例
-const proTable = ref<ProTableInstance>()
-// 如果表格需要初始化请求参数，直接定义传给 ProTable (之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
-const initParam = reactive({ type: 1 })
-// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total 这些字段，可以在这里进行处理成这些字段
-// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
-const dataCallback = (data: any) => {
-  return {
-    list: data.list,
-    total: data.total,
-  }
-}
-// 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
-// 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
-const getTableList = (params: any) => {
-  let newParams = JSON.parse(JSON.stringify(params))
-  newParams.createTime && (newParams.startTime = newParams.createTime[0])
-  newParams.createTime && (newParams.endTime = newParams.createTime[1])
-  delete newParams.createTime
-  return getUserList(newParams)
-}
-// 页面按钮权限（按钮权限既可以使用 hooks，也可以直接使用 v-auth 指令，指令适合直接绑定在按钮上，hooks 适合根据按钮权限显示不同的内容）
-const { BUTTONS } = useAuthButtons()
-// 表格配置项
-const columns = reactive<ColumnProps<any>[]>([
-  { type: 'selection', fixed: 'left', width: 70 },
-  { type: 'index', fixed: 'left', width: 70, label: '序号' },
-  {
-    prop: 'username',
-    label: '姓名',
-    width: 120,
-    search: { el: 'input' },
-  },
-  {
-    prop: 'gender',
-    label: '性别',
-    // 字典数据（本地数据）
-    enum: dictStore.getDictData('sex'),
-    search: { el: 'select', props: { filterable: true } },
-    fieldNames: { label: 'label', value: 'code' },
-  },
-  {
-    prop: 'age',
-    label: '年龄',
-    search: {
-      // 自定义 search 显示内容
-      render: ({ searchParam }) => {
-        return (
-            <div class='flx-center'>
-              <el-input vModel_trim={searchParam.minAge} placeholder='最小年龄' />
-              <span class='mr10 ml10'>-</span>
-              <el-input vModel_trim={searchParam.maxAge} placeholder='最大年龄' />
-            </div>
-        )
-      },
-    },
-  },
-  { prop: 'idCard', label: '身份证号' },
-  { prop: 'email', label: '邮箱' },
-  { prop: 'address', label: '居住地址', width: 120 },
-  {
-    prop: 'status',
-    label: '状态',
-    enum: dictStore.getDictData('status'),
-    search: { el: 'tree-select', props: { filterable: true } },
-    fieldNames: { label: 'userLabel', value: 'userStatus' },
-    render: scope => {
-      return (
-          <>
-            {BUTTONS.value.status ? (
-                <el-switch
-                    model-value={scope.row.status}
-                    active-text={scope.row.status ? '启用' : '禁用'}
-                    active-value={1}
-                    inactive-value={0}
-                    onClick={() => changeStatus(scope.row)}
-                />
-            ) : (
-                <el-tag type={scope.row.status ? 'success' : 'danger'}>{scope.row.status ? '启用' : '禁用'}</el-tag>
-            )}
-          </>
-      )
-    },
-  },
-  {
-    prop: 'createTime',
-    label: '创建时间',
-    width: 180,
-    search: {
-      el: 'date-picker',
-      span: 1,
-      props: { type: 'daterange', valueFormat: 'YYYY-MM-DD' },
-      defaultValue: ['2024-11-12', '2024-12-12'],
-    },
-  },
-  { prop: 'operation', label: '操作', fixed: 'right', width: 330 },
-])
-
-
-// 下钻
-const deleteAccount = async () => {
-  openView.value.open('测试弹出框')
-}
-// 批量删除用户信息
-const batchDelete = async (id: string[]) => {
-  await useHandleData(deleteUser, { id }, '删除所选用户信息')
-  proTable.value?.clearSelection()
-  proTable.value?.getTableList()
-}
-// 重置用户密码
-const resetPass = async (params: any) => {
-  // await useHandleData(resetUserPassWord, { id: params.id }, `重置【${params.username}】用户密码`)
-  // proTable.value?.getTableList()
-  doubleColumn.value.open('双列弹出框')
-}
-// 切换用户状态
-const changeStatus = async (row: any) => {
-  // await useHandleData(changeUserStatus, {
-  //   id: row.id,
-  //   status: row.status == 1 ? 0 : 1,
-  // }, `切换【${row.username}】用户状态`)
-  proTable.value?.getTableList()
-}
-// 导出用户列表
-const downloadFile = async () => {
-
-}
-// 批量添加用户
-const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
-const batchAdd = () => {
-  const params = {
-    title: '用户',
-    getTableList: proTable.value?.getTableList,
-  }
-  dialogRef.value?.acceptParams(params)
-}
-// 打开 drawer(新增、查看、编辑)
-const openDrawer = (title: string, row: Partial<any> = {}) => {
-  singleColumn.value.open('单列弹出框')
-}
-</script>

frontend/src/views/demo/proTable/open.vue

@@ -1,177 +0,0 @@
-<!--单列-->
-<template>
-  <el-dialog class='table-box'
-             v-model='dialogVisible'
-             top='114px'
-             :style="{height:height+'px',maxHeight:height+'px',overflow:'hidden'}"
-             :title='title'
-             :width='width'
-             :modal='false'>
-    <div class='table-box' :style="{height:(height-64)+'px',maxHeight:(height-64)+'px',overflow:'hidden'}">
-      <ProTable
-          ref='proTable'
-          :columns='columns'
-          :data='userData'
-      >
-        <!-- 表格 header 按钮 -->
-        <template #tableHeader='scope'>
-          <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增')">新增用户</el-button>
-        </template>
-        <!-- 表格操作 -->
-        <template #operation='scope'>
-          <el-button type='primary' link :icon='View'
-                     @click="openDrawer('查看', scope.row)">查看
-          </el-button>
-          <el-button type='primary' link :icon='EditPen' @click="openDrawer('编辑', scope.row)">编辑</el-button>
-          <el-button type='primary' link :icon='Refresh' @click='resetPass(scope.row)'>重置密码</el-button>
-          <el-button type='primary' link :icon='Delete' @click='deleteAccount(scope.row)'>删除</el-button>
-        </template>
-      </ProTable>
-    </div>
-  </el-dialog>
-</template>
-<script setup lang='tsx'>
-import { CirclePlus, Delete, EditPen, Refresh, View } from '@element-plus/icons-vue'
-import ProTable from '@/components/ProTable/index.vue'
-import { useHandleData } from '@/hooks/useHandleData'
-import { useAuthButtons } from '@/hooks/useAuthButtons'
-import { reactive } from 'vue'
-import { ColumnProps } from '@/components/ProTable/interface'
-import { User } from '@/api/user/interface'
-import { useDictStore } from '@/stores/modules/dict'
-
-const dictStore = useDictStore()
-import {
-  changeUserStatus,
-} from '@/api/user/user'
-import userDataList from '@/api/user/userData'
-
-const userData = userDataList
-const proTable = ref()
-
-const dialogVisible = ref(false)
-const title = ref('单列弹出框')
-
-const { BUTTONS } = useAuthButtons()
-// 表格配置项
-const columns = reactive<ColumnProps<User.ResUserList>[]>([
-  { type: 'selection', fixed: 'left', width: 70 },
-  { type: 'index', fixed: 'left', width: 70, label: '序号' },
-  {
-    prop: 'username',
-    label: '姓名',
-    width: 120,
-    search: { el: 'input' },
-  },
-  {
-    prop: 'gender',
-    label: '性别',
-    // 字典数据（本地数据）
-    enum: dictStore.getDictData('sex'),
-    search: { el: 'select', props: { filterable: true } },
-    fieldNames: { label: 'label', value: 'code' },
-  },
-  {
-    prop: 'age',
-    label: '年龄',
-    search: {
-      // 自定义 search 显示内容
-      render: ({ searchParam }) => {
-        return (
-            <div class='flx-center'>
-              <el-input vModel_trim={searchParam.minAge} placeholder='最小年龄' />
-              <span class='mr10 ml10'>-</span>
-              <el-input vModel_trim={searchParam.maxAge} placeholder='最大年龄' />
-            </div>
-        )
-      },
-    },
-  },
-  { prop: 'idCard', label: '身份证号', search: { el: 'input' } },
-  { prop: 'email', label: '邮箱' },
-  { prop: 'address', label: '居住地址', width: 120 },
-  {
-    prop: 'status',
-    label: '状态',
-    enum: dictStore.getDictData('status'),
-    search: { el: 'tree-select', props: { filterable: true } },
-    fieldNames: { label: 'userLabel', value: 'userStatus' },
-    render: scope => {
-      return (
-          <>
-            {BUTTONS.value.status ? (
-                <el-switch
-                    model-value={scope.row.status}
-                    active-text={scope.row.status ? '启用' : '禁用'}
-                    active-value={1}
-                    inactive-value={0}
-                    onClick={() => changeStatus(scope.row)}
-                />
-            ) : (
-                <el-tag type={scope.row.status ? 'success' : 'danger'}>{scope.row.status ? '启用' : '禁用'}</el-tag>
-            )}
-          </>
-      )
-    },
-  },
-  {
-    prop: 'createTime',
-    label: '创建时间',
-    width: 180,
-    search: {
-      el: 'date-picker',
-      span: 1,
-      props: { type: 'daterange', valueFormat: 'YYYY-MM-DD' },
-      defaultValue: ['2024-11-12', '2024-12-12'],
-    },
-  },
-  { prop: 'operation', label: '操作', fixed: 'right', width: 330 },
-])
-
-
-const open = (textTitle: string) => {
-  dialogVisible.value = true
-  title.value = textTitle
-}
-
-
-defineExpose({ open })
-
-
-const props = defineProps({
-  width: {
-    type: Number,
-    default: 800,
-  },
-  height: {
-    type: Number,
-    default: 744,
-  },
-})
-
-// 切换用户状态
-const changeStatus = async (row: User.ResUserList) => {
-  await useHandleData(changeUserStatus, {
-    id: row.id,
-    status: row.status == 1 ? 0 : 1,
-  }, `切换【${row.username}】用户状态`)
-  proTable.value?.getTableList()
-}
-
-// 删除用户信息
-const deleteAccount = async (params: User.ResUserList) => {
-
-}
-// 重置用户密码
-const resetPass = async (params: User.ResUserList) => {
-
-}
-
-// 打开 drawer(新增、查看、编辑)
-const openDrawer = (title: string, row: Partial<User.ResUserList> = {}) => {
-}
-
-</script>
-<style>
-
-</style>

frontend/src/views/demo/proTable/singleColumn.vue

@@ -1,169 +0,0 @@
-<!--单列-->
-<template>
-  <el-dialog v-model='dialogVisible' :title='title' v-bind='dialogSmall'>
-    <el-scrollbar>
-      <el-form
-          :model='form'
-          :inline='false'
-          label-width='auto'
-          ref='formRuleRef'
-          :rules='rules'
-      >
-        <el-form-item label='姓名' prop='username'>
-          <el-input
-              v-model='form.username'
-              placeholder='请输入姓名'
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label='性别' prop='gender'>
-          <el-radio-group v-model='form.gender'>
-            <el-radio-button :label='0'>男</el-radio-button>
-            <el-radio-button :label='1'>女</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item label='年龄' prop='age'>
-          <el-input
-              v-model='form.age'
-              placeholder='年龄'
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label='身份证号' prop='idCard'>
-          <el-input
-              v-model='form.idCard'
-              placeholder='身份证号'
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label='邮箱' prop='email'>
-          <el-input
-              v-model='form.email'
-              placeholder='邮箱'
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label='居住地址' prop='address'>
-          <el-input
-              v-model='form.address'
-              placeholder='居住地址'
-          ></el-input>
-        </el-form-item>
-
-      </el-form>
-    </el-scrollbar>
-
-    <template #footer>
-      <div class='dialog-footer'>
-        <el-button @click='close()'>取消</el-button>
-        <el-button type='primary' @click='confirmForm()'>确定</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-<script setup lang='ts'>
-import { dialogSmall } from '@/utils/elementBind'
-import { FormInstance, FormItemRule } from 'element-plus'
-
-interface userForm {
-  id?: string;       //用户ID，作为唯一标识
-  username: string; //用户名
-  gender: number; // 性别
-  age: number; // 年龄
-  idCard: string; // 身份证
-  email: string; // 邮箱
-  address?: string; // 地址
-}
-
-const form: Ref<userForm> = ref({
-  username: '',
-  gender: 0,
-  age: 1,
-  idCard: '',
-  email: '',
-})
-
-const formRuleRef = ref<FormInstance>()
-//定义校验规则
-const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
-  username: [{ required: true, message: '用户名必填！', trigger: 'blur' }],
-  age: [
-    { required: true, message: '年龄必填！', trigger: 'blur' },
-    // 指定正则，此处是数字正则
-    { pattern: /^[1-9][0-9]?$|^100$/, message: '年龄必须在1到100之间', trigger: 'blur' },
-  ],
-  idCard: [
-    { required: true, message: '身份证必填！', trigger: 'blur' },
-    // 指定正则，此处是身份证正则
-    { pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '请输入正确的身份证号码', trigger: 'blur' },
-  ],
-  email: [
-    { required: true, message: '邮箱必填！', trigger: 'blur' },
-    // 指定校验类型
-    { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] },
-  ],
-})
-
-/**
- * 重置表单
- */
-const resetForm = () => {
-  form.value = {
-    username: '',
-    gender: 0,
-    age: 1,
-    idCard: '',
-    email: '',
-    address: '',
-  }
-}
-
-const dialogVisible = ref(false)
-const title = ref('单列弹出框')
-const open = (textTitle: string) => {
-  dialogVisible.value = true
-  title.value = textTitle
-}
-
-// 关闭弹出框
-const close = () => {
-  //重置表单内容
-  //取消表单校验状态
-  formRuleRef.value && formRuleRef.value.resetFields()
-  dialogVisible.value = false
-  resetForm()
-}
-
-/**
- * 校验表单数据
- * 数据没问题，提交数据，并根据业务情况请求新增接口还是修改接口
- */
-const confirmForm = () => {
-  ElMessage.info('业务数据提交')
-  try {
-    formRuleRef.value?.validate((valid: boolean) => {
-      if (valid) {
-        // 将表单数据转为json,发送到后端
-        let confirmFormData = JSON.parse(JSON.stringify(form.value))
-
-        if ('是否新增') {
-          // 执行新增接口
-        } else {
-          // 执行修改接口
-        }
-      } else {
-        ElMessage.error('表单验证失败！')
-      }
-    })
-  } catch (error) {
-    console.error('验证过程中发生错误', error)
-  }
-}
-
-defineExpose({ open })
-
-</script>
-<style>
-
-</style>

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

@@ -6,202 +6,309 @@
             style="width: 100%" 
             max-height="400px" 
             :span-method="objectSpanMethod">
-                    <el-table-column   prop="MonitorIdx" label="监测点序号" width="80"/>
-                    <!-- <el-table-column prop="updateTime" label="上送时刻" width="180"/> -->
-                    <el-table-column prop="deviceName" label="描述"  width="90"/>
+                    <el-table-column   prop="monitorNum" label="监测点序号" width="80"/>
+                    <el-table-column prop="desc" label="描述"  width="90"/>
                     <el-table-column label="电压通道" >
-                        <el-table-column prop="Ua" label="L1">
-                          <el-table-column prop="UaData" label="数据(V)">
+                        <el-table-column prop="Ua" label="A相">
+                          <el-table-column prop="aVuData" label="被检值(V)" width="100px">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.UaData === '—'&& loading" class="loading-box">
+                              <el-icon v-if="scope.row.aVuData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
-                                {{ scope.row.UaData }}
+                                {{ scope.row.aVuData }}
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="UaChannel" label="系数">
+                          <el-table-column prop="aVuXi" label="检测结果" width="90px">
                             <template #default="scope">
-                              <el-tag type="danger" v-if="scope.row.UaChannel === '不合格'">
-                                {{ scope.row.UaChannel }}
+                              <el-tooltip
+                                v-if="scope.row.aVuXi === '不合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                                <template #content>
+                                  误差范围： {{ (-0.001 * props.curV).toFixed(4) + 'V~' +  (0.001 * props.curV).toFixed(4)+ 'V'}}<br/>
+                                  误差值：{{ scope.row.aV + 'V'}}
+                                </template>
+                                <el-tag type="danger" class="tooltip-content">
+                                  {{ scope.row.aVuXi }}
                                 </el-tag>
-                              <el-icon v-else-if="scope.row.UaChannel === '—'&& loading" class="loading-box">
+                              </el-tooltip>
+                              <el-tooltip
+                                v-else-if="scope.row.aVuXi === '合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                误差范围： {{ (-0.001 * props.curV).toFixed(4) + 'V~' +  (0.001 * props.curV).toFixed(4)+ 'V'}}<br/>
+                                  误差值：{{ scope.row.aV + 'V'}}
+                                </template>
+                                <el-tag type="success" class="tooltip-content">{{ scope.row.aVuXi }}</el-tag>
+                              </el-tooltip>
+                              <!-- <el-tag type="danger" v-if="scope.row.aVuXi === '不合格'">
+                                {{ scope.row.aVuXi }}
+                              </el-tag> -->
+                              <el-icon v-else-if="scope.row.aVuXi === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
-                              <span v-else>
-                                {{ scope.row.UaChannel }}
-                              </span>
-                              <!-- <el-tag type="danger" v-if="scope.row.UaChannel === '不合格'">{{ scope.row.UaChannel }}</el-tag> -->
+                              <!-- <span v-else>
+                                {{ scope.row.aVuXi }}
+                              </span> -->
                             </template>
                           </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="Ub" label="L2">
-                          <el-table-column prop="UbData" label="数据(V)">
+                        <el-table-column prop="Ub" label="B相">
+                          <el-table-column prop="bVuData" label="被检值(V)" width="100px">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.UbData === '—'&& loading" class="loading-box">
+                              <el-icon v-if="scope.row.bVuData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
-                                {{ scope.row.UbData }}
+                                {{ scope.row.bVuData }}
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="UbChannel" label="系数">
+                          <el-table-column prop="bVuXi" label="检测结果" width="90px">
                             <template #default="scope">
-                              <el-tag type="danger" v-if="scope.row.UbChannel === '不合格'">
-                                {{ scope.row.UbChannel }}
+                              <el-tooltip
+                                v-if="scope.row.bVuXi === '不合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                误差范围： {{ (-0.001 * props.curV).toFixed(4) + 'V~' +  (0.001 * props.curV).toFixed(4)+ 'V'}}<br/>
+                                  误差值：{{ scope.row.bV + 'V'}}
+                                </template>
+                                <el-tag type="danger" class="tooltip-content">
+                                  {{ scope.row.bVuXi }}
                                 </el-tag>
-                              <el-icon v-else-if="scope.row.UbChannel === '—'&& loading" class="loading-box">
+                              </el-tooltip>
+                              <el-tooltip
+                                v-else-if="scope.row.bVuXi === '合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                误差范围： {{ (-0.001 * props.curV).toFixed(4) + 'V~' +  (0.001 * props.curV).toFixed(4)+ 'V'}}<br/>
+                                  误差值：{{ scope.row.bV + 'V'}}
+                                </template>
+                                <el-tag type="success" class="tooltip-content">{{ scope.row.bVuXi }}</el-tag>
+                              </el-tooltip>
+                              <el-icon v-else-if="scope.row.bVuXi === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
-                              <span v-else>
-                                {{ scope.row.UbChannel }}
-                              </span>
                             </template>
                           </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="Uc" label="L3">
-                          <el-table-column prop="UcData" label="数据(V)">
+                        <el-table-column prop="Uc" label="C相">
+                          <el-table-column prop="cVuData" label="被检值(V)" width="100px">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.UcData === '—'&& loading" class="loading-box">
+                              <el-icon v-if="scope.row.cVuData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
-                                {{ scope.row.UcData }}
+                                {{ scope.row.cVuData }}
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="UcChannel" label="系数">
+                          <el-table-column prop="cVuXi" label="检测结果" width="90px">
                             <template #default="scope">
-                              <el-tag type="danger" v-if="scope.row.UcChannel === '不合格'">
-                                {{ scope.row.UcChannel }}
+                              <el-tooltip
+                                v-if="scope.row.cVuXi === '不合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                  误差范围： {{ (-0.001 * props.curV).toFixed(4) + 'V~' +  (0.001 * props.curV).toFixed(4)+ 'V'}}<br/>
+                                  误差值：{{ scope.row.cV + 'V'}}
+                                </template>
+                                <el-tag type="danger" class="tooltip-content">
+                                  {{ scope.row.cVuXi }}
                                 </el-tag>
-                              <el-icon v-else-if="scope.row.UcChannel === '—'&& loading" class="loading-box">
+                              </el-tooltip>
+                              <el-tooltip
+                                v-else-if="scope.row.cVuXi === '合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                误差范围： {{ (-0.001 * props.curV).toFixed(4) + 'V~' +  (0.001 * props.curV).toFixed(4) + 'V'}}<br/>
+                                  误差值：{{ scope.row.cV + 'V'}}
+                                </template>
+                                <el-tag type="success" class="tooltip-content">{{ scope.row.cVuXi }}</el-tag>
+                              </el-tooltip>
+                              <el-icon v-else-if="scope.row.cVuXi === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
-                              <span v-else>
-                                {{ scope.row.UcChannel }}
-                              </span>
                             </template>
                           </el-table-column>
                         </el-table-column>
                     </el-table-column>
                     <el-table-column label="电流通道" >
-                        <el-table-column prop="Ia" label="L1">
-                          <el-table-column prop="IaData" label="数据(A)">
+                        <el-table-column prop="Ia" label="A相">
+                          <el-table-column prop="aIeData" label="被检值(A)" width="100px">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.IaData === '—'&& loading" class="loading-box">
+                              <el-icon v-if="scope.row.aIeData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
-                                {{ scope.row.IaData }}
+                                {{ scope.row.aIeData }}
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="IaChannel" label="系数">
+                          <el-table-column prop="aIeXi" label="检测结果" width="90px">
                             <template #default="scope">
-                              <el-tag type="danger" v-if="scope.row.IaChannel === '不合格'">
-                                {{ scope.row.IaChannel }}
+                              <el-tooltip
+                                v-if="scope.row.aIeXi === '不合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                  误差范围： {{-0.5 + "%~" +0.5 + "%" }}<br/>
+                                  误差值：{{ scope.row.aI + '%'}}
+                                </template>
+                                <el-tag type="danger" class="tooltip-content">
+                                  {{ scope.row.aIeXi }}
                                 </el-tag>
-                              <el-icon v-else-if="scope.row.IaChannel === '—'&& loading" class="loading-box">
+                              </el-tooltip>
+                              <el-tooltip
+                                v-else-if="scope.row.aIeXi === '合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                误差范围： {{ -0.5 + "%~" +0.5 + "%" }}<br/>
+                                  误差值：{{ scope.row.aI + '%'}}
+                                </template>
+                                <el-tag type="success" class="tooltip-content">{{ scope.row.aIeXi }}</el-tag>
+                              </el-tooltip>
+                              <el-icon v-else-if="scope.row.aIeXi === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
-                              <span v-else>
-                                {{ scope.row.IaChannel }}
-                              </span>
                             </template>
                             </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="Ib" label="L2">
-                          <el-table-column prop="IbData" label="数据(A)">
+                        <el-table-column prop="Ib" label="B相">
+                          <el-table-column prop="bIeData" label="被检值(A)" width="100px">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.IbData === '—'&& loading" class="loading-box">
+                              <el-icon v-if="scope.row.bIeData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
-                                {{ scope.row.IbData }}
+                                {{ scope.row.bIeData }}
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="IbChannel" label="系数">
+                          <el-table-column prop="bIeXi" label="检测结果" width="90px">
                             <template #default="scope">
-                              <el-tag type="danger" v-if="scope.row.IbChannel === '不合格'">
-                                {{ scope.row.IbChannel }}
+                              <el-tooltip
+                                v-if="scope.row.bIeXi === '不合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                误差范围： {{ -0.5 + "%~" +0.5 + "%" }}<br/>
+                                  误差值：{{ scope.row.bI + '%'}}
+                                </template>
+                                <el-tag type="danger" class="tooltip-content">
+                                  {{ scope.row.bIeXi }}
                                 </el-tag>
-                              <el-icon v-else-if="scope.row.IbChannel === '—'&& loading" class="loading-box">
+                              </el-tooltip>
+                              <el-tooltip
+                                v-else-if="scope.row.bIeXi === '合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                误差范围： {{ -0.5 + "%~" +0.5 + "%" }}<br/>
+                                  误差值：{{ scope.row.bI + '%'}}
+                                </template>
+                                <el-tag type="success" class="tooltip-content">{{ scope.row.bIeXi }}</el-tag>
+                              </el-tooltip>
+                              <el-icon v-else-if="scope.row.bIeXi === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
-                              <span v-else>
-                                {{ scope.row.IbChannel }}
-                              </span>
                             </template>
                           </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="Ic" label="L3">
-                          <el-table-column prop="IcData" label="数据(A)">
+                        <el-table-column prop="Ic" label="C相">
+                          <el-table-column prop="cIeData" label="被检值(A)" width="100px">
                             <template #default="scope">
-                              <el-icon v-if="scope.row.IcData === '—'&& loading" class="loading-box">
+                              <el-icon v-if="scope.row.cIeData === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
                               <span v-else>
-                                {{ scope.row.IcData }}
+                                {{ scope.row.cIeData }}
                               </span>
                             </template>
                           </el-table-column>
-                          <el-table-column prop="IcChannel" label="系数">
+                          <el-table-column prop="cIeXi" label="检测结果" width="90px">
                             <template #default="scope">
-                              <el-tag type="danger" v-if="scope.row.IcChannel === '不合格'">
-                                {{ scope.row.IcChannel }}
+                              <el-tooltip
+                                v-if="scope.row.cIeXi === '不合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                  误差范围： {{ -0.5 + "%~" +0.5 + "%" }}<br/>
+                                  误差值：{{ scope.row.cI + '%'}}
+                                </template>
+                                <el-tag type="danger" class="tooltip-content">
+                                  {{ scope.row.cIeXi }}
                                 </el-tag>
-                              <el-icon v-else-if="scope.row.IcChannel === '—'&& loading" class="loading-box">
+                              </el-tooltip>
+                              <el-tooltip
+                                v-else-if="scope.row.cIeXi === '合格'"
+                                class="item"
+                                effect="dark"
+                                placement="bottom-start"
+                              >
+                              <template #content>
+                                  误差范围： {{ -0.5 + "%~" +0.5 + "%" }}<br/>
+                                  误差值：{{ scope.row.cI + '%'}}
+                                </template>
+                                <el-tag type="success" class="tooltip-content">{{ scope.row.cIeXi }}</el-tag>
+                              </el-tooltip>
+                              <el-icon v-else-if="scope.row.cIeXi === '—'&& scope.row.loading" class="loading-box">
                                 <el-icon-loading />
                               </el-icon>
-                              <span v-else>
-                                {{ scope.row.IcChannel }}
-                              </span>
                             </template>
                           </el-table-column>
                         </el-table-column>
                     </el-table-column>
-                    <!-- <el-table-column  label="校准结果">
-                      <template #default="scope">
-                        <el-tag type="danger" v-if="scope.row.Result === '不合格'">{{ scope.row.Result }}</el-tag>
-                        <span v-if="scope.row.Result != '不合格'">{{ scope.row.Result }}</span>
-                      </template>
-                    </el-table-column> -->
-                   
             </el-table>
         </div>
 </template>
   
   <script lang="ts" setup name="ErrorSystemDialog">
-  import { defineProps } from 'vue';
+  import { defineProps, type PropType } from 'vue';
   import { ElIcon, ElLoading, ElTag } from 'element-plus';
-  //import IndicatorTypeDialog from "@/views/machine/errorSystem/components/IndicatorTypeDialog.vue"; // 导入子组件
+  import type { ChannelsTest } from '@/api/home/interface/channelsTest';
+import { number } from 'echarts';
   
-  const props = defineProps<{
-      tableData: Array<{
-        id: string;
-        deviceName?: string;
-        MonitorIdx: number;
-        UaData?: number | string;
-        UaChannel?: number | string;
-        UbData?: number | string;
-        UbChannel?: number | string;
-        UcData?: number | string;
-        UcChannel?: number | string;
-        IaData?: number | string;
-        IaChannel?: number | string;
-        IbData?: number | string;
-        IbChannel?: number | string;
-        IcData?: number | string;
-        IcChannel?: number | string;
-        Result?: string | string;
-        updateTime?: string;
-      }>
-      loading: boolean; // 定义 loading 属性
-  }>();
+interface Props {
+  tableData: ChannelsTest.CoefficientVO[];
+  big_V_loading: boolean;
+  curV: number;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  tableData: () => [],
+  big_V_loading: false,
+  curV: 0,
+});
 
   function objectSpanMethod({ row, column, rowIndex, columnIndex }: { row: any, column: any, rowIndex: number, columnIndex: number }) {
     if (columnIndex === 0) {
@@ -232,64 +339,6 @@
     }
 }
 
-  // const tableData = ref([
-  //   {
-  //     id: '1',
-  //     updateTime: '2024-10-10 10:30:00', 
-  //     deviceName:'被检设备1',
-  //     MonitorIdx: 1, 
-  //     Ua:1.0003,
-  //     Ub:1.0003,
-  //     Uc:0.0096,
-  //     Ia:1.0003,
-  //     Ib:1.0003,
-  //     Ic:1.0008,
-  //     Result: '合格', 
-  //   },
-  //   {
-  //     id: '2',
-  //     updateTime: '2024-10-10 10:30:00', 
-  //     deviceName:'被检设备1',
-  //     MonitorIdx: 2, 
-  //     Ua:1.0003,
-  //     Ub:1.0003,
-  //     Uc:0.0096,
-  //     Ia:1.0003,
-  //     Ib:1.0003,
-  //     Ic:1.0008,
-  //     Result: '合格', 
-  //   },
-  //   {
-  //     id: '3',
-  //     updateTime: '2024-10-10 10:30:00', 
-  //     deviceName:'被检设备1',
-  //     MonitorIdx: 3, 
-  //     Ua:1.0003,
-  //     Ub:1.0003,
-  //     Uc:0.0096,
-  //     Ia:1.0003,
-  //     Ib:1.0003,
-  //     Ic:1.0008,
-  //     Result: '合格', 
-  //   },
-  //   {
-  //     id: '4',
-  //     updateTime: '2024-10-10 10:30:00', 
-  //     deviceName:'被检设备1',
-  //     MonitorIdx: 4, 
-  //     Ua:1.0003,
-  //     Ub:1.0003,
-  //     Uc:0.0096,
-  //     Ia:1.0003,
-  //     Ib:1.0003,
-  //     Ic:1.0008,
-  //     Result: '合格', 
-  //   },
-  // ])
-
-
-  // 监听 tableData 的变化
-
   </script>
   
   <style scoped>
@@ -330,6 +379,19 @@
   animation: rotate 2s linear infinite;
 }
 
+.icon-margin {
+  margin-left: 0px;
+}
+
+.icon-align {
+  vertical-align: 0px;
+}
+
+.tooltip-content {
+  cursor: pointer;
+}
+
+
 @keyframes rotate {
   from {
     transform: rotate(0deg);

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

@@ -38,13 +38,13 @@
           <!-- <el-button type="primary" loading v-if="activeIndex > 0 && activeIndex < activeTotalNum">合格92项/共103项</el-button> 
                   <el-button type="primary" v-if="activeIndex >= activeTotalNum" disabled>合格92项/共103项</el-button>  -->
           <span style="  font-size: 18px;font-weight: 600;">
-            数据已合格 <span style="color: #67C23A">{{ qualified }}</span> 项/共 <span style="color: green">{{ 103 }}</span>
+            数据已合格 <span style="color: #91cc75">{{ qualified }}</span> 项/共 <span style="color: green">{{ 103 }}</span>
             项
           </span>
         </div>
         <div class="dialog-content">
           <el-table :data="tableData" :cell-class-name="tableCell"  row-key="id" height="450px"
-            :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' }" style="width: 100%"
+            :header-cell-style="{ background: 'var(--el-color-primary)', color: '#eee', textAlign: 'center' }" style="width: 100%"
             border>
             <el-table-column fixed prop="scriptItemName" label="检测项目" width="210px" />
             <el-table-column label="被检通道1" :min-width="minwidth" align="center">
@@ -422,9 +422,9 @@ const scrollContainer = ref<HTMLElement | null>(null); // 声明 scrollContainer
 
 const scrollToBottom = () => {
   if (scrollContainer.value) {
-    console.log(scrollContainer.value)
+    //console.log(scrollContainer.value)
     scrollContainer.value.scrollTop = scrollContainer.value.scrollHeight;
-    console.log(scrollContainer.value)
+    //console.log(scrollContainer.value)
   }
 };
 
@@ -541,7 +541,7 @@ function traverseTableData(data: any[], id: string): void {
           item[field1] = "danger";
           item[field2] = "×";
           columnList.value.push(activeIndex.value.toString());
-          console.log(id,activeIndex.value,columnList.value)
+         // console.log(id,activeIndex.value,columnList.value)
         }
         else {
           item[field1] = "success";
@@ -561,7 +561,7 @@ function traverseTableData(data: any[], id: string): void {
 const updateTableData = (id: string) => {
 
   traverseTableData(tableData.value, id);
-  console.log(id)
+ // console.log(id)
 };
 
 let timer: any = ref("");
@@ -582,7 +582,7 @@ const handleFinishTest = () => {
 };
 
 const handleClick = (row: any) => {
-  console.log(111, row)
+ // console.log(111, row)
   dataCheckSingleChannelSingleTestDialogVisable.value = true;
 };
 
@@ -1885,7 +1885,7 @@ const startTimer = () => {
   //if (timer.value !== null) return; // 如果定时器已经启动，则不再重复启动
   timer.value = setInterval(() => {
 
-    console.log(activeIndex.value, 111)
+   // console.log(activeIndex.value, 111)
     if (activeIndex.value <= activeTotalNum.value) {
       activeIndex.value++;
 
@@ -1943,10 +1943,10 @@ const startTimer = () => {
 
     }
     else {
-      console.log(activeIndex.value, 222)
+     // console.log(activeIndex.value, 222)
       clearInterval(timer.value)
       reportDisabled.value = false;
-      console.log(activeIndex.value, 333)
+     // console.log(activeIndex.value, 333)
     }
     qualified.value = 92
   }, 100);

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

@@ -43,7 +43,7 @@
                             v-model="scriptSwitch"
                             class="ml-2"
                             inline-prompt
-                            style="--el-switch-on-color: #003078; --el-switch-off-color: #5a79a9"
+                            style="--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #5a79a9"
                             active-text="不合格测试项"
                             inactive-text="全部测试项"
                         /> -->
@@ -145,7 +145,7 @@ const monitorIdxList = [
     },
 ]
 const handleNodeClick = (data) => {
-    console.log(data);
+   // console.log(data);
 };
 const MonIsShow = ref(false)
 const DevIsShow = ref(false)

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

@@ -1,18 +1,21 @@
 <template>
-
-  <div class="table-main">
-    <el-table :data="tableData" stripe border :header-cell-style="{ textAlign: 'center' } "
-              :cell-style="{ textAlign: 'center' }" height="335px"
+  <el-button v-if="tableData.length > 0" type="primary" @click="exportData" style="margin-bottom: 10px">导出</el-button>
+  <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' }" max-height="282px"
               style="width: 100%;">
       <el-table-column type="index" label="序号" width="70" fixed="left"/>
-      <el-table-column prop="updateTime" label="数据时间"/>
-      <template v-if="phaseFlag === 0">
-        <el-table-column prop="A" :label="`A（${unit}）`"/>
-        <el-table-column prop="B" :label="`B（${unit}）`"/>
-        <el-table-column prop="C" :label="`C（${unit}）`"/>
+      <el-table-column prop="time" label="数据时间"/>
+      <template v-if="!isThreePhase && phaseT === 0">
+        <el-table-column prop="dataA" :label="'A相'+(unit==''?'':'（'+unit+'）')"/>
+        <el-table-column prop="dataB" :label="'B相'+(unit==''?'':'（'+unit+'）')"/>
+        <el-table-column prop="dataC" :label="'C相'+(unit==''?'':'（'+unit+'）')"/>
       </template>
-      <template v-if="phaseFlag === 1">
-        <el-table-column prop="T" :label="`T（${unit}）`"/>
+      <template v-if="!isThreePhase && phaseT === 1">
+        <el-table-column prop="dataT" :label="tableHeader+(unit==''?'':'（'+unit+'）')"/>
+      </template>
+      <template v-if="isThreePhase">
+        <el-table-column prop="dataB" :label="'负序不平衡度'+(unit==''?'':'（'+unit+'）')"/>
       </template>
     </el-table>
   </div>
@@ -20,26 +23,39 @@
 </template>
 
 <script lang="tsx" setup>
-
 import {CheckData} from "@/api/check/interface";
+import {computed} from "vue";
 
-const {tableData} = defineProps<{
+const {tableData, currentScriptTypeName} = defineProps<{
   tableData: CheckData.RawDataItem[]
+  currentScriptTypeName: string
 }>()
 
+const emit = defineEmits(['exportRawDataHandler'])
 
 const unit = computed(() => {
-  return "V"
+  return tableData.length > 0 ? tableData[0].unit : '';
 })
 
-const phaseFlag = computed(() => {
-  let result = 0;
-  if (tableData.length > 0) {
-    result = !tableData[0].T ? 0 : 1;
+const phaseT = computed(() => {
+  return tableData[0].dataT == '/' ? 0 : 1
+})
+
+const tableHeader = computed(() => {
+  if (phaseT.value === 1) {
+    let index = currentScriptTypeName.indexOf('=');
+    return currentScriptTypeName.substring(0, index);
   }
-  return result;
+  return currentScriptTypeName
 })
 
+const isThreePhase = computed(() => {
+  return currentScriptTypeName.includes('三相电压不平衡度') || currentScriptTypeName.includes('三相电流不平衡度')
+})
+
+const exportData = () => {
+  emit('exportRawDataHandler')
+}
 </script>
 
 <style scoped>

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

@@ -1,74 +1,100 @@
 <template>
 
   <div class="table-main">
-    <el-table :data="tableData" height="335px" :header-cell-style="{ textAlign: 'center' } "
+    <el-table v-if="tableData.length > 0" :data="tableData" height="357px" :header-cell-style="{ textAlign: 'center' } "
               :cell-style="{ textAlign: 'center' }">
       <!--      <el-table-column prop="chnNum" label="通道号" width="80">-->
       <!--        <template #default="{row}">-->
       <!--          {{ '通道' + row.chnNum }}-->
       <!--        </template>-->
       <!--      </el-table-column>-->
-      <template v-if="phaseFlag === 0">
-        <el-table-column :label="`A（${unit}）`">
-          <el-table-column prop="standardValue" width="74" label="标准值（V）"/>
-          <el-table-column prop="A" width="74" label="被检值">
-
-          </el-table-column>
-          <el-table-column prop="A_errValue" width="74" label="误差值">
-
-          </el-table-column>
-        </el-table-column>
-        <el-table-column :label="`B（${unit}）`">
-          <el-table-column prop="standardValue" width="74" label="标准值（V）"/>
-          <el-table-column prop="B" width="74" label="被检值">
-
-          </el-table-column>
-          <el-table-column prop="B_errValue" width="74" label="误差值">
-
-          </el-table-column>
-        </el-table-column>
-        <el-table-column :label="`C（${unit}）`">
-          <el-table-column prop="standardValue" width="74" label="标准值（V）"/>
-          <el-table-column prop="C" width="74" label="被检值">
-
-          </el-table-column>
-          <el-table-column prop="C_errValue" width="74" label="误差值">
-
-          </el-table-column>
-        </el-table-column>
-        <el-table-column prop="maxErrVaule" label="最大误差（V）">
-
-        </el-table-column>
-        <el-table-column prop="result" label="检测结果" width="70">
+      <template v-if="phaseT === 0">
+        <el-table-column label="A相">
+          <el-table-column prop="stdA" width="130" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="dataA" width="130" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="isDataA" label="检测结果">
             <template #default="scope">
-            <el-tag type="danger" v-if="scope.row.result === '不合格'">{{ scope.row.result }}</el-tag>
-            <span v-if="scope.row.result != '不合格'">{{ scope.row.result }}</span>
+              <el-tooltip effect="dark" placement="bottom">
+                <template #content>
+                  误差范围：{{ scope.row.maxErrorA }} <br/>
+                  误差值：{{ scope.row.errorA }} {{ scope.row.errorA !== '/' ? innerUnitA : '' }}
+                </template>
+                <el-tag type="success" v-if="scope.row.isDataA === 1">符合</el-tag>
+                <el-tag type="danger" v-if="scope.row.isDataA === 2">不符合</el-tag>
+                <el-tag type="warning" v-if="scope.row.isDataA === 4">/</el-tag>
+                <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+              </el-tooltip>
             </template>
           </el-table-column>
-      </template>
-      <template v-if="phaseFlag === 1">
-        <el-table-column :label="`T（${unit}）`">
-          <el-table-column prop="standardValue" label="标准值（V）"/>
-          <el-table-column prop="T" label="被检值">
-
         </el-table-column>
-          <el-table-column prop="T_errValue" label="误差值">
-
-          </el-table-column>
-        </el-table-column>
-        <el-table-column prop="maxErrVaule" label="最大误差（V）">
-
-        </el-table-column>
-        <el-table-column prop="result" label="检测结果">
+        <el-table-column label="B相">
+          <el-table-column prop="stdB" width="130" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="dataB" width="130" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="isDataB" label="检测结果">
             <template #default="scope">
-            <el-tag type="danger" v-if="scope.row.result === '不合格'">{{ scope.row.result }}</el-tag>
-            <span v-if="scope.row.result != '不合格'">{{ scope.row.result }}</span>
+              <el-tooltip effect="dark" placement="bottom">
+                <template #content>
+                  误差范围：{{ scope.row.maxErrorB }}<br/>
+                  误差值：{{ scope.row.errorB }} {{ scope.row.errorB !== '/' ? innerUnitB : '' }}
+                </template>
+                <el-tag type="success" v-if="scope.row.isDataB === 1">符合</el-tag>
+                <el-tag type="danger" v-if="scope.row.isDataB === 2">不符合</el-tag>
+                <el-tag type="warning" v-if="scope.row.isDataB === 4">/</el-tag>
+                <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+              </el-tooltip>
             </template>
           </el-table-column>
+        </el-table-column>
+        <el-table-column label="C相">
+          <el-table-column prop="stdC" width="130" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="dataC" width="130" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="isDataC" label="检测结果">
+            <template #default="scope">
+              <el-tooltip effect="dark" placement="bottom">
+                <template #content>
+                  误差范围： {{ scope.row.maxErrorC }}<br/>
+                  误差值：{{ scope.row.errorC }} {{ scope.row.errorC !== '/' ? innerUnitC : '' }}
+                </template>
+                <el-tag type="success" v-if="scope.row.isDataC === 1">符合</el-tag>
+                <el-tag type="danger" v-if="scope.row.isDataC === 2">不符合</el-tag>
+                <el-tag type="warning" v-if="scope.row.isDataC === 4">/</el-tag>
+                <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table-column>
+      </template>
+
+      <template v-if="phaseT === 1">
+        <el-table-column :label="tableHeader">
+          <el-table-column prop="stdT" :label="'标准值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="dataT" :label="'被检值'+(outerUnit==''?'':'（'+outerUnit+'）')"/>
+          <el-table-column prop="isDataT" label="检测结果">
+            <template #default="scope">
+              <el-tooltip effect="dark" placement="bottom">
+                <template #content>
+                  误差范围： {{ scope.row.maxErrorT }}<br/>
+                  误差值：{{ scope.row.errorT }} {{ scope.row.errorT !== '/' ? innerUnitT : '' }}
+                </template>
+                <el-tag type="success" v-if="scope.row.isDataT === 1">符合</el-tag>
+                <el-tag type="danger" v-if="scope.row.isDataT === 2">不符合</el-tag>
+                <el-tag type="warning" v-if="scope.row.isDataT === 4">/</el-tag>
+                <el-tag type="info" v-if="scope.row.isDataA === 5">-</el-tag>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <!--        <el-table-column prop="maxError" label="误差范围"/>-->
+        <!--        <el-table-column prop="result" label="检测结果">-->
+        <!--          <template #default="scope">-->
+        <!--            <span v-if="scope.row.result === 1">符合</span>-->
+        <!--            <el-tag type="danger" v-if="scope.row.result === 2">不符合</el-tag>-->
+        <!--            <span v-if="scope.row.result === 4">/</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </template>
 
     </el-table>
-
   </div>
 
 </template>
@@ -77,21 +103,49 @@
 import {defineProps} from 'vue';
 import {CheckData} from "@/api/check/interface";
 
-const {tableData} = defineProps<{
+const {tableData, currentScriptTypeName} = defineProps<{
   tableData: CheckData.CheckResult[],
+  currentScriptTypeName: string
 }>();
 
-const unit = computed(() => {
-  return "V"
+
+const outerUnit = computed(() => {
+  return tableData.length > 0 ? tableData[0].unit : '';
 })
 
-const phaseFlag = computed(() => {
-  let result = 0;
-  if (tableData.length > 0) {
-    result = !tableData[0].T ? 0:1;
-  }
-  return result;
+const innerUnitA = computed(() => {
+  return tableData.length > 0 ? tableData[0].unitA : '';
 })
+const innerUnitB = computed(() => {
+  return tableData.length > 0 ? tableData[0].unitB : '';
+})
+const innerUnitC = computed(() => {
+  return tableData.length > 0 ? tableData[0].unitC : '';
+})
+const innerUnitT = computed(() => {
+  return tableData.length > 0 ? tableData[0].unitT : '';
+})
+
+const phaseT = computed(() => {
+  return tableData[0].dataT == null || tableData[0].dataT == undefined ? 0 : 1
+})
+
+const tableHeader = computed(() => {
+  if (phaseT.value === 1){
+    let index = currentScriptTypeName.indexOf('=');
+    return currentScriptTypeName.substring(0, index);
+  }
+  return currentScriptTypeName
+})
+
+// const maxErrorStr = computed((data) => {
+//   let result = tableData[0].maxError ?? '/'
+//   let idx = result.indexOf('~');
+//   if (idx > 0) {
+//     result = result.substring(0, idx) + outerUnit.value + result.substring(idx, result.length) + outerUnit.value;
+//   }
+//   return result;
+// })
 
 </script>
 

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

@@ -0,0 +1,833 @@
+<template>
+  <div class="dialog" v-bind="dialogBig">
+    <div class="dialog-content">
+      <div class="right-title">
+        <!-- <div>系数校准表</div> -->
+        <div>{{ outputDsc }}</div>
+        <div>
+            <span style="  font-size: 18px;font-weight: 600;">
+              设备已合格 <span style="color: #91cc75">{{ qualified }}</span> 台/共 <span style="color: green">{{ total }}</span>
+              台
+            </span>
+          <!-- <el-button type="primary" loading
+            v-if="activeIndex > 0 && activeIndex < activeTotalNum">通道系数已校准3台/共3台</el-button>
+          <el-button type="primary" :disabled="true" v-if="activeIndex === activeTotalNum">通道系数已校准3台/共3台</el-button> -->
+        </div>
+      </div>
+      <div class="container">
+        <div class="dialog-left">
+          <el-steps direction="vertical" :active="active" :process-status="currentStepStatus" finish-status="success">
+            <el-step title="开始"/>
+            <el-step>
+              <template #title>
+                <span>大电压/电流系数下装</span><br/>
+                <span class="spanStyle">源输出为：</span><br/>
+                <span class="spanStyle" v-if="active > 0">{{ big_V_Download }}</span><br/>
+                <span class="spanStyle" v-if="active > 0">{{ big_I_Download }}</span>
+                <el-icon v-if="active === 1 " class="loading-box">
+                  <el-icon-loading/>
+                </el-icon>
+              </template>
+            </el-step>
+            <el-step>
+              <template #title>
+                <span>小电压/电流系数下装</span><br/>
+                <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>
+              </template>
+            </el-step>
+            <el-step>
+              <template #title>
+                <span>大电压/电流校准</span><br/>
+                <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>
+              </template>
+            </el-step>
+            <el-step>
+              <template #title>
+                <span>小电压/电流校准</span><br/>
+                <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>
+              </template>
+            </el-step>
+            <el-step title="结束"/>
+          </el-steps>
+        </div>
+        <div class="right-content">
+          <el-tabs type="border-card" v-model="editableTabsValue" :active-index="String(activeIndex)">
+            <el-tab-pane v-for="(device, index) in name" :key="index" :label="device">
+              <template #label>
+                    <span class="custom-tabs-label">
+                      <span>{{ device }}</span>
+                      <el-icon v-if="errorStates[index]" class="icon-style">
+                        <Failed/>
+                      </el-icon>
+                    </span>
+              </template>
+              <channelsTestTable
+                  :tableData="getTableDataForChannel(index)"
+                  :big_V_loading="big_V_loadingStates"
+                  :curV="CurV">
+              </channelsTestTable>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="tsx" setup name="FactorTest">
+import {type Device} from '@/api/device/interface/device';
+import {Failed} from '@element-plus/icons-vue'
+import {onBeforeMount, type Ref, ref, toRef, watch} from 'vue'
+import {dialogBig} from '@/utils/elementBind'
+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 {useCheckStore} from "@/stores/modules/check";
+import {useUserStore} from "@/stores/modules/user";
+
+const checkStore = useCheckStore()
+const activeIndex = ref(0)
+const activeTotalNum = ref(4)
+const qualified = ref(0)
+const outputDsc = ref('电压误差为：±0.1Un%； 电流误差为：±0.5%')
+const total = ref(0)
+const dialogVisible = ref(false)
+const active = ref(0)
+let timer1: NodeJS.Timeout | null = null; // 声明并初始化 timer1
+let timer2: NodeJS.Timeout | null = null; // 同样声明并初始化 timer2
+const name = ref<string[]>([])//系数校准所选设备名字数组
+const channel = ref<number[]>([])//系数校准所选设备通道数组
+const devIdArray = ref<string[]>([])//系数校准所选设备ID数组
+const select_Plan = ref<Plan.ReqPlan>()
+const planId = ref('')
+const isButtonDisabled = ref(false);
+const CurV = ref<number>()//额定电压
+// 在 setup 函数中
+const errorStates = ref(new Array(name.value.length).fill(false));
+//const loadingStates = ref(new Array(name.value.length).fill(false)); // 初始化 loading 状态
+const big_V_loadingStates = ref(false); // 初始化 大电压大电流下装loading 状态
+const small_V_loadingStates = ref(false); // 初始化 小电压小电流下装loading 状态
+const big_V_loadingStates2 = ref(false); // 初始化 大电压大电流校准loading 状态
+const small_V_loadingStates2 = ref(false); // 初始化 小电压小电流校准loading 状态
+const editableTabsValue = ref('0')
+const big_V_Download = ref('')
+const big_I_Download = ref('')
+const small_V_Download = ref('')
+const small_I_Download = ref('')
+const big_V_Adjust = ref('')
+const big_I_Adjust = ref('')
+const small_V_Adjust = ref('')
+const small_I_Adjust = ref('')
+const props = defineProps({
+  testStatus: {
+    type: String,
+    default: 'wait'
+  },
+  webMsgSend: {
+    type: Object,
+    default: () => ({})
+  },
+})
+const userStore = useUserStore()
+const testStatus = toRef(props, 'testStatus');
+const tableDataMap = new Map<number, Ref<ChannelsTest.CoefficientVO[]>>([]);
+const currentStepStatus = ref<'error' | 'finish' | 'wait' | 'success' | 'process'>('finish');
+const webMsgSend = toRef(props, 'webMsgSend');
+
+onBeforeMount(() => {
+  // 初始化
+  initData()
+})
+const initData = () => {
+ 
+  CurV.value = checkStore.devices[0]?.devVolt || 57.74;
+  isButtonDisabled.value = false; // 恢复按钮
+  select_Plan.value = checkStore.plan
+  planId.value = checkStore.devices[0]?.planId || '';
+  devIdArray.value = checkStore.devices.map(item => item.deviceId);
+  name.value = checkStore.devices.map(item => item.deviceName)
+  channel.value = checkStore.devices.map(item => item.chnNum)
+  dialogVisible.value = true;
+  total.value = name.value.length
+
+
+  // 初始化 loadingStates 为 false
+  // loadingStates.value = new Array(selection.length).fill(false);
+  errorStates.value = new Array(checkStore.devices.length).fill(false);
+
+  for (let i = 0; i < channel.value.length; i++) {
+    const currentTableData = initializeTableData(dataTemplates, i);
+    tableDataMap.set(i, currentTableData)
+  }
+  //console.log('tableDataMap',tableDataMap);
+}
+
+
+watch(testStatus, function (newValue, oldValue) {
+  if (newValue === 'start') {
+      // 开始系数校准操作
+      handleSubmit()
+    }
+})
+
+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: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10521) {
+      ElMessageBox.alert('程控源參数有误！', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10522) {
+      ElMessageBox.alert('测试项解析有误！', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10523) {
+      ElMessageBox.alert('源连接失败！', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10524) {
+      ElMessageBox.alert('获取源控制权失败！', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10525) {
+      ElMessageBox.alert('重置源失败！', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10527) {
+      ElMessageBox.alert('源未进行初始化！', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10528) {
+      ElMessageBox.alert('目标源有误(该用户已控制其他源，在关闭前无法操作新的源)！', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10529) {
+      ElMessageBox.alert('源状态有误，无法响应报文(例如源处于输出状态，无法响应初始化报文)！', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10550) {
+      ElMessageBox.alert(`${newValue.data}设备连接异常！`, '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10551) {
+      ElMessageBox.alert(`${newValue.data}设备触发报告异常！`, '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else if (newValue.code == 10552) { //todo 10552之后还会发送消息吗？
+      ElMessageBox.alert('存在已经初始化步骤,执行自动关闭,请重新发起检测', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
+    } else {
+      console.log('显示东西code', newValue.code)
+      console.log('显示东西requestId', newValue.requestId)
+      switch (newValue.requestId) {
+
+        case 'yjc_ytxjy':
+          switch (newValue.operateCode) {
+            case'INIT_GATHER':
+              if (newValue.code == -1) {
+                ElMessageBox.alert('源未知异常', '初始化失败', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              } else if (newValue.code == 10523) {
+                ElMessageBox.alert('源连接失败', '源连接失败', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              }
+          }
+          break;
+        case 'YJC_xujy':
+          switch (newValue.operateCode) {
+            case 'OPER_GATHER':
+              if (newValue.code == 10552) {
+                ElMessageBox.alert('存在已经初始化步骤,执行自动关闭,请重新发起检测', '初始化失败', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              } else if (newValue.code == 10520) {
+                ElMessageBox.alert('解析报文异常,执行自动关闭,请重新发起检测', '解析报文异常', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              }
+              break;
+            case 'DATA_REQUEST$02':
+              if (newValue.code == 25003) {
+                ElMessageBox.alert('相序校验未通过,执行自动关闭,请重新发起检测', '相序校验未通过', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              }
+              break;
+          }
+          break;
+        case 'yjc_sbtxjy':
+          switch (newValue.operateCode) {
+            case 'INIT_GATHER$01':
+              if (newValue.code == 10550) {
+                ElMessageBox.alert('设备连接异常', '设备连接异常', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              } else if (newValue.code == 10551) {
+                ElMessageBox.alert('设备触发报告异常', '设备触发报告异常', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              } else if (newValue.code == 10552) {
+                ElMessageBox.alert('存在已经初始化步骤,执行自动关闭,请重新发起检测', '初始化失败', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              } else if (newValue.code == 10520) {
+                ElMessageBox.alert('解析报文异常,执行自动关闭,请重新发起检测', '解析报文异常', {
+                  confirmButtonText: '确定',
+                  type: 'error',
+                })
+                TableInit();
+              }
+
+              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_start'://大电压,电流下装
+              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_start'://小电压,电流下装
+              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_start'://大电压,电流校准
+              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_start'://小电压,电流校准
+              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++) {
+                const currentDataRef = tableDataMap.get(i);
+                if (currentDataRef) {
+                  const currentData = currentDataRef.value;
+                  // 检查当前数据中有无不合格字段
+                  const hasError = checkForErrors(currentData);
+                  if (hasError) {
+                  } else {
+                    qualified.value++;
+                  }
+                  updateErrorState(i, hasError);
+                }
+              }
+
+              //editableTabsValue.value = (tabNumber.value).toString();//显示下一个tab
+              isButtonDisabled.value = false; // 恢复按钮
+              emit('update:testStatus', 'success')
+              break;
+          }
+          switch (newValue.operateCode) {
+            case 'DATA_CHNFACTOR$02'://表格
+              // 输出 key 为 0 的数组中的第一条 ChannelsTest.CoefficientVO 对象
+              console.log('表格', name.value)
+              for (let i = 0; i < name.value.length; i++) {
+                const targetArrayRef = tableDataMap.get(i);
+                if (targetArrayRef) {
+                  const targetArray = targetArrayRef.value;
+                  if (targetArray.length > 0) {
+                    const firstCoefficientVO = targetArray.find(item => item.monitorNum === newValue.data.monitorNum &&
+                        item.type === newValue.data.type &&
+                        item.desc === newValue.data.desc &&
+                        item.devName === newValue.data.devName);
+                    if (firstCoefficientVO) { // 检查 firstCoefficientVO 是否存在
+                      firstCoefficientVO.aVuData = parseFloat(newValue.data.aVuData).toFixed(4);
+
+                      if (!isNaN(parseFloat(newValue.data.aVuXi)) && isFinite(newValue.data.aVuXi)) {
+                        firstCoefficientVO.aVuXi = (parseFloat(newValue.data.aVuXi) / 10000).toFixed(4);
+                      } else {
+                        firstCoefficientVO.aVuXi = newValue.data.aVuXi;
+                      }
+
+                      firstCoefficientVO.bVuData = parseFloat(newValue.data.bVuData).toFixed(4);
+
+                      if (!isNaN(parseFloat(newValue.data.bVuXi)) && isFinite(newValue.data.bVuXi)) {
+                        firstCoefficientVO.bVuXi = (parseFloat(newValue.data.bVuXi) / 10000).toFixed(4);
+                      } else {
+                        firstCoefficientVO.bVuXi = newValue.data.bVuXi;
+                      }
+
+                      firstCoefficientVO.cVuData = parseFloat(newValue.data.cVuData).toFixed(4);
+
+                      if (!isNaN(parseFloat(newValue.data.cVuXi)) && isFinite(newValue.data.cVuXi)) {
+                        firstCoefficientVO.cVuXi = (parseFloat(newValue.data.cVuXi) / 10000).toFixed(4);
+                      } else {
+                        firstCoefficientVO.cVuXi = newValue.data.cVuXi;
+                      }
+
+                      firstCoefficientVO.aIeData = parseFloat(newValue.data.aIeData).toFixed(4);
+
+                      if (!isNaN(parseFloat(newValue.data.aIeXi)) && isFinite(newValue.data.aIeXi)) {
+                        firstCoefficientVO.aIeXi = (parseFloat(newValue.data.aIeXi) / 10000).toFixed(4);
+                      } else {
+                        firstCoefficientVO.aIeXi = newValue.data.aIeXi;
+                      }
+
+                      firstCoefficientVO.bIeData = parseFloat(newValue.data.bIeData).toFixed(4);
+
+                      if (!isNaN(parseFloat(newValue.data.bIeXi)) && isFinite(newValue.data.bIeXi)) {
+                        firstCoefficientVO.bIeXi = (parseFloat(newValue.data.bIeXi) / 10000).toFixed(4);
+                      } else {
+                        firstCoefficientVO.bIeXi = newValue.data.bIeXi;
+                      }
+
+                      firstCoefficientVO.cIeData = parseFloat(newValue.data.cIeData).toFixed(4);
+
+                      if (!isNaN(parseFloat(newValue.data.cIeXi)) && isFinite(newValue.data.cIeXi)) {
+                        firstCoefficientVO.cIeXi = (parseFloat(newValue.data.cIeXi) / 10000).toFixed(4);
+                      } else {
+                        firstCoefficientVO.cIeXi = newValue.data.cIeXi;
+                      }
+
+                      firstCoefficientVO.aV = newValue.data.aV;
+                      firstCoefficientVO.bV = newValue.data.bV;
+                      firstCoefficientVO.cV = newValue.data.cV;
+                      firstCoefficientVO.aI = newValue.data.aI;
+                      firstCoefficientVO.bI = newValue.data.bI;
+                      firstCoefficientVO.cI = newValue.data.cI;
+                      console.log(newValue.data.devName + '对象:', firstCoefficientVO);
+                      activeIndex.value++;
+                    } else {
+                      console.log('未找到匹配的' + newValue.data.devName + '对象');
+                    }
+                  } else {
+                    console.log(newValue.data.devName + '数组为空');
+                  }
+                } else {
+                  console.log('未找到' + newValue.data.devName + '对应的数组');
+                }
+              }
+              break;
+          }
+          break;
+        case 'socket_timeout':
+          switch (newValue.operateCode) {
+            case 'VOLTAGE':
+              ElMessageBox.alert('连接超时！', '连接超时', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              TableInit();
+              break;
+          }
+          break;
+        case 'connect':
+          switch (newValue.operateCode) {
+            case "Source":
+              ElMessageBox.alert('源服务端连接失败', '源服务端连接失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              TableInit();
+              break;
+            case "Dev":
+              ElMessageBox.alert('设备服务端连接失败', '设备服务端连接失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              TableInit();
+              break;
+          }
+
+          break;
+      }
+    }
+  }
+})
+
+//出错系数检测初始化
+const TableInit = () => {
+  console.log("出错系数检测",active.value);
+  emit('update:testStatus', 'test_init_fail')
+  // isButtonDisabled.value = false; // 恢复按钮
+  // for (let i = 0; i < channel.value.length; i++) {
+  //   const currentTableData = initializeTableData(dataTemplates, i);
+  //   tableDataMap.set(i, currentTableData)
+  // }
+  // activeIndex.value = 0
+  // qualified.value = 0
+  // active.value = 0
+
+}
+
+//按行图标转动
+const tableLoading = (type: string, desc: string) => {
+  console.log('转动',channel.value)
+  for (let i = 0; i < channel.value.length; i++) {
+
+    const targetArrayRef = tableDataMap.get(i);
+    if (targetArrayRef) {
+      const targetArray = targetArrayRef.value;
+      if (targetArray.length > 0) {
+        for (let j = 0; j < channel.value[i]; j++) {
+          const firstCoefficientVO = targetArray.find(item => item.monitorNum === (j + 1).toString() &&
+              item.type === type &&
+              item.desc === desc);
+          if (firstCoefficientVO) {
+            firstCoefficientVO.loading = true;
+          }
+        }
+      }
+    }else{
+      console.log('不转了')
+    }
+  }
+}
+
+const dataTemplates: ChannelsTest.CoefficientVO[] = [
+  {
+    monitorNum: '1',
+    desc: '系数下装',
+    type: 'big',
+    aVuData: '—',
+    aVuXi: '—',
+    bVuData: '—',
+    bVuXi: '—',
+    cVuData: '—',
+    cVuXi: '—',
+    aIeData: '—',
+    aIeXi: '—',
+    bIeData: '—',
+    bIeXi: '—',
+    cIeData: '—',
+    cIeXi: '—',
+    loading: false,
+    devName: '',
+    aV: '—',
+    bV: '—',
+    cV: '—',
+    aI: '—',
+    bI: '—',
+    cI: '—',
+  },
+  {
+    monitorNum: '2',
+    desc: '系数下装',
+    type: 'small',
+    aVuData: '—',
+    aVuXi: '—',
+    bVuData: '—',
+    bVuXi: '—',
+    cVuData: '—',
+    cVuXi: '—',
+    aIeData: '—',
+    aIeXi: '—',
+    bIeData: '—',
+    bIeXi: '—',
+    cIeData: '—',
+    cIeXi: '—',
+    loading: false,
+    devName: '',
+    aV: '—',
+    bV: '—',
+    cV: '—',
+    aI: '—',
+    bI: '—',
+    cI: '—',
+  },
+  {
+    monitorNum: '3',
+    desc: '系数校准',
+    type: 'big',
+    aVuData: '—',
+    aVuXi: '—',
+    bVuData: '—',
+    bVuXi: '—',
+    cVuData: '—',
+    cVuXi: '—',
+    aIeData: '—',
+    aIeXi: '—',
+    bIeData: '—',
+    bIeXi: '—',
+    cIeData: '—',
+    cIeXi: '—',
+    loading: false,
+    devName: '',
+    aV: '—',
+    bV: '—',
+    cV: '—',
+    aI: '—',
+    bI: '—',
+    cI: '—',
+  },
+  {
+    monitorNum: '4',
+    desc: '系数校准',
+    type: 'small',
+    aVuData: '—',
+    aVuXi: '—',
+    bVuData: '—',
+    bVuXi: '—',
+    cVuData: '—',
+    cVuXi: '—',
+    aIeData: '—',
+    aIeXi: '—',
+    bIeData: '—',
+    bIeXi: '—',
+    cIeData: '—',
+    cIeXi: '—',
+    loading: false,
+    devName: '',
+    aV: '—',
+    bV: '—',
+    cV: '—',
+    aI: '—',
+    bI: '—',
+    cI: '—',
+  },
+
+];
+
+
+// 更新错误状态的方法
+const updateErrorState = (index: number, hasError: boolean) => {
+  errorStates.value[index] = hasError;
+};
+
+
+// const emit = defineEmits<{
+  
+//   (e: 'submitClicked', callback: (resolve: (value: boolean) => void) => void): void;
+// }>();
+
+const emit = defineEmits(['update:testStatus']);
+
+const getTableDataForChannel = (index: number): any[] => {
+  const data = tableDataMap.get(index);
+  return data ? data.value : [];
+}
+
+
+watch(activeIndex, function (newValue, oldValue) {
+  if (activeIndex.value === 1) {
+    outputDsc.value = "电压误差为：±0.1Un%； 电流误差为：±0.5%";
+    // 当前源输出为：Ua=Ub=Uc=57.74V Ia=Ib=Ic=1A"
+  }
+})
+
+// 示例的 checkForErrors 函数，根据实际需求进行调整
+const checkForErrors = (data: ChannelsTest.CoefficientVO[]): boolean => {
+  // 这里假设不合格字段的标准是 status 为 '不合格' 或 isValid 为 false
+  return data.some(item =>
+      item.aVuXi === '不合格' ||
+      item.bVuXi === '不合格' ||
+      item.cVuXi === '不合格' ||
+      item.aIeXi === '不合格' ||
+      item.bIeXi === '不合格' ||
+      item.cIeXi === '不合格'
+  );
+};
+
+const handleSubmit = async () => {
+  // 创建一个 Promise 来等待父组件的回调
+  // const response = await new Promise<boolean>((resolve) => {
+  //   emit('submitClicked', resolve);
+  // });
+
+  // if (!response) {
+  //   return;
+  // }()
+
+  isButtonDisabled.value = true; // 禁用按钮
+  tableLoading('big', '系数下装')
+  await getCoefficientCheck({
+    userPageId: "cdf",
+    devIds: devIdArray.value,
+    planId: planId.value,
+    errorSysId: select_Plan.value?.errorSysId,
+    scriptId: select_Plan.value?.scriptId,
+    operateType: '0', // '0'为预检测、‘1‘为正式检测
+    userId:userStore.userInfo.id
+  })
+  active.value++;  
+
+  console.log('开始检测active.value', active.value)
+};
+
+// 提取初始化并填充 currentTableData 的函数
+const initializeTableData = (templates: ChannelsTest.CoefficientVO[], index: number): Ref<ChannelsTest.CoefficientVO[]> => {
+  const currentTableData = ref<ChannelsTest.CoefficientVO[]>([]);
+  for (let j = 0; j < channel.value[index]; j++) {
+    templates.forEach((template) => {
+      // 使用解构赋值排除 id 和 MonitorIdx 属性
+      const {devName, monitorNum: __, ...rest} = template;
+      currentTableData.value.push({
+        monitorNum: (j + 1).toString(),
+        devName: name.value[index],
+        ...rest,
+      });
+    });
+  }
+  return currentTableData;
+};
+
+</script>
+
+<style scoped lang="scss">
+/* 确保 el-icon-loading 的动画效果没有被覆盖 */
+.loading-box {
+  animation: rotate 2s linear infinite;
+  font-size: 30px; /* 增大图标的大小 */
+}
+
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.right-title {
+  display: flex;
+  flex-direction: row;
+  /* 横向排列 */
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+
+.custom-tabs-label .el-icon {
+  vertical-align: middle;
+}
+
+.custom-tabs-label span {
+  vertical-align: middle;
+  margin-left: 4px;
+}
+
+.dialog-content {
+  height: 510px;
+}
+
+.el-tabs--border-card {
+  height: 470px;
+}
+
+/* .el-icon svg {
+  color: #ff7171;
+} */
+
+.icon-style {
+  color: #ff7171;
+}
+
+.container {
+  display: flex;
+}
+
+.dialog-left {
+  flex: 1;
+}
+
+.right-content {
+  flex: 6;
+}
+
+.spanStyle {
+  font-size: 14px;
+}
+
+</style>

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>
-          <!-- disabled="true" -->
+                       :label="item.name" disabled></el-checkbox>
         </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">
@@ -51,7 +50,13 @@
             <div class="div-log">
               <p v-for="(item, index) in step4InitLog" :key="index"
                  :style="{ color: item.type === 'error' ? '#F56C6C' : 'var(--el-text-color-regular)' }">
-                {{ item.log }} <br />
+                {{ item.log.split('&&')[0] }}
+                <br v-if="item.log.includes('&&')"/>
+                &nbsp;&nbsp;&nbsp;&nbsp;{{ item.log.split('&&')[1] }}
+
+                <br v-if="item.log.includes('&&')"/>
+                &nbsp;&nbsp;&nbsp;&nbsp;{{ item.log.split('&&')[2] }}
+
               </p>
             </div>
           </el-collapse-item>
@@ -62,8 +67,9 @@
 
 </template>
 <script lang="tsx" setup name="preTest">
-import {ElMessage} from "element-plus";
-import { defineExpose } from 'vue';
+import {ElMessage, ElMessageBox} from "element-plus";
+import {defineExpose, toRef} from 'vue';
+
 const step1InitLog = ref([
   {
     type: 'info',
@@ -222,16 +228,12 @@ const props = defineProps({
 })
 
 
-
-
-
 const testStatus = toRef(props, 'testStatus');
 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) {
@@ -239,7 +241,7 @@ watch(webMsgSend,function (newValue,oldValue){
             if (newValue.code == 10200) {
               step1InitLog.value.push({
                 type: 'info',
-              log: '源校验成功!',
+                log: '源初始化成功!',
               })
               activeIndex.value = 1
               step1.value = 'success'
@@ -248,18 +250,33 @@ watch(webMsgSend,function (newValue,oldValue){
               step1.value = 'process'
               step1InitLog.value = [{
                 type: 'wait',
-              log: '正在进行源校验!',
+                log: '正在进行源初始化!',
               }];
             } else if (newValue.code == 10552) {
               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: '源连接失败!',
+              }];
+            } else if (newValue.code == -1) {
+              step1.value = 'error'
+              ts.value = 'error'
+              step5.value = 'error'
+              step1InitLog.value = [{
+                type: 'error',
+                log: '源未知异常!',
+              }];
             }
             break;
 
 
-
-
         }
         break;
       case 'yjc_sbtxjy':
@@ -284,7 +301,8 @@ watch(webMsgSend,function (newValue,oldValue){
                 log: newValue.data + '设备连接异常!',
               })
               step2.value = 'error'
-            ts.value = 'error'
+              // ts.value = 'error'
+              // step5.value = 'error'
             } else if (newValue.code == 10551) {
               step2InitLog.value.push({
                 type: 'error',
@@ -292,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 = [{
@@ -300,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'
@@ -330,7 +350,8 @@ watch(webMsgSend,function (newValue,oldValue){
                 log: newValue.data + '设备连接异常!',
               })
               step3.value = 'error'
-            ts.value = 'error'
+              // ts.value = 'error'
+              // step5.value = 'error'
             } else if (newValue.code == 10551) {
               step3InitLog.value.push({
                 type: 'error',
@@ -338,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("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
@@ -346,6 +368,7 @@ watch(webMsgSend,function (newValue,oldValue){
                 log: '存在已经初始化步骤,执行自动关闭,请重新发起检测！',
               }];
               ts.value = 'error'
+              step5.value = 'error'
             }
             break;
           case 'INIT_GATHER$02':
@@ -367,7 +390,8 @@ watch(webMsgSend,function (newValue,oldValue){
                 log: newValue.data + '设备连接异常!',
               })
               step3.value = 'error'
-            ts.value = 'error'
+              // ts.value = 'error'
+              // step5.value = 'error'
             } else if (newValue.code == 10551) {
               step3InitLog.value.push({
                 type: 'error',
@@ -375,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("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
@@ -383,6 +408,7 @@ watch(webMsgSend,function (newValue,oldValue){
                 log: '存在已经初始化步骤,执行自动关闭,请重新发起检测！',
               }];
               ts.value = 'error'
+              step5.value = 'error'
             }
             break;
           case 'INIT_GATHER$03':
@@ -400,7 +426,8 @@ watch(webMsgSend,function (newValue,oldValue){
                 log: newValue.data + '设备连接异常!',
               })
               step3.value = 'error'
-            ts.value = 'error'
+              // ts.value = 'error'
+              // step5.value = 'error'
             } else if (newValue.code == 10551) {
               step3InitLog.value.push({
                 type: 'error',
@@ -408,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'
@@ -416,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) {
@@ -431,19 +471,20 @@ watch(webMsgSend,function (newValue,oldValue){
             if (newValue.code == 10200) {
               step4InitLog.value.push({
                 type: 'info',
-              log: '源已接通!',
+                log: '源参数下发成功,等待校验中.....',
               })
 
             } else if (newValue.code == 10201) {
               step4.value = 'process'
               step4InitLog.value = [{
                 type: 'wait',
-              log: '正在接通源.....',
+                log: '源参数下发中.....',
               }];
             } else if (newValue.code == 10552) {
               ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
               step4.value = 'error'
               ts.value = 'error'
+              step5.value = 'error'
             } else if (newValue.code == 10520) {
               step4.value = 'error'
               step4InitLog.value.push({
@@ -451,14 +492,21 @@ watch(webMsgSend,function (newValue,oldValue){
                 log: '解析报文异常',
               })
               ts.value = 'error'
+              step5.value = 'error'
             }
             break;
 
           case 'DATA_REQUEST$02':
             if (newValue.code == 10200) {
+              let type = 'info'
+              if (newValue.data.includes('不合格')) {
+                type = 'error'
+              }
+
+              newValue.data.split('<br/>')
               step4InitLog.value.push({
-              type: 'info',
-              log: '相序校验:'+newValue.data,
+                type: type,
+                log: newValue.data,
               })
 
             } else if (newValue.code == 10201) {
@@ -467,17 +515,25 @@ watch(webMsgSend,function (newValue,oldValue){
                 type: 'wait',
                 log: '获取数据相序校验数据!',
               }];
-          }
-          else if (newValue.code == 25001) {
+            } else if (newValue.code == 25003) {
+              step4.value = 'error'
+              step4InitLog.value.push({
+                type: 'error',
+                log: '相序校验未通过!',
+              })
+              ts.value = 'error'
+              step5.value = 'error'
+            } else if (newValue.code == 25001) {
               step4.value = 'success'
               step5.value = 'success'
               step4InitLog.value.push({
                 type: 'wait',
                 log: '相序校验成功!',
               })
+              ts.value = 'success'
             }
             activeIndex.value = 5
-          ts.value = 'success'
+            console.log("@@@@", ts.value)
             break
         }
 
@@ -493,6 +549,7 @@ watch(webMsgSend,function (newValue,oldValue){
               log: '源服务端连接失败!',
             }];
             ts.value = 'error'
+            step5.value = 'error'
             break;
           case "Dev":
             step2.value = 'error'
@@ -501,11 +558,23 @@ watch(webMsgSend,function (newValue,oldValue){
               log: '设备服务端连接失败!',
             }];
             ts.value = 'error'
+            step5.value = 'error'
             break;
         }
         break;
-  }
+      case 'unknown_operate':
 
+        break;
+      case 'error_flow_end':
+        ElMessageBox.alert(`设备连接异常，请检查设备连接情况！`, '检测失败', {
+          confirmButtonText: '确定',
+          type: 'error',
+        })
+        ts.value = 'error'
+        step5.value = 'error'
+        break;
+    }
+  }
 })
 
 watch(activeIndex, function (newValue, oldValue) {
@@ -518,7 +587,6 @@ watch(activeIndex, function (newValue, oldValue) {
 
 //监听goods_sn的变化
 watch(testStatus, function (newValue, oldValue) {
-
   ts.value = props.testStatus;
   if (ts.value === 'start') {
     ts.value = 'process'
@@ -546,8 +614,6 @@ watch(ts, function (newValue, oldValue) {
 })
 
 
-
-
 // 定义一个初始化参数的方法
 function initializeParameters() {
   activeIndex.value = 0
@@ -585,9 +651,6 @@ function initializeParameters() {
 }
 
 
-
-
-
 defineExpose({
   initializeParameters,
 });

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

@@ -27,7 +27,7 @@
                                 <div class="tabs-title ">
                                     <el-button type="primary" :icon="Download"  >报告下载</el-button>     
                                     <span style="  font-size: 18px;font-weight: 600;">
-                                        已生成 <span style="color: #67C23A">2</span> 台/共 <span style="color: green">3</span> 台
+                                        已生成 <span style="color: #91cc75">2</span> 台/共 <span style="color: green">3</span> 台
                                     </span>
                                     
                                     </div> 

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

@@ -0,0 +1,111 @@
+<template>
+  <el-dialog title="选择测试内容" v-model='dialogVisible' @close="handleClose" v-bind="dialogSmall" >
+    <div>
+      <el-form ref="dialogFormRef" :model="formContent" class="form-three">
+        <el-form-item prop="preTest" :label-width="100">
+          <el-checkbox v-model="formContent.preTest" label="预检测"/>
+        </el-form-item>
+        <el-form-item v-if="checkStore.plan.timeCheck===1" prop="timeTest" :label-width="100">
+          <el-checkbox v-model="formContent.timeTest" label="守时检测"/>
+        </el-form-item>
+        <el-form-item  v-if="AppSceneStore.currentScene === '1'" prop="channelsTest" :label-width="100">
+          <el-checkbox v-model="formContent.channelsTest" label="系数校准"/>
+        </el-form-item>
+        <el-form-item prop="test" :label-width="100">
+          <el-checkbox v-model="formContent.test" label="正式检测"/>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleClose">取消</el-button>
+          <el-button type="primary" @click="handleStart">确定</el-button>
+        </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang='tsx' name='selectTestItemPopup'>
+import {dialogSmall} from "@/utils/elementBind";
+import {ref} from "vue";
+import {useCheckStore} from "@/stores/modules/check";
+import type {CheckData} from "@/api/check/interface";
+import {ElMessageBox} from "element-plus";
+import {useAppSceneStore} from "@/stores/modules/mode";
+const AppSceneStore = useAppSceneStore()
+const emit = defineEmits(['openTestDialog'])
+const checkStore = useCheckStore();
+
+const dialogFormRef = ref()
+
+
+const dialogVisible = ref(false)
+const formContent = reactive<CheckData.SelectTestItem>({preTest: true, timeTest: false, channelsTest: false, test: false})
+
+const open = async () => {
+  resetFormContent()
+  checkStore.setSelectTestItems(formContent)
+  dialogVisible.value = true
+}
+
+// 清空表单内容
+const resetFormContent = () => {
+  Object.assign(formContent, {preTest: true, channelsTest: false, timeTest: false, test: false})
+}
+
+const handleStart = () => {
+  let count = 0
+  for (let key in formContent) {
+    if (formContent[key]) {
+      count++
+    }
+  }
+  if (count === 0) {
+    ElMessage.warning('请选择测试内容！')
+  } else {
+    if(formContent.channelsTest){
+      const factorFlagArray = ref<string[]>([]) // 初始化为空数组
+      for (let i = 0; i < checkStore.devices.length; i++) {
+        const factorFlag = checkStore.devices[i].factorFlag
+        if (factorFlag !== undefined && factorFlag !== null && factorFlag === 0) {
+          factorFlagArray.value.push(checkStore.devices[i].deviceName.toString())
+        }
+      }
+      if (factorFlagArray.value.length > 0) {
+        const factorFlags = factorFlagArray.value.join(', ')
+        ElMessageBox.confirm(
+            factorFlags + '设备不支持系数校准，请重新选择',
+            '提示',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            },
+        )
+        return
+      }
+    }
+    checkStore.setCheckType(0)
+    checkStore.setSelectTestItems({...formContent})
+    handleClose()
+    emit('openTestDialog')
+  }
+}
+
+// 关闭弹窗
+const handleClose = () => {
+  dialogVisible.value = false
+  // 清空dialogForm中的值
+  resetFormContent()
+  dialogFormRef.value?.resetFields()
+}
+
+defineExpose({open})
+
+</script>
+
+
+<style scoped lang="scss">
+
+</style>

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

@@ -1,7 +1,7 @@
 <template>
   <el-table
     :data="tableData"
-:row-class-name="tableRowClassName" row-key="id" height="300px" :header-cell-style="{ background: '#003078', color: '#eee', textAlign: 'center' } " style="width: 100%" border v-on:cell-click="handleClick"
+:row-class-name="tableRowClassName" row-key="id" height="300px" :header-cell-style="{ background: 'var(--el-color-primary)', color: '#eee', textAlign: 'center' } " style="width: 100%" border v-on:cell-click="handleClick"
   >
     <el-table-column prop="date" label="Date" width="180" />
     <el-table-column prop="name" label="Name" width="180" />

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

@@ -1,37 +1,80 @@
 <template>
-    <el-dialog  :title="dialogTitle" :model-value="dialogVisible" :before-close="beforeClose" @close="handleCancel" width="1200px" height="1000px" draggable>
+  <el-dialog :title="dialogTitle" width="1550px" :model-value="dialogVisible" :before-close="beforeClose" @close="handleClose" height="1000px" draggable>
 
     <div class="steps-container">
-        <!-- simple -->
-        <!-- :style="{color:node.label=='未检'?'#F56C6C':node.label=='检测中'?'#E6A23C':'#67C23A'}" -->
       <el-steps class="test-head-steps" simple :active="stepsActiveIndex" process-status="finish" finish-status="success">
-          <!-- style="height:100px"  -->
-        <!-- <el-step title="预检测" :icon="getIcon(0)" /> -->
-        <el-step title="预检测" :icon="stepsActiveIndex > 1 ? SuccessFilled :Edit" />
-        <el-step title="守时检测" :icon="stepsActiveIndex > 1 ? SuccessFilled :UploadFilled" v-if="isTimeCheck"/>
-        <!-- <el-step title="系数校准" :icon="stepsActiveIndex > 2 ? SuccessFilled :Odometer" /> -->
-        <el-step title="正式检测" :icon="stepsActiveIndex > 3 ? SuccessFilled :Coin" />
-        <el-step title="检测完成" :icon="stepsActiveIndex > 4 ? SuccessFilled :Key" />
+        <el-step v-if="preTestSelected" title="预检测" :icon="stepsActive > 1 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Edit" @click="handleStepClick(1)"/>
+        <el-step v-if="timeTestSelected" title="守时检测" :icon="stepsActive > 2 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :UploadFilled" @click="handleStepClick(2)"/>
+        <el-step v-if="channelsTestSelected" title="系数校准" :icon="stepsActive > 3 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Odometer" @click="handleStepClick(3)"/>
+        <el-step v-if="testSelected" title="正式检测" :icon="stepsActive > 4 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Coin" @click="handleStepClick(4)"/>
+        <el-step title="检测完成" :icon="stepsActiveIndex > stepsTotalNum-1 ? SuccessFilled :Key"/>
       </el-steps>
     </div>
-        <preTest ref="preTestRef" v-if="stepsActiveIndex === 0" v-model:testStatus="preTestStatus" :webMsgSend="webMsgSend"></preTest>
-        <timeTest v-if="stepsActiveIndex === 1 && isTimeCheck" v-model:testStatus="timeTestStatus"></timeTest>
-        <!-- <channelsTest v-if="stepsActiveIndex === 2" v-model:testStatus="channelsTestStatus"></channelsTest> -->
-        <test ref="testRef" v-if="stepsActiveIndex >= 2" v-model:testStatus="TestStatus" :webMsgSend="webMsgSend" @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume"></test>
+
+    <preTest v-if="showComponent&&preTestSelected" v-show="preTestSelected && stepsActiveView==1" ref="preTestRef" v-model:testStatus="preTestStatus"
+             :webMsgSend="webMsgSend"/>
+    <timeTest v-if="showComponent&&timeTestSelected" v-show="timeTestSelected && stepsActiveView==2" v-model:testStatus="timeTestStatus"/>
+    <!--     <channelsTest v-if="stepsActiveIndex === 3" v-model:testStatus="channelsTestStatus"></channelsTest>-->
+    <factorTest v-if="showComponent&&channelsTestSelected" v-show="channelsTestSelected && stepsActiveView==3" v-model:testStatus="channelsTestStatus" :webMsgSend="webMsgSend"/>
+    <test v-if="showComponent&&testSelected" ref="testRef" v-show="testSelected && stepsActiveView==4" v-model:testStatus="TestStatus" :webMsgSend="webMsgSend"
+          @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck" :stepsActive="stepsActive"/>
 
     <template #footer>
       <div>
-                <!-- <el-button @click="handleCancel">取 消</el-button> -->
-                <el-button type="primary" :icon="DArrowRight" v-if="stepsActiveIndex < 2 && ActiveStatue != 'success'" :disabled="skipDisabled"  @click="nextStep">跳过</el-button>
+<!--        <el-button type="primary" :icon="DArrowRight" v-if="stepsActiveIndex < stepsTotalNum && ActiveStatue != 'success'" @click="nextStep">跳过</el-button>-->
         <el-button type="primary" :icon="VideoPlay" v-if="ActiveStatue === 'waiting'" @click="handleSubmit">开始检测</el-button>
-                <el-button type="danger" :icon="Close" v-if="ActiveStatue === 'process'" @click="handleSubmit">停止检测</el-button>
-                <el-button type="danger" :icon="Close" v-if="ActiveStatue === 'paused'" @click="handleSubmit">继续检测</el-button>
-                <el-button type="primary" :icon="RefreshLeft" v-if="ActiveStatue === 'error'" @click="handleSubmit">重新检测</el-button>
-                <el-button type="primary" :icon="Refresh" v-if="ActiveStatue === 'preTest_process'" disabled>预检测中</el-button>
+<!--        <el-button type="primary"-->
+<!--                   v-if="(stepsActiveIndex <= stepsTotalNum - 1) && (ActiveStatue !== 'success' &&ActiveStatue !== 'test_init' && ActiveStatue !=='paused_ing' && ActiveStatue !=='paused' && ActiveStatue !== 'waiting' && ActiveStatue !== 'error' && ActiveStatue !== 'test_init_fail' && ActiveStatue !== 'connect_timeout' && ActiveStatue!=='pause_timeout')"-->
+<!--                   disabled>-->
+<!--          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">-->
+<!--            <component :is="Refresh"/>-->
+<!--          </el-icon>-->
+<!--          检测中-->
+<!--        </el-button>-->
+
+
+        <!--        <el-button type="primary" v-if="ActiveStatue === 'process'" disabled>-->
+        <!--          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">-->
+        <!--            <component :is="Refresh"/>-->
+        <!--          </el-icon>-->
+        <!--          检测中-->
+        <!--        </el-button>-->
+<!--        <el-button type="warning" :icon="VideoPlay" v-if="TestStatus === 'paused'" @click="handleSubmit">继续检测</el-button>-->
+        <!--        <el-button type="primary" :icon="RefreshLeft" v-if="ActiveStatue === 'recheck' || ActiveStatue ==='error' || ActiveStatue ==='test_init_fail' || ActiveStatue === 'pause_timeout' || ActiveStatue === 'connect_timeout'" @click="handleSubmit">重新检测</el-button>-->
+        <el-button type="primary" v-if="TestStatus === 'test_init'" disabled>
+          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
+            <component :is="Refresh"/>
+          </el-icon>
+          初始化中
+        </el-button>
+        <el-button
+            type="primary"
+            v-if="TestStatus=='process'"
+            :icon="VideoPause"
+            @click="handlePause()">停止检测
+        </el-button>
+        <el-button type="warning" v-if="TestStatus === 'paused_ing'" disabled>
+          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
+            <component :is="Refresh"/>
+          </el-icon>
+          暂停中
+        </el-button>
+        <el-button
+            type="warning"
+            v-if="(TestStatus =='paused')"
+            :icon="VideoPlay"
+            @click="sendResume"
+        >继续检测
+        </el-button>
+
         <el-button :type="ActiveStatue==='success'?'primary':'danger'" :icon="Right"
-                         v-if="ActiveStatue === 'success'||ActiveStatue==='preTest_fail'" @click="nextStep">
+                   v-if="nextStepText !== '下一步' && (ActiveStatue === 'success'||ActiveStatue==='error'||ActiveStatue==='test_init_fail'||ActiveStatue==='connect_timeout'||ActiveStatue==='pause_timeout')"
+                   @click="nextStep">
           {{ nextStepText }}
         </el-button>
+        <el-button type="primary" @click="handleQuit" v-else>
+          退出检测
+        </el-button>
       </div>
     </template>
   </el-dialog>
@@ -40,107 +83,27 @@
 </template>
 
 <script lang="tsx" setup name="testPopup">
-  import {h, reactive, ref, watch} from 'vue';
+import {reactive, ref, watch} from 'vue';
 import {ElMessage, ElMessageBox} from 'element-plus'
-  //import IndicatorTypeDialog from "@/views/machine/errorSystem/components/IndicatorTypeDialog.vue"; // 导入子组件
-  import {
-    Close,
-    Coin,
-    DArrowRight,
-    Edit,
-    Key,
-    Odometer,
-    Refresh,
-    Right,
-    SuccessFilled,
-    UploadFilled,
-    VideoPlay,
-      RefreshLeft
-  } from '@element-plus/icons-vue'
+import {Coin, DArrowRight, Edit, Key, Odometer, Refresh, Right, SuccessFilled, UploadFilled, VideoPlay,VideoPause} from '@element-plus/icons-vue'
 import preTest from './preTest.vue'
 import timeTest from './timeTest.vue'
-  import { Device } from '@/api/device/interface/device';
+import factorTest from './factorTest.vue'
+import test from './test.vue'
 import socketClient from '@/utils/webSocketClient';
 import {useCheckStore} from "@/stores/modules/check";
-  import {startPreTest,startTest,pauseTest,resumeTest} from '@/api/socket/socket'
-
-
-  //import SvgIcon from '@/components/SvgIcon.vue';
-
-//   import preTestIcon from '@/assets/icons/preTest.svg'
-
-//   const preTestIcon = `
-//   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
-//   </svg>
-// `;
-  // const props = defineProps<{
-  //   visible: boolean;
-  //   dialogTitle: string;
-    
-  //   formData: {
-  //       id: string;//误差体系表Id
-  //       name: string;//误差体系名称
-  //       standard_Name:string;//参照标准名称
-  //       standard_Time:string;//标准推行时间
-  //       dev_Level:string;//使用设备等级
-  //       enable:number;//状态：0-不启用 1-启用
-  //       state:number;//0-删除 1-正常
-  //   };
-  // }>();
-
-  // const emit = defineEmits<{
-  //   (e: 'update:visible', value: boolean): void;
-  //   (e: 'submit', data: any): void;
-  // }>();
+import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket'
+import {useUserStore} from "@/stores/modules/user";
 
+const userStore = useUserStore()
 const checkStore = useCheckStore();
-  const skipDisabled = ref(false);
 const nextStepText = ref('下一步');
 const dialogVisible = ref(false)
-//定义与预检测配置数组
-const detectionOptions = ref([
-  {
-    id: 0,
-    name: "源通讯检测",//判断源通讯是否正常
-    selected: true,
-  },
-  {
-    id: 1,
-    name: "设备通讯检测",//判断设备的IP、Port、识别码、秘钥是否正常
-    selected: true,
-  },
-  {
-    id: 2,
-    name: "协议校验",//ICD报告触发测试
-    selected: true,
-  },
-  {
-    id: 3,
-    name: "相序校验",//判断装置的接线是否正确
-    selected: true,
-  },
-//   {
-//     id: 4,
-//     name: "守时校验",//判断装置24小时内的守时误差是否小于1s
-//     selected: true,
-//   },
-//   {
-//     id: 5,
-//     name: "通道系数校准",//通过私有协议与装置进行通讯，校准三相电压电流的通道系数
-//     selected: true,
-//   },
-  // {
-  //   id: 6,
-  //   name: "实时数据比对",
-  // },
-  // {
-  //   id: 7,
-  //   name: "录波数据比对",
-  // },
-]);
 
-  const stepsTotalNum = ref(4);//步骤总数
-  const stepsActiveIndex = ref(0); //当前正在执行的步骤索引
+const stepsTotalNum = ref(-1);//步骤总数
+const stepsActiveIndex = ref(1); //当前正在执行的步骤索引
+const stepsActiveView = ref(-1); //当前正在执行的步骤在（预处理、守时校验、系数校准、正式检测）中的排序，仅用于页面显示
+const stepsActive = ref(-1); //当前正在执行的步骤在（预处理、守时校验、系数校准、正式检测）中的排序，实际记录步骤的状态，用于切换步骤
 const ActiveStatue = ref('waiting');//当前步骤状态
 const preTestStatus = ref('waiting');//预检测执行状态
 const timeTestStatus = ref('waiting');//守时校验执行状态
@@ -148,162 +111,171 @@ const detectionOptions = ref([
 const TestStatus = ref('waiting');//正式检测执行状态
 const webMsgSend = ref();//webSocket推送的数据
 
-  const dialogTitle = ref('');
-  const isTimeCheck = ref(false)
-  const preTestRef = ref(null);
-  const testRef = ref(null);
+const dialogTitle = ref('')
+const showComponent = ref(true)
+const preTestRef = ref(null)
+const testRef = ref(null)
 
-  // const devIdArr = ref([])
-  // const planId = ref('')
+const dataSocket = reactive({
+  socketServe: socketClient.Instance,
+});
 
+// 勾选的检测内容
+const preTestSelected = ref(false)
+const timeTestSelected = ref(false)
+const channelsTestSelected = ref(false)
+const testSelected = ref(false)
 
-  // 打开弹窗，可能是新增，也可能是编辑
-  const open = (selection: Device.ResPqDev[],title: string,time:boolean) => {
+const initOperate = () => {
+  ActiveStatue.value = 'waiting'
+  preTestStatus.value = 'waiting'
+  timeTestStatus.value = 'waiting'
+  channelsTestStatus.value = 'waiting'
+  TestStatus.value = 'waiting'
 
+  stepsActiveIndex.value = 1
+  showComponent.value = true
+  // 初始化勾选的检测内容
+  preTestSelected.value = checkStore.selectTestItems.preTest
+  timeTestSelected.value = checkStore.selectTestItems.timeTest
+  channelsTestSelected.value = checkStore.selectTestItems.channelsTest
+  testSelected.value = checkStore.selectTestItems.test
 
-    const checkStates = selection.map(item => item.checkState);
-    // devIdArr.value = selection.map(item => item.id);
-    // planId.value =selection[0].planId
-    // console.log('wwwwwwwwwwwwwwwww',selection)
-
-    const allCheckStatesEqual = new Set(checkStates).size <= 1;
-
-    if (!allCheckStatesEqual) {
-      ElMessageBox.confirm(
-        '所勾选设备检测状态不一致，请重新选择',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
+  let count = 0
+  for (let key in checkStore.selectTestItems) {
+    if (checkStore.selectTestItems[key]) {
+      count++
     }
-      )
+  }
+  stepsTotalNum.value = count + 1
+
+  if (preTestSelected.value) {
+    stepsActiveView.value = 1
+    stepsActive.value = 1
     return
   }
+  if (timeTestSelected.value) {
+    stepsActiveView.value = 2
+    stepsActive.value = 2
+    return
+  }
+  if (channelsTestSelected.value) {
+    stepsActiveView.value = 3
+    stepsActive.value = 3
+    return
+  }
+  if (testSelected.value) {
+    stepsActiveView.value = 4
+    stepsActive.value = 4
+    return
+  }
+}
 
+const open = (title: string) => {
+  initOperate()
   dialogTitle.value = title;
   dialogVisible.value = true;
-    isTimeCheck.value = time
 
   if (preTestRef.value) {
     preTestRef.value.initializeParameters();
   }
 
-    preTestStatus.value = 'waiting';//预检测执行状态
   //开始创建webSocket客户端
-    const data = reactive({
-      socketServe: socketClient.Instance,
-    });
-    const url = 'ws://localhost:7777/hello?name=cdf';
-    socketClient.Instance.connect(url);
-    data.socketServe = socketClient.Instance;
-    data.socketServe.registerCallBack('aaa', (res) => {
+  socketClient.Instance.connect();
+  dataSocket.socketServe = socketClient.Instance;
+  dataSocket.socketServe.registerCallBack('aaa', (res) => {
     // 处理来自服务器的消息
-      console.log('Received message:', res);
+    // console.log('Received message:', res);
     // 根据需要在这里添加更多的处理逻辑
-
     if (res.code === 20000) {
-        ElMessage.error(message.message)
-        loading.close()
+      //ElMessage.error(message.message)
+      // loading.close()
     } else {
       webMsgSend.value = res
     }
-
-
   });
-
-
-
-
 }
 
-  let loading;
+// let loading;
 const handleSubmit = () => {
-    skipDisabled.value = true
-    console.log('=============',stepsActiveIndex.value)
-
   let deviceIds = checkStore.devices.map((item) => item.deviceId)
-    let planId = checkStore.planId
+  let planId = checkStore.plan.id
 
-    switch (stepsActiveIndex.value) {
-      case 0:
-        preTestStatus.value = 'start'
-
-
-        /* loading = ElLoading.service({
-           lock: true,
-           text: '',
-           background: 'rgb(255, 255, 255, 0)',
-         })*/
+  if (!dataSocket.socketServe.connected) {
+    ElMessage.error('webSocket连接中断！')
+    return
+  }
+  console.log("handleSubmit",stepsActive.value,TestStatus.value)
+  switch (stepsActive.value) {
+    case 1:
       startPreTest({
         userPageId: "cdf",
         devIds: deviceIds,
         planId: planId,
-          operateType:'0' // '0'为预检测、‘1‘为正式检测
+        operateType: '1', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+        userId:userStore.userInfo.id
       }).then(res => {
-
-
+        if (res.code === 'A001014') {
+          ElMessageBox.alert('装置配置异常', '检测失败', {
+            confirmButtonText: '确定',
+            type: 'error',
           })
+          preTestStatus.value = 'error'
+        }
+      })
+      preTestStatus.value = 'start'
+      // setTimeout(() => {
+      //   preTestStatus.value = 'success'
+      // }, 5000)
       break;
-      case 1:
+    case 2:
       timeTestStatus.value = 'start'
       break;
-        // case 2:
-        //       channelsTestStatus.value = 'start'
-        //   break;
-      case 2:
+    case 3:
+      // 调用系数校准组件的handleSubmit方法
+      channelsTestStatus.value = 'start'
+      break;
+    case 4:
       if (TestStatus.value == "waiting") {
-          // startTest({
-          //   userPageId: "cdf",
-          //   devIds:deviceIds,
-          //   planId:planId,
-          //   operateType:'1' // '0'为预检测、‘1‘为正式检测
-          // }).then(res => {
-          //   console.log(res)
-            // if (res.code === 20000) {
-            //   TestStatus.value = 'start'
-            //   webMsgSend.value = ''
-            // } else {
-            //   ElMessage.error(res.message)
-            // }
-          // })
+        startPreTest({
+          userPageId: "cdf",
+          devIds: deviceIds,
+          planId: planId,
+          operateType: checkStore.reCheckType ==1 ?'2':'8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+          userId:userStore.userInfo.id
+        }).then(res => {
+          console.log(res)
+          if (res.code === 'A001014') {
+            ElMessageBox.alert('装置配置异常', '初始化失败', {
+              confirmButtonText: '确定',
+              type: 'error',
+            })
+            TestStatus.value = 'test_init_fail'
+          }
+        })
         TestStatus.value = 'start'
-        } else if (TestStatus.value == 'process') {
-          // 发送暂停指令
-          // pauseTest({deviceIds}).then(res => {
-          //   console.log(res)
-          //   if (res.code === 20000) {
-          //     TestStatus.value = 'paused'
-          // webMsgSend.value = ''
-          //   } else {
-          //     ElMessage.error(res.message)
-          //   }
-          // })
-          TestStatus.value = 'paused'
       } else if (TestStatus.value == 'paused') {
         // 发送继续指令
-          // resumeTest({deviceIds}).then(res => {
-          //   console.log(res)
-          //   if (res.code === 20000) {
-          //     TestStatus.value = 'process'
-          // webMsgSend.value = ''
-          //   } else {
-          //     ElMessage.error(res.message)
-          //   }
-          // })
-          TestStatus.value = 'process'
+        sendResume()
       }
+      // else if (TestStatus.value == 'recheck') {
+      //   // 发送重新检测指令
+      //   sendReCheck()
+      // }
+      // else if (TestStatus.value == 'success') {
+      //   handleClose()
+      // }
       break;
     default:
       break;
   }
-
-
-
-
 };
 
 
+const emit = defineEmits<{
+  (e: 'quitClicked'): void;
+}>();
+
 watch(preTestStatus, function (newValue, oldValue) {
   console.log(newValue, oldValue);
 
@@ -326,122 +298,176 @@ const detectionOptions = ref([
 })
 
 watch(ActiveStatue, function (newValue, oldValue) {
-
-    if(newValue === 'success' || newValue === 'error'){
-      skipDisabled.value = false
+  if (newValue === 'error') {
+    stepsActiveIndex.value = stepsTotalNum.value + 1
+    nextStepText.value = '检测失败'
   }
-    
-    if(newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value - 2)
-    {
-      stepsActiveIndex.value++;
-      stepsActiveIndex.value++;
+  if (newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value - 1) {
+    stepsActiveIndex.value += 2
     nextStepText.value = '检测完成'
   }
-    if(newValue === 'preTest_fail' && stepsActiveIndex.value === stepsTotalNum.value - 2)
-    {
-      stepsActiveIndex.value++;
-      stepsActiveIndex.value++;
-      nextStepText.value = '预检测失败'
+  if (newValue === 'test_init_fail') {
+    stepsActiveIndex.value += 2
+    nextStepText.value = '初始化失败'
   }
+  if (newValue === 'connect_timeout') {
+    stepsActiveIndex.value += 2
+    nextStepText.value = '连接超时'
+  }
+  if (newValue === 'pause_timeout') {
+    stepsActiveIndex.value += 2
+    // nextStepText.value = '结束测试'
+    nextStepText.value = '暂停超时'
+  }
+  if (newValue === 'success' && stepsActiveIndex.value < stepsTotalNum.value - 1) {
+    nextStep() // 实现自动点击，进入下一个测试内容
+    handleSubmit()
+  }
+
 })
 
-  const sendPause = () => {
-    console.log('发送暂停指令')
+const handleQuit = () => {
+  console.log('handleQuit',ActiveStatue.value)
+  if (ActiveStatue.value !== 'success' && ActiveStatue.value !== 'waiting' && ActiveStatue.value !== 'paused' && ActiveStatue.value !== 'test_init_fail' && ActiveStatue.value !== 'connect_timeout' && ActiveStatue.value !== 'pause_timeout') {
+    beforeClose(() => {})
+  } else {
+    handleClose()
+  }
+}
 
+
+const handlePause=()=>{
+  sendPause()
+  testRef.value?.handlePause()
+}
+const sendPause = () => {
+  console.log('发起暂停请求')
+
+  TestStatus.value = 'paused_ing'
+  pauseTest()
+  // setTimeout(() => {
+  //   Object.assign(webMsgSend.value, {
+  //     requestId: 'preStopTest',
+  //     operateCode: 'stop'
+  //   })
+  // }, 5000)
 }
 const sendResume = () => {
-    console.log('发送继续检测指令')
+  console.log('发起继续检测请求')
+
+  resumeTest({
+    userPageId: "cdf",
+    devIds: checkStore.devices.map((item) => item.deviceId),
+    planId: checkStore.plan.id,
+    operateType: '2', //  0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+    userId:userStore.userInfo.id
+  })
+  Object.assign(webMsgSend.value, {
+    requestId: 'Resume_Success'
+  })
 }
 
-const getIcon = (index: number) => {
-  if (stepsActiveIndex.value > index) return SuccessFilled;
-  switch (index) {
-    case 0: return h(<svg-icon  name="preTest"></svg-icon>);
-    case 1: return UploadFilled;
-    case 2: return Odometer;
-    case 3: return Coin;
-    case 4: return Key;
-    default: return null;
+const sendReCheck = () => {
+  console.log('发送重新检测指令')
+  startPreTest({
+    userPageId: "cdf",
+    devIds: checkStore.devices.map((item) => item.deviceId),
+    planId: checkStore.plan.id,
+    operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+    userId:userStore.userInfo.id
+  }).then(res => {
+    console.log(res)
+    if (res.code === 'A001014') {
+      ElMessageBox.alert('装置配置异常', '初始化失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TestStatus.value = 'test_init_fail'
+    }
+  })
+  TestStatus.value = 'start'
 }
-};
 
 const nextStep = () => {
-    if(stepsActiveIndex.value < stepsTotalNum.value )
-    {
-      stepsActiveIndex.value++
-      if(!isTimeCheck.value){//不具备守时检测，预检测后直接跳正式检测
+  if (stepsActiveIndex.value == stepsTotalNum.value + 1 || ActiveStatue.value === 'error' || ActiveStatue.value === 'test_init_fail' || ActiveStatue.value === 'connect_timeout' || ActiveStatue.value === 'pause_timeout') {
+    handleClose()
+    return
+  }
+  if (ActiveStatue.value != 'error') {
+    ActiveStatue.value = 'waiting'
+    let tempStep = stepsActiveIndex.value
+    let idx = 1
     stepsActiveIndex.value++
+    for (let selectTestItemsKey in checkStore.selectTestItems) {
+      if (tempStep == 0 && checkStore.selectTestItems[selectTestItemsKey]) {
+        stepsActiveView.value = idx
+        stepsActive.value = idx
+        return
+      }
+      if (checkStore.selectTestItems[selectTestItemsKey] && tempStep != 0) {
+        tempStep--
+      }
+      idx++
+    }
   }
 
-      ActiveStatue.value = 'waiting'
+  // if (stepsActiveIndex.value < stepsTotalNum.value && ActiveStatue.value != 'error') {
+  //   stepsActiveIndex.value++
+  //   if (!checkStore.selectTestItems.timeTest) { // 不具备守时检测
+  //     stepsActiveIndex.value++
+  //   }
+  //
+  //   ActiveStatue.value = 'waiting'
+  // } else if (stepsActiveIndex.value === stepsTotalNum.value || ActiveStatue.value === 'error') {
+  //   //emit('update:visible', false); // 关闭对话框
+  //   clearData()
+  //   dialogVisible.value = false;
+  // }
+}
+
+const handleStepClick = (step: number) => {
+  if (step > stepsActive.value) {
+    return
+  } else {
+    stepsActiveView.value = step
   }
-    else if(stepsActiveIndex.value === stepsTotalNum.value)
-    {
-      //emit('update:visible', false); // 关闭对话框
-      clearData()
-      dialogVisible.value = false;
 }
-  };
 
 function clearData() {
-    stepsActiveIndex.value = 0;
+  stepsTotalNum.value = -1
+  stepsActiveIndex.value = 1
+  stepsActiveView.value = -1
   preTestStatus.value = "waiting"
   timeTestStatus.value = "waiting"
   channelsTestStatus.value = "waiting"
   TestStatus.value = "waiting"
   ActiveStatue.value = "waiting"
-    skipDisabled.value = false
   nextStepText.value = "下一步"
 }
+
 const beforeClose = (done: () => void) => {
-    console.log(stepsActiveIndex.value,stepsTotalNum.value)
-    if(stepsActiveIndex.value < stepsTotalNum.value)
-    {
-      ElMessageBox.confirm(
-      '检测未完成，是否退出当前检测流程?',
-      '提示',
-      {
+  if (stepsActiveIndex.value < stepsTotalNum.value && ActiveStatue.value != 'error') {
+    ElMessageBox.confirm('检测未完成，是否退出当前检测流程?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
         }
-    )
-      .then(() => {
-        clearData()
-        // todo 关闭弹窗，终止整个检测流程
-        //emit('update:visible', false); // 关闭对话框
-        dialogVisible.value = false;
+    ).then(() => {
+      handleClose()
     })
+  } else {
+    handleClose()
   }
-    else
-    {
-      clearData()
-      //emit('update:visible', false); // 关闭对话框
+}
+
+const handleClose = () => {
+  dataSocket.socketServe.closeWs()
   dialogVisible.value = false;
+  clearData()
+  showComponent.value = false;
+
+  emit('quitClicked'); // 触发事件
 }
-  // ElMessageBox.confirm('Are you sure to close this dialog?')
-  //   .then(() => {
-  //     done()
-  //   })
-  //   .catch(() => {
-  //     // catch error
-  //   })
-}
-  const handleCancel = () => {
-    // clearData()
-    // emit('update:visible', false); // 关闭对话框
-    testRef.value?.clear()
-  };
-  
-
-  
-  // // 当 props.visible 改变时，更新 formData
-  // watch(() => props.visible, (newVal) => {
-  //   if (!newVal) {
-  //     // 这里可以重置表单数据，如果需要的话
-     
-  //   }
-  // });
 
 // 对外映射
 defineExpose({open})
@@ -449,15 +475,20 @@ const getIcon = (index: number) => {
 
 <style scoped lang="scss">
 
+.test-head-steps {
+  ::v-deep .el-step {
+    .el-step__head.is-success {
+      color: #91cc75;
+    }
+    .el-step__title.is-success{
+      color: #91cc75;
+    }
+  }
+}
+
 :deep(.dialog-big .el-dialog__body) {
   max-height: 840px !important;
 }
-// :deep(.dialog-big){
-//     max-height: 840px !important;
-// }
-// :deep(.el-dialog__body){
-//     max-height: 840px !important;
-// }
 
 .steps-container :deep(.test-head-steps) {
   height: 80px;
@@ -485,6 +516,19 @@ const getIcon = (index: number) => {
   line-height: 1; /* 调整行高以确保底部对齐 */
 }
 
+.loading-box {
+  animation: loading 1.5s linear infinite;
+}
+
+@keyframes loading {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
 // :deep(.test-head-steps){
 //     height: 100px;
 //     margin-bottom: 20px;

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

@@ -4,17 +4,17 @@
       <el-tab-pane label="守时误差">
         <div class="right-title" >
           <span v-if="activeIndex <= 1"> </span>
-            <span v-if="activeIndex > 1" style="  font-size: 18px;font-weight: 600;">
-            标准时间: <span style="color: #003078">{{ gpsTime }}</span> 
+            <span v-if="activeIndex > 1" class="time-text">
+            标准时间: <span style="color: var(--el-color-primary)">{{ gpsTime }}</span> 
             </span>
             <div class="error-dsc">
               <div class="green-div"></div>
-              <span style=" color: #606266; font-size: 16px;font-weight: 600;">
+              <span class="description-text">
               合格≤1000ms
             </span>
 
             <div class="red-div"></div>
-            <span style=" color: #F56C6c; font-size: 16px;font-weight: 600;">
+            <span class="description-text unqualified">
               不合格>1000ms
             </span>
             </div>
@@ -52,7 +52,7 @@
 
             <!-- <span v-if="activeIndex <= 1"> </span>
             <span v-if="activeIndex > 1" style="  font-size: 18px;font-weight: 600;">
-            标准时间: <span style="color: #003078">{{ gpsTime }}</span> 
+            标准时间: <span style="color: var(--el-color-primary)">{{ gpsTime }}</span> 
             </span>
             <div class="error-dsc">
               <div class="green-div"></div>
@@ -78,7 +78,14 @@
             :cell-style="{ textAlign: 'center' }" style="width: 100%; height:435px" border>
           </ProTable> -->
 
-          <el-table v-if="activeIndex > 0" :data="deviceOperatorData" stripe :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="margin-top: -30px;width: 100%" border>
+          <el-table 
+          v-if="activeIndex > 0" 
+              :data="deviceOperatorData" 
+              stripe 
+              :header-cell-class-name="'el-table-header'"
+              :cell-class-name="'el-table-cell'"
+              class="el-table"
+              border>
                 <el-table-column prop="deviceName" label="设备名称" />
                 <el-table-column prop="updataTime" label="上送时刻" />
                 <el-table-column prop="ErrorValue" label="守时误差(ms)">
@@ -110,6 +117,7 @@
 </template>
 <script lang="tsx" setup name="timeTest">
 import { SuccessFilled } from '@element-plus/icons-vue'
+import { reactive, ref, toRef, watch } from 'vue'
 
 const stepsIndex = ref(0)
 const activeIndex = ref(0)
@@ -196,7 +204,7 @@ const columns = reactive([
     prop: 'Result',
     label: '检测结果',
     // width: 100,
-    render: (scope) => {
+    render: (scope: { row: { Result: string } }) => {
       if (scope.row.Result === '不合格') {
         return (
           <el-tag type='danger'>{scope.row.Result}</el-tag>
@@ -231,7 +239,7 @@ watch(testStatus, function (newValue, oldValue) {
   }
 })
 
-function formatDateTime(date) {
+function formatDateTime(date: Date) {
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, '0');
   const day = String(date.getDate()).padStart(2, '0');
@@ -408,4 +416,70 @@ watch(ts, function (newValue, oldValue) {
       margin-bottom: 10px;
       padding: 10px 20px 10px 20px;
       box-sizing: border-box; */
+
+      .right-title .time-text {
+  font-size: 18px;
+  font-weight: 600;
+}
+
+.right-title .gps-time {
+  color: var(--el-color-primary);
+}
+
+.error-dsc {
+  display: flex;
+  align-items: center;
+  margin-top: 10px; /* 根据需要调整 */
+}
+
+.error-dsc .green-div,
+.error-dsc .red-div {
+  width: 12px;
+  height: 12px;
+  margin-right: 8px;
+}
+
+.error-dsc .green-div {
+  background-color: #91cc75;
+}
+
+.error-dsc .red-div {
+  background-color: #F56C6C;
+}
+
+.error-dsc .description-text {
+  color: #606266;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.error-dsc .description-text.unqualified {
+  color: #F56C6C;
+}
+
+.el-table-header {
+  text-align: center;
+}
+
+.el-table-cell {
+  text-align: center;
+}
+
+.el-table {
+  margin-top: -30px;
+  width: 100%;
+}
+
+.tooltip-icon {
+  margin-left: 4px;
+  vertical-align: middle;
+}
+
+.result-tag {
+  font-weight: 600;
+}
+
+.result-text {
+  font-weight: 600;
+}
 </style>

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

@@ -3,10 +3,15 @@
     <div class='search_view'>
       <el-input
         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)'
             @click.stop='detail()' />
+      </el-tooltip>
     </div>
     <div class='tree_container'>
       <el-tree
@@ -16,6 +21,7 @@
         :props='defaultProps'
         node-key='id'
         class="filter-tree"
+        :highlight-current="true"
         default-expand-all
         :default-checked-keys='defaultChecked'
         @node-click='handleNodeClick'
@@ -23,7 +29,7 @@
         <template #default='{ node, data }'>
           <span class='custom-tree-node' style='display: flex;align-items: center;'>
             <Platform v-if='!data.pid' style='width:18px;height: 18px;margin-right:8px;'
-                      :style="{color:node.label=='未检'?'#F56C6C':node.label=='检测中'?'#E6A23C':'#67C23A'}" />
+                      :style="{color:node.label=='未检'?'#fac858':node.label=='检测中'?'#ee6666':'#91cc75'}" />
             <span>{{ node.label }}</span>
             <!-- <Menu v-if="data.pid" @click.stop="detail(data)" style="width: 12px;margin-left: 8px;"/> -->
           </span>
@@ -35,13 +41,15 @@
 <script lang='ts' setup>
 import { type Plan } from '@/api/plan/interface';
 import { Menu, Platform, CircleCheck,Loading } from '@element-plus/icons-vue'
-import { onMounted, ref, watch } from 'vue';
+import { nextTick, onMounted, ref, watch } from 'vue';
 import { useRouter } from 'vue-router'
 import {useCheckStore} from "@/stores/modules/check";
+import { ElTooltip } from 'element-plus';
 
 const router = useRouter()
 const checkStore = useCheckStore()
-
+const filterText = ref('')
+const treeRef = ref()
 const data: any = ref([])
 const defaultProps = {
   children: 'children',
@@ -51,18 +59,54 @@ const defaultProps = {
 const searchForm = ref({
   planName: '',
 })
-const defaultChecked = ref<number[]>([])  // 明确类型为 number[]
+const defaultChecked = ref<string[]>([])  // 明确类型为 number[]
+const tree = ref(false)//确保左侧树高凉只执行一次
 const getTreeData = (val: any) => {
+  defaultChecked.value = [];
+  data.value = val;
+
+  for (let item of data.value) {
+    if (item.children.length > 0) {
+      let node = item.children[0];
+      defaultChecked.value.push(node.id);
+      checkStore.setPlan(node);
+      // 高亮显示第一个节点
+      // 使用 nextTick 确保在 DOM 更新后调用 setCurrentKey
+      nextTick(() => {
+        treeRef.value?.setCurrentKey(node.id);
+        idd.value = node.id;
+      });
+      // 找到第一个符合条件的 children 后跳出循环
+      break;
+    }
+  }
+}
+
+//点击表格后左侧树刷新，高亮显示对应节点
+const  clickTableToTree = (val: any,id:any) => {
+
   defaultChecked.value = []
   data.value = val
-  if (data.value.length > 0 && data.value[0].children.length > 0) {
-    defaultChecked.value.push(data.value[0].children[0].id as number)
+  let node = ref('')
+  if (data.value.length > 0) {
+    for (let i = 0; i < data.value.length; i++){
+        for (let j = 0; j < data.value[i].children.length; j++) {
+            if (data.value[i].children[j].id == id) {
+              node.value = data.value[i].children[j].id
+              break;
             }
-  checkStore.setPlanId(defaultChecked.value[0])
-  checkStore.setPlanCode(data.value[0].code)
         }
-const filterText = ref('')
-const treeRef = ref()
+    }
+    
+    // 使用 nextTick 确保在 DOM 更新后调用 setCurrentKey
+    nextTick(() => {
+      treeRef.value?.setCurrentKey(node.value);
+      idd.value = node.value
+    });
+   
+  }
+}
+
 const {updateSelectedTreeNode}  = defineProps<{
     updateSelectedTreeNode:Function;
   }>();
@@ -75,33 +119,47 @@ watch(
     deep: true,
   },
 )
+
+const idd = ref('')
 const handleNodeClick = (data: Plan.ResPlan) => {
-  checkStore.setPlanId(data.id)
-  checkStore.setPlanCode(data.code)
-  checkStore.setScriptId(data.scriptId)
+
+    if (data.name === '未检' || data.name === '检测中' || data.name === '检测完成') {
+      // 如果是父节点，不执行任何操作
+      //console.log('父节点不执行任何操作');
+      // 设置当前高亮节点
+    nextTick(() => {
+      treeRef.value?.setCurrentKey(idd.value);
+    });
+    return;
+  }
+ 
+  idd.value = data.id
+
+  checkStore.setPlan(data);
   updateSelectedTreeNode(data.id)
 }
 const filterNode = (value: string, data: any) => {
   if (!value) return true
    return data.name.includes(value)
 }
+
+
 // 点击详情
 const detail = () => {
-  router.push('/plan')
+  router.push('/plan/planList')
 }
 onMounted(() => {
  // console.log()
 })
-defineExpose({ getTreeData })
+defineExpose({ getTreeData ,clickTableToTree})
+
+
 </script>
 <style lang='scss' scoped>
 .plan_tree {
-  // width: 200px;
   height: 100%;
   display: flex;
   flex-direction: column;
-  padding: 5px;
-  // height: calc(100% - 70px);
   background-color: #fff;
 
   .search_view {
@@ -136,6 +194,8 @@ defineExpose({ getTreeData })
     }
   }
 }
+
+
 .filter-tree {
 //  border: 1px solid #dcdfe6;
   min-width: 100%;
@@ -143,6 +203,7 @@ defineExpose({ getTreeData })
   display: inline-block;
   overflow: auto;
   margin-top: 12px;
+
 }
 
 //.filter-tree span {
@@ -154,7 +215,6 @@ defineExpose({ getTreeData })
   //  text-overflow:ellipsis;
 //   padding-right: 12px;
 //}
-
 .leftBox {
   // float: left;
   // width: 20%;

frontend/src/views/home/index.vue

@@ -37,7 +37,10 @@ import { useAuthStore } from "@/stores/modules/auth";
 
 import model from "./tabs/model.vue";
 import dashboard from "./tabs/dashboard.vue";
-import { onMounted } from "vue";
+import { onMounted, ref } from "vue";
+// defineOptions({
+//       name: 'home'
+//   })
 const authStore = useAuthStore();
 
 const activeIndex = ref("1-1");
@@ -46,22 +49,21 @@ const modeList = [
   {
     name: "模拟式模式",
     code:"模拟式",
-    subName: "未启用模拟式检测计划",
-    img: "/src/assets/images/dashboard/1.svg",
+    img: new URL('/src/assets/images/dashboard/1.svg', import.meta.url).href,
     isActive: true,
   },
   {
     name: "数字式模式",
     code:"数字式",
     subName: "启用数字检测计划",
-    img: "/src/assets/images/dashboard/2.svg",
+    img: new URL('/src/assets/images/dashboard/2.svg', import.meta.url).href,
     isActive: false,
   },
   {
     name: "比对式模式",
     code:"比对式",
     subName: "启用比对式检测计划",
-    img: "/src/assets/images/dashboard/3.svg",
+    img: new URL('/src/assets/images/dashboard/3.svg', import.meta.url).href,
     isActive: false,
   },
 ];

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

@@ -1,45 +1,45 @@
 <!-- 真正的首页 -->
 <template>
-  <div class="static">
-    <div class="left_tree">
-      <tree ref="treeRef" :updateSelectedTreeNode="getPieData || (() => {})"/>
+  <div class='static'>
+    <el-row :gutter='10'>
+      <el-col :lg='4' :xl='4' :md='4' :sm='4'>
+        <div class='left_tree'>
+          <!-- <tree ref='treeRef' :updateSelectedTreeNode='getPieData || (() => {})' /> -->
+            <tree ref='treeRef' :updateSelectedTreeNode='updateData|| (() => {})' />
         </div>
-    <!-- <span class="new_span">测试scss颜色</span> -->
-    <div class="right_container">
+      </el-col>
+      <el-col :lg='20' :xl='20' :md='20' :sm='20'>
+        <div class='right_container'>
           <!-- 功能选择 -->
-      <div class="container_function">
+          <div class='container_function'>
             <div
-            class="function_item"
-            :class="
-            item.checked ? 'function_item checked_function' : 'function_item'
-          "
-            v-for="(item, index) in tabsList"
-            :key="index"
-            @click="handleCheckFunction(item.value)"
+              class='function_item'
+              :class="item.checked ? 'function_item checked_function' : 'function_item'"
+              v-for='(item, index) in tabsList'
+              :key='index'
+              @click='handleCheckFunction(item.value)'
             >
-          <div class="item_img">
-            <img :src="item.img" alt=""/>
+              <div class='item_img'>
+                <img :src='item.img' />
               </div>
-          <div class="item_text">
+              <div class='item_text'>
                 <p>{{ item.label }}</p>
               </div>
             </div>
           </div>
-
-      <!-- <el-collapse v-model="activeNames" @change="handleChange">
-        <el-collapse-item title="检测进度展示" name="1"> -->
-      <div class="container_pieShow">
-        <el-collapse model-value="1" accordion @change="handleCollapseChange">
-          <el-collapse-item  name="1">
+          <!--检测计划统计 饼图统计-->
+          <div class='container_pieShow'>
+            <el-collapse model-value='1' accordion @change='handleCollapseChange'>
+              <el-collapse-item name='1'>
                 <template #title>
-              <div style="display: flex; justify-content: space-between; width: 100%;">
-                <span style="font-weight: bold;margin-left: 15px;">检测计划统计</span>
-                <span style="font-weight: bold;margin-right: 15px;">{{ planName }}</span>
+                  <div class='container_pieShow_title'>
+                    <span>检测计划统计</span>
+                    <span>{{ planName }}</span>
                   </div>
                 </template>
                 <!-- 饼图 -->
-            <div class="container_charts">
-              <div class="charts_info" ref="chartsInfoRef">
+                <div class='container_charts'>
+                  <div class='charts_info' ref='chartsInfoRef'>
                     <pie
                       :customData="{
                        title: '设备检测状态',
@@ -50,11 +50,11 @@
                        left: 'left',
                        top: 'bottom',
                       }"
-                    :chartsData="chartsData1"
-                    ref="pieRef1"
+                      :chartsData='chartsData1'
+                      ref='pieRef1'
                     ></pie>
                   </div>
-              <div class="charts_info">
+                  <div class='charts_info'>
                     <pie
                       :customData="{
                        title: '设备检测结果',
@@ -65,28 +65,23 @@
                        left: 'left',
                        top: 'bottom',
                       }"
-                    :chartsData="chartsData2"
-                    ref="pieRef2"
+                      :chartsData='chartsData2'
+                      ref='pieRef2'
                     ></pie>
                   </div>
-              <div class="charts_info">
+                  <div class='charts_info'>
                     <pie
                       :customData="{
                        title: '设备报告状态',
                        textAlign: 'left',
-                label: {
-                  normal: {
-                    position: 'inner',
-                  },
-                },
                       }"
                       :legendData="{
                         icon: 'circle',
                         left: 'left',
                         top: 'bottom',
                       }"
-                    :chartsData="chartsData3"
-                    ref="pieRef3"
+                      :chartsData='chartsData3'
+                      ref='pieRef3'
                     ></pie>
                   </div>
                 </div>
@@ -94,46 +89,43 @@
             </el-collapse>
           </div>
 
-      <el-tabs class="tabs-menu" type="border-card" @tab-change="handleTabsChange" v-model="editableTabsValue" :style="{ height: tabsHeight }">
-        <el-tab-pane :label="tabLabel1" :style="{ height: tabPaneHeight }">
+          <!--下方表格数据-->
+          <el-tabs class='tabs-menu' type='border-card' @tab-change='handleTabsChange' v-model='editableTabsValue'
+                   :style='{ height: tabsHeight }'>
+            <el-tab-pane :label='tabLabel1' :style='{ height: tabPaneHeight}'>
               <!-- 列表数据 -->
-          <div class="container_table" :style="{ height: tableHeight }">
-            <Table ref="tableRef1" :id='currentId' :isTimeCheck='isTimeCheck'></Table>
+              <div class='container_table' :style='{ height: tableHeight }'>
+                <Table ref='tableRef1' :id='currentId' :plan = 'select_Plan' @batchGenerateClicked="handleBatchGenerate"></Table>
               </div>
             </el-tab-pane>
-        <!--      <el-tab-pane label="已检设备"  v-if="tabShow" :style="{ height: tabPaneHeight }">-->
-        <!--        &lt;!&ndash; 列表数据 &ndash;&gt;-->
-        <!--        <div class="container_table" :style="{ height: tableHeight }">-->
-        <!--          <Table ref="tableRef2" :id='currentId'></Table>-->
-        <!--        </div>-->
-        <!--      </el-tab-pane>-->
           </el-tabs>
         </div>
+      </el-col>
+    </el-row>
   </div>
 </template>
-<script lang="ts" setup>
-import pie from "@/components/echarts/pie/default.vue";
-import {useRouter} from "vue-router";
-import tree from "../components/tree.vue";
-import Table from "../components/table.vue";
-//import { data } from "@/api/plan/static.json";
+<script lang='ts' setup>
+import pie from '@/components/echarts/pie/default.vue'
+import { useRouter } from 'vue-router'
+import tree from '../components/tree.vue'
+import Table from '../components/table.vue'
 import deviceDataList from '@/api/device/device/deviceData'
 import { getBoundPqDevList, getPlanListByPattern } from '@/api/plan/plan.ts'
-import {onBeforeMount, onUnmounted, ref, watch} from "vue";
-import {useModeStore} from '@/stores/modules/mode'; // 引入模式 store
+import { onBeforeMount, onUnmounted, ref, watch } from 'vue'
+import { useModeStore } from '@/stores/modules/mode' // 引入模式 store
 import { useDictStore } from '@/stores/modules/dict'
-import {type Plan} from "@/api/plan/interface";
-import type {CollapseModelValue} from "element-plus/es/components/collapse/src/collapse.mjs";
-import {type Device} from "@/api/device/interface/device";
-import {ResultData} from "@/api/interface";
+import { type Plan } from '@/api/plan/interface'
+import type { CollapseModelValue } from 'element-plus/es/components/collapse/src/collapse.mjs'
+import { type Device } from '@/api/device/interface/device'
+import { ResultData } from '@/api/interface'
 
 const planName = ref('')
 const dictStore = useDictStore()
-const modeStore = useModeStore();
-const chartsInfoRef = ref<HTMLElement | null>(null);
-const chartsWidth = ref<number>(0);
+const modeStore = useModeStore()
+const chartsInfoRef = ref<HTMLElement | null>(null)
+const chartsWidth = ref<number>(0)
 const deviceData = deviceDataList.plan_devicedata
-const treeRef = ref();
+const treeRef = ref()
 const form: any = ref({
   activeTabs: 0, //功能选择,例如报告生成
   activeChildTabs: 0,//子功能选择,例如未检设备报告生成，或已检设备更换误差体系生成
@@ -143,84 +135,73 @@ const form: any = ref({
   deviceBindStatus: 0, //绑定状态
   deviceType: 0, //设备类型
   manufacturer: 0, //制造厂商
-});
-const router = useRouter();
-const activeNames = ref(['2'])
-const tabShow = ref(false);
+})
+const router = useRouter()
+const tabShow = ref(false)
 const tabLabel1 = ref('设备检测')
 const editableTabsValue = ref('0')
 const checkStateTable = ref<number[]>([0, 1, 2])
-const tabsHeight = ref('calc(100vh - 538px)'); // 初始高度
+const tabsHeight = ref('calc(100vh - 522px)') // 初始高度
+const tabPaneHeight = ref('calc(100% - 5px)') // 初始高度
+const tableHeight = ref('calc(100% - 50px)') // 初始高度
 
-const tabPaneHeight = ref('calc(100% - 5px)'); // 初始高度
-const tableHeight = ref('calc(100% - 5px)'); // 初始高度
-const handleChange = (val: string[]) => {
-}
-const isTimeCheck = ref<boolean>(false);
-const planList = ref<ResultData<Plan.ReqPlan[]>>();
+const planList = ref<ResultData<Plan.ReqPlan[]>>()
+const select_Plan = ref<Plan.ReqPlan>()
+const isLabelLineShow = ref(true)
 const handleCollapseChange = (val: CollapseModelValue) => {
 
   // 计算新的高度
-  let newHeight;
+  let newHeight
   if (Array.isArray(val)) {
-    newHeight = val.length > 0 ? 'calc(100vh - 538px)' : 'calc(100vh - 333px)';
+    newHeight = val.length > 0 ? 'calc(100vh - 522px)' : 'calc(100vh - 333px)'
   } else {
-    newHeight = val ? 'calc(100vh - 538px)' : 'calc(100vh - 333px)';
+    newHeight = val ? 'calc(100vh - 538px)' : 'calc(100vh - 333px)'
+  }
+  tabsHeight.value = newHeight
+  tabPaneHeight.value = `calc(100% - 5px)`
+  tableHeight.value = `calc(100% - 5px)`
 }
-  //const newtableHeight= val.length > 0 ? 'calc(100vh - 638px)' : 'calc(100vh - 433px)';
-  tabsHeight.value = newHeight;
-  tabPaneHeight.value = `calc(100% - 5px)`;
-  tableHeight.value = `calc(100% - 5px)`;
-
-  // tableRef1.value.resize();
-  // tableRef2.value.resize();
-};
 
 const handleTabsChange = (val: any) => {
-  form.value.activeTabs = 0;
-  form.value.activeTabs = 3;
-  form.value.activeChildTabs = Number(val);
+  form.value.activeTabs = 0
+  form.value.activeTabs = 3
+  form.value.activeChildTabs = Number(val)
 
 }
-localStorage.setItem("color", "red");
+localStorage.setItem('color', '#91cc75')
 //功能选择数据
 const tabsList = ref([
   {
-    label: "设备检测",
+    label: '设备检测',
     value: 0,
-    img: "/src/assets/images/plan/static/1.svg",
+    img: new URL('/src/assets/images/plan/static/1.svg', import.meta.url).href,
     checked: true,
   },
-  // {
-  //   label: "设备复检",
-  //   value: 2,
-  //   img: "/src/assets/images/plan/static/2.svg",
-  //   checked: false,
-  // },
   {
-    label: "报告生成",
+    label: '报告生成',
     value: 3,
-    img: "/src/assets/images/plan/static/3.svg",
+    img: new URL('/src/assets/images/plan/static/3.svg', import.meta.url).href,
     checked: false,
   },
   {
-    label: "设备归档",
+    label: '设备归档',
     value: 4,
-    img: "/src/assets/images/plan/static/4.svg",
+    img: new URL('/src/assets/images/plan/static/4.svg', import.meta.url).href,
     checked: false,
   },
   {
-    label: "数据操作",
+    label: '数据操作',
     value: 5,
-    img: "/src/assets/images/plan/static/5.svg",
+    img: new URL('/src/assets/images/plan/static/5.svg', import.meta.url).href,
     checked: false,
   },
-]);
+])
+
+form.value.activeTabs = tabsList.value[0].value
+const tableRef1 = ref()
+const tableRef2 = ref()
+const currentId = ref('')
 
-form.value.activeTabs = tabsList.value[0].value;
-const tableRef1 = ref();
-const tableRef2 = ref();
-const currentId = ref('');
 
 watch(
   () => form.value,
@@ -229,261 +210,350 @@ watch(
 
       if (form.value.activeTabs === 0)//设备检测
       {
-          const tabledata = deviceData.filter((item) => item.document_State === "未归档")
-          tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata);
+        const tabledata = deviceData.filter((item) => item.document_State === '未归档')
+        tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata)
       } else if (form.value.activeTabs === 4)//设备归档
       {
-          const tabledata = deviceData.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档")
-          tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata);
+        const tabledata = deviceData.filter((item) => item.check_State === '检测完成' && item.document_State === '未归档')
+        tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata)
       } else if (form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
       {
-          const tabledata = deviceData.filter((item) => item.check_State === "检测完成");
-          tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata);
+        const tabledata = deviceData.filter((item) => item.check_State === '检测完成')
+        tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata)
       }
     }
   },
   {
     immediate: true,
     deep: true,
-    }
-);
+  },
+)
 watch(
   () => form.value,
   (val, oldVal) => {
     if (val) {
-        tableRef2.value && tableRef2.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs);
+      tableRef2.value && tableRef2.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs)
     }
   },
   {
     immediate: true,
     deep: true,
-    }
-);
+  },
+)
+
+
+
 const pieRef1 = ref(),
   pieRef2 = ref(),
-    pieRef3 = ref();
+  pieRef3 = ref()
 
 const chartsData1: any = ref([]),
   chartsData2: any = ref([]),
-    chartsData3: any = ref([]);
+  chartsData3: any = ref([])
 
 const findPlanById = (plans: Plan.ReqPlan[], id: string): Plan.ReqPlan | undefined => {
   for (const plan of plans) {
     if (plan.id === id) {
-      return plan;
+      return plan
     }
     if (plan.children) {
-      const foundPlan = findPlanById(plan.children, id);
+      const foundPlan = findPlanById(plan.children, id)
       if (foundPlan) {
-        return foundPlan;
+        return foundPlan
       }
     }
   }
-  return undefined;
-};
+  return undefined
+}
+
+
+const updateData = (id: string) => {
+    getPieData(id);//刷新饼图
+
+    //获取点击树的父节点名字
+    const parentNodeName = ref('')
+    for (let i = 0; i < planList.value.data.length; i++) {
+    if (Array.isArray(planList.value.data[i].children) && planList.value.data[i].children.length > 0) {
+        for (let j = 0; j < planList.value.data[i].children.length; j++) {
+            if (planList.value.data[i].children[j].id === id) {
+                parentNodeName.value = planList.value.data[i].name
+                break;
+            }
+        }
+      }
+    }
+    if(parentNodeName.value === '检测完成'){
+      handleCheckFunction(5)
+    }else{
+      handleCheckFunction(0)
+    }
+}
 
 const getPieData = async (id: string) => {
-  currentId.value = id; // 设置当前ID
-  //handleCheckFunction(0)//切换左侧树，默认css功能是设备检测
-
+  currentId.value = id // 设置当前ID
   // 初始化计数对象
-  const checkStateCount: { [key: number]: number } = {0: 0, 1: 0, 2: 0, 3: 0};
-  const checkResultCount: { [key: number]: number } = {0: 0, 1: 0, 2: 0};
-  const reportStateCount: { [key: number]: number } = {0: 0, 1: 0, 2: 0};
+  const checkStateCount: { [key: number]: number } = { 0: 0, 1: 0, 2: 0, 3: 0 }
+  const checkResultCount: { [key: number]: number } = { 0: 0, 1: 0, 2: 0 }
+  const reportStateCount: { [key: number]: number } = { 0: 0, 1: 0, 2: 0 }
   if (id) {
     const boundPqDevList = ref<Device.ResPqDev[]>([])//根据检测计划id查询出所有已绑定的设备
-    const plan = findPlanById(planList.value?.data || [], id);
+    const plan = findPlanById(planList.value?.data || [], id)
     planName.value = '所选计划:' + plan.name
-    if (plan) {
-      //isTimeCheck.value = plan.timeCheck === 1; // 将 1 转换为 true，0 转换为 false
-      isTimeCheck.value = false; // 将 1 转换为 true，0 转换为 false   ----目前不用守时检测，先去除
-    } else {
-      // 处理未找到计划的情况
-      isTimeCheck.value = false; // 或者其他默认值
-    }
-    const pqDevList_Result2 = await getBoundPqDevList({'planId': id, 'checkStateList': [0, 1, 2, 3]});
-    boundPqDevList.value = pqDevList_Result2.data as Device.ResPqDev[];
+    
+    select_Plan.value = plan
+
+    const pqDevList_Result2 = await getBoundPqDevList({ 'planId': id, 'checkStateList': [0, 1, 2, 3] })
+    boundPqDevList.value = pqDevList_Result2.data as Device.ResPqDev[]
     // 遍历 boundPqDevList 并更新计数对象
     boundPqDevList.value.forEach(t => {
       if (t.checkState !== undefined && t.checkState !== null && checkStateCount[t.checkState] !== undefined) {
-        checkStateCount[t.checkState]++;
+        checkStateCount[t.checkState]++
       }
-    });
+    })
     boundPqDevList.value.forEach(t => {
       if (t.checkResult !== undefined && t.checkResult !== null && checkResultCount[t.checkResult] !== undefined) {
-        checkResultCount[t.checkResult]++;
+        checkResultCount[t.checkResult]++
       }
-    });
+    })
     boundPqDevList.value.forEach(t => {
       if (t.reportState !== undefined && t.reportState !== null && reportStateCount[t.reportState] !== undefined) {
-        reportStateCount[t.reportState]++;
-      }
-    });
+        reportStateCount[t.reportState]++
       }
+    })
 
+
+    // 检查 checkStateCount 是否全为 0
+    if(boundPqDevList.value.length != 0){
+
+      isLabelLineShow.value = true;
+      const allZero = Object.values(checkStateCount).every(count => count === 0);
       chartsData1.value = [
-    {value: checkStateCount[0], name: "未检", itemStyle: {color: '#fac858'}},
-    {value: checkStateCount[1], name: "检测中", itemStyle: {color: '#ee6666'}},
-    {value: checkStateCount[2], name: "检测完成", itemStyle: {color: '#91cc75'}},
-    {value: checkStateCount[3], name: "归档", itemStyle: {color: '#5470c6'}},
+      { value: allZero ? 0 : checkStateCount[0] === 0 ? null : checkStateCount[0], name: '未检', itemStyle: { color: '#fac858' } },
+      { value: allZero ? 0 : checkStateCount[1] === 0 ? null : checkStateCount[1], name: '检测中', itemStyle: { color: '#ee6666' } },
+      { value: allZero ? 0 : checkStateCount[2] === 0 ? null : checkStateCount[2], name: '检测完成', itemStyle: { color: '#91cc75' } },
+      { value: allZero ? 0 : checkStateCount[3] === 0 ? null : checkStateCount[3], name: '归档', itemStyle: { color: '#5470c6' } },
       ];
+         // 同样处理 chartsData2 和 chartsData3
+      const allZeroResult = Object.values(checkResultCount).every(count => count === 0);
       chartsData2.value = [
-    {value: checkResultCount[2], name: "未检", itemStyle: {color: '#fac858'}},
-    {value: checkResultCount[0], name: "不符合", itemStyle: {color: '#ee6666'}},
-    {value: checkResultCount[1], name: "符合", itemStyle: {color: '#91cc75'}},
-  ];
-  chartsData3.value = [
-    {value: reportStateCount[2], name: "未检", itemStyle: {color: '#fac858'}},
-    {value: reportStateCount[0], name: "未生成", itemStyle: {color: '#ee6666'}},
-    {value: reportStateCount[1], name: "已生成", itemStyle: {color: '#91cc75'}},
+        { value: allZeroResult ? 0 : checkResultCount[2] === 0 ? null : checkResultCount[2], name: '未检', itemStyle: { color: '#fac858' } },
+        { value: allZeroResult ? 0 : checkResultCount[0] === 0 ? null : checkResultCount[0], name: '不符合', itemStyle: { color: '#ee6666' } },
+        { value: allZeroResult ? 0 : checkResultCount[1] === 0 ? null : checkResultCount[1], name: '符合', itemStyle: { color: '#91cc75' } },
       ];
 
-  pieRef1.value.init();
-  pieRef2.value.init();
-  pieRef3.value.init();
-  // pieRef1.value.reSize(470,145,true);
-  // pieRef2.value.reSize(470,145,true);
-  // pieRef3.value.reSize(470,145,true);
-};
+
+      // 检查 reportStateCount 是否全为 0
+      const allZeroReport = Object.values(reportStateCount).every(count => count === 0);
+      chartsData3.value = [
+        { value: allZeroReport ? 0 : reportStateCount[2] === 0 ? null : reportStateCount[2], name: '未检', itemStyle: { color: '#fac858' } },
+        { value: allZeroReport ? 0 : reportStateCount[0] === 0 ? null : reportStateCount[0], name: '未生成', itemStyle: { color: '#ee6666' } },
+        { value: allZeroReport ? 0 : reportStateCount[1] === 0 ? null : reportStateCount[1], name: '已生成', itemStyle: { color: '#91cc75' } },
+      ];
+
+    }else{
+
+      isLabelLineShow.value = false;//不展示引导线
+      chartsData1.value = [
+      { value: null , name: '未检', itemStyle: { color: '#fac858' } },
+      { value:  null , name: '检测中', itemStyle: { color: '#ee6666' } },
+      { value: null , name: '检测完成', itemStyle: { color: '#91cc75' } },
+      { value:  null , name: '归档', itemStyle: { color: '#5470c6' } },
+      { value:  0 , itemStyle: { color: '#eeeeee' } },
+    ];
+
+    chartsData2.value = [
+        { value: null, name: '未检', itemStyle: { color: '#fac858' } },
+        { value: null, name: '不符合', itemStyle: { color: '#ee6666' } },
+        { value: null, name: '符合', itemStyle: { color: '#91cc75' } },
+        { value:  0 , itemStyle: { color: '#eeeeee' } },
+      ];
+
+      chartsData3.value = [
+        { value: null, name: '未检', itemStyle: { color: '#fac858' } },
+        { value: null, name: '未生成', itemStyle: { color: '#ee6666' } },
+        { value: null, name: '已生成', itemStyle: { color: '#91cc75' } },
+        { value:  0 , itemStyle: { color: '#eeeeee' } },
+      ];
+    }
+    
+
+
+ 
+  }else{
+    
+    planName.value = '所选计划:' 
+  }
+
+
+
+  pieRef1.value.init()
+  pieRef2.value.init()
+  pieRef3.value.init()
+}
 const getTree = (data?: any) => {
-  treeRef.value.getTreeData(data);
-};
+  treeRef.value.getTreeData(data)
+}
 //前往检测
 const handleDetection = () => {
   router.push({
-    path: "/detection",
-  });
-};
+    path: '/detection',
+  })
+}
 //前往计划详情
 const planDetail = () => {
   router.push({
-    path: "/plan/planList",
-  });
-};
+    path: '/plan/planList',
+  })
+}
+
+
 //功能选择css切换
 const handleCheckFunction = (val: any) => {
-  editableTabsValue.value = '0';
-  form.value.activeChildTabs = 0;
+
+  editableTabsValue.value = '0'
+  form.value.activeChildTabs = 0
   tabsList.value.map((item: any, index: any) => {
     if (val == item.value) {
-      item.checked = true;
+      item.checked = true
     } else {
-      item.checked = false;
+      item.checked = false
     }
-  });
+  })
 
-  tabShow.value = false;
+  tabShow.value = false
 
   switch (val) {
     case 0://自动检测
       checkStateTable.value = [0, 1, 2]
-      tabLabel1.value = "设备检测";
-      break;
+      tabLabel1.value = '设备检测'
+      break
     case 1://手动检测
-      tabLabel1.value = "手动检测";
-      break;
+      tabLabel1.value = '手动检测'
+      break
     case 2://设备复检
-      tabLabel1.value = "设备复检";
-      break;
+      tabLabel1.value = '设备复检'
+      break
     case 3://报告生成
       checkStateTable.value = [2, 3]
-      tabLabel1.value = "报告生成";
+      tabLabel1.value = '报告生成'
       //tabShow.value = true;
-      break;
+      break
     case 4://设备归档
       checkStateTable.value = [2]
-      tabLabel1.value = "设备归档";
-      break;
+      tabLabel1.value = '设备归档'
+      break
     case 5://数据查询
       checkStateTable.value = [2, 3]
-      tabLabel1.value = "数据查询";
-      break;
+      tabLabel1.value = '数据查询'
+      break
+  }
+  form.value.activeTabs = val
 }
-  form.value.activeTabs = val;
-};
 
 
 const resizeObserver = new ResizeObserver(entries => {
   for (let entry of entries) {
-    chartsWidth.value = entry.contentRect.width;
+    chartsWidth.value = entry.contentRect.width
     //console.log('Charts Info Width:', chartsWidth.value);
 
-    pieRef1.value?.reSize(chartsWidth.value * 0.95, 180, true);
-    pieRef2.value?.reSize(chartsWidth.value * 0.95, 180, true);
-    pieRef3.value?.reSize(chartsWidth.value * 0.95, 180, true);
+    pieRef1.value?.reSize(chartsWidth.value * 0.95, 180, true)
+    pieRef2.value?.reSize(chartsWidth.value * 0.95, 180, true)
+    pieRef3.value?.reSize(chartsWidth.value * 0.95, 180, true)
   }
-});
+})
 
-onBeforeMount(async () => {
+
+const initPlan = async () => {
   const patternId = dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''//获取数据字典中对应的id
   const reqPlan: Plan.ReqPlan = {
     pattern: patternId,
-    datasourceIds: "",
-    sourceIds: "",
-    planId: "",
-    scriptName: "",
-    errorSysName: "",
-    sourceName: "",
+    datasourceIds: '',
+    sourceIds: '',
+    planId: '',
+    scriptName: '',
+    errorSysName: '',
+    sourceName: '',
     devIds: [],
-    id: "",
-    name: "",
-    dataSourceId: "",
-    scriptId: "",
-    errorSysId: "",
+    id: '',
+    name: '',
+    dataSourceId: '',
+    scriptId: '',
+    errorSysId: '',
     timeCheck: 0,
     testState: 0,
     reportState: 0,
     result: 0,
     code: 0,
-    state: 0
-  };
-  planList.value = (await getPlanListByPattern(reqPlan)) as ResultData<Plan.ReqPlan[]>;
-
-  if (planList.value.data[0].children[0]) {
-    currentId.value = planList.value.data[0].children[0].id;
+    state: 0,
   }
+  planList.value = (await getPlanListByPattern(reqPlan)) as ResultData<Plan.ReqPlan[]>
+}
+
+onBeforeMount(async () => {
+  await initPlan()
+  for (let i = 0; i < planList.value.data.length; i++) {
+    if (Array.isArray(planList.value.data[i].children) && planList.value.data[i].children.length > 0) {
+      currentId.value = planList.value.data[i].children[0].id; // 直接赋值第一个 children 的 id
+      break; // 确保只执行一次
+    }
+  }
+  
+  // if (planList.value.data[0].children[0]) {
+  //   currentId.value = planList.value.data[0].children[0].id
+  //   console.log('currentId.value',planList.value.data[0])
+  // }
+
   if (chartsInfoRef.value) {
-    resizeObserver.observe(chartsInfoRef.value);
+    resizeObserver.observe(chartsInfoRef.value)
   }
-  getTree(planList.value.data);
+  getTree(planList.value.data)
 
-  getPieData(currentId.value);
-});
+  getPieData(currentId.value)
+})
 
 onUnmounted(() => {
   if (chartsInfoRef.value) {
-    resizeObserver.unobserve(chartsInfoRef.value);
+    resizeObserver.unobserve(chartsInfoRef.value)
   }
-});
+})
 
+const handleBatchGenerate = async () => {
+ // console.log('批量生成按钮被点击了');
+  // 在这里添加其他逻辑，比如显示对话框、更新状态等
+  await initPlan()
+  treeRef.value.clickTableToTree(planList.value.data,currentId.value)
+  getPieData(currentId.value)
  
+  if (form.value.activeTabs === 0)//设备检测
+      {
+        const tabledata = deviceData.filter((item) => item.document_State === '未归档')
+        tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata)
+      } else if (form.value.activeTabs === 4)//设备归档
+      {
+        const tabledata = deviceData.filter((item) => item.check_State === '检测完成' && item.document_State === '未归档')
+        tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata)
+      } else if (form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询
+      {
+        const tabledata = deviceData.filter((item) => item.check_State === '检测完成')
+        tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs, form.value.activeChildTabs, tabledata)
+      }
+
+};
 </script>
-<style lang="scss" scoped>
+<style lang='scss' scoped>
+
 .static {
-  width: 100%;
-  // height: calc(100vh - 165px);
-  height: 100%;
-  display: flex;
-  justify-content: space-between;
-  //background-color: #eee;
 
   .left_tree {
-    width: 14% !important;
     height: 100%;
     background-color: #fff;
   }
 
   .right_container {
     flex: none;
-    width: 85.8%;
-    // padding: 0 10px 0 10px;
-    margin-left: 10px;
     height: 100%;
     display: flex;
     flex-direction: column;
-    //justify-content: space-between;
-    //align-items: center;
-    //box-sizing: border-box;
 
 
     .container_function {
@@ -565,134 +635,48 @@ onUnmounted(() => {
       }
     }
 
-    // .container_function {
-    //   width: 100%;
-    //   height: auto;
-    //   background: #fff;
-    //   border-radius: 4px;
-    //   display: flex;
-    //   // justify-content: space-around;
-    //   // justify-content: space-evenly;
-    //   justify-content: space-between;
-    //   align-items: center;
-    //   margin-bottom: 10px;
-    //   padding: 10px 20px 10px 20px;
-    //   box-sizing: border-box;
-
-    //   .function_item {
-    //     flex: none;
-    //     width: 6%;
-    //     height: 40px;
-    //     display: flex;
-    //     justify-content: space-between;
-    //     align-items: center;
-    //     flex-direction: row;
-    //     cursor: pointer;
-    //     background-color: #607eab;
-    //     border-radius: 8px;
-    //     padding: 0px 30px;
-
-    //     .item_img {
-    //       width: 30px;
-    //       height: 30px;
-    //       border-radius: 50%;
-    //       // background-color: #607eab;
-    //       display: flex;
-    //       align-items: center;
-    //       justify-content: center;
-    //       margin-right: 5px;
-    //       img {
-    //         width: 20px;
-    //         height: auto;
-    //       }
-    //     }
-
-    //     .item_img:nth-child(3),
-    //     .item_img:nth-child(6) {
-    //       padding: 10px !important;
-
-    //       img {
-    //         width: 20px !important;
-    //         height: auto;
-    //       }
-    //     }
-
-    //     .item_text {
-    //       p {
-    //         width: 80px;
-    //         margin: 0;
-    //         font-weight: 800;
-    //         color: var(--el-color-primary);
-    //         font-size: 14px;
-    //         font-family: "Microsoft YaHei", "微软雅黑", "Arial", sans-serif;
-    //       }
-    //     }
-    //   }
-
-    //   .function_item:hover,
-    //   .checked_function {
-    //     background-color: var(--el-color-primary);
-
-    //     .item_img {
-    //       // background-color: var(--el-color-primary);
-    //     }
-
-    //     .item_text {
-    //       p {
-    //         // color: var(--el-color-primary);
-    //         color: #fff;
-    //       }
-    //     }
-    //   }
-    // }
-
     .container_pieShow {
       width: 100% !important;
-      //min-height: 200px !important;
       height: auto;
       background-color: #eee;
-      // display: flex;
-      // justify-content: space-between;
-      // padding-left: 2ch;
       margin-bottom: 10px;
+
+      .container_pieShow_title {
+        display: flex;
+        justify-content: space-between;
+        padding: 0 15px;
+        font-weight: bold;
+        width: 100%;
+        font-size: 14px;
+      }
+
     }
 
     .el-collapse {
       width: 100% !important;
-      // min-height: 200px !important;
       height: 100% !important;
       background-color: #eee;
-      // display: flex;
-      // justify-content: space-between;
-      // padding-left: 2ch;
-      // margin-bottom: 10px;
     }
 
     .el-collapse-item {
       width: 100% !important;
-      // min-height: 200px !important;
       height: 100% !important;
       background-color: #eee;
-      // display: flex !important;
     }
 
     .container_charts {
       width: 100%;
-      //min-height: 180px !important;
       height: 100%;
       background-color: #eee;
       display: flex;
       justify-content: space-between;
-      margin-bottom: 10px;
 
       .charts_info {
-        margin-top: 5px;
-        border-radius: 4px;
+        margin-top: 1px;
         flex: none;
         width: 33.1%;
         height: 100% !important;
         background-color: #fff;
-        // border-radius: 4px;
       }
     }
 
@@ -701,8 +685,11 @@ onUnmounted(() => {
       border-radius: 4px;
     }
 
+
+
     .tabs-menu {
       height: 100%;
+      border: 0;
     }
 
     .container_table {
@@ -728,12 +715,18 @@ onUnmounted(() => {
 }
 
 :deep(.el-collapse-item__conten) {
-  // background-color:#f6f6f6;
   padding-bottom: 0px !important;
 }
 
 :deep(.el-collapse-item__content ) {
-  // background-color:#f6f6f6;
   padding-bottom: 0px !important;
 }
+
+:deep(.el-tabs--border-card > .el-tabs__content) {
+  padding: 0 !important;
+}
+
+
+
+
 </style>

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

@@ -1,12 +1,34 @@
 <!-- 模式切换页面 -->
 <template>
-  <div class="main_container">
+  <div class="main_container box">
     <!-- :style="{
       height: authStore?.showMenuFlag
         ? 'calc(100vh - 165px)'
         : 'calc(100vh - 125px)',
     }" -->
-    <div class="mode" v-for="(item, index) in modeList" :key="index">
+
+    <el-carousel :interval="5000" type="card" style="width: 60%;margin-left: 20%;height: 70%;">
+      <el-carousel-item class="mode" :class="{ modeBG: index != 0 }" v-for="(item, index) in modeList" :key="index">
+
+        <div class="mode_top">
+          <div class="mode_name">
+            {{ item.name }}
+          </div>
+        </div>
+
+        <div class="mode_img">
+          <img :src="item.img" />
+        </div>
+        <div class="test_button">
+          <el-button size="large" type="primary" @click="handelOpen(item)"
+            :disabled="item.isActive == false">进入检测</el-button>
+        </div>
+      </el-carousel-item>
+    </el-carousel>
+
+
+
+    <!-- <div class="mode" :class="{ modeBG: index != 0 }" v-for="(item, index) in modeList" :key="index">
       <div class="mode_top">
         <div class="mode_name">
           <p>
@@ -14,28 +36,26 @@
           </p>
         </div>
         <div class="test_button">
-          <el-button
-            size="small"
-            type="primary"
-            @click="handelOpen(item)"
-            :disabled="item.isActive == false"
-            >进入检测</el-button
-          >
+          <el-button size="small" type="primary" @click="handelOpen(item)"
+            :disabled="item.isActive == false">进入检测</el-button>
         </div>
       </div>
       <div class="mode_img">
         <img :src="item.img" />
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 <script lang="ts" setup>
 import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
 import { useAuthStore } from "@/stores/modules/auth";
-import { useModeStore } from "@/stores/modules/mode"; // 引入模式 store
+import { useModeStore, useAppSceneStore } from "@/stores/modules/mode"; // 引入模式 store
+import { ref } from "vue";
+import {getCurrentScene} from "@/api/user/login";
 const authStore = useAuthStore();
 const modeStore = useModeStore(); // 使用模式 store
+const AppSceneStore = useAppSceneStore();
 const activeIndex = ref("1-1");
 const router = useRouter();
 const modeList = [
@@ -43,26 +63,30 @@ const modeList = [
     name: "模拟式模块",
     code: "模拟式",
     subName: "未启用模拟式检测计划",
-    img: "/src/assets/images/dashboard/1.svg",
+    img: new URL('/src/assets/images/dashboard/1.svg', import.meta.url).href,
     isActive: true,
   },
   {
     name: "数字式模块",
     code: "数字式",
     subName: "启用数字检测计划",
-    img: "/src/assets/images/dashboard/2.svg",
-    isActive: true,
+    img: new URL('/src/assets/images/dashboard/2.svg', import.meta.url).href,
+    isActive: false,
   },
   {
     name: "比对式模块",
     code: "比对式",
     subName: "启用比对式检测计划",
-    img: "/src/assets/images/dashboard/3.svg",
-    isActive: true,
+    img: new URL('/src/assets/images/dashboard/3.svg', import.meta.url).href,
+    isActive: false,
   },
 ];
 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();
   return;
   // if (isActive) {
@@ -82,7 +106,23 @@ onMounted(() => {
 });
 </script>
 <style lang="scss" scoped>
+.box {
+  background: #ededed;
+  // background-image: url("/src/assets/images/dashboard/DT.jpg");
+  // /* 背景图垂直、水平均居中 */
+  // // background-position: center center;
+  // /* 背景图不平铺 */
+  // background-repeat: no-repeat;
+  // /* 当内容高度大于图片高度时，背景图像的位置相对于viewport固定 */
+  // background-attachment: fixed;
+  // /* 让背景图基于容器大小伸缩 */
+  // background-size: cover;
+
+
+}
+
 .main_container {
+
   width: 100%;
   // height: calc(100vh - 165px);
   height: 100%;
@@ -91,55 +131,45 @@ onMounted(() => {
   justify-content: space-between;
   flex-wrap: wrap;
   align-items: center;
-  // padding: 20px 2%;
+
   .mode {
-    flex: none;
-    margin-top: 3px;
-    width: 32.5%;
+
     height: 99.5% !important;
     border: 1px solid #eee;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    background: #fff;
     border-radius: 6px;
-    background: linear-gradient(
-      180deg,
+    background: linear-gradient(180deg,
         rgba(0, 153, 255, 1) 0%,
         rgba(0, 153, 255, 1) 0%,
         rgba(0, 102, 255, 1) 65%,
         rgba(0, 51, 255, 1) 100%,
-      rgba(0, 51, 255, 1) 100%
-    );
+        rgba(0, 51, 255, 1) 100%);
+
+    position: absolute;
+
+
     //   padding: 40px 0;
     .mode_top {
       width: 100%;
       height: 40px;
       display: flex;
-      justify-content: space-between;
+      justify-content: center;
       align-items: center;
       background: #008aff;
       border-radius: 6px 6px 0 0;
+
       .mode_name {
         width: 100%;
         height: 40px;
-        flex: 1;
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        p {
         font-family: "微软雅黑 Bold", "微软雅黑", "微软雅黑", sans-serif;
         font-weight: 700;
         font-style: normal;
-          font-size: 16px;
+        font-size: 20px;
         color: #ffffff;
         text-align: center;
-          //   background: #fff;
         line-height: 40px;
-          text-align: left;
         padding-left: 10px;
         // margin-top: 20px;
-        }
+
         .mode_subName {
           font-family: "微软雅黑", sans-serif;
           font-weight: 400;
@@ -154,14 +184,16 @@ onMounted(() => {
       }
 
       .test_button {
-        width: 150px;
-        height: 100%;
+        display: flex;
+        text-align: center;
+        width: 100%;
         display: flex;
         align-items: center;
         justify-content: flex-end;
         padding-right: 5px;
       }
     }
+
     .mode_img {
       width: 100%;
       height: auto;
@@ -170,32 +202,46 @@ onMounted(() => {
       justify-content: center;
       // padding: 30px 0 50px;
       margin-top: 100px;
+      // margin-bottom: 100px;
+
       img:nth-child(1) {
         width: 60%;
         height: auto;
         display: block;
       }
+
       img:nth-child(2) {
         width: 70%;
         height: auto;
         display: block;
       }
+
       img:nth-child(3) {
         width: 60%;
         height: auto;
         display: block;
       }
     }
+
     .mode_test {
       width: 100%;
       height: 40px;
       display: flex;
       justify-content: center;
       margin-bottom: 20px;
+
+
+      .test_button:hover {
+        background: rgba(0, 0, 0, 0.2);
+      }
+    }
+  }
+
   .test_button {
-        width: 120px;
-        height: 100%;
-        border: 1px solid rgba(121, 121, 121, 1);
+    position: absolute;
+    bottom: 30px;
+    left: 50%;
+    transform: translateX(-50%);
     border-radius: 5px;
     font-family: "微软雅黑", sans-serif;
     font-weight: 400;
@@ -205,36 +251,58 @@ onMounted(() => {
     line-height: 40px;
     cursor: pointer;
   }
-      .test_button:hover {
-        background: rgba(0, 0, 0, 0.2);
-      }
-    }
-  }
+
 
   .mode:nth-child(3n + 3) {
-    background: linear-gradient(
-      180deg,
+    background: linear-gradient(180deg,
         rgba(0, 153, 255, 1) 0%,
         rgba(0, 153, 255, 1) 0%,
         rgba(0, 102, 255, 1) 39%,
         rgba(102, 51, 204, 1) 100%,
-      rgba(102, 51, 204, 1) 100%
-    );
+        rgba(102, 51, 204, 1) 100%);
+
   }
+
   .mode_off {
+
     .mode_name,
     .mode_subName,
     .test_button {
       color: #fff !important;
+
     }
+
     .test_button:hover {
       // background: rgba(0, 0, 0, 0.2) !important;
       cursor: pointer;
     }
   }
 }
+
 :deep(.el-sub-menu__title) {
   border-bottom: 0 !important;
   outline: none !important;
 }
+
+// .modeBG {
+//   &::before {
+//     content: "";
+//     position: absolute;
+//     top: 0;
+//     left: 0;
+//     width: 100%;
+//     height: 100%;
+//     background-color: #70707080;
+//     ;
+//   }
+
+
+// }
+:deep(.el-carousel__container) {
+  height: 100%;
+}
+
+:deep(.el-carousel__item) {
+  position: relative;
+}
 </style>

frontend/src/views/log/index.vue

@@ -3,14 +3,12 @@
     <ProTable
         ref='proTable'
         :columns='columns'
-      :data='logData'
-      @selection-change='handleSelectionChange'
-      type='selection'
+        :request-api='getTableList'
     >
       <!-- 表格 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>
 
@@ -21,32 +19,39 @@
 <script setup lang='tsx' name='useProTable'>
 // 根据实际路径调整
 import TimeControl from '@/components/TimeControl/index.vue'
-import { type Sys_Log_Audit } from '@/api/system/interface/log'
+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 logDataList from '@/api/system/log/logData'
+import {DataAnalysis, Upload} from '@element-plus/icons-vue'
 import type {ColumnProps, ProTableInstance} from '@/components/ProTable/interface'
-import { reactive,ref,watch } from 'vue'
-import { useDictStore } from '@/stores/modules/dict'
-let multipleSelection = ref<string[]>([])
-const logData = logDataList
-const dictStore = useDictStore()
-// 定义包含和排除的单位
-const includedUnits = ['日', '周', '月', '自定义']; // 可以根据需要包含的单位
-const excludedUnits = ['季度','年']; // 要排除的单位
-const defaultUnits = '日'; // 默认的单位
+import {reactive, ref} from 'vue'
+import {getAuditLog, exportCsv} from '@/api/system/log/index.ts'
+import {useDownload} from "@/hooks/useDownload";
+import {exportPqDev} from "@/api/device/device";
+
+
+// defineOptions({
+// name: 'log'
+// })
+
+const startDate = ref('')
+const endDate = ref('')
 // ProTable 实例
 const proTable = ref<ProTableInstance>()
+
+const getTableList = async (params: any) => {
+  let newParams = JSON.parse(JSON.stringify(params))
+  newParams.searchEndTime = endDate.value
+  newParams.searchBeginTime = startDate.value
+  return getAuditLog(newParams)
+}
+
+
 // 表格配置项
-const columns = reactive<ColumnProps<Sys_Log_Audit.Audit_LogList>[]>([
+const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
   {type: 'selection', fixed: 'left', width: 70},
+  {type: 'index', fixed: 'left', width: 70, label: '序号'},
   {
-    prop: 'id',
-    label: '序号',
-    width: 70,
-  },
-  {
-    prop: 'create_By',
+    prop: 'userName',
     label: '操作用户',
     search: {el: 'input'},
     minWidth: 100,
@@ -57,18 +62,17 @@ const columns = reactive<ColumnProps<Sys_Log_Audit.Audit_LogList>[]>([
     minWidth: 120,
   },
   {
-    prop: 'create_Time',
+    prop: 'logTime',
     label: '记录时间',
     minWidth: 180,
     search: {
-      span: 2,
       render: () => {
         return (
             <div class='flx-flex-start'>
               <TimeControl
-            include={includedUnits} 
-            exclude={excludedUnits} 
-            default={defaultUnits} 
+                  include={['日', '周', '月', '自定义']}
+                  default={'月'}
+                  onUpdate-dates={handleDateChange}
               />
             </div>
         )
@@ -76,9 +80,11 @@ const columns = reactive<ColumnProps<Sys_Log_Audit.Audit_LogList>[]>([
     },
   },
   {
-    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',
@@ -91,25 +97,33 @@ const columns = reactive<ColumnProps<Sys_Log_Audit.Audit_LogList>[]>([
     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>
       )
     },
   },
   {
-    prop: 'operate_Type',
+    prop: 'operateType',
     label: '日志类型',
     width: 100,
-    search: { el: 'select', props: { filterable: true } },
   },
 ])
 
-//选中
-// 处理选择变化
-const handleSelectionChange = (selection: Sys_Log_Audit.Audit_LogList[]) => {
-  multipleSelection.value = selection.map(row => row.id) // 更新选中的行
-  
+// 处理日期变化的回调函数
+const handleDateChange = (startDateTemp: string, endDateTemp: string) => {
+  startDate.value = startDateTemp
+  endDate.value = endDateTemp
 }
 
+const handleExport = () => {
+  // 获取当前的搜索参数
+  let searchParam = proTable.value?.searchParam || {}
+
+  // 将开始时间和结束时间添加到搜索参数中
+  searchParam.searchBeginTime = startDate.value
+  searchParam.searchEndTime = endDate.value
+
+  useDownload(exportCsv, '日志列表', searchParam, false, '.csv')
+}
 
 </script>
 

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

@@ -29,6 +29,9 @@
         </template>
       </el-input>
     </el-form-item>
+    <el-form-item prop='checked'>
+      <el-checkbox v-model="loginForm.checked">记住我</el-checkbox>
+    </el-form-item>
   </el-form>
   <div class='login-btn'>
     <el-button
@@ -58,16 +61,17 @@ import { HOME_URL } from '@/config'
 import {getTimeState} from '@/utils'
 import {type Dict} from '@/api/interface'
 import {type Login} from '@/api/user/interface/user'
+import type {ElForm} from 'element-plus'
 import {ElNotification} from 'element-plus'
-import { getDictList, loginApi } from '@/api/user/login'
+import {getDictList, getPublicKey, loginApi} from '@/api/user/login'
 import {useUserStore} from '@/stores/modules/user'
 import {useTabsStore} from '@/stores/modules/tabs'
 import {useKeepAliveStore} from '@/stores/modules/keepAlive'
 import {initDynamicRouter} from '@/routers/modules/dynamicRouter'
 import {CircleClose, UserFilled} from '@element-plus/icons-vue'
 import {useAuthStore} from '@/stores/modules/auth'
-import type { ElForm } from 'element-plus'
 import {useDictStore} from "@/stores/modules/dict";
+import forge from 'node-forge'
 
 const authStore = useAuthStore()
 const router = useRouter()
@@ -76,6 +80,7 @@ const tabsStore = useTabsStore()
 const keepAliveStore = useKeepAliveStore()
 
 const dictStore = useDictStore()
+let publicKey: any = null;
 
 
 type FormInstance = InstanceType<typeof ElForm>;
@@ -89,6 +94,7 @@ const loading = ref(false)
 const loginForm = reactive<Login.ReqLoginForm>({
   username: '',
   password: '',
+  checked: false,
 })
 
 // login
@@ -98,13 +104,22 @@ const login = (formEl: FormInstance | undefined) => {
     if (!valid) return
     loading.value = true
     try {
+      let {data: publicKeyBase64}: { data: string } = await getPublicKey(loginForm.username)
+      //将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({
-        ...loginForm,
-        password: loginForm.password,
+        username: forge.util.encode64(loginForm.username),
+        password: encryptPassword(loginForm.password),
       })
-      userStore.setToken(data.accessToken)
+      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)
@@ -147,6 +162,13 @@ onMounted(() => {
     }
   }
 })
+
+const encryptPassword = (password: string) => {
+  const encrypted = publicKey.encrypt(password, 'RSAES-PKCS1-V1_5');
+  // 将加密后的数据转换为base64格式以便传输
+  return forge.util.encode64(encrypted);
+}
+
 </script>
 
 <style scoped lang='scss'>