From b797ee09309709cdd0d80b262f8e2c78c509f039 Mon Sep 17 00:00:00 2001
From: PLUTO <>
Date: Thu, 12 Oct 2023 18:39:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=B9=E6=9C=8D=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98icon=E5=9B=BE=E6=A0=87=EF=BC=8C=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E5=91=98=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/home/tfry.png               | Bin 0 -> 819 bytes
 .../dataBoard/cpts/homeDetails/index.vue      |  62 ++++++++++--------
 2 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 src/assets/images/home/tfry.png

diff --git a/src/assets/images/home/tfry.png b/src/assets/images/home/tfry.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1e4b83bd2b84d2b1b11102d10ccfb1dc5dab185
GIT binary patch
literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%?MXyIR5(wqlWj=VXBft>>p6d4dRy)|aly)cF={U)Zb$8mpe@Q~ZXeV}NQ1>(
zr9w+LHll49464b*RTKr9pfxZ&5=BT!u`lYjnj6!|%*k+LIp~~_4W^#+T;qS1&hmJQ
zvFF=!-S_?D;(j6i=f`-wwxCK$R0zl-APC=E;c!VRTj#2q6Br1o0Ym|WS^}3{Ktxz?
zi1#717kRle7BnU>5K@(Z-LQD6IF-N5ENl&GnL~70;XsL(M;?UE0$!1vU<kiii?Yp6
z@N6s>ZFf{6;E?rV=^JEZX3i{N^QcxiLf2S2Qg)D&v4AIsm7F{ucOw?rTbJ;9Twvp`
z@>2+Gdx}rS8(7nbf)et#E#tRwfrkc_mgvFli3pbO%H&Wi=<#8#kVT($kXDhwP+XuJ
ztiP^v*5Xd}b9^fnu&!UHK+LOthD8q@ikq;%S5I5v8(DlA4&&pRJdU|~O^+UP9PBp+
zMK+9_k8(KjNWf_E*IGUqMuULoVR2Oi4e=s?YYD{m8b5D6@*ck1sdNc@L0m{Q2w5V_
zEtUtpb`lv@Sa~;s&ztl4=R+NqwQDUC&}xWYj|Y`UH{S20{DShVa7@C231L&yYaE<&
zC|l0R?=X61AGVb6i_$aNEFgD$0*8|v_(>GX;9%IIKgpn0z!nj!PZ#s&Dd_ZKzuurl
zo+R8b2K8;FtSvsJObIvdB?bYc05A})2HvF4)r(uyV1bqGTj`$#%s-)hG}zct##}e}
zYNOI%F(Baa`}#z5cD&8?uC}383rq@r0#M%Z4g;<hb@;+@B`geM$QV>zDQDXhV9gO_
z8-q&}yitwln;_P8mGk$hoR^R46D#C>Rmp;Bps!v&N9Ya<tE@%z*sr~Z0g&?5=~)lZ
z31XDOE8W!$uC9}JoJeN`N-)R-(b7}J#s50|EZY3$Xpio_NCbsH?BPZC>-$to|MK9E
xANTxoX4waI9>j(jt+3yHz~pIQtOfnA+TXd@BP3YPfYbm0002ovPDHLkV1leUfUy7o

literal 0
HcmV?d00001

diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue
index 306f097e4..38ff69a85 100644
--- a/src/views/dataBoard/cpts/homeDetails/index.vue
+++ b/src/views/dataBoard/cpts/homeDetails/index.vue
@@ -129,11 +129,14 @@
                 <span style="color: #3cf5ff" v-else>否</span>
               </template>
             </el-table-column>
-            <el-table-column prop="importanceNum" width="140" label="重点人员">
+            <el-table-column prop="categorys" width="140" label="重点人员">
               <template slot="header"> <img :src="require('@/assets/images/home/dangerPeople.png')" alt="" /> 重点人员 </template>
               <template slot-scope="scope">
-                <span style="color: #f95619" v-if="+scope.row.importanceNum > 0">是</span>
-                <span style="color: #3cf5ff" v-else>否</span>
+                <div v-if="scope.row.categorys && scope.row.categorys.length > 0" style="display: flex; align-items: center; margin-bottom: 5px">
+                  <div v-for="item in scope.row.categorys.slice(0, 5)" :key="item">
+                    <img :src="require(`@/assets/images/home/${getHomeTypesMap(item)}.png`)" alt="" style="width: 20px; height: 20px; margin-right: 5px" />
+                  </div>
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="90" align="center">
@@ -142,6 +145,10 @@
               </template>
             </el-table-column>
           </el-table>
+          <!-- <div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 120px">
+            <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
+            <div style="color: #fff">暂无数据</div>
+          </div> -->
         </div>
         <div>
           <Pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" @pagination="getTableData" />
@@ -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) {