diff --git a/frontend/src/api/check/interface/index.ts b/frontend/src/api/check/interface/index.ts index 4c267fc..84aa651 100644 --- a/frontend/src/api/check/interface/index.ts +++ b/frontend/src/api/check/interface/index.ts @@ -1,3 +1,11 @@ +export interface DataCheck { + testScriptName: string, + errorSysName: string, + dataRule: string, + deviceName: string, + monitorIdx: string, +} + /** * 用于定义 查看(设备)通道检测结果 类型 */ @@ -24,10 +32,65 @@ export interface RawDataItem { L3: number } + +// 用来描述检测脚本类型 +export interface ScriptItem { + id: string, + scriptItemName: string, + children?: ScriptItem[] +} + +// 用来描述 通道检测结果 +export enum ChnCheckResultEnum { + UNKNOWN = -1, + FAIL = 0, + SUCCESS = 1, +} + +//用来描述 某个脚本测试项对所有通道的检测结果 +export interface ScriptChnItem { + scriptID: string + scriptItemName: string + + // 设备 + devices: Array<{ + deviceID: string, + deviceName: string, + chnResult: ChnCheckResultEnum[] //通道检测结果 + }> +} + /** - * 用于定义 (设备)通道的原始数据 + * 用于描述 (设备)通道检测结果展示的按钮类型 */ -export interface RawData { - chnNum: string, - rawDataItems: RawDataItem[] -} \ No newline at end of file +export interface ButtonResult { + resultType: 'info' | 'success' | 'danger', + resultValue: '-' | '√' | '×' +} + +/** + * 用于描述 脚本检测结果展示的按钮类型 + */ +export interface ScriptChnViewItem { + scriptID: string, + scriptItemName: string //脚本项名称 + + // 设备 + devices:Array<{ + deviceID: string, + deviceName: string, + chnResult: ButtonResult[], + }> +} + + +/** + * 定义检测日志类型 + */ +export interface LogItem { + type: 'info' | 'error' + log: string +} + + + diff --git a/frontend/src/views/home/components/channelsTest.vue b/frontend/src/views/home/components/channelsTest.vue index df77adf..08ce89d 100644 --- a/frontend/src/views/home/components/channelsTest.vue +++ b/frontend/src/views/home/components/channelsTest.vue @@ -456,6 +456,7 @@ const currentStepStatus = ref<'error' | 'finish' | 'wait' | 'success' | 'process total.value = 0; activeIndex.value = 0 qualified.value = 0 + active.value = 0 dialogVisible.value = false } diff --git a/frontend/src/views/home/components/dataCheckRawDataTable.vue b/frontend/src/views/home/components/dataCheckRawDataTable.vue index 2044bbf..47cfc72 100644 --- a/frontend/src/views/home/components/dataCheckRawDataTable.vue +++ b/frontend/src/views/home/components/dataCheckRawDataTable.vue @@ -1,42 +1,28 @@ \ No newline at end of file diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index b0b8cc4..5cb462e 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -25,7 +25,7 @@ v-for="(item, index) in checkStatus" :label="item.label" :value="item.id" - + :key="index" v-show="shouldShowOption(item)" > @@ -37,7 +37,7 @@ v-for="(item, index) in checkResult" :label="item.label" :value="item.id" - + :key="index" v-show="shouldShowOption(item)" > @@ -49,7 +49,7 @@ v-for="(item, index) in checkReportStatus" :label="item.label" :value="item.id" - + :key="index" v-show="shouldShowOption(item)" > @@ -100,7 +100,7 @@ >归档 - + 系数校准 @@ -114,8 +114,7 @@ :icon="View" @click="openDrawer('查看', scope.row)" v-if="form.activeTabs === 3 && form.activeChildTabs === 1" - >查看 + >查看 报告下载 + >报告下载 - - + - + >() + const dataCheckChangeErrSysDialogVisible = ref(false) const matchDialogVisible = ref(false) const dialogTitle = ref('手动检测') @@ -405,7 +400,7 @@ const getTableList = async (params: any) => { }else{ checkStateList.value = checkStateTable.value } - return getBoundPqDevList({'planId': props.id,  + return getBoundPqDevList({'planId': props.id, 'checkStateList': checkStateList.value, 'checkResult': form.value.checkResult, 'reportState': form.value.checkReportStatus, @@ -867,7 +862,8 @@ const openDrawer = (title: string, row: any) => { if(title === '检测数据查询') { - dataCheckDialogVisible.value = true; + let device={} + dataCheckPopupRef.value?.open(device) } if (title === '误差体系更换') { diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index dc8e2fb..ceb024e 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -1,116 +1,94 @@ + + + - + +