From e0941d628b775cd9065869587f13287b44e2f0e1 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Thu, 27 Mar 2025 15:54:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5=E8=8E=B7=E5=8F=96=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/user/login/index.ts | 7 +++++++ .../components/dataCheckSingleChannelSingleTestPopup.vue | 3 ++- frontend/src/views/home/components/test.vue | 8 +++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/frontend/src/api/user/login/index.ts b/frontend/src/api/user/login/index.ts index d590da5..eeca626 100644 --- a/frontend/src/api/user/login/index.ts +++ b/frontend/src/api/user/login/index.ts @@ -50,3 +50,10 @@ export const getCurrentScene = () => { export const getPublicKey = (username: string, checked: boolean) => { return http.get(`/admin/getPublicKey?username=${username}&checked=${checked}`, {}, {loading: false}) } + +/** + * 获取是否在检测中自动生成报告 + */ +export const getAutoGenerate = () => { + return http.get('/sysTestConfig/getAutoGenerate', {}, {loading: false}) +} diff --git a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue index b157255..d20fd20 100644 --- a/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue +++ b/frontend/src/views/home/components/dataCheckSingleChannelSingleTestPopup.vue @@ -371,7 +371,8 @@ const updateTableData = async () => { setCheckResultData(resCheckResult) setRawData(resRawData) checkList.length = 0 - checkList.push({value: keys1[0], label: resCheckResult.isData === 1 ? `${keys1[0]}` : resCheckResult.isData === 4 ? `${keys1[0]}(/)` : resCheckResult.isData === 5? `${keys1[0]}(-)`:`${keys1[0]}(不符合)`}) + let key = formatHarmNum(keys1[0]) + checkList.push({value: keys1[0], label: resCheckResult.isData === 1 ? `${key}` : resCheckResult.isData === 4 ? `${key}(/)` : resCheckResult.isData === 5? `${key}(-)`:`${key}(不符合)`}) if (currentCheckItem.value == checkList[0].value) { doCurrentCheckItemUpdate(checkList[0].value) } else { diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 9229154..7a1b24f 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -168,6 +168,7 @@ import {CheckData} from "@/api/check/interface" import {useCheckStore} from "@/stores/modules/check"; import {ElMessage, ElMessageBox} from "element-plus"; import {getBigTestItem} from "@/api/check/test"; +import {getAutoGenerate} from "@/api/user/login"; const checkStore = useCheckStore() @@ -688,12 +689,17 @@ const handleEndItem = (code: string, desc: string | undefined, devices: CheckDat } // 更新进度条 -const updatePercentage = () => { +const updatePercentage = async () => { if (activeIndex < checkTotal) { percentage.value = Math.trunc(activeIndex / checkTotal * 100); } else { percentage.value = 100; emit('update:testStatus', 'success') + + let {data: autoGenerate} = await getAutoGenerate() + if (autoGenerate == 1) { + //调用自动生成报告接口 + } ElMessageBox.alert('检测全部结束,你可以停留在此页面查看检测结果,或返回首页进行复检、报告生成和归档等操作', '检测完成', { confirmButtonText: '确定', })