diff --git a/frontend/src/stores/modules/check.ts b/frontend/src/stores/modules/check.ts index 4710690..aa0a6a6 100644 --- a/frontend/src/stores/modules/check.ts +++ b/frontend/src/stores/modules/check.ts @@ -2,8 +2,9 @@ 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, @@ -13,7 +14,7 @@ export const useCheckStore = defineStore("check", { selectTestItems: Object({preTest: true, timeTest: true, channelsTest: false, test: true}), checkType:1, // 0:手动检测 1:自动检测 reCheckType: 1, // 0:不合格项复检 1:全部复检 - showDetailType: 0 // 0:数据查询 1:误差体系跟换 + showDetailType: 0 // 0:数据查询 1:误差体系跟换 2:正式检测 }), getters: {}, @@ -30,7 +31,11 @@ export const useCheckStore = defineStore("check", { }, initSelectTestItems() { this.selectTestItems.preTest = true - this.selectTestItems.channelsTest = false + if (AppSceneStore.currentScene === '1') { + this.selectTestItems.channelsTest = true + } else { + this.selectTestItems.timeTest = true + } this.selectTestItems.test = true }, setSelectTestItems(selectTestItems: CheckData.SelectTestItem) { diff --git a/frontend/src/views/home/components/selectTestItemPopup.vue b/frontend/src/views/home/components/selectTestItemPopup.vue index 3291be7..9379c5d 100644 --- a/frontend/src/views/home/components/selectTestItemPopup.vue +++ b/frontend/src/views/home/components/selectTestItemPopup.vue @@ -8,7 +8,7 @@ - + @@ -32,7 +32,8 @@ 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(); diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index a99eb10..9d6ddbb 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -938,6 +938,7 @@ const handleTest = async (val: string) => { dialogTitle.value = val if (val === '手动检测') { + checkStore.setShowDetailType(2) if (testType === 'reTest') { ElMessageBox.confirm('请选择复检检测方式', '设备复检', @@ -988,6 +989,7 @@ const handleTest = async (val: string) => { channelsTest.value?.open(channelsSelection.value, props.plan) return } else { + checkStore.setShowDetailType(2) checkStore.setCheckType(1) checkStore.initSelectTestItems() // 一键检测