diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue index 7d127a1..08d682d 100644 --- a/frontend/src/views/plan/planList/components/planPopup.vue +++ b/frontend/src/views/plan/planList/components/planPopup.vue @@ -378,6 +378,39 @@ + + + + + + 闪变耗时较长,不推荐批量被检设备在检测过程中采集该指标 + (shanBianDialogVisible = false)"> + + + + @@ -414,6 +447,7 @@ import { downloadTemplate, importPqDev } from '@/api/device/device' import { getTestConfig } from '@/api/system/base' import { getRegRes } from '@/api/system/versionRegister' import DevSelect from '@/views/plan/planList/components/devSelect.vue' +import { WarningFilled } from '@element-plus/icons-vue' const modeStore = useModeStore() const AppSceneStore = useAppSceneStore() @@ -444,6 +478,7 @@ const planType = ref(0) const subPlanBindStandardDev = ref([]) //哪些标准设备已经被子计划绑定 const activeNames = ref(['1']) const allDisabled = ref(false) +const shanBianDialogVisible = ref(false) const leaderData = ref([]) const memberData = ref([]) const generateData = () => { @@ -761,7 +796,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan: user_Result: any if (mode.value === '比对式') { - [ + ;[ PqErrSys_Result, pqDevList_Result, pqReportName_Result, @@ -805,9 +840,8 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan: const dataRuleDict = dictStore.getDictData('Data_Rule') const rule = dataRuleDict.find(item => item.code === 'Cp95_Value') formContent.dataRule = rule ? rule.id : '' - } else { - [pqSource_Result, PqScript_Result, PqErrSys_Result, pqDevList_Result, pqReportName_Result] = + ;[pqSource_Result, PqScript_Result, PqErrSys_Result, pqDevList_Result, pqReportName_Result] = await Promise.all([ getTestSourceList(data), getPqScriptList(data), @@ -873,7 +907,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan: isSelectDisabled.value = true formContent.memberIds = data.members } - [ + ;[ PqErrSys_Result, boundPqDevList_Result, unboundPqDevList_Result, @@ -920,7 +954,7 @@ const open = async (sign: string, data: Plan.ReqPlan, currentMode: string, plan: } } } else { - [ + ;[ pqSource_Result, PqScript_Result, PqErrSys_Result, @@ -1048,7 +1082,10 @@ const handleTestItemChange = () => { .filter(option => formContent.testItems.includes(option.value)) .find(option => option.label === '闪变') if (hasShanBian) { - ElMessage.warning('闪变耗时较长,不推荐批量被检设备在检测过程中采集该指标') + shanBianDialogVisible.value = true + setTimeout(() => { + shanBianDialogVisible.value = false + }, 5000) } } } @@ -1208,7 +1245,7 @@ const handleDataSourceChange = () => { formContent.datasourceIds = [] } - if(hasLuBo && hasMinuteStats){ + if (hasLuBo && hasMinuteStats) { ElMessage.warning('录波数据与分钟统计数据不能同时选择') formContent.datasourceIds = [] } @@ -1272,4 +1309,12 @@ const props = defineProps<{ justify-content: center; align-items: center; } +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.5s; +} +.fade-enter-from, +.fade-leave-to { + opacity: 0; +}