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