From 1f6079e9ddf9b1ef63883cd4f6090e000069c8d2 Mon Sep 17 00:00:00 2001 From: PLUTO <> Date: Thu, 12 Oct 2023 17:18:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A5=BC=E6=A0=8Btabs=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E8=80=80=E5=8D=9A=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataBoard/cpts/homeDetails/index.vue | 55 ++++++++++++++++++- .../dataBoard/overview/components/jdwgy.vue | 6 +- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue index 6037d4d03..306f097e4 100644 --- a/src/views/dataBoard/cpts/homeDetails/index.vue +++ b/src/views/dataBoard/cpts/homeDetails/index.vue @@ -12,7 +12,7 @@ }, ]" /> -
+
{{ item.buildingName }}{{ item.unitName }}
@@ -26,7 +26,7 @@
-->
-
+
/
@@ -57,6 +57,24 @@ /
+
+
+ / +
+
+
+
+
+
+
+
+
+
+ +
+ / +
+
@@ -186,6 +204,7 @@ export default { // { doorName: 104, riskyNum: 0, importanceNum: 0, rentFlag: "2" }, // ], ], + freeHomeArr: [], }; }, watch: {}, @@ -248,6 +267,8 @@ export default { } = res.data; if (code === 0) { let unitInfos = unitInfo || {}; + const freeHomeArr = new Array(unitInfos.totalFloorNum).fill([{}, {}, {}]); + this.freeHomeArr = freeHomeArr; this.homeMsg = unitInfos; this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : "") + (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : ""); this.houseMountArr = this.getDoorNameList(houseList); @@ -343,6 +364,34 @@ export default { return houseTypeMap.get(type); }, + getHomeTypesMap(item) { + const homeTypeMap = new Map([ + ["partyFlag", { name: "党员", icon: "dy" }], + ["subsistenceAllowanceFlag", { name: "低保人员", icon: "dbry" }], + ["ensureHouseFlag", { name: "保障房人员", icon: "bzfry" }], + ["unemployedFlag", { name: "失业人员", icon: "syry" }], + ["fertileWomanFlag", { name: "育龄妇女", icon: "ylfn" }], + ["veteranFlag", { name: "退役军人", icon: "tyjr" }], + ["unitedFrontFlag", { name: "统战人员", icon: "tzry" }], + ["petitionOfficerFlag", { name: "信访人员", icon: "xfry" }], + ["volunteerFlag", { name: "志愿者", icon: "zyz" }], + ["oldPeopleFlag", { name: "老年人", icon: "lnr" }], + ["emptyNesterFlag", { name: "空巢老人", icon: "kclr" }], + ["specialSupportFlag", { name: "特扶人员", icon: "tfry" }], + ["disabledFlag", { name: "失能人员", icon: "snry" }], + ["dementedFlag", { name: "失智人员", icon: "szry" }], + ["disabilityFlag", { name: "残疾人", icon: "cjr" }], + ["seriousIllnessFlag", { name: "大病人员", icon: "dbry" }], + ["chronicDiseaseFlag", { name: "慢性病人员", icon: "mxbry" }], + ["specialCrowdFlag", { name: "特殊人群", icon: "tsry" }], + ["tenantFlag", { name: "租户", icon: "zh" }], + ["floatingFlag", { name: "流动人员", icon: "ldry" }], + ["liveAloneFlag", { name: "独居老人", icon: "kclr" }], + ["publicWelfareFlag", { name: "公益岗人员", icon: "gyg" }], + ]); + return [homeTypeMap.get(item).name, homeTypeMap.get(item).icon]; + }, + chooseNav(item) { let buildList = [...this.buildingList]; this.homeText = item.buildingName + item.unitName; @@ -402,7 +451,7 @@ export default { font-weight: 500; color: #fff; &:not(:last-child) { - margin-right: 10px; + margin-right: 20px; } } diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue index b6b5f6a3c..33c6869d6 100644 --- a/src/views/dataBoard/overview/components/jdwgy.vue +++ b/src/views/dataBoard/overview/components/jdwgy.vue @@ -32,10 +32,10 @@ + - - - + + - + @@ -142,6 +145,10 @@ +
@@ -280,6 +287,7 @@ export default { }, getTableData(id) { + // const idx = "812295ba44c594fc85a808f67b7a8aa4"; this.queryParams.unitId = id; this.loading = true; this.$http.get("/actual/base/streetOverview/getUnitHouseOverviewList?" + this.$paramsFormat(this.queryParams)).then((res) => { @@ -366,30 +374,32 @@ export default { getHomeTypesMap(item) { const homeTypeMap = new Map([ - ["partyFlag", { name: "党员", icon: "dy" }], - ["subsistenceAllowanceFlag", { name: "低保人员", icon: "dbry" }], - ["ensureHouseFlag", { name: "保障房人员", icon: "bzfry" }], - ["unemployedFlag", { name: "失业人员", icon: "syry" }], - ["fertileWomanFlag", { name: "育龄妇女", icon: "ylfn" }], - ["veteranFlag", { name: "退役军人", icon: "tyjr" }], - ["unitedFrontFlag", { name: "统战人员", icon: "tzry" }], - ["petitionOfficerFlag", { name: "信访人员", icon: "xfry" }], - ["volunteerFlag", { name: "志愿者", icon: "zyz" }], - ["oldPeopleFlag", { name: "老年人", icon: "lnr" }], - ["emptyNesterFlag", { name: "空巢老人", icon: "kclr" }], - ["specialSupportFlag", { name: "特扶人员", icon: "tfry" }], - ["disabledFlag", { name: "失能人员", icon: "snry" }], - ["dementedFlag", { name: "失智人员", icon: "szry" }], - ["disabilityFlag", { name: "残疾人", icon: "cjr" }], - ["seriousIllnessFlag", { name: "大病人员", icon: "dbry" }], - ["chronicDiseaseFlag", { name: "慢性病人员", icon: "mxbry" }], - ["specialCrowdFlag", { name: "特殊人群", icon: "tsry" }], - ["tenantFlag", { name: "租户", icon: "zh" }], - ["floatingFlag", { name: "流动人员", icon: "ldry" }], - ["liveAloneFlag", { name: "独居老人", icon: "kclr" }], - ["publicWelfareFlag", { name: "公益岗人员", icon: "gyg" }], + ["PARTY_FLAG", "dy"], + ["SUBSISTENCE_ALLOWANCE_FLAG", "dbry"], + ["ENSURE_HOUSE_FLAG", "bzfry"], + ["UNEMPLOYED_FLAG", "syry"], + ["FERTILE_WOMAN_FLAG", "ylfn"], + ["VETERAN_FLAG", "tyjr"], + ["UNITED_FRONT_FLAG", "tzry"], + ["PETITION_OFFICER_FLAG", "xfry"], + ["VOLUNTEER_FLAG", "zyz"], + ["oldPeopleFlag", "lnr"], + ["EMPTY_NESTER_FLAG", "kclr"], + ["SPECIAL_SUPPORT_FLAG", "tfry"], + ["DISABLED_FLAG", "snry"], + ["DEMENTED_FLAG", "szry"], + ["DISABILITY_FLAG", "cjr"], + ["SERIOUS_ILLNESS_FLAG", "dbry"], + ["CHRONIC_DISEASE_FLAG", "mxbry"], + ["SPECIAL_CROWD_FLAG", "tsry"], + ["TENANT_FLAG", "zh"], + ["FLOATING_FLAG", "ldry"], + ["LIVE_ALONE_FLAG", "kclr"], + ["PUBLIC_WELFARE_FLAG", "gyg"], ]); - return [homeTypeMap.get(item).name, homeTypeMap.get(item).icon]; + console.log(item); + console.log(homeTypeMap.get(item)); + return homeTypeMap.get(item); }, chooseNav(item) {