合并feature-dev分支代码

src/views/dataBoard/cpts/homeDetails/index.vue

@@ -12,7 +12,7 @@
           },
         ]" />
     </div>
-    <div class="top-nav-list" v-if="$route.query.typeB !== building">
+    <div class="top-nav-list" v-if="$route.query.typeB == 'building'">
       <div v-for="item in buildingList" :key="item.id" :class="[item.ifActive ? 'top-nav-itemAC' : 'top-nav-item']" @click="chooseNav(item)">{{ item.buildingName }}{{ item.unitName }}</div>
     </div>
     <el-row :gutter="48">
@@ -26,7 +26,7 @@
           <people-mount />
         </div> -->
         <div class="apartment">
-          <div class="apar_comtent">
+          <div class="apar_comtent" v-if="houseMountArr.length > 0">
             <div class="apar_top">
               <img src="@/assets/images/home/homeTop.png" alt="/" />
             </div>
@@ -57,6 +57,24 @@
               <img src="@/assets/images/home/homeBottom.png" alt="/" />
             </div>
           </div>
+          <div v-else class="apar_comtent">
+            <div class="apar_top">
+              <img src="@/assets/images/home/homeTop.png" alt="/" />
+            </div>
+            <div style="min-width: 284px; max-width: 488px; padding: 0 20px">
+              <div class="apar_center">
+                <div class="apar_center_flex" style="width: 50px">
+                  <div v-for="(item, index) in freeHomeArr" :key="index" class="floor">
+                    <div v-for="(itm, i) in item" :key="i" class="freeHome"></div>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="apar_bottom">
+              <img src="@/assets/images/home/homeBottom.png" alt="/" />
+            </div>
+          </div>
           <!-- <div class="apar_right">
             <img src="@/assets/images/home/homeRight.png" alt="" />
           </div> -->
@@ -111,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">
@@ -124,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" />
@@ -186,6 +211,7 @@ export default {
         //   { doorName: 104, riskyNum: 0, importanceNum: 0, rentFlag: "2" },
         // ],
       ],
+      freeHomeArr: [],
     };
   },
   watch: {},
@@ -248,6 +274,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);
@@ -259,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) => {
@@ -343,6 +372,36 @@ export default {
       return houseTypeMap.get(type);
     },
 
+    getHomeTypesMap(item) {
+      const homeTypeMap = new Map([
+        ["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"],
+      ]);
+      console.log(item);
+      console.log(homeTypeMap.get(item));
+      return homeTypeMap.get(item);
+    },
+
     chooseNav(item) {
       let buildList = [...this.buildingList];
       this.homeText = item.buildingName + item.unitName;
@@ -402,7 +461,7 @@ export default {
   font-weight: 500;
   color: #fff;
   &:not(:last-child) {
-    margin-right: 10px;
+    margin-right: 20px;
   }
 }
 

src/views/dataBoard/overview/components/jdwgy.vue

@@ -32,10 +32,10 @@
       <!-- 单位/组织 -->
       <el-table :data="unitList" v-if="currentLevelData.orgLevel != 'grid' && peopleType === 'staffDepartment'" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px">
         <el-table-column label="序号" type="index" width="80" />
+        <el-table-column prop="orgName" label="组织名称" />
         <el-table-column prop="departmentName" label="单位名称" />
-        <el-table-column prop="departmentDuty" label="职责" />
-        <el-table-column prop="deptType" label="单位类型" />
-        <el-table-column prop="totalUser" label="总人数" />
+        <el-table-column prop="serviceType" label="服务类别" />
+        <el-table-column prop="deptType" label="单位分类" />
         <template slot="empty">
           <div style="width: 100%; height: 100%; text-align: center; padding-top: 50px; color: #ffffff">
             <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />