楼栋tabs切换修改字段类型，耀博修改列表提交

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> -->
@@ -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;
   }
 }
 

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" />