From dd9ca8f95627f5c12ecff50efa4a6c736336d0be Mon Sep 17 00:00:00 2001 From: guanj Date: Fri, 22 Aug 2025 15:33:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=20=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/check/interface/index.ts | 200 ++++---- frontend/src/api/check/test/index.ts | 112 +++-- .../compareDataCheckResultTable.vue | 263 +++++++---- ...eDataCheckSingleChannelSingleTestPopup.vue | 441 ++++++++++-------- .../src/views/home/components/compareTest.vue | 96 ++-- .../home/components/compareTestPopup.vue | 20 +- .../home/components/deviceConnectionPopup.vue | 7 +- 7 files changed, 664 insertions(+), 475 deletions(-) diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts index da4309a..b7b5af6 100644 --- a/frontend/src/api/check/interface/index.ts +++ b/frontend/src/api/check/interface/index.ts @@ -1,127 +1,149 @@ export namespace CheckData { export interface DataCheck { - scriptName: string, - errorSysId: string, - dataRule: string, - deviceName: string, - chnNum: string, + scriptName: string + errorSysId: string + dataRule: string + deviceName: string + chnNum: string + deviceId: string + num?: string | number | null } export interface PhaseCheckResult { // 检测源定值-标准值 - resultData: number, + resultData: number // 装置原始数据-被检值 - data: number, + data: number // 误差值 - errorData: number, + errorData: number // 第几次谐波 - num?: number, + num?: number //符合、不符合 - isData?: number, + isData?: number //最大误差值 - radius?: string, - unit?: string, + radius?: string + unit?: string + } + export interface DataItem { + num: number + isData: number + data: number + resultData: number + radius: string + errorData: number + unit: string + } + + export interface TableRow { + isData: number + harmNum: number + radius: string + dataA: DataItem + dataB: DataItem + dataC: DataItem + dataT: DataItem | null + unit: string } /** * 用于定义 查看（设备）通道检测结果响应数据 类型 */ export interface ResCheckResult { - dataA?: PhaseCheckResult | null, - dataB?: PhaseCheckResult | null, - dataC?: PhaseCheckResult | null, - dataT?: PhaseCheckResult | null, + dataA?: PhaseCheckResult | null + dataB?: PhaseCheckResult | null + dataC?: PhaseCheckResult | null + dataT?: PhaseCheckResult | null // 第几次谐波 //num: number | null, //符合、不符合 - isData?: number, + isData?: number //最大误差值 - radius?: string, + radius?: string //单位 - unit?: string, + unit?: string } /** * 用于定义 查看（设备）通道检测结果表格展示数据 类型 */ export interface CheckResult { - 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, + 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, + maxError?: string + unit?: string //符合、不符合 - result?: number, + result?: number } /** * 用于定义 具体通道的原始数据类型 */ export interface RawDataItem { - time?: string, - harmNum?: number | null, - dataA?: string, - dataB?: string, - dataC?: string, - dataT?: string, + 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; //设备通道数 + deviceId: string //装置序号Id + deviceName: string //设备名称 + chnNum: number //设备通道数 - planId: string; //计划Id - devType: string; //设备类型 - devVolt: number; //设备电压 - devCurr: number; //设备电流 - factorFlag: number; //是否支持系数校准 - checkResult:number; //检测结果 - chnNumList: object[]; //连线存储数据 + planId: string //计划Id + devType: string //设备类型 + devVolt: number //设备电压 + devCurr: number //设备电流 + factorFlag: number //是否支持系数校准 + checkResult: number //检测结果 + chnNumList: string[] //连线存储数据 } // 用来描述检测脚本类型 export interface ScriptItem { - id: string, - code: string, - scriptName: string, + id: string + code: string + scriptName: string } // 用来描述 检测数据-左侧树结构 export interface TreeItem { - id: string | null, - scriptTypeName: string | null, - sourceDesc: string | null, - harmNum: number | null, - index: number | null, - fly: number | null, - children: TreeItem[] | null, + id: string | null + scriptTypeName: string | null + sourceDesc: string | null + harmNum: number | null + index: number | null + fly: number | null + children: TreeItem[] | null } // 用来描述 通道检测结果 @@ -136,15 +158,15 @@ export namespace CheckData { } export interface DeviceCheckResult { - deviceId: string, - deviceName: string, + deviceId: string + deviceName: string chnResult: ChnCheckResultEnum[] //通道检测结果 } //用来描述 某个脚本测试项对所有通道的检测结果 export interface ScriptChnItem { scriptType: string - scriptName?: string //可以不要该属性，有点多余 + scriptName?: string //可以不要该属性，有点多余 // 设备 devices: Array @@ -155,7 +177,7 @@ export namespace CheckData { LOADING = 'var(--el-color-primary)', SUCCESS = '#91cc75', WARNING = '#e6a23c', - DANGER = '#f56c6c', + DANGER = '#f56c6c' } /** @@ -170,18 +192,17 @@ export namespace CheckData { * 用于描述 脚本检测结果展示的按钮类型 */ export interface ScriptChnViewItem { - scriptType: string, + scriptType: string scriptName?: string //脚本项名称，可以不要该属性，有点多余 // 设备 devices: Array<{ - deviceId: string, - deviceName: string, - chnResult: ButtonResult[], + deviceId: string + deviceName: string + chnResult: ButtonResult[] }> } - /** * 定义检测日志类型 */ @@ -194,21 +215,16 @@ export namespace CheckData { * 定义手动检测时，勾选的测试项 */ export interface SelectTestItem { - preTest: boolean, - timeTest: boolean, - channelsTest: boolean, + preTest: boolean + timeTest: boolean + channelsTest: boolean test: boolean } - //描述比对式检测项描述 export interface CompareTestItem { - id: string, - code: string, - name: string, + id: string + code: string + name: string } } - - - - diff --git a/frontend/src/api/check/test/index.ts b/frontend/src/api/check/test/index.ts index d5a8639..f7ab36c 100644 --- a/frontend/src/api/check/test/index.ts +++ b/frontend/src/api/check/test/index.ts @@ -1,14 +1,14 @@ -import { pa } from 'element-plus/es/locale/index.mjs'; -import http from "@/api"; -import {CheckData} from "@/api/check/interface"; +import { pa } from 'element-plus/es/locale/index.mjs' +import http from '@/api' +import { CheckData } from '@/api/check/interface' export const getBigTestItem = (params: { - reCheckType: number, - planId: string, - devIds: string[], + reCheckType: number + planId: string + devIds: string[] patternId: string }) => { - return http.post(`/adPlan/getBigTestItem`, params, {loading: false}); + return http.post(`/adPlan/getBigTestItem`, params, { loading: false }) } /** @@ -16,12 +16,12 @@ export const getBigTestItem = (params: { * @param params 当为scriptType为null时，表示查询所有脚本类型，否则只查询指定脚本类型。当为chnNum为-1时，表示查询所有通道，否则只查询指定通道。 */ export const getFormData = (params: { - planId: string, - deviceId: string, - chnNum: string, + planId: string + deviceId: string + chnNum: string scriptType: string | null }) => { - return http.post("/result/formContent/", params, {loading: false}); + return http.post('/result/formContent/', params, { loading: false }) } /** @@ -29,13 +29,13 @@ export const getFormData = (params: { * @param params */ export const getTreeData = (params: { - scriptId?: string, - devId?: 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('/result/treeData/', params, { loading: false }) } /** @@ -43,25 +43,25 @@ export const getTreeData = (params: { * @param params */ export const getTableData = (params: { - scriptType: string | null, - scriptId: string, - devId: string, - devNum: string, - code: string, - index: number, + scriptType: string | null + scriptId: string + devId: string + devNum: string + code: string + index: number }) => { - return http.post("/result/resultData/", 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, + scriptType: string | null + scriptId: string + devId: string + devNum: string + code: string + index: number }) => { - return http.download("/result/exportRawData", params, {loading: false}); + return http.download('/result/exportRawData', params, { loading: false }) } /** @@ -69,13 +69,39 @@ export const exportRawData = (params: { * @param params */ export const reCalculate = (params: { - planId: string, - scriptId: string, - errorSysId: string, - deviceId: string, + planId: string + scriptId: string + errorSysId: string + deviceId: string code: string }) => { - return http.post("/result/reCalculate", params, {loading: true}); + return http.post('/result/reCalculate', params, { loading: true }) +} +/** + * 获取数据获取基本信息 + * @param params + */ +export const getContrastFormContent = (params: { + planId: string + scriptType: string + deviceId: string + chnNum: string | number + num: number | string | null +}) => { + return http.post('/result/getContrastFormContent', params, { loading: false }) +} +/** + * 获取检测结果 + * @param params + */ +export const getContrastResult = (params: { + planId: string + scriptType: string + deviceId: string + chnNum: string | number + num: number | string | null +}) => { + return http.post('/result/getContrastResult', params, { loading: false }) } /** @@ -83,13 +109,13 @@ export const reCalculate = (params: { * @param params */ export const changeErrorSystem = (params: { - planId: string, - scriptId: string, - errorSysId: string, - deviceId: string, + planId: string + scriptId: string + errorSysId: string + deviceId: string code: string }) => { - return http.post("/result/changeErrorSystem", params, {loading: true}); + return http.post('/result/changeErrorSystem', params, { loading: true }) } /** @@ -97,5 +123,5 @@ export const changeErrorSystem = (params: { * @param code */ export const deleteTempTable = (code: string) => { - return http.get(`/result/deleteTempTable?code=${code}`, null, {loading: false}) -} \ No newline at end of file + return http.get(`/result/deleteTempTable?code=${code}`, null, { loading: false }) +} diff --git a/frontend/src/views/home/components/compareDataCheckResultTable.vue b/frontend/src/views/home/components/compareDataCheckResultTable.vue index 7942fdd..1636791 100644 --- a/frontend/src/views/home/components/compareDataCheckResultTable.vue +++ b/frontend/src/views/home/components/compareDataCheckResultTable.vue @@ -1,121 +1,192 @@ \ No newline at end of file + diff --git a/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue index 4e3084c..c82783a 100644 --- a/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/compareDataCheckSingleChannelSingleTestPopup.vue @@ -1,248 +1,311 @@ - diff --git a/frontend/src/views/home/components/compareTest.vue b/frontend/src/views/home/components/compareTest.vue index 1258e67..27c9841 100644 --- a/frontend/src/views/home/components/compareTest.vue +++ b/frontend/src/views/home/components/compareTest.vue @@ -40,7 +40,7 @@