From f0081f892ed51395239a490e35b6c07cc0725138 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Tue, 10 Oct 2023 15:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B+=E5=8D=95=E5=85=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |   6 +-
 src/views/components/fixed1920.vue            |   2 +-
 .../cpts/family/modules/BusinessRecords.vue   |  47 ++------
 .../cpts/family/modules/EnjoyService.vue      |  35 +++---
 .../dataBoard/cpts/homeDetails/index.vue      | 113 +++++++++++-------
 src/views/dataBoard/cpts/map/index.vue        |   2 +-
 .../overview/familyPortrait/index.vue         |  70 ++++++-----
 src/views/dataBoardMain/main-content.vue      |   2 +-
 8 files changed, 143 insertions(+), 134 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index a6090f905..6f93f324e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -258,7 +258,8 @@ export const dataBoardRoutes = {
         title: "居民画像",
         isTab: false,
       },
-    },,
+    },
+    ,
     {
       path: "overview/familyPortrait",
       props: true,
@@ -455,10 +456,11 @@ export const dataBoardRoutes = {
       path: "/homeDetails/index",
       props: true,
       component: () => import("@/views/dataBoard/cpts/homeDetails/index"),
-      name: "homeDetails",
+      name: "HomeDetails",
       meta: {
         title: "单元",
         isTab: false,
+        keepAlive: false,
       },
     },
     {
diff --git a/src/views/components/fixed1920.vue b/src/views/components/fixed1920.vue
index 46341a169..0fc13df29 100644
--- a/src/views/components/fixed1920.vue
+++ b/src/views/components/fixed1920.vue
@@ -18,7 +18,7 @@ export default {
   computed: {
     bdStyle() {
       const { clientHeight, clientWidth } = this;
-      console.log("clientHeight", clientHeight);
+      // console.log("clientHeight", clientHeight);
       const scale = clientWidth / 1920;
       const height = clientHeight / scale;
       const top = (clientHeight - height) / 2;
diff --git a/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue b/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue
index eb9028f0d..b9a6e0240 100644
--- a/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue
+++ b/src/views/dataBoard/cpts/family/modules/BusinessRecords.vue
@@ -1,36 +1,12 @@
 <template>
   <div class="business-records">
     <Tabs v-model="type" :list="typeList" @changeVal="typeChange" />
-    <complaint
-      @changeTotal="changeTotal"
-      :juminArr="juminArr"
-      v-show="type == 1"
-    />
-    <economize
-      @changeTotal="changeTotal"
-      :juminArr="juminArr"
-      v-show="type == 2"
-    />
-    <community
-      @changeTotal="changeTotal"
-      :juminArr="juminArr"
-      v-show="type == 3"
-    />
-    <reporting-events
-      @changeTotal="changeTotal"
-      :juminArr="juminArr"
-      v-show="type == 4"
-    />
-    <resident
-      @changeTotal="changeTotal"
-      :juminArr="juminArr"
-      v-show="type == 5"
-    />
-    <giveService
-      @changeTotal="changeTotal"
-      :juminArr="juminArr"
-      v-show="type == 6"
-    />
+    <complaint @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 1" />
+    <economize @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 2" />
+    <community @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 3" />
+    <reporting-events @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 4" />
+    <resident @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 5" />
+    <giveService @changeTotal="changeTotal" :juminArr="juminArr" v-show="type == 6" />
   </div>
 </template>
 
@@ -123,9 +99,7 @@ export default {
       this.type = e;
     },
     changeTotal(item) {
-      this.typeList[item.name].label = item.total
-        ? `${this.typeLists[item.name].label}（${item.total}）`
-        : this.typeLists[item.name].label;
+      this.typeList[item.name].label = item.total ? `${this.typeLists[item.name].label}（${item.total}）` : this.typeLists[item.name].label;
     },
   },
 };
@@ -138,15 +112,14 @@ export default {
 }
 .table {
   /deep/ .el-table td,
-  /deep/ .el-table th,
   /deep/ .el-table tr {
-    padding: 14px !important;
+    padding: 3px 14px !important;
     border: none !important;
-    min-height: 52px;
   }
-  /deep/ .el-table td,
   /deep/ .el-table th {
     background: none !important;
+    padding: 6px 14px !important;
+    border: none !important;
   }
   /deep/ .el-table td {
     font-size: 14px;
diff --git a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue
index 7f028803a..06868b2fa 100644
--- a/src/views/dataBoard/cpts/family/modules/EnjoyService.vue
+++ b/src/views/dataBoard/cpts/family/modules/EnjoyService.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="table">
-    <el-table :data="list" max-height="390px" height="390px">
+    <el-table v-if="list.length > 0" :data="list" max-height="390px" height="390px">
       <el-table-column label="序号" type="index" width="80" />
       <el-table-column label="变更人" prop="resiName" width="140" />
       <el-table-column label="变更类型" prop="typeName" width="" />
@@ -9,8 +9,13 @@
       <el-table-column label="操作人" prop="operatorName" width="120" />
       <el-table-column label="调整时间" prop="changeTime" width="190" />
     </el-table>
+
+    <div v-else style="width: 100%; height: 100%; text-align: center; padding-top: 20px">
+      <img width="268px" height="128px" src="~@/assets/images/overview/zanwu.png" />
+      <div style="color: #fff">暂无数据</div>
+    </div>
   </div>
-</template> 
+</template>
 
 <script>
 export default {
@@ -38,8 +43,8 @@ export default {
   },
   methods: {
     getList() {
-    const query = this.$route.query;
-    this.houseId = query.houseId;
+      const query = this.$route.query;
+      this.houseId = query.houseId;
       // 办理状态(-2：未知，-1：不接受回访，0：接受回访/待回访，1已回访)
       const completeFlags = {
         "-2": "未知",
@@ -48,21 +53,15 @@ export default {
         1: "已回访",
       };
       // 省满意度列表
-      this.$http
-        .get(
-          "/actual/base/peopleRoomOverview/houseResidentChangeRecord?houseId=" +
-            this.houseId
-        )
-        .then(({ data: res }) => {
-          console.log('res::',res);
-          this.list = res.data.map((item) => {
-            return {
-              ...item,
-              completeFlag: completeFlags[item.completeFlag],
-            };
-          });
-          this.total = res.data.length;
+      this.$http.get("/actual/base/peopleRoomOverview/houseResidentChangeRecord?houseId=" + this.houseId).then(({ data: res }) => {
+        this.list = res.data.map((item) => {
+          return {
+            ...item,
+            completeFlag: completeFlags[item.completeFlag],
+          };
         });
+        this.total = res.data.length;
+      });
     },
   },
 };
diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue
index d52eeb6c5..fe272ba6c 100644
--- a/src/views/dataBoard/cpts/homeDetails/index.vue
+++ b/src/views/dataBoard/cpts/homeDetails/index.vue
@@ -12,7 +12,7 @@
           },
         ]" />
     </div>
-    <div class="top-nav-list">
+    <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">
@@ -48,9 +48,9 @@
           <el-table :data="list" v-loading="loading" height="500" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
             <el-table-column label="序号" type="index" width="80" />
             <el-table-column prop="doorName" label="门牌号" />
-            <el-table-column prop="fullName" label="所属小区" />
-            <el-table-column prop="buildingId" label="所属楼栋" />
-            <el-table-column prop="houseName" label="所属单元" />
+            <el-table-column prop="fullName" show-overflow-tooltip label="所属小区" />
+            <el-table-column prop="buildingId" show-overflow-tooltip label="所属楼栋" />
+            <el-table-column prop="houseName" show-overflow-tooltip label="所属单元" />
             <el-table-column prop="houseCode" label="房屋编码" />
             <el-table-column prop="rentFlag" label="房屋状态">
               <template slot-scope="scope">
@@ -72,7 +72,7 @@
             </el-table-column>
             <el-table-column label="操作" width="90" align="center">
               <template slot-scope="{ row }">
-                <el-button type="text" @click="$router.push('/dataBoard/overview/familyPortrait/?name=' + row.doorName + '&houseId=' + row.id + '&id=' + $route.query.id + '&name2=' + (homeText ? homeText : ''))">查看</el-button>
+                <el-button type="text" @click="$router.push(`/dataBoard/overview/familyPortrait/?name=${row.doorName}&houseId=${row.id}&id=${row.buildingId}&buId=${row.buildingUnitId}&type=${$route.query.typeB}&name2=${row.houseName}`)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -112,12 +112,27 @@ export default {
     };
   },
   watch: {
-    "$route.query.id"() {
-      this.getList();
-    },
+    // "$route.query.buIding": {
+    //   handler(val) {
+    //     if (val) {
+    //       this.getList(val);
+    //     }
+    //   },
+    //   immediate: true,
+    // },
+    // "$route.query.typeB": {
+    //   handler(val) {
+    //     console.log("jhjkbhkjhkjhkjhkjhkj");
+    //     if (val) {
+    //       this.getList();
+    //     }
+    //   },
+    //   immediate: true,
+    // },
   },
   mounted() {
-    this.getList();
+    const buId = this.$route.query.buId || null;
+    this.getList(buId);
   },
   methods: {
     getDoorNameList(list) {
@@ -151,52 +166,65 @@ export default {
       return doorNameList;
     },
 
-    getList() {
+    getUnitList(id) {
+      this.$http.get(`/actual/base/streetOverview/getUnitHouseList?unitId=` + id).then((res) => {
+        const {
+          code,
+          data: { houseList, unitInfo },
+        } = res.data;
+        if (code === 0) {
+          let unitInfos = unitInfo || {};
+          this.list = houseList;
+          this.homeMsg = unitInfos;
+          this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : "") + (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : "");
+          this.houseMountArr = this.getDoorNameList(this.list);
+          if (this.houseMountArr.length > 0) {
+            this.flexWidth = this.houseMountArr[0].length * 58;
+          }
+          this.loading = false;
+        } else {
+          this.loading = false;
+        }
+      });
+    },
+
+    getList(buid) {
       this.loading = true;
-      const homeType = this.$route.query.type;
+      const homeType = this.$route.query.typeB;
       if (homeType === "building") {
         this.$http.get(`/actual/base/streetOverview/getUnitListByBuilding?buildingId=` + "1514914015259979777").then((res) => {
           const { code, data } = res.data;
           if (code === 0) {
             this.buildingList = data;
             this.homeText = this.buildingList[0].buildingName + this.buildingList[0].unitName;
-            this.buildingList.forEach((item, i) => {
-              if (i === 0) {
-                item.ifActive = true;
-              } else {
-                item.ifActive = false;
-              }
-            });
-            this.loading = false;
-          } else {
-            this.loading = false;
-          }
-        });
-      } else {
-        this.$http.get(`/actual/base/streetOverview/getUnitHouseList?unitId=` + this.$route.query.id).then((res) => {
-          const {
-            code,
-            data: { houseList, unitInfo },
-          } = res.data;
-          if (code === 0) {
-            let unitInfos = unitInfo || {};
-            this.list = houseList;
-            this.homeMsg = unitInfos;
-            this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : "") + (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : "");
-            console.log(this.homeText, " this.homeText");
-            this.houseMountArr = this.getDoorNameList(this.list);
-            // this.houseMountArr = [
-            //   [{ doorName: 101 }, { doorName: 102 }, { doorName: 103 }, { doorName: 104 }, { doorName: 105 }, { doorName: 106 }, { doorName: 107 }, { doorName: 108 }, { doorName: 109 }],
-            //   [{ doorName: 201 }, { doorName: 202 }, { doorName: 203 }, { doorName: 204 }, { doorName: 205 }, { doorName: 206 }, { doorName: 207 }, { doorName: 208 }, { doorName: 209 }],
-            // ];
-            if (this.houseMountArr.length > 0) {
-              this.flexWidth = this.houseMountArr[0].length * 58;
+            if (buid) {
+              this.buildingList.forEach((item, i) => {
+                console.log(item);
+                if (item.id === buid) {
+                  item.ifActive = true;
+                  this.getUnitList(item.id);
+                } else {
+                  item.ifActive = false;
+                }
+              });
+            } else {
+              this.buildingList.forEach((item, i) => {
+                if (i === 0) {
+                  item.ifActive = true;
+                  this.getUnitList(item.id);
+                } else {
+                  item.ifActive = false;
+                }
+              });
             }
+
             this.loading = false;
           } else {
             this.loading = false;
           }
         });
+      } else {
+        this.getUnitList(this.$route.query.id);
       }
     },
 
@@ -225,6 +253,7 @@ export default {
       buildList.forEach((d) => {
         if (item.id === d.id) {
           d.ifActive = true;
+          this.getUnitList(item.id);
         } else {
           d.ifActive = false;
         }
diff --git a/src/views/dataBoard/cpts/map/index.vue b/src/views/dataBoard/cpts/map/index.vue
index 500d36d69..c8dbfad2c 100644
--- a/src/views/dataBoard/cpts/map/index.vue
+++ b/src/views/dataBoard/cpts/map/index.vue
@@ -841,7 +841,7 @@ export default {
           popup.remove();
         });
         pointMarkerItem.on("click", () => {
-          this.$router.push(`/homeDetails/index?id=${data[i].id}&type=${peopleType}`);
+          this.$router.push(`/homeDetails/index?id=${data[i].id}&typeB=${peopleType}`);
         });
 
         pointMarker.addMarker(pointMarkerItem);
diff --git a/src/views/dataBoard/overview/familyPortrait/index.vue b/src/views/dataBoard/overview/familyPortrait/index.vue
index b6b32c79d..b1d9311a6 100644
--- a/src/views/dataBoard/overview/familyPortrait/index.vue
+++ b/src/views/dataBoard/overview/familyPortrait/index.vue
@@ -1,50 +1,56 @@
 <template>
   <div>
     <div class="breadcrumb">
-      <Breadcrumb :list="breadcrumbList"/>
+      <Breadcrumb :list="breadcrumbList" />
     </div>
-    <Family/>
+    <Family />
   </div>
 </template>
 
 <script>
-import Breadcrumb from '@/views/dataBoard/satisfactionEval/components/Breadcrumb'
-import Family from '@/views/dataBoard/cpts/family'
+import Breadcrumb from "@/views/dataBoard/satisfactionEval/components/Breadcrumb";
+import Family from "@/views/dataBoard/cpts/family";
 export default {
   name: "dissatisfiedPersonnelDetail",
   components: {
     Breadcrumb,
-    Family
+    Family,
   },
   data() {
     return {
-      breadcrumbList: [{
-        path: '/dataBoard/overview/index',
-        name: '概览'
-      }, {
-        path: '/homeDetails/index',
-        name: '画像匹配同类潜在不满意人员 '
-      }, {
-        path: '',
-        name: ''
-      }],
-    }
+      breadcrumbList: [
+        {
+          path: "/dataBoard/overview/index",
+          name: "概览",
+        },
+        {
+          path: "/homeDetails/index",
+          name: "",
+        },
+        {
+          path: "",
+          name: "",
+        },
+      ],
+    };
   },
-  watch: {
-    '$route.query'() {
-      this.$set(this.breadcrumbList[1], 'name', this.$route.query.name2)
-      this.$set(this.breadcrumbList[1], 'path', this.breadcrumbList[1].path + '?id=' +this.$route.query.id)
-      this.$set(this.breadcrumbList[2], 'name', this.$route.query.name)
-      this.breadcrumbList[2].name = this.$route.query.name
-    }
+  // watch: {
+  //   "$route.query.name"() {
+  //     this.breadcrumbList[1].name = this.$route.query.name2;
+  //   },
+  //   "$route.query.name2"() {
+  //     this.breadcrumbList[2].name = this.$route.query.name;
+  //   },
+  // },
+  activated() {
+    // console.log(this.$route.query);
+    const { name, name2, id, buId, type } = this.$route.query;
+    this.breadcrumbList[1].name = name2;
+    this.breadcrumbList[2].name = name;
+    const url = type === "building" ? `/homeDetails/index?id=${id}&buId=${buId}&typeB=${type}` : `/homeDetails/index?id=${buId}&buId=${buId}&typeB=${type}`;
+    this.breadcrumbList[1].path = url;
   },
-  mounted() {
-    this.$set(this.breadcrumbList[1], 'name', this.$route.query.name2)
-    this.$set(this.breadcrumbList[1], 'path', this.breadcrumbList[1].path + '?id=' +this.$route.query.id)
-    this.$set(this.breadcrumbList[2], 'name', this.$route.query.name)
-    this.breadcrumbList[2].name = this.$route.query.name
-  }
-}
+};
 </script>
 
 <style scoped lang="scss">
@@ -52,7 +58,7 @@ export default {
   background: url("@/assets/images/manyidu/icon_fk.png") no-repeat left center;
   font-size: 18px;
   font-weight: 500;
-  color: #FFFFFF;
+  color: #ffffff;
   line-height: 22px;
   padding-left: 26px;
   margin-bottom: 20px;
@@ -60,4 +66,4 @@ export default {
 .breadcrumb {
   margin-bottom: 25px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/dataBoardMain/main-content.vue b/src/views/dataBoardMain/main-content.vue
index 9724dbc5e..9c734e908 100644
--- a/src/views/dataBoardMain/main-content.vue
+++ b/src/views/dataBoardMain/main-content.vue
@@ -5,7 +5,7 @@
       <template v-if="tabIsIframe($router.currentRoute.meta.iframeURL)">
         <iframe :src="$router.currentRoute.meta.iframeURL + '?token=' + token + '&customerId=' + customerId" ref="iframe" class="m-iframe" id="iframe" width="100%" height="100%" frameborder="0" scrolling="yes" :style="{ height: $store.state.fixed1920.height - 100 + 'px' }" />
       </template>
-      <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)">
+      <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)" :exclude="['homeDetails']">
         <router-view ref="reloadPage" @changeCustomerName="changeCustomerName" />
       </keep-alive>
     </template>