From ca40d95f1de53b7a69db7598a01f252bfe2f4e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Mon, 15 Apr 2024 16:13:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=8F=90=E9=86=92?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/home/notice.vue | 160 +++++++++++++++++++++--------- 1 file changed, 111 insertions(+), 49 deletions(-) diff --git a/src/views/modules/home/notice.vue b/src/views/modules/home/notice.vue index 9c47d84e3..01bc6b973 100644 --- a/src/views/modules/home/notice.vue +++ b/src/views/modules/home/notice.vue @@ -84,50 +84,112 @@ export default { this.getList(); }, methods: { - handleClickNotice(item, index) { - // this.readClearOne(item); - if (item.msgType == "community_house") { - let { agencyId, gridId, gridName, houseId, houseName, targetId } = item - this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName:'房屋详情' }); - this.$router.push({ name: 'house-huaxiang' }); - this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { - if (item.name === "house-huaxiang") { - return { ...item, title: '房屋信息' }; - } - return item; - }); - } else if (item.msgType == "resident_base_info") { - let { - agencyId, - gridId, - gridName, - gender, - homeId, - homeName, - name, - targetId, - deptName - } = item; - this.$store.dispatch("saveData", { - agencyId, - gridId, - gridName, - gender, - homeId, - homeName, - name:'居民详情', - resiId: targetId, - }); - this.$router.push({ name: "jumin-huaxiang" }); - this.$store.state.contentTabs = this.$store.state.contentTabs.map( - (item) => { - if (item.name === "jumin-huaxiang") { - return { ...item, title: name }; - } - return item; - } - ); - } + // handleClickNotice(item, index) { + // // this.readClearOne(item); + // if (item.msgType == "community_house") { + // let { agencyId, gridId, gridName, houseId, houseName, targetId } = item + // this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' }); + // this.$router.push({ name: 'house-huaxiang' }); + // this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { + // if (item.name === "house-huaxiang") { + // return { ...item, title: '房屋信息' }; + // } + // return item; + // }); + // } else if (item.msgType == "resident_base_info") { + // let { + // agencyId, + // gridId, + // gridName, + // gender, + // homeId, + // homeName, + // name, + // targetId, + // deptName + // } = item; + // this.$store.dispatch("saveData", { + // agencyId, + // gridId, + // gridName, + // gender, + // homeId, + // homeName, + // name: '居民详情', + // resiId: targetId, + // }); + // this.$router.push({ name: "jumin-huaxiang" }); + // this.$store.state.contentTabs = this.$store.state.contentTabs.map( + // (item) => { + // if (item.name === "jumin-huaxiang") { + // return { ...item, title: name }; + // } + // return item; + // } + // ); + // } + // }, + handleClickNotice(item) { + this.readClearOne(item); + if (item.msgType == "community_house") { + let { agencyId, gridId, gridName, houseId, houseName, targetId } = item + this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' }); + this.$router.push({ name: 'house-huaxiang' }); + this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { + if (item.name === "house-huaxiang") { + return { ...item, title: '房屋信息' }; + } + return item; + }); + } else if (item.msgType == "resident_base_info") { + let { + agencyId, + gridId, + gridName, + gender, + homeId, + homeName, + name, + targetId, + deptName + } = item; + this.$store.dispatch("saveData", { + agencyId, + gridId, + gridName, + gender, + homeId, + homeName, + name: '居民详情', + resiId: targetId, + }); + this.$router.push({ name: "jumin-huaxiang" }); + this.$store.state.contentTabs = this.$store.state.contentTabs.map( + (item) => { + if (item.name === "jumin-huaxiang") { + return { ...item, title: name }; + } + return item; + } + ); + } 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.getNoticeData() }, async read(item, index) { @@ -150,13 +212,13 @@ export default { this.$message.error(msg); } }, - async readClearOne(item){ - console.log("item",item) + async readClearOne(item) { + console.log("item", item) const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}` - const {data,code,msg} = await requestPost(url) - if(code == 0){ + const { data, code, msg } = await requestPost(url) + if (code == 0) { this.getList() - }else if(code >= 8000){ + } else if (code >= 8000) { this.$message.error(msg) } }, From b1ea8a0605de5835ad0f6a0de0d203e2aea6a70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Mon, 15 Apr 2024 16:53:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E5=BA=A6=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/resi.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 721bd69eb..763a14985 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -129,11 +129,9 @@ -
+
{{ - scope.row.gender == null - ? ((1 - scope.row.nationality)*100).toFixed(2) + '%' - : ((1 - scope.row.nationality)*100).toFixed(2) + '%' + scope.row.synthesizeScore }}
@@ -359,7 +357,7 @@ export default { // { columnName: "agencyName", label: "所属组织", width: 150 }, { columnName: "idTypeName", label: "证件类型", width: 80 }, { columnName: "idNum", label: "证件号", width: 170 }, - { columnName: "nationality", label: "信息完整度", width: 95 }, + { columnName: "synthesizeScore", label: "信息完整度", width: 95 }, { columnName: "categoryNames", label: "居民分类" }, { columnName: "nationalityName", label: "国籍", width: 50 }, { columnName: "nationName", label: "民族", width: 50 },