diff --git a/mes-ui/mes-ui-admin-vue3/src/layout/components/ToolHeader.vue b/mes-ui/mes-ui-admin-vue3/src/layout/components/ToolHeader.vue
index 04f5dc61..81d31116 100644
--- a/mes-ui/mes-ui-admin-vue3/src/layout/components/ToolHeader.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/layout/components/ToolHeader.vue
@@ -11,8 +11,10 @@ import RouterSearch from '@/components/RouterSearch/index.vue'
import { useAppStore } from '@/store/modules/app'
import { useDesign } from '@/hooks/web/useDesign'
import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
+import warnmessage from './warnmessage.vue'
const { getPrefixCls, variables } = useDesign()
+
const prefixCls = getPrefixCls('tool-header')
const appStore = useAppStore()
@@ -71,6 +73,7 @@ export default defineComponent({
+
)
}
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
new file mode 100644
index 00000000..1a9556ce
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue
@@ -0,0 +1,180 @@
+
+
+
+
+
设计预警通知
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 铸造工艺设计负责人: {{`薛小宝`}} 请注意!
+ 项目编号【{{ item}}】的图纸设计即将超时,请及时完成。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mes-ui/mes-ui-admin-vue3/src/store/modules/common.ts b/mes-ui/mes-ui-admin-vue3/src/store/modules/common.ts
index db9b9658..2b86ce72 100644
--- a/mes-ui/mes-ui-admin-vue3/src/store/modules/common.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/store/modules/common.ts
@@ -3,18 +3,26 @@ import { store } from '../index'
export interface CommonStoreState {
storeMap: object
+ showWarning: boolean;
}
export const useCommonStore = defineStore('commonStore', () => {
const storeMap = ref({})
+ const showWarning = ref(true);
const getStore = (key) => {
+ return key === 'showWarning' ? showWarning.value : storeMap.value[key];
return storeMap.value[key]
}
const setStore = (key, value) => {
+ if (key === 'showWarning') {
+ showWarning.value = value;
+ } else {
+ storeMap.value[key] = value;
+ }
return storeMap.value[key] = value
}
- return {getStore, setStore}
+ return {getStore, setStore,showWarning}
})
export const useCommonStateWithOut = () => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue
index 7f8aad1c..6e91f127 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue
@@ -3,24 +3,6 @@
首页
-
-
- 设计预警通知
-
-
-
-
-
-
-
-
- 铸造工艺设计负责人: {{`薛小宝`}} 请注意!
- 项目编号【{{ item}}】的图纸设计即将超时,请及时完成。
-
-
-
-
-
@@ -191,14 +173,12 @@ import { formatTime } from '@/utils'
import { ElNotification } from 'element-plus'
import { useUserStore } from '@/store/modules/user'
import { useWatermark } from '@/hooks/web/useWatermark'
-import { CloseBold } from '@element-plus/icons-vue'
import avatarImg from '@/assets/imgs/smile.png'
import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
import { pieOptions, barOptions } from './echarts-data'
-import warnimg from '/src/assets/imgs/warnicon.png'
-
+import { useCommonStore } from '@/store/modules/common'
defineOptions({ name: 'Home' })
-
+const commonStore = useCommonStore()
const { t } = useI18n()
const userStore = useUserStore()
const { setWatermark } = useWatermark()
@@ -418,66 +398,12 @@ const openwarn = () => {
})
}
-const showWarning = ref(false)
-const closeWran = () => {
- showWarning.value = false
-}
onMounted(() => {
- showWarning.value = true
// openwarn()
})