From 71a1d068ece24c83ff1ac38fb40c22fb8573a6a9 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 12 Jun 2024 10:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=9B=B4=E6=96=B0=E6=8F=90=E9=86=92=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=87=B3=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue   |  2 +-
 src/views/modules/home/index.vue  | 21 ++++++---------------
 src/views/modules/home/notice.vue | 17 ++++-------------
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index a4a0ae462..4a3cea0b9 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1151,7 +1151,7 @@ export default {
   watch: {
     $route: {
       handler: function (newVal, oldVal) {
-        if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home'||oldVal.name === 'base-classification')) {
+        if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home'||oldVal.name === 'base-classification'||oldVal.name === 'home-notice')) {
           this.$nextTick(() => {
               this.$refs.myResiSearch.form.attentionCrowds = [];
               this.$refs.myResiSearch.form.healthStatus = [];
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index c04163e03..7d633ea8f 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -488,21 +488,12 @@ export default {
           }
         );
       }else if(item.msgType == "resident_category"){
-        let obj = {
-          PARTY_FLAG: '/main/communityParty-members-memberList',
-          SUBSISTENCE_ALLOWANCE_FLAG: '/main/base-residentManagement-subsistenceAllowance-subsistenceAllowance',
-          ENSURE_HOUSE_FLAG: '/main/base-residentManagement-housingNature-housingNature',
-          VETERAN_FLAG: '/main/base-residentManagement-veteran-veteran',
-          OLD_PEOPLE_FLAG: '/main/base-residentManagement-oldPeople-oldPeople',
-          SPECIAL_SUPPORT_FLAG: '/main/base-residentManagement-tefu-tefuList',
-          DISABILITY_FLAG: '/main/base-residentManagement-resiDisability-resiDisability',
-          SERIOUS_ILLNESS_FLAG: '大病',
-          CHRONIC_DISEASE_FLAG: '慢病',
-          SPECIAL_CROWD_FLAG: '特殊人群',
-        }
-        this.$router.push({
-            path: obj[item.category],
-          });
+          this.$router.push({
+          name: "base-resi",
+          query: {
+            category: item.category || null,
+          },
+        });
       } else if(item.msgType == "sys_version_upgrade_publish"){
 				let {  targetId } = item
 				this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
diff --git a/src/views/modules/home/notice.vue b/src/views/modules/home/notice.vue
index 7bf0079bd..a8ea58aef 100644
--- a/src/views/modules/home/notice.vue
+++ b/src/views/modules/home/notice.vue
@@ -173,20 +173,11 @@ export default {
 					}
 				);
 			} else if (item.msgType == "resident_category") {
-				let obj = {
-					PARTY_FLAG: '/main/communityParty-members-memberList',
-					SUBSISTENCE_ALLOWANCE_FLAG: '/main/base-residentManagement-subsistenceAllowance-subsistenceAllowance',
-					ENSURE_HOUSE_FLAG: '/main/base-residentManagement-housingNature-housingNature',
-					VETERAN_FLAG: '/main/base-residentManagement-veteran-veteran',
-					OLD_PEOPLE_FLAG: '/main/base-residentManagement-oldPeople-oldPeople',
-					SPECIAL_SUPPORT_FLAG: '/main/base-residentManagement-tefu-tefuList',
-					DISABILITY_FLAG: '/main/base-residentManagement-resiDisability-resiDisability',
-					SERIOUS_ILLNESS_FLAG: '大病',
-					CHRONIC_DISEASE_FLAG: '慢病',
-					SPECIAL_CROWD_FLAG: '特殊人群',
-				}
 				this.$router.push({
-					path: obj[item.category],
+				name: "base-resi",
+				query: {
+					category: item.category || null,
+				},
 				});
 			} else if(item.msgType == "sys_version_upgrade_publish"){
 				let {  targetId } = item