diff --git a/folder-alias.json b/folder-alias.json index c126f439..c5f85ad9 100644 --- a/folder-alias.json +++ b/folder-alias.json @@ -34,5 +34,11 @@ }, "src/views/sitePersonnel/work-attendance": { "description": "考勤记录" + }, + "src/views/constructionScheduling/progress-alert": { + "description": "进度预警" + }, + "src/views/constructionScheduling/progress-monitoring": { + "description": "进度监控" } } \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 83ba626c..335f6d32 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,12 +1,12 @@ diff --git a/src/components/prompt/index.vue b/src/components/prompt/index.vue index b20603d7..3d93cb88 100644 --- a/src/components/prompt/index.vue +++ b/src/components/prompt/index.vue @@ -8,6 +8,7 @@ import { } from "./api"; import { ElNotification } from "element-plus"; const { proxy } = getCurrentInstance(); +import useUserStore from "@/store/modules/settings"; const notify = ref({}); const router = useRouter(); const state = reactive({ @@ -15,8 +16,10 @@ const state = reactive({ arr: [], }); onMounted(() => { + if(!useUserStore().promptShow) return iengineerlogList().then((res) => { if (res.code == 200) { + useUserStore().setpromptShow(false) res.data.list.map((item) => { setTimeout(() => { notify.value[item.id] = ElNotification({ @@ -32,6 +35,11 @@ onMounted(() => { item.planName + "的计划已滞后" + "需要您查看。" ), + h( + "p", + {}, + "预警时间为"+item.createTime + ), h( "p", { @@ -64,25 +72,14 @@ onMounted(() => { }) // proxy.$getsystemdict('purpose_expenses').then((res) => { // if (res.length > 0) { - // } // }) - }); const change = (item) => { - let formData = new FormData(); - formData.append("id", item.id); - formData.append("status", 0); - let filenull = new File([""], "", { type: "" }); - formData.append("file", filenull); - edit(formData).then((res) => { - if (res.code == 200) { - notify.value[item.id].close(); - } - }); + }; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index b0141327..e3b9c255 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -22,7 +22,6 @@ const routeName = ref(route.meta.title); watch(() => route.meta.title, (newTitle) => { routeName.value = newTitle; }); - defineProps({ height: { type: String, diff --git a/src/layout/index.vue b/src/layout/index.vue index 7b71e75c..54c43f24 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -6,12 +6,12 @@ - +