From 05224ff3479fcc9ccf18ca9d0a797e4c6f68d39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Fri, 7 Jun 2024 16:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/classification/index.vue | 365 +++++++++--------- src/views/modules/base/virtualResi.vue | 66 +++- 2 files changed, 235 insertions(+), 196 deletions(-) diff --git a/src/views/modules/base/classification/index.vue b/src/views/modules/base/classification/index.vue index fc06b4eac..132ac65b3 100644 --- a/src/views/modules/base/classification/index.vue +++ b/src/views/modules/base/classification/index.vue @@ -7,24 +7,23 @@
-
-
-
+
+
+
-
-
群众
+
+
群众
-
{{categoryList.massFlagCount}}
+
{{ categoryList.massFlagCount }}
-
+
群众(虚拟网格)
-
{{categoryList.massFlagVirtualCount}}
+
{{ categoryList.massFlagVirtualCount }}
@@ -32,22 +31,22 @@
-
-
+
+
-
+
流动人员
-
{{categoryList.floatingFlagCount}}
+
{{ categoryList.floatingFlagCount }}
-
+
流动人员(虚拟网格)
-
{{categoryList.floatingFlagVirtualCount}}
+
{{ categoryList.floatingFlagVirtualCount }}
@@ -55,22 +54,22 @@
-
-
+
+
-
+
党员
-
{{categoryList.partyFlagCount}}
+
{{ categoryList.partyFlagCount }}
-
+
党员(虚拟网格)
-
{{categoryList.partyFlagVirtualCount}}
+
{{ categoryList.partyFlagVirtualCount }}
@@ -78,22 +77,22 @@
-
-
+
+
-
+
共青团员
-
{{categoryList.leagueFlagCount}}
+
{{ categoryList.leagueFlagCount }}
-
+
共青团员(虚拟网格)
-
{{categoryList.leagueFlagVirtualCount}}
+
{{ categoryList.leagueFlagVirtualCount }}
@@ -101,22 +100,22 @@
-
-
+
+
-
+
残疾人
-
{{categoryList.disabilityFlagCount}}
+
{{ categoryList.disabilityFlagCount }}
-
+
残疾人(虚拟网格)
-
{{categoryList.disabilityFlagVirtualCount}}
+
{{ categoryList.disabilityFlagVirtualCount }}
@@ -124,22 +123,22 @@
-
-
+
+
-
+
大病人员
-
{{categoryList.seriousIllnessFlagCount}}
+
{{ categoryList.seriousIllnessFlagCount }}
-
+
大病人员(虚拟网格)
-
{{categoryList.seriousIllnessFlagVirtualCount}}
+
{{ categoryList.seriousIllnessFlagVirtualCount }}
@@ -147,22 +146,22 @@
-
-
+
+
-
+
慢病人员
-
{{categoryList.chronicDiseaseFlagCount}}
+
{{ categoryList.chronicDiseaseFlagCount }}
-
+
慢病人员(虚拟网格)
-
{{categoryList.chronicDiseaseFlagVirtualCount}}
+
{{ categoryList.chronicDiseaseFlagVirtualCount }}
@@ -170,22 +169,22 @@
-
-
+
+
-
-
+
+
老年人
-
{{categoryList.oldPeopleFlagCount}}
+
{{ categoryList.oldPeopleFlagCount }}
-
+
老年人(虚拟网格)
-
{{categoryList.oldPeopleFlagVirtualCount}}
+
{{ categoryList.oldPeopleFlagVirtualCount }}
@@ -193,22 +192,23 @@
-
-
+
+
-
+
低保人员
-
{{categoryList.subsistenceAllowanceFlagCount}}
+
{{ categoryList.subsistenceAllowanceFlagCount }}
-
+
低保人员(虚拟网格)
-
{{categoryList.subsistenceAllowanceFlagVirtualCount}}
+
{{ categoryList.subsistenceAllowanceFlagVirtualCount }} +
@@ -216,22 +216,22 @@
-
-
- +
+
+
-
+
退役军人
-
{{categoryList.veteranFlagCount}}
+
{{ categoryList.veteranFlagCount }}
-
+
退役军人(虚拟网格)
-
{{categoryList.veteranFlagVirtualCount}}
+
{{ categoryList.veteranFlagVirtualCount }}
@@ -239,22 +239,22 @@
-
-
+
+
-
+
保障房人员
-
{{categoryList.ensureHouseFlagCount}}
+
{{ categoryList.ensureHouseFlagCount }}
-
+
保障房人员(虚拟网格)
-
{{categoryList.ensureHouseFlagVirtualCount}}
+
{{ categoryList.ensureHouseFlagVirtualCount }}
@@ -262,22 +262,22 @@
-
-
+
+
-
+
育龄妇女
-
{{categoryList.fertileWomanFlagCount}}
+
{{ categoryList.fertileWomanFlagCount }}
-
-
育龄妇女(虚拟网格)
+
+
育龄妇女(虚拟网格)
-
{{categoryList.fertileWomanFlagVirtualCount}}
+
{{ categoryList.fertileWomanFlagVirtualCount }}
@@ -285,22 +285,22 @@
-
-
+
+
-
+
特扶人员
-
{{categoryList.specialSupportFlagCount}}
+
{{ categoryList.specialSupportFlagCount }}
-
+
特扶人员(虚拟网格)
-
{{categoryList.specialSupportFlagVirtualCount}}
+
{{ categoryList.specialSupportFlagVirtualCount }}
@@ -308,22 +308,22 @@
-
-
+
+
-
+
失业人员
-
{{categoryList.unemployedFlagCount}}
+
{{ categoryList.unemployedFlagCount }}
-
+
失业人员(虚拟网格)
-
{{categoryList.unemployedFlagVirtualCount}}
+
{{ categoryList.unemployedFlagVirtualCount }}
@@ -331,22 +331,22 @@
-
-
+
+
-
+
新阶层人士
-
{{categoryList.newStratumFlagCount}}
+
{{ categoryList.newStratumFlagCount }}
-
新阶层人士(虚拟网格)
+
新阶层人士(虚拟网格)
-
{{categoryList.newStratumFlagVirtualCount}}
+
{{ categoryList.newStratumFlagVirtualCount }}
@@ -354,22 +354,22 @@
-
-
+
+
-
+
安置帮教人员
-
{{categoryList.azbjFlagCount}}
+
{{ categoryList.azbjFlagCount }}
-
+
安置帮教人员(虚拟网格)
-
{{azbjFlagVirtualCount}}
+
{{ azbjFlagVirtualCount }}
@@ -377,22 +377,22 @@
-
-
+
+
-
+
吸毒人员
-
{{categoryList.drugFlagCount}}
+
{{ categoryList.drugFlagCount }}
-
+
吸毒人员(虚拟网格)
-
{{categoryList.drugFlagVirtualCount}}
+
{{ categoryList.drugFlagVirtualCount }}
@@ -400,22 +400,22 @@
-
-
+
+
-
+
社区矫正人员
-
{{categoryList.sqjzFlagCount}}
+
{{ categoryList.sqjzFlagCount }}
-
+
社区矫正人员(虚拟网格)
-
{{categoryList.sqjzFlagVirtualCount}}
+
{{ categoryList.sqjzFlagVirtualCount }}
@@ -423,22 +423,22 @@
-
-
+
+
-
+
不良青少年
-
{{categoryList.blqsnFlagCount}}
+
{{ categoryList.blqsnFlagCount }}
-
+
不良青少年(虚拟网格)
-
{{categoryList.blqsnFlagVirtualCount}}
+
{{ categoryList.blqsnFlagVirtualCount }}
@@ -446,22 +446,22 @@
-
-
+
+
-
+
精神障碍
-
{{categoryList.zszhjsbFlagCount}}
+
{{ categoryList.zszhjsbFlagCount }}
-
+
精神障碍(虚拟网格)
-
{{categoryList.zszhjsbFlagVirtualCount}}
+
{{ categoryList.zszhjsbFlagVirtualCount }}
@@ -469,19 +469,19 @@
-
-
+
+
-
+
邪教人员
-
{{categoryList.xjryFlagCount}}
+
{{ categoryList.xjryFlagCount }}
-
+
邪教人员(虚拟网格)
{{ categoryList.xjryFlagVirtualCount }}
@@ -492,22 +492,22 @@
-
-
+
+
-
+
信访人员
-
{{categoryList.petitionOfficerFlagCount}}
+
{{ categoryList.petitionOfficerFlagCount }}
-
+
信访人员(虚拟网格)
-
{{categoryList.petitionOfficerFlagVirtualCount}}
+
{{ categoryList.petitionOfficerFlagVirtualCount }}
@@ -515,22 +515,22 @@
-
-
+
+
-
+
统战人员
-
{{categoryList.unitedFrontFlagCount}}
+
{{ categoryList.unitedFrontFlagCount }}
-
+
统战人员(虚拟网格)
-
{{categoryList.unitedFrontFlagVirtualCount}}
+
{{ categoryList.unitedFrontFlagVirtualCount }}
@@ -538,22 +538,22 @@
-
-
+
+
-
+
志愿者
-
{{categoryList.volunteerFlagCount}}
+
{{ categoryList.volunteerFlagCount }}
-
+
志愿者(虚拟网格)
-
{{categoryList.volunteerFlagVirtualCount}}
+
{{ categoryList.volunteerFlagVirtualCount }}
@@ -561,23 +561,23 @@
- -
-
+ +
+
-
+
楼长
-
{{categoryList.buildingChiefFlagCount}}
+
{{ categoryList.buildingChiefFlagCount }}
-
+
楼长(虚拟网格)
-
{{categoryList.buildingChiefFlagVirtualCount}}
+
{{ categoryList.buildingChiefFlagVirtualCount }}
@@ -585,22 +585,22 @@
-
-
+
+
-
+
单元长
-
{{categoryList.unitChiefFlagVirtualCount}}
+
{{ categoryList.unitChiefFlagVirtualCount }}
-
+
单元长(虚拟网格)
-
{{categoryList.unitChiefFlagVirtualCount}}
+
{{ categoryList.unitChiefFlagVirtualCount }}
@@ -608,23 +608,23 @@
- -
-
+ +
+
-
+
公益岗
-
{{categoryList.publicWelfareFlagCount}}
+
{{ categoryList.publicWelfareFlagCount }}
-
+
公益岗(虚拟网格)
-
{{categoryList.publicWelfareFlagVirtualCount}}
+
{{ categoryList.publicWelfareFlagVirtualCount }}
@@ -668,19 +668,28 @@ export default { this.$message.error(msg) } }, - handelClickToResi(e){ + handelClickToResi(e) { console.log(e); - this.$router.push({ - name: "base-resi", - query: { - category: e || null, + this.$router.push({ + name: "base-resi", + query: { + category: e || null, + }, + + }) + }, + handelClickTovirtualResi(e) { + console.log(e); + this.$router.push({ + name: "base-virtualResi", + query: { + category: e || null, + }, + }); }, - }); - }, - } + } } - // import addCategory from "./addCategory"; diff --git a/src/views/modules/base/virtualResi.vue b/src/views/modules/base/virtualResi.vue index a41fa6c87..9f824753c 100644 --- a/src/views/modules/base/virtualResi.vue +++ b/src/views/modules/base/virtualResi.vue @@ -1219,26 +1219,56 @@ export default { }, }, watch: { - $route: { - handler: function (newVal, oldVal) { - // console.log(newVal, oldVal) - if (newVal.name == "base-resi") { - this.$nextTick(() => { - if (newVal.params.category) { - this.$refs.myResiSearch.form.categoryKey = [] - this.$refs.myResiSearch.form.categoryKey.push(newVal.params.category) - this.handleSearchFrom() - } else { - // this.$refs.myResiSearch.form.categoryKey = [] - // this.handleSearchFrom() - } - }) - } - }, - deep: true, - immediate: true + $route: { + handler: function (newVal, oldVal) { + if (newVal.name == "base-virtualResi" && (!oldVal || oldVal.name === 'base-classification')) { + console.log(oldVal); + this.$nextTick(() => { + this.$refs.myResiSearch.form.attentionCrowds = []; + this.$refs.myResiSearch.form.healthStatus = []; + this.$refs.myResiSearch.form.specialCategoryCodes = []; + this.$refs.myResiSearch.form.partyFlag=null; + if (newVal.query.category === 'SPECIAL_SUPPORT_FLAG' ||newVal.query.category === 'SUBSISTENCE_ALLOWANCE_FLAG'|| newVal.query.category === 'VETERAN_FLAG'|| newVal.query.category === 'ENSURE_HOUSE_FLAG'|| newVal.query.category === 'OLD_PEOPLE_FLAG'|| newVal.query.category === 'FERTILE_WOMAN_FLAG' || newVal.query.category === 'FLOATING_FLAG' || newVal.query.category === 'NEW_STRATUM_FLAG' || newVal.query.category === 'permanentFlag') { + this.$refs.myResiSearch.form.attentionCrowds.push( + newVal.query.category + ); + } else if(newVal.query.category === 'CHRONIC_DISEASE_FLAG' ||newVal.query.category === 'SERIOUS_ILLNESS_FLAG'||newVal.query.category === 'DISABILITY_FLAG'){ + this.$refs.myResiSearch.form.healthStatus.push( + newVal.query.category + ); + }else if(newVal.query.category === 'SQJZ_FLAG' || newVal.query.category === 'AZBJ_FLAG' || newVal.query.category === 'DRUG_FLAG' || newVal.query.category === 'XJRY_FLAG' || newVal.query.category === 'ZSZHJSB_FLAG' || newVal.query.category === 'UNITED_FRONT_FLAG'|| newVal.query.category === 'PETITION_OFFICER_FLAG' || newVal.query.category === 'BLQSN_FLAG'){ + let obj = { + SQJZ_FLAG:'shequjiaozheng', + AZBJ_FLAG:'anzhibangjiao', + DRUG_FLAG:'xidurenyuan', + XJRY_FLAG:'xiejiaorenyuan', + ZSZHJSB_FLAG:'zhaoshizhaohuojingshenbing', + UNITED_FRONT_FLAG:'tongzhanrenyuan', + PETITION_OFFICER_FLAG:'xinfangrenyaun', + BLQSN_FLAG:'buliangqingshaonian' + } + this.$refs.myResiSearch.form.specialCategoryCodes = [obj[newVal.query.category]]; + }else if(newVal.query.category === 'PARTY_FLAG'){ + this.$refs.myResiSearch.form.partyFlag =1; + }else if(newVal.query.category === 'BUILDING_CHIEF_FLAG' || newVal.query.category === 'VOLUNTEER_FLAG' || newVal.query.category === 'UNIT_CHIEF_FLAG' || newVal.query.category ==='PUBLIC_WELFARE_FLAG'){ + console.log(newVal.query.category); + this.$refs.myResiSearch.form.identity = newVal.query.category; + }else if(newVal.query.category === 'MASS_FLAG'){ + this.$refs.myResiSearch.form.partyFlag = 0; + }else if(newVal.query.category === 'LEAGUE_FLAG'){ + this.$refs.myResiSearch.form.partyFlag = 2; + } else if(newVal.query.category === 'UNEMPLOYED_FLAG'){ + this.$refs.myResiSearch.form.careerStatus = '0'; + } + this.handleSearchFrom(); + }); } + + }, + deep: true, + immediate: true, }, + }, };