引入获取是否自动生成报告接口
This commit is contained in:
@@ -50,3 +50,10 @@ export const getCurrentScene = () => {
|
|||||||
export const getPublicKey = (username: string, checked: boolean) => {
|
export const getPublicKey = (username: string, checked: boolean) => {
|
||||||
return http.get(`/admin/getPublicKey?username=${username}&checked=${checked}`, {}, {loading: false})
|
return http.get(`/admin/getPublicKey?username=${username}&checked=${checked}`, {}, {loading: false})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取是否在检测中自动生成报告
|
||||||
|
*/
|
||||||
|
export const getAutoGenerate = () => {
|
||||||
|
return http.get('/sysTestConfig/getAutoGenerate', {}, {loading: false})
|
||||||
|
}
|
||||||
|
|||||||
@@ -371,7 +371,8 @@ const updateTableData = async () => {
|
|||||||
setCheckResultData(resCheckResult)
|
setCheckResultData(resCheckResult)
|
||||||
setRawData(resRawData)
|
setRawData(resRawData)
|
||||||
checkList.length = 0
|
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) {
|
if (currentCheckItem.value == checkList[0].value) {
|
||||||
doCurrentCheckItemUpdate(checkList[0].value)
|
doCurrentCheckItemUpdate(checkList[0].value)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -168,6 +168,7 @@ import {CheckData} from "@/api/check/interface"
|
|||||||
import {useCheckStore} from "@/stores/modules/check";
|
import {useCheckStore} from "@/stores/modules/check";
|
||||||
import {ElMessage, ElMessageBox} from "element-plus";
|
import {ElMessage, ElMessageBox} from "element-plus";
|
||||||
import {getBigTestItem} from "@/api/check/test";
|
import {getBigTestItem} from "@/api/check/test";
|
||||||
|
import {getAutoGenerate} from "@/api/user/login";
|
||||||
|
|
||||||
|
|
||||||
const checkStore = useCheckStore()
|
const checkStore = useCheckStore()
|
||||||
@@ -688,12 +689,17 @@ const handleEndItem = (code: string, desc: string | undefined, devices: CheckDat
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 更新进度条
|
// 更新进度条
|
||||||
const updatePercentage = () => {
|
const updatePercentage = async () => {
|
||||||
if (activeIndex < checkTotal) {
|
if (activeIndex < checkTotal) {
|
||||||
percentage.value = Math.trunc(activeIndex / checkTotal * 100);
|
percentage.value = Math.trunc(activeIndex / checkTotal * 100);
|
||||||
} else {
|
} else {
|
||||||
percentage.value = 100;
|
percentage.value = 100;
|
||||||
emit('update:testStatus', 'success')
|
emit('update:testStatus', 'success')
|
||||||
|
|
||||||
|
let {data: autoGenerate} = await getAutoGenerate()
|
||||||
|
if (autoGenerate == 1) {
|
||||||
|
//调用自动生成报告接口
|
||||||
|
}
|
||||||
ElMessageBox.alert('检测全部结束,你可以停留在此页面查看检测结果,或返回首页进行复检、报告生成和归档等操作', '检测完成', {
|
ElMessageBox.alert('检测全部结束,你可以停留在此页面查看检测结果,或返回首页进行复检、报告生成和归档等操作', '检测完成', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user