diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java index d5d7cff..72ed5a5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/unqualifiednotification/UnqualifiedNotificationController.java @@ -213,9 +213,9 @@ public class UnqualifiedNotificationController { List fileUrlList = new ArrayList<>(); Integer type = 0; if (unqualifiedNotificationDO.getTypeName().equals("过程检")){ - type = 2; - }else if (unqualifiedNotificationDO.getTypeName().equals("终检")){ type = 1; + }else if (unqualifiedNotificationDO.getTypeName().equals("终检")){ + type = 2; } List unqualifiedNotificationFileDOS = unqualifiedNotificationFileService.queryUnqualifiedNotificationFileBySuperId(unqualifiedNotificationDO.getId(),type); if(CollUtil.isNotEmpty(unqualifiedNotificationFileDOS)){ diff --git a/mes-ui/mini-app/src/pages/index/index.vue b/mes-ui/mini-app/src/pages/index/index.vue index d509a20..bb0d103 100644 --- a/mes-ui/mini-app/src/pages/index/index.vue +++ b/mes-ui/mini-app/src/pages/index/index.vue @@ -6,7 +6,7 @@ import CustomNavbar from "./components/CustomNavbar.vue"; import CategoryPanel from "./components/CategoryPanel.vue"; import footRight from "./components/footRight.vue"; import PageSkeleton from "./components/PageSkeleton.vue"; -import {countReview, getHomeCategoryAPI, getUnreadMessage} from "@/services/home"; +import {countReview, getHomeCategoryAPI, getUnreadMessage,countUnqualifiedNotification} from "@/services/home"; // 获取前台分类数据 const categoryList = ref([ { @@ -111,6 +111,9 @@ const getHomeCategory = async () => { const unReadCount = await getUnreadMessage(); const count = await countReview(); + var query ={ + queryType:2, + } const unqualifiedNotificationCount = await countUnqualifiedNotification(query); // 把未读数放到消息通知项 const cgdsp = categoryList.value.find( diff --git a/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue b/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue index b0d6b9c..a80d3cf 100644 --- a/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue +++ b/mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue @@ -200,7 +200,7 @@ if (isQua.value == 1) { await imgUpload() } - + await initPage(); const pages = getCurrentPages(); // 获取当前页面栈 const currentPage = pages[pages.length - 1]; // 当前页面 const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`; @@ -223,7 +223,7 @@ if (isQua.value == 1) { await imgUpload() } - + await initPage(); const pages = getCurrentPages(); // 获取当前页面栈 const currentPage = pages[pages.length - 1]; // 当前页面 const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;