diff --git a/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue b/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue index 44dc930c..81bc960d 100644 --- a/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue +++ b/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue @@ -13,21 +13,21 @@ - -
-
- -
- {{processDesignTypeDict[item.processDesignType]}}设计负责人: {{item.ownerName}} 请注意! - 项目编号【{{ item.projectCode}}】, 子项目编号【{{ item.projectSubCode }}】的图纸设计{{item.remainingTime < 0 ? '已超时' : '即将超时'}},请及时完成。 -
-
- {{processDesignTypeDict[item.processDesignType]}}设计负责人: {{item.ownerName}} 请注意! - 项目编号【{{ item.projectCode}}】的图纸设计{{item.remainingTime < 0 ? '已超时' : '即将超时'}},请及时完成。 + +
+
+ +
+ {{processDesignTypeDict[item.processDesignType]}}设计负责人: {{item.ownerName}} 请注意! + 项目编号【{{ item.projectCode}}】, 子项目编号【{{ item.projectSubCode }}】的图纸设计{{item.remainingTime < 0 ? '已超时' : '即将超时'}},请及时完成。 +
+
+ {{processDesignTypeDict[item.processDesignType]}}设计负责人: {{item.ownerName}} 请注意! + 项目编号【{{ item.projectCode}}】的图纸设计{{item.remainingTime < 0 ? '已超时' : '即将超时'}},请及时完成。 +
+
-
-
@@ -42,16 +42,16 @@ import { useCommonStore } from '@/store/modules/common' import { CloseBold, Expand, WarningFilled } from '@element-plus/icons-vue' import warnimg from '/src/assets/imgs/warnicon.png' -import {getProcessDesignDeferredWarning} from "@/api/heli/processdesign"; +import { getProcessDesignDeferredWarning } from '@/api/heli/processdesign' const commonStore = useCommonStore() const showWarning = computed(() => commonStore.showWarning) const showFilled = ref(false) const warnings = ref([]) const processDesignTypeDict = { - "BLUEPRINT_FOUNDRY_TECHNOLOGY": "铸造工艺", - "BLUEPRINT_3D": "3D", - "BLUEPRINT_2D": "2D", - "BLUEPRINT_WORKBLANK": "毛坯" + BLUEPRINT_FOUNDRY_TECHNOLOGY: '铸造工艺', + BLUEPRINT_3D: '3D', + BLUEPRINT_2D: '2D', + BLUEPRINT_WORKBLANK: '毛坯' } const FoldWran = () => { showFilled.value = false @@ -96,14 +96,15 @@ const onMouseMove = (event: MouseEvent) => { // const onDragEnd = () => { // // 可以在此处执行拖拽结束后的操作(如果需要) // }; +const wranout = ref(false) const queryData = async () => { + const data = await getProcessDesignDeferredWarning() - const data = await getProcessDesignDeferredWarning(); - if (data.hasWarning){ - warnings.value = data.warnings; + if (data.hasWarning) { + warnings.value = data.warnings commonStore.setStore('showWarning', true) - }else{ - commonStore.setStore('showWarning', false) + } else { + // commonStore.setStore('showWarning', false) } } @@ -114,6 +115,11 @@ onMounted(() => { })