From 92186cbf64ba94f6157dad7192bf9c3c90d59d64 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Mon, 9 Oct 2023 18:16:22 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=A5=BC=E6=A0=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataBoard/cpts/homeDetails/index.vue      | 118 +++++++++++++-----
 1 file changed, 88 insertions(+), 30 deletions(-)

diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue
index 3fccea977..d52eeb6c5 100644
--- a/src/views/dataBoard/cpts/homeDetails/index.vue
+++ b/src/views/dataBoard/cpts/homeDetails/index.vue
@@ -12,6 +12,9 @@
           },
         ]" />
     </div>
+    <div class="top-nav-list">
+      <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">
       <el-col :span="8">
         <div class="bg">
@@ -104,6 +107,7 @@ export default {
       homeMsg: {},
       list: [],
       homeText: "",
+      buildingList: [],
       houseMountArr: [],
     };
   },
@@ -150,36 +154,50 @@ export default {
     getList() {
       this.loading = true;
       const homeType = this.$route.query.type;
-      // if (homeType === "building") {
-      //   this.$http.get(`/actual/base/streetOverview/getUnitHouseOverviewList?unitId=` + this.$route.query.id).then((res) => {
-      //     console.log(res);
-      //   });
-      // } 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 (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;
           }
-          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;
+            }
+            this.loading = false;
+          } else {
+            this.loading = false;
+          }
+        });
+      }
     },
 
     getRentFlag(type) {
@@ -200,6 +218,19 @@ export default {
       ]);
       return houseTypeMap.get(type);
     },
+
+    chooseNav(item) {
+      let buildList = [...this.buildingList];
+      this.homeText = item.buildingName + item.unitName;
+      buildList.forEach((d) => {
+        if (item.id === d.id) {
+          d.ifActive = true;
+        } else {
+          d.ifActive = false;
+        }
+      });
+      this.buildingList = buildList;
+    },
   },
 };
 </script>
@@ -221,9 +252,36 @@ export default {
   font-weight: 500;
 }
 
+@mixin navListCommon {
+  min-width: 120px;
+  height: 36px;
+  font-size: 14px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  margin-right: 4px;
+  text-align: center;
+  line-height: 36px;
+  cursor: pointer;
+}
+
+.top-nav-list {
+  display: flex;
+  margin-bottom: 16px;
+  .top-nav-item {
+    @include navListCommon;
+    background-image: url("~@/assets/images/home/noChooseMain.png");
+    color: #96b1ce;
+  }
+  .top-nav-itemAC {
+    @include navListCommon;
+    background-image: url("~@/assets/images/home/chooseMain.png");
+    color: #fff;
+  }
+}
+
 .homeWrap {
   .bread {
-    margin-bottom: 25px;
+    margin-bottom: 16px;
   }
 
   .apar_top {

From 154a3f025bdc4cd725c0e46538ec11fd8d6fb2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Tue, 10 Oct 2023 10:45:35 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=8D=E6=BB=A1=E6=84=8F=E4=BA=8B=E9=A1=B9=E6=9C=88=E5=BA=A6?=
 =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/home/index.vue | 57 +++++++++++++++-----------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 796364687..540d4a93e 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -278,7 +278,7 @@ export default {
     }
   },
   computed: {
-    maxTableHeight () {
+    maxTableHeight() {
       // return this.clientHeight - 450;
       return 420;
     },
@@ -314,14 +314,11 @@ export default {
     initChart() {
       this.$http.get('/governance/satisfactionOverview/notSatisfactionTrend').then(({data: {data}}) => {
         this.myChart = echarts.init(document.getElementById('my_chart'));
-        let series = []
-        console.log(data,'datadatadata')
-        data.series.forEach(item => {
-          series.push({
+        let series = data.series.map((item, index) => {
+          return {
             ...item,
             type: 'line',
-            stack: 'Total',
-          })
+          }
         })
         let option = {
           tooltip: {
@@ -361,15 +358,15 @@ export default {
       })
 
     },
-    handleWindowResize () {
+    handleWindowResize() {
       if (this.myChart) {
         this.myChart.resize();
       }
     },
-    searchDataTab (str) {
+    searchDataTab(str) {
       this.searchData.type = str;
     },
-    handleClickCategory (item) {
+    handleClickCategory(item) {
       this.$router.push({
         name: "base-resi",
         params: {
@@ -378,18 +375,18 @@ export default {
       });
 
     },
-    async readClearOne (item) {
+    async readClearOne(item) {
       console.log("item", item)
       const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`
-      const { data, code, msg } = await requestPost(url)
+      const {data, code, msg} = await requestPost(url)
       if (code == 0) {
         this.getNoticeData()
       } else if (code >= 8000) {
         this.$message.error(msg)
       }
     },
-    handleClickNotice (item) {
-      const { msgType, targetId } = item;
+    handleClickNotice(item) {
+      const {msgType, targetId} = item;
       this.readClearOne(item)
       if (msgType == "community_house") {
         this.$refs.fastcall.showHouseInfo(targetId);
@@ -398,13 +395,13 @@ export default {
       }
     },
 
-    toNoticePage () {
+    toNoticePage() {
       this.$router.push({
         path: "/main/home-notice",
       });
     },
 
-    toSearchPage (type, searchKey) {
+    toSearchPage(type, searchKey) {
       this.$router.push({
         path: "/main/shequ-chaxun"
       });
@@ -412,9 +409,9 @@ export default {
       localStorage.setItem('homeSearchKey', searchKey)
     },
 
-    handleClickSearchBtn (str) {
+    handleClickSearchBtn(str) {
       const {
-        searchData: { type, searchKey },
+        searchData: {type, searchKey},
       } = this;
       if (str) {
         this.toSearchPage(type, searchKey);
@@ -424,7 +421,7 @@ export default {
       this.toSearchPage(type, searchKey);
     },
 
-    async getApiData () {
+    async getApiData() {
       await this.getOrgData();
       this.getWarningList();
       this.getZnycList();
@@ -433,14 +430,14 @@ export default {
     },
 
     //加载组织数据
-    async getOrgData () {
+    async getOrgData() {
       const url = "/gov/org/agency/maporg";
       let params = {
         orgId: "",
         level: "",
       };
 
-      const { data, code, msg } = await requestPost(url, params);
+      const {data, code, msg} = await requestPost(url, params);
 
       if (code === 0) {
         this.orgData = data;
@@ -450,14 +447,14 @@ export default {
     },
 
     //加载组织数据
-    async getPandectData () {
+    async getPandectData() {
       const url = "/actual/base/residentHouseMerge/communityOverview";
       let params = {
         // orgId: "",
         // level: "",
       };
 
-      const { data, code, msg } = await requestGet(url, params);
+      const {data, code, msg} = await requestGet(url, params);
 
       if (code === 0) {
         if (data) {
@@ -469,13 +466,13 @@ export default {
     },
 
     //加载组织数据
-    async getNoticeData () {
+    async getNoticeData() {
       const url = "/message/intelligentMessage/list";
       let params = {
         last: "10",
       };
 
-      const { data, code, msg } = await requestGet(url, params);
+      const {data, code, msg} = await requestGet(url, params);
 
       if (code === 0) {
         if (data) {
@@ -487,7 +484,7 @@ export default {
     },
 
     //加载组织数据
-    async getWarningList () {
+    async getWarningList() {
       const url = "/actual/base/resiCategory/categoryCountList";
       let params = {
         // id: this.orgData.id,
@@ -495,7 +492,7 @@ export default {
       };
 
       this.resiCategory.loading = true;
-      const { data, code, msg } = await requestGet(url, params);
+      const {data, code, msg} = await requestGet(url, params);
       this.resiCategory.loading = false;
 
       if (code === 0) {
@@ -507,7 +504,7 @@ export default {
               name: resiCategoryMap[item.categoryName] || "",
               count: item.categoryCount,
               per: parseInt(
-                (100 * item.categoryCount) / data.resiCount
+                  (100 * item.categoryCount) / data.resiCount
               ),
               const: "const",
             };
@@ -518,7 +515,7 @@ export default {
       }
     },
     //加载智能预测数据
-    async getZnycList () {
+    async getZnycList() {
       const url = "/actual/base/resiCategory/intelligentPredictioncategoryCountList";
       // const url = "/actual/base/resiCategory/categoryCountList";
       let params = {
@@ -527,7 +524,7 @@ export default {
       };
 
       this.znycCategory.loading = true;
-      const { data, code, msg } = await requestGet(url, params);
+      const {data, code, msg} = await requestGet(url, params);
       this.znycCategory.loading = false;
 
       if (code === 0) {

From f0081f892ed51395239a490e35b6c07cc0725138 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Tue, 10 Oct 2023 15:00:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=A5=BC=E6=A0=8B+=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=8E=A5=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>

From 26d67d7a00b8104a542b8b6c3dbbcdcb33d998b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com>
Date: Tue, 10 Oct 2023 15:29:52 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/shuju/main/back1.png        | Bin 0 -> 1062 bytes
 src/assets/scss/dataBoardMain.scss            |  34 ++--
 .../components/EventList/index.vue            | 136 ++++++++--------
 .../satisfactionEval/dissatisfied/detail.vue  |   6 +-
 .../modules/RiskStatistics/index.vue          | 143 ++++++++++-------
 src/views/dataBoardMain/main-navbar.vue       | 146 ++++++++++++------
 6 files changed, 266 insertions(+), 199 deletions(-)
 create mode 100644 src/assets/images/shuju/main/back1.png

diff --git a/src/assets/images/shuju/main/back1.png b/src/assets/images/shuju/main/back1.png
new file mode 100644
index 0000000000000000000000000000000000000000..289a41f728d2d77fc33fcff74574bc841ed023a2
GIT binary patch
literal 1062
zcmV+>1ljwEP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px&;7LS5R9Hvtm|bWbRTRg6XEvL}NYzxUsECb=AK9A(id2O@DfU4TedvP)sSgrq
zE6L2Jl7RN5FA9a|CKC`Uh#&YM`r-#ggo=V9wFJZ_vqtOZiyxq^rc$fT&XL*dmhEIe
zCc7JU0==*=d+#~-chCIqIcG*#XG7K*FBgH=`iZqH!qc8UB+8HWfPA@@&`krop5CD_
z0qn5g{!t_E#}e4}bPGyGg-1((me1DFL79yeaCT1nEsLjsU12bVyD~;Tj|K4ao|+D2
zqCBFp1TIE&6xdrYa&48w%!2m$dB&rF77wBcp>HHDKh--}GxIC5MD{D)Z25&-KMW*S
z;oMjFz=B1EL<PHGFID(k;B@c<eglp!!MFR2oQ$&9d0=-=Q@$`FQh4-TQH)!-=9CH_
zSw64W1M*%izXf2|)5jEEY9T<wt^_=V{f?1$DmhsO4x(#up9OmqOvAgi)^O4>65OE+
z#tIF)Io+#DkQMqH*#8WWuVWYJyC<UW8OMlSzP4&<E`kRq?2G6elzYy0P_xn{^CUZb
zdP%SeC8f#`!VVx+Q3Ar4otCN6T+LqM(5xo^?O|B8kTo{f0~av1kzBoX;rTaJ6Tjxz
zr7#Ix8J_or>&DXZOYncB=EpsuU7RD3N(Q*G8c?&PIh)gKE#)w<CA7zjj*;DwflI~*
zJnh^lIO^jdTptE+7C7+t@(<d*c!q^gVEpcGHttTzUy&jl20JvXJ!g9uQRPX2tIPCt
zr)}ieY9$d~?|S-(!s{1YHsJv~Er%NdE;-76p;uU)>|wbd?)81{9vhU8n*~0gYW3#$
zJ@8rbrQl|aI86bUoVh1-lm5qqz`M4QPnrb|?590_E!4t(=oq=TCBUr!Tp^2`W>m?Z
z|6lmbNz1nQ0<YBZoMU7tw!l+4eOQz?$|C>0V<Z(@;9{kHp$vH5F)|oi;OTiih!nEV
z@>mBNo)2}7M;s&DV;SM8dEF{PxBwN}&3FQP`l-OSP^H^$r{zfOfL%|YQFuC(mrv&}
z<C=Xp$Um_GKDeM8F7bIzmB+(HMBrK5$o^G#Yim)_W{&G^euAAS!<9O~0%Rwb+c(Q%
zP2kC|^{V7K#t|%)y01NT&mxKz(^D79r7CO?<#ynfTE?P0SpFtmRT5JRdaL9MeQ7(#
zxML)E3n@#-RdBM$^(HI9cWt6w3MAqT$g36fTp6iNz<&U5B`mTd{qjvEvUW=%_*@k{
z#iPKnWS+O57?M*pHC=5oxO5#$?6g{N;Yxd`kHzx0wUY>c;`6gTD65iPZ1Ql_yK)gY
gYNQ%nx9%eRKhO(JJTkwW8UO$Q07*qoM6N<$f=O8SeE<Le

literal 0
HcmV?d00001

diff --git a/src/assets/scss/dataBoardMain.scss b/src/assets/scss/dataBoardMain.scss
index e9a71e469..735937384 100644
--- a/src/assets/scss/dataBoardMain.scss
+++ b/src/assets/scss/dataBoardMain.scss
@@ -66,29 +66,33 @@
         left: 60px;
         right: 0;
         top: 0;
-        line-height: 82px;
-        font-family: PingFang SC;
-        font-weight: bold;
-        color: #FFFFFF;
-        font-size: 34px;
-        // text-shadow: 0px 4px 3px rgba(18, 27, 70, 0.51);
-        background: linear-gradient(0deg, #8FD4FF 0%, #FFFFFF 64.0380859375%);
-        background-clip: text;
-        -webkit-background-clip: text;
-        -webkit-text-fill-color: transparent;
+        display: flex;
+        &-txt {
+            line-height: 82px;
+            font-family: PingFang SC;
+            font-weight: bold;
+            color: #FFFFFF;
+            font-size: 34px;
+            // text-shadow: 0px 4px 3px rgba(18, 27, 70, 0.51);
+            background: linear-gradient(0deg, #8FD4FF 0%, #FFFFFF 64.0380859375%);
+            background-clip: text;
+            -webkit-background-clip: text;
+            -webkit-text-fill-color: transparent;
+
+        }
     }
 
     .selectArea {
-        position: absolute;
-        left: 680px;
+        // position: absolute;
+        // left: 680px;
         width: 120px;
-        right: 0;
-        top: 20px;
+        padding-left: 15px;
+        margin-top: 26px;
 
         ::v-deep .el-input__inner {
             height: 32px !important;
             border-radius: 16px !important;
-            border: none !important;
+            border: 1px solid #125AAA !important;
             color: #fff !important;
             background: linear-gradient(180deg, #05326E 0%, #032A5D 100%) !important;
         }
diff --git a/src/views/dataBoard/satisfactionEval/components/EventList/index.vue b/src/views/dataBoard/satisfactionEval/components/EventList/index.vue
index 252ea4f43..4ab7837db 100644
--- a/src/views/dataBoard/satisfactionEval/components/EventList/index.vue
+++ b/src/views/dataBoard/satisfactionEval/components/EventList/index.vue
@@ -1,86 +1,71 @@
 <template>
   <div>
-
     <el-dialog
-        class="dissatisfied-detail"
-        title=""
-        :visible.sync="dialogVisible"
-        width="1118px"
-        :modal="false"
-        :before-close="handleClose"
+      class="dissatisfied-detail"
+      title=""
+      :visible.sync="dialogVisible"
+      width="1118px"
+      :modal="false"
+      :before-close="handleClose"
     >
       <div class="main-title">
-        <Title :text="month+'份12345政务热线事件列表'"/>
+        <Title :text="month + '份12345政务热线事件列表'" />
       </div>
       <div class="content">
         <div class="table">
           <el-table :data="list">
-            <el-table-column
-                label="序号"
-                type="index"
-                width="80"/>
+            <el-table-column label="序号" type="index" width="80" />
 
-            <el-table-column
-                prop="monthTime"
-                label="月度"/>
+            <el-table-column prop="monthTime" label="月度" />
 
-            <el-table-column
-                prop="agencyName"
-                label="所属社区">
+            <el-table-column prop="agencyName" label="所属社区">
             </el-table-column>
 
-            <el-table-column
-                prop="categoryName"
-                label="事项类型"/>
+            <el-table-column prop="categoryName" label="事项类型" />
 
             <el-table-column
-                prop="eventContent"
-                width="200"
-                show-overflow-tooltip
-                label="事项描述"/>
-            <el-table-column
-                prop="receiveTime"
-                width="200"
-                label="接收时间"/>
+              prop="eventContent"
+              width="200"
+              show-overflow-tooltip
+              label="事项描述"
+            />
+            <el-table-column prop="receiveTime" width="200" label="接收时间" />
 
-            <el-table-column
-                prop="statusName"
-                label="状态"/>
+            <el-table-column prop="statusName" label="状态" />
 
             <el-table-column label="详情" width="90" align="center">
               <template slot-scope="data">
-                <el-button type="text" @click="handleView(data.row)">查看</el-button>
+                <el-button type="text" @click="handleView(data.row)"
+                  >查看</el-button
+                >
               </template>
             </el-table-column>
-
           </el-table>
         </div>
 
         <Pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNo"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNo"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
         />
       </div>
     </el-dialog>
 
-    <EventDetails :showDialog="showDialog" :id="this.rowId" @close="close"/>
-
+    <EventDetails :showDialog="showDialog" :id="this.rowId" @close="close" />
   </div>
 </template>
 
 <script>
-import Breadcrumb from '@/views/dataBoard/satisfactionEval/components/Breadcrumb'
-import Pagination from '@/views/dataBoard/satisfactionEval/components/Pagination'
-import Title from "@/views/dataBoard/satisfactionEval/components/Title"
-import EventDetails from "@/views/dataBoard/cpts/event-details.vue"
-
+import Breadcrumb from "@/views/dataBoard/satisfactionEval/components/Breadcrumb";
+import Pagination from "@/views/dataBoard/satisfactionEval/components/Pagination";
+import Title from "@/views/dataBoard/satisfactionEval/components/Title";
+import EventDetails from "@/views/dataBoard/cpts/event-details.vue";
 
 export default {
   name: "EventList",
-  components: {Breadcrumb, Pagination, Title, EventDetails},
+  components: { Breadcrumb, Pagination, Title, EventDetails },
   data() {
     return {
       queryParams: {
@@ -89,57 +74,58 @@ export default {
       },
       total: 0,
       list: [],
-      month: '',
+      month: "",
       dialogVisible: false,
       showDialog: false,
-      rowId: ''
-    }
-  },
-  activated() {
-
+      rowId: "",
+    };
   },
+  activated() {},
   methods: {
-
     handleClose(done) {
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     open(searchParams) {
-      this.dialogVisible = true
-      this.month = this.$moment(searchParams.monthTime).format('YYYY年M月')
+      this.dialogVisible = true;
+      this.month = this.$moment(searchParams.monthTime).format("YYYY年M月");
       this.queryParams = {
         ...this.queryParams,
-        ...searchParams
-      }
-      this.getList()
+        ...searchParams,
+      };
+      this.getList();
     },
     getList() {
-      this.$http.get('/governance/satisfactionOverview/event12345List?' + this.$paramsFormat(this.queryParams)).then(({data: {data}}) => {
-        this.list = data.list
-        this.total = data.total
-      })
+      this.$http
+        .get(
+          "/governance/satisfactionOverview/event12345List?" +
+            this.$paramsFormat(this.queryParams)
+        )
+        .then(({ data: { data } }) => {
+          this.list = data.list;
+          this.total = data.total;
+        });
     },
-    handleView({id}) {
-      this.showDialog = true
-      this.rowId = id
+    handleView({ id }) {
+      this.showDialog = true;
+      this.rowId = id;
     },
     close() {
-      this.showDialog = false
-    }
-  }
-}
+      this.showDialog = false;
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
 @import "@/assets/scss/dataBoard/table.scss";
 @import "@/assets/scss/dataBoard/dialog.scss";
 /deep/ .el-dialog__wrapper {
-  background: rgba(0,0,0,.5);
-  z-index: 9999999999!important;
+  background: rgba(0, 0, 0, 0.85);
+  z-index: 9999999999 !important;
 }
 .dissatisfied-detail {
-
   .main-title {
     margin-bottom: 20px;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
index 9e7acf232..cc1ab501b 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
@@ -16,7 +16,7 @@
           <div class="detail">
             <p>
               {{unsatisfiedMattersModel.reason}}
-            </p>a
+            </p>
             <ul>
               <li><span>事项来源：</span>{{satisfactionSourceOptions[unsatisfiedMattersModel.satisfactionSource]}}</li>
               <li><span>事项类型：</span>{{unsatisfiedMattersModel.satisfactionCategoryName}}</li>
@@ -145,7 +145,7 @@ export default {
     color: #FFFFFF;
     line-height: 22px;
     padding-left: 26px;
-    margin-bottom: 20px;
+    margin-bottom: 15px;
   }
 
   .detail {
@@ -165,7 +165,7 @@ export default {
 
     li {
       color: #FFFFFF;
-      line-height: 28px;
+      line-height: 32px;
 
       span {
         color: #9CB4D3
diff --git a/src/views/dataBoard/satisfactionEval/modules/RiskStatistics/index.vue b/src/views/dataBoard/satisfactionEval/modules/RiskStatistics/index.vue
index 84d3b464e..f9e02f85f 100755
--- a/src/views/dataBoard/satisfactionEval/modules/RiskStatistics/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/RiskStatistics/index.vue
@@ -1,79 +1,101 @@
 <template>
-  <div v-loading="loading"
-       element-loading-text="加载中..."
-       element-loading-spinner="el-icon-loading"
-       element-loading-background="rgba(0,0,0,0.5)">
+  <div
+    v-loading="loading"
+    element-loading-text="加载中..."
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0,0,0,0.5)"
+  >
     <div class="number-list">
       <div class="number-item">
         <div class="img">
-          <img src="@/assets/images/manyidu/hf_ts.png" alt="">
+          <img src="@/assets/images/manyidu/hf_ts.png" alt="" />
         </div>
         <div>
           <div class="txt">
-            12345热线 <br>
+            12345热线 <br />
             投诉人数
           </div>
-          <div class="num"><span>{{ event12345Num ? event12345Num : 0 }}</span> 人</div>
+          <div class="num">
+            <span>{{ event12345Num ? event12345Num : 0 }}</span> 人
+          </div>
         </div>
-
       </div>
       <div class="number-item">
         <div class="img">
-          <img src="@/assets/images/manyidu/hf_bmy.png" alt="">
+          <img src="@/assets/images/manyidu/hf_bmy.png" alt="" />
         </div>
         <div>
           <div class="txt">
-            省满意度调查 <br>
+            省满意度调查 <br />
             不满意人数
           </div>
-          <div class="num"><span>{{ provinceSatisfactionNum ? provinceSatisfactionNum : 0 }}</span> 人</div>
+          <div class="num">
+            <span>{{
+              provinceSatisfactionNum ? provinceSatisfactionNum : 0
+            }}</span>
+            人
+          </div>
         </div>
-
       </div>
       <div class="number-item">
         <div class="img">
-          <img src="@/assets/images/manyidu/hf_zpbmy.png" alt="">
+          <img src="@/assets/images/manyidu/hf_zpbmy.png" alt="" />
         </div>
         <div>
           <div class="txt">
-            社区满意度自评 <br>
+            社区满意度自评 <br />
             不满意人数
           </div>
-          <div class="num"><span>{{ selfInspectNum ? selfInspectNum : 0 }}</span> 人</div>
+          <div class="num">
+            <span>{{ selfInspectNum ? selfInspectNum : 0 }}</span> 人
+          </div>
         </div>
       </div>
     </div>
     <div class="number-list2">
       <div class="number-item">
         <div class="txt">
-          本月回访 <br>
+          本月回访 <br />
           次数
         </div>
-        <div class="num"><span class="grey">{{ followMonthNum ? followMonthNum : 0 }}</span> 人</div>
+        <div class="num">
+          <span class="grey">{{ followMonthNum ? followMonthNum : 0 }}</span> 人
+        </div>
       </div>
       <div class="number-item">
         <div class="txt">
-          本月回访消除 <br>
+          本月回访消除 <br />
           风险人员数
         </div>
-        <div class="num"><span class="green">{{ followMonthNotRiskyNum ? followMonthNotRiskyNum : 0 }}</span> 人</div>
+        <div class="num">
+          <span class="green">{{
+            followMonthNotRiskyNum ? followMonthNotRiskyNum : 0
+          }}</span>
+          人
+        </div>
       </div>
       <div class="number-item">
         <div class="txt">
-          累计回访 <br>
+          累计回访 <br />
           次数
         </div>
-        <div class="num"><span class="purple">{{ followSumNum ? followSumNum : 0 }}</span> 人</div>
+        <div class="num">
+          <span class="purple">{{ followSumNum ? followSumNum : 0 }}</span> 人
+        </div>
       </div>
       <div class="number-item">
         <div class="txt">
-          累计回访消除 <br>
+          累计回访消除 <br />
           风险人员数
         </div>
-        <div class="num"><span class="blue">{{ followNotRiskyNum ? followNotRiskyNum : 0 }}</span> 人</div>
+        <div class="num">
+          <span class="blue">{{
+            followNotRiskyNum ? followNotRiskyNum : 0
+          }}</span>
+          人
+        </div>
       </div>
     </div>
-
   </div>
 </template>
 
@@ -89,15 +111,14 @@ export default {
       followSumNum: 0,
       provinceSatisfactionNum: 0,
       selfInspectNum: 0,
-      loading: true
-    }
+      loading: true,
+    };
   },
   props: {
     date: {
       type: Object,
-      default: () => {
-      }
-    }
+      default: () => {},
+    },
   },
   watch: {
     "$store.state.chooseArea.chooseName"(val) {
@@ -107,7 +128,7 @@ export default {
     },
     date() {
       this.getData();
-    }
+    },
   },
   mounted() {
     if (this.$store.state.chooseArea.chooseName.orgId) {
@@ -116,25 +137,30 @@ export default {
   },
   methods: {
     getData() {
-      this.loading = true
+      this.loading = true;
       let params = {
         level: this.$store.state.chooseArea.chooseName.level,
         orgId: this.$store.state.chooseArea.chooseName.orgId,
-        ...this.date
-      }
-      this.$http.get('/governance/satisfactionOverview/satisfactionFollowGroup?' + this.$paramsFormat(params)).then(({data: {data}}) => {
-        this.event12345Num = data.event12345Num;
-        this.followMonthNotRiskyNum = data.followMonthNotRiskyNum;
-        this.followMonthNum = data.followMonthNum;
-        this.followNotRiskyNum = data.followNotRiskyNum;
-        this.followSumNum = data.followSumNum;
-        this.provinceSatisfactionNum = data.provinceSatisfactionNum;
-        this.selfInspectNum = data.selfInspectNum;
-        this.loading = false
-      })
-    }
-  }
-}
+        ...this.date,
+      };
+      this.$http
+        .get(
+          "/governance/satisfactionOverview/satisfactionFollowGroup?" +
+            this.$paramsFormat(params)
+        )
+        .then(({ data: { data } }) => {
+          this.event12345Num = data.event12345Num;
+          this.followMonthNotRiskyNum = data.followMonthNotRiskyNum;
+          this.followMonthNum = data.followMonthNum;
+          this.followNotRiskyNum = data.followNotRiskyNum;
+          this.followSumNum = data.followSumNum;
+          this.provinceSatisfactionNum = data.provinceSatisfactionNum;
+          this.selfInspectNum = data.selfInspectNum;
+          this.loading = false;
+        });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
@@ -152,10 +178,11 @@ export default {
     }
 
     .txt {
-      font-size: 16px;
+      font-size: 15px;
+      margin-left: -6px;
       font-weight: 400;
-      color: #FFFFFF;
-      line-height: 24px;
+      color: #ffffff;
+      line-height: 26px;
       margin-bottom: 22px;
       white-space: nowrap;
     }
@@ -163,13 +190,13 @@ export default {
     .num {
       font-size: 14px;
       font-weight: 500;
-      color: #A3B9DA;
+      color: #a3b9da;
       white-space: nowrap;
       span {
         font-size: 32px;
         font-weight: bold;
         font-style: italic;
-        color: #3AB7FF;
+        color: #3ab7ff;
       }
     }
   }
@@ -184,7 +211,7 @@ export default {
     .txt {
       font-size: 14px;
       font-weight: 400;
-      color: #A3B9DA;
+      color: #a3b9da;
       line-height: 24px;
       margin-bottom: 16px;
     }
@@ -192,7 +219,7 @@ export default {
     .num {
       font-size: 14px;
       font-weight: 500;
-      color: #A3B9DA;
+      color: #a3b9da;
 
       span {
         font-size: 32px;
@@ -204,18 +231,18 @@ export default {
 }
 
 .grey {
-  color: #78C4F3;
+  color: #78c4f3;
 }
 
 .green {
-  color: #08EBAE;
+  color: #08ebae;
 }
 
 .purple {
-  color: #A761FD;
+  color: #a761fd;
 }
 
 .blue {
-  color: #356EFF;
+  color: #356eff;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue
index 02889d62d..de96637eb 100644
--- a/src/views/dataBoardMain/main-navbar.vue
+++ b/src/views/dataBoardMain/main-navbar.vue
@@ -1,13 +1,33 @@
 <template>
   <div class="m-topnav">
     <div class="back" style="cursor: pointer" @click="goBack()">
-      <img src="~@/assets/images/shuju/main/back.png" alt="/" />
+      <img
+        width="22px"
+        height="22px"
+        src="~@/assets/images/shuju/main/back1.png"
+        alt="/"
+      />
     </div>
-    <div class="title">{{ customerName }}数据智能分析平台</div>
-    <div class="selectArea" v-if="$route.path == '/dataBoard/satisfactionEval/index'">
-      <el-select @change="setSelectName" v-model="value" popper-class="selectPopClass">
-        <el-option v-for="(item, index) in options" v-if="item.agencyLevel !== 'grid'" :key="item.value" :label="item.label" :value="item.value"/>
-      </el-select>
+    <div class="title">
+      <div class="title-txt">{{ customerName }}数据智能分析平台</div>
+      <div
+        class="selectArea"
+        v-if="$route.path == '/dataBoard/satisfactionEval/index'"
+      >
+        <el-select
+          @change="setSelectName"
+          v-model="value"
+          popper-class="selectPopClass"
+        >
+          <el-option
+            v-for="(item, index) in options"
+            v-if="item.agencyLevel !== 'grid'"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </div>
     </div>
     <!-- <div class="btn-back" @click="toPage('/')">
 			<img class="z-default" src="~@/assets/images/shuju/main/back.png" />
@@ -26,16 +46,32 @@
       </div>
     </div>-->
     <div class="nav-list">
-      <div class="nav-item" :class="{ 'z-on': $route.path.indexOf('/dataBoard/overview') != -1 }" @click="toPage('/dataBoard/overview/index')">
+      <div
+        class="nav-item"
+        :class="{ 'z-on': $route.path.indexOf('/dataBoard/overview') != -1 }"
+        @click="toPage('/dataBoard/overview/index')"
+      >
         <span>概览</span>
       </div>
-      <div class="nav-item" :class="{ 'z-on': $route.path.includes('/organizational') }" @click="toPage('/organizational/dangTree')">
+      <div
+        class="nav-item"
+        :class="{ 'z-on': $route.path.includes('/organizational') }"
+        @click="toPage('/organizational/dangTree')"
+      >
         <span>组织架构</span>
       </div>
-      <div class="nav-item" :class="{ 'z-on': $route.path.indexOf('/dataBoard/renfang') != -1 }" @click="toPage('/dataBoard/renfang/index')">
+      <div
+        class="nav-item"
+        :class="{ 'z-on': $route.path.indexOf('/dataBoard/renfang') != -1 }"
+        @click="toPage('/dataBoard/renfang/index')"
+      >
         <span>人房数据</span>
       </div>
-      <div class="nav-item" :class="{ 'z-on': $route.path.includes('/satisfactionEval') }" @click="toPage('/dataBoard/satisfactionEval/index')">
+      <div
+        class="nav-item"
+        :class="{ 'z-on': $route.path.includes('/satisfactionEval') }"
+        @click="toPage('/dataBoard/satisfactionEval/index')"
+      >
         <span>满意度评价</span>
       </div>
     </div>
@@ -184,10 +220,15 @@ export default {
     const customerId = localStorage.getItem("customerId");
     let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
     //暂时 亿联街道和 微笑崂山显示 社区治理-》多元化菜单
-    if ("04c0d396e298f13e57aa5904a657eaa6" != customerId && "3fdd0380deff5b30f45376cdf995d1c1" != customerId) {
+    if (
+      "04c0d396e298f13e57aa5904a657eaa6" != customerId &&
+      "3fdd0380deff5b30f45376cdf995d1c1" != customerId
+    ) {
       for (let index in siteconfigElement) {
         if (siteconfigElement[index].id == "6") {
-          let newMenuArr = siteconfigElement[index].children.filter((item) => item.id !== "duoyuanfuwufenxi");
+          let newMenuArr = siteconfigElement[index].children.filter(
+            (item) => item.id !== "duoyuanfuwufenxi"
+          );
           siteconfigElement[index].children = newMenuArr;
         }
       }
@@ -217,46 +258,51 @@ export default {
         params = { orgId: this.value, level: this.getChooseLabel(this.value) };
       }
       console.log(params);
-      this.$http.post(`/gov/org/agency/maporg`, params).then(async ({ data: { data } }) => {
-        console.log(data);
-        this.value = data.id;
-        this.$store.dispatch("chooseArea/chooseName", {
-          orgId: data.id,
-          level: data.level,
+      this.$http
+        .post(`/gov/org/agency/maporg`, params)
+        .then(async ({ data: { data } }) => {
+          console.log(data);
+          this.value = data.id;
+          this.$store.dispatch("chooseArea/chooseName", {
+            orgId: data.id,
+            level: data.level,
+          });
+          let children = await this.dealTreeData(data.children);
+          if (data.parentId) {
+            this.options = [
+              {
+                ...data,
+                value: data.parentId,
+                label: data.parentName,
+              },
+              {
+                ...data,
+                value: data.id,
+                label: data.name,
+              },
+              ...children,
+            ];
+          } else {
+            this.options = [
+              {
+                ...data,
+                value: data.id,
+                label: data.name,
+              },
+              ...children,
+            ];
+          }
         });
-        let children = await this.dealTreeData(data.children);
-        if (data.parentId) {
-          this.options = [
-            {
-              ...data,
-              value: data.parentId,
-              label: data.parentName,
-            },
-            {
-              ...data,
-              value: data.id,
-              label: data.name,
-            },
-            ...children,
-          ];
-        } else {
-          this.options = [
-            {
-              ...data,
-              value: data.id,
-              label: data.name,
-            },
-            ...children,
-          ];
-        }
-      });
     },
     dealTreeData(treeData, level = 0) {
       const data = treeData.map((item) => ({
         ...item,
         value: item.id,
         label: item.name,
-        children: item.children && item.children.length ? this.dealTreeData(item.children, level++) : null,
+        children:
+          item.children && item.children.length
+            ? this.dealTreeData(item.children, level++)
+            : null,
       }));
       return data;
     },
@@ -290,7 +336,9 @@ export default {
     },
     // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
     gotoRouteHandle(menuId, idx) {
-      var route = window.SITE_CONFIG["dynamicMenuRoutesShuju"].filter((item) => item.meta.menuId === menuId)[0];
+      var route = window.SITE_CONFIG["dynamicMenuRoutesShuju"].filter(
+        (item) => item.meta.menuId === menuId
+      )[0];
       if (route) {
         this.$router.push({
           name: route.name,
@@ -299,10 +347,12 @@ export default {
       }
     },
     changeCustomerName() {
-      this.customerName = localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
+      this.customerName =
+        localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台";
     },
     async getWeatherData() {
-      const url = "https://restapi.amap.com/v3/weather/weatherInfo?key=8c87678f34ce9e8e23245c5161991c4e";
+      const url =
+        "https://restapi.amap.com/v3/weather/weatherInfo?key=8c87678f34ce9e8e23245c5161991c4e";
       const { data, code, msg } = await requestGet(url, {
         city: this.$store.state.user.areaCode,
       });

From 6efe6c3040869dde720feb5acef94248cabddf4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com>
Date: Tue, 10 Oct 2023 15:54:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satisfactionEval/dissatisfied/detail.vue  | 161 +++++++++++-------
 1 file changed, 103 insertions(+), 58 deletions(-)

diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
index cc1ab501b..574d0e72c 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfied/detail.vue
@@ -1,29 +1,49 @@
 <template>
   <el-dialog
-      class="dissatisfied-detail"
-      title=""
-      :modal="false"
-      :visible.sync="dialogVisible"
-      width="1118px"
-      :before-close="handleClose">
+    class="dissatisfied-detail"
+    title=""
+    :modal="true"
+    :visible.sync="dialogVisible"
+    width="1118px"
+    :modal-append-to-body="false"
+    :before-close="handleClose"
+  >
     <div class="content">
       <div class="main-title">
-        <Title text="不满意事项详情" noBg/>
+        <Title text="不满意事项详情" noBg />
       </div>
       <el-row :gutter="20">
         <el-col :span="10">
           <div class="sub-title">事项详情</div>
           <div class="detail">
             <p>
-              {{unsatisfiedMattersModel.reason}}
+              {{ unsatisfiedMattersModel.reason }}
             </p>
             <ul>
-              <li><span>事项来源：</span>{{satisfactionSourceOptions[unsatisfiedMattersModel.satisfactionSource]}}</li>
-              <li><span>事项类型：</span>{{unsatisfiedMattersModel.satisfactionCategoryName}}</li>
-              <li><span>所属月份：</span>{{unsatisfiedMattersModel.satisfactionCategoryName}}</li>
-              <li><span>所属社区：</span>{{unsatisfiedMattersModel.organizationName}}</li>
-              <li><span>提交人：</span>{{unsatisfiedMattersModel.name}}</li>
-              <li><span>提交人电话：</span>{{unsatisfiedMattersModel.mobile}}</li>
+              <li>
+                <span>事项来源：</span
+                >{{
+                  satisfactionSourceOptions[
+                    unsatisfiedMattersModel.satisfactionSource
+                  ]
+                }}
+              </li>
+              <li>
+                <span>事项类型：</span
+                >{{ unsatisfiedMattersModel.satisfactionCategoryName }}
+              </li>
+              <li>
+                <span>所属月份：</span
+                >{{ unsatisfiedMattersModel.satisfactionCategoryName }}
+              </li>
+              <li>
+                <span>所属社区：</span
+                >{{ unsatisfiedMattersModel.organizationName }}
+              </li>
+              <li><span>提交人：</span>{{ unsatisfiedMattersModel.name }}</li>
+              <li>
+                <span>提交人电话：</span>{{ unsatisfiedMattersModel.mobile }}
+              </li>
             </ul>
           </div>
         </el-col>
@@ -33,34 +53,46 @@
             <div class="number-item">
               <div class="text">12345投诉</div>
               <div class="num">
-                <span class="orange">{{unsatisfiedHisCount.satisfaction_12345}}</span>
+                <span class="orange">{{
+                  unsatisfiedHisCount.satisfaction_12345
+                }}</span>
                 人
               </div>
             </div>
             <div class="number-item">
               <div class="text">省满意度调查</div>
               <div class="num">
-                <span class="green">{{unsatisfiedHisCount.satisfaction_province}}</span>
+                <span class="green">{{
+                  unsatisfiedHisCount.satisfaction_province
+                }}</span>
                 人
               </div>
             </div>
             <div class="number-item">
               <div class="text">社区满意度自评</div>
               <div class="num">
-                <span class="light">{{unsatisfiedHisCount.satisfaction_community}}</span>
+                <span class="light">{{
+                  unsatisfiedHisCount.satisfaction_community
+                }}</span>
                 人
               </div>
             </div>
           </div>
           <div class="sub-title">回访记录</div>
           <div class="log">
-            <div class="log-item" v-for="(item,index) in followUpRecordDetails">
-              <div class="name">{{item.followUpUser}}（{{item.roleName}}）</div>
-              <div>{{item.followUpDate}}</div>
-              <div>{{item.followUpWay}} <i class="el-icon-arrow-right"></i></div>
+            <div
+              class="log-item"
+              v-for="(item, index) in followUpRecordDetails"
+            >
+              <div class="name">
+                {{ item.followUpUser }}（{{ item.roleName }}）
+              </div>
+              <div>{{ item.followUpDate }}</div>
+              <div>
+                {{ item.followUpWay }} <i class="el-icon-arrow-right"></i>
+              </div>
             </div>
           </div>
-
         </el-col>
       </el-row>
     </div>
@@ -68,44 +100,53 @@
 </template>
 
 <script>
-import Title from "@/views/dataBoard/satisfactionEval/components/Title"
+import Title from "@/views/dataBoard/satisfactionEval/components/Title";
 
 export default {
   name: "DissatisfiedDetail",
-  components: {Title},
+  components: { Title },
   data() {
     return {
       dialogVisible: false,
-      unsatisfiedMattersModel: '',
-      unsatisfiedHisCount: '',
-      followUpRecordDetails: '',
+      unsatisfiedMattersModel: "",
+      unsatisfiedHisCount: "",
+      followUpRecordDetails: "",
       satisfactionSourceOptions: {
-        satisfaction_12345: '12345投诉',
-        satisfaction_province: '省满意度调查',
-        satisfaction_community: '社区满意度自查',
-      }
+        satisfaction_12345: "12345投诉",
+        satisfaction_province: "省满意度调查",
+        satisfaction_community: "社区满意度自查",
+      },
     };
   },
   methods: {
     handleClose(done) {
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     open(id) {
-      this.dialogVisible = true
-      this.getDetail(id)
+      this.dialogVisible = true;
+      this.getDetail(id);
     },
     getDetail(id) {
-      this.$http.post('/governance/satisfactionDetailList/getUnsatisfiedMattersDetailInfo', id).then(({data: {data}}) => {
-        this.unsatisfiedMattersModel = data.unsatisfiedMattersModel
-        this.unsatisfiedHisCount = data.unsatisfiedHisCount
-        this.followUpRecordDetails = data.followUpRecordDetails
-        if(this.unsatisfiedMattersModel.satisfactionSource) {
-          this.unsatisfiedMattersModel.satisfactionSource = satisfactionSourceOptions.filter(item => item.value === this.unsatisfiedMattersModel.satisfactionSource)[0].label
-        }
-      })
-    }
-  }
-}
+      this.$http
+        .post(
+          "/governance/satisfactionDetailList/getUnsatisfiedMattersDetailInfo",
+          id
+        )
+        .then(({ data: { data } }) => {
+          this.unsatisfiedMattersModel = data.unsatisfiedMattersModel;
+          this.unsatisfiedHisCount = data.unsatisfiedHisCount;
+          this.followUpRecordDetails = data.followUpRecordDetails;
+          if (this.unsatisfiedMattersModel.satisfactionSource) {
+            this.unsatisfiedMattersModel.satisfactionSource =
+              satisfactionSourceOptions.filter(
+                (item) =>
+                  item.value === this.unsatisfiedMattersModel.satisfactionSource
+              )[0].label;
+          }
+        });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
@@ -130,6 +171,10 @@ export default {
     }
   }
 
+.el-dialog__wrapper {
+    background: rgba(0, 0, 0, 0.85);
+  }
+
   .content {
     padding: 0 64px;
   }
@@ -142,17 +187,17 @@ 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: 15px;
+    margin-bottom: 14px;
   }
 
   .detail {
     p {
       font-size: 14px;
       font-weight: 400;
-      color: #FFFFFF;
+      color: #ffffff;
       line-height: 32px;
       margin: 0 0 10px;
     }
@@ -164,11 +209,11 @@ export default {
     }
 
     li {
-      color: #FFFFFF;
+      color: #ffffff;
       line-height: 32px;
 
       span {
-        color: #9CB4D3
+        color: #9cb4d3;
       }
     }
   }
@@ -182,14 +227,14 @@ export default {
     .text {
       font-size: 14px;
       font-weight: 400;
-      color: #A3B9DA;
+      color: #a3b9da;
       margin-bottom: 17px;
     }
 
     .num {
       font-size: 14px;
       font-weight: 400;
-      color: #A3B9DA;
+      color: #a3b9da;
 
       span {
         font-size: 32px;
@@ -200,15 +245,15 @@ export default {
   }
 
   .orange {
-    color: #FFB73C;
+    color: #ffb73c;
   }
 
   .green {
-    color: #08EBAE;
+    color: #08ebae;
   }
 
   .light {
-    color: #7FCEFF;
+    color: #7fceff;
   }
 
   .log {
@@ -219,7 +264,8 @@ export default {
       justify-content: space-between;
       width: 100%;
       color: #fff;
-      background: url("@/assets/images/manyidu/hf_line.png") bottom center no-repeat;
+      background: url("@/assets/images/manyidu/hf_line.png") bottom center
+        no-repeat;
       padding: 9px 0;
 
       .name {
@@ -227,6 +273,5 @@ export default {
       }
     }
   }
-
 }
-</style>
\ No newline at end of file
+</style>