Merge branch 'bug_mk' into dev

src/components/PopHomeTip/index.vue

@@ -4,8 +4,8 @@
       <div style="margin-bottom: 13px">家庭类别</div>
       <div v-if="homeTypeArr.length > 0">
         <div class="listMsg" v-for="itm in homeTypeArr" :key="itm">
-          <img :src="require(`@/assets/images/home/${getHomeTypesMap(itm)[1]}.png`)" alt="" />
-          <span style="margin-left: 3px">{{ getHomeTypesMap(itm)[0] }}</span>
+          <img :src="require(`@/assets/images/home/${getHomeTypesMap(itm)}.png`)" alt=""  style="width: 20px;height: 20px;"/>
+          <span style="margin-left: 3px">{{itm}}</span>
         </div>
       </div>
       <div v-else>暂无</div>
@@ -39,39 +39,46 @@ export default {
     // 家庭类别Map
     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];
+                ["群众", "qz"],
+                ["流动人员", "dbry"],
+                ["党员", "dy"],
+                ["共青团员", "gqty"],
+                ["残疾人", "cjr"],
+                ["大病人员", "dbry"],
+                ["慢病人员", "mxbry"],
+                ["老年人", "lnr"],
+                ["低保人员", "dbry1"],
+                ["退役军人", "tyjr"],
+                ["保障房人员", "bzfry"],
+                ["育龄妇女", "ylfn"],
+                ["特扶人员", "tfry"],
+                ["留守儿童", "lset"],
+                ["艾滋病人员", "azb"],
+                ["失业人员", "syry"],
+                ["新阶层人士", "xjcrs"],
+                ["新就业群体", "xjyqt"],
+                ["安置帮教", "azbj"],
+                ["吸毒人员", "xdry"],
+                ["社区矫正", "sqjz"],
+                ["不良青少年", "blqsn"],
+                ["肇事肇祸精神病", "szry"],
+                ["邪教人员", "xjry"],
+                ["信访人员", "xfry"],
+                ["统战人员", "tzry"],
+                ["志愿者", "zyz"],
+                ["网格员", "wgy"],
+                ["楼长", "lzdyz"],
+                ["单元长", "dyz"],
+                ["公益岗", "gyg"],
+            ]);
+            return homeTypeMap.get(item);
     },
 
     getHomeTypes(id) {
       this.$http.get(`/actual/base/organizational/structure/getResidentCategoryByHouseId?houseId=${id}`).then((res) => {
         const { code, msg, data } = res.data;
         if (code === 0) {
-          const newItem = data[0];
-          const itemNumOne = Object.keys(newItem).filter((key) => newItem[key] === 1);
-          this.homeTypeArr = itemNumOne;
+          this.homeTypeArr = data.categoryNameList
         } else {
           this.$message.error(msg);
         }