From 757f7cdeb08d78f280882d71df800c02c07d060b Mon Sep 17 00:00:00 2001
From: PLUTO <>
Date: Thu, 12 Oct 2023 16:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E9=A1=B5=E9=9D=A2UI=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/home/dangerHomeBg.png       | Bin 0 -> 627 bytes
 src/js/store/modules/chooseArea.js            |   7 +
 .../dataBoard/cpts/homeDetails/index.vue      | 147 +++++++---
 .../dataBoard/overview/components/jdwgy.vue   |   2 +
 src/views/dataBoardMain/main-content.vue      |   2 +-
 src/views/modules/home/index.vue              | 266 +++++++-----------
 6 files changed, 217 insertions(+), 207 deletions(-)
 create mode 100644 src/assets/images/home/dangerHomeBg.png

diff --git a/src/assets/images/home/dangerHomeBg.png b/src/assets/images/home/dangerHomeBg.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3102ad7337935be64404c6baa3595b02c111617
GIT binary patch
literal 627
zcmeAS@N?(olHy`uVBq!ia0vp^MnG)E!3HEh<#62rQjEnx?oJHr&dI!FU|`bqba4#H
zaDF?>G5@lINXzq^(JMM0UvR$5vM$$e=@auW6Sg^iNOoMJ+WxOCz+!2PVrR8RVa}DH
z_2O&Sx~yaoiYg6`uG)7i|4*7-wZHS??uX^9CLId0MFCT_gC(alc^_C)d!f>E@%h6n
zE$O!!v{_a#`H3*hTy}IB*Zy1Utxb3RF`A<}q5k`CzU$ZR6_>IER=(BfJy^PN>sJ|R
ze=~=Gi}zOhHS6u?OXu79&t%V`pATd_=RDz`_VtqE^*vI2yW4MYZkwnn`SxwO)E8gr
z!kBuSd5iu(<oQ^`_poczF9)sQimz5x`TZBO-YT3<*;0M}gvycS{md$bF^o!befLT(
zX0hcwxoE%hk$j?3KVQ;L24PM9?j&KgLoPb12j)*(n$Vj%v!k$N8r#ecTCxB4d(=0i
z#5L-9-8~%mUOsk;{9{eO`}38qxw&*^`>kvV|6cIv9gF_E?ag{=PbSz)wp+aB=TcUE
zpPi|Ee6QZDwG3Lp7vKGJRL;M^_~ibbJ4r%ql}Fco;k8n{z{8Z2XLmLBz#>QUOKu`H
zd-n)1g=(5E%jAmXW>L&qFLm*Fhgoo%RQF;(=@Y(By#F6P@o3)1n>&sjOsy};Oj)Y8
u`<SiVyU^}kZ?YPHKD=^$@s_BBf6UVx?90`b6h{D45re0zpUXO@geCxy1{>r6

literal 0
HcmV?d00001

diff --git a/src/js/store/modules/chooseArea.js b/src/js/store/modules/chooseArea.js
index 0619530fb..8e138c8db 100644
--- a/src/js/store/modules/chooseArea.js
+++ b/src/js/store/modules/chooseArea.js
@@ -3,6 +3,7 @@ const state = {
     orgId: "",
     level: "",
   },
+  commonLoading: false,
   realScale: null,
 };
 
@@ -13,6 +14,9 @@ const mutations = {
   CHOOSE_REAL_SCALE: (state, name) => {
     state.realScale = name;
   },
+  COMMON_LOADING: (state, flag) => {
+    state.commonLoading = flag;
+  },
 };
 
 const actions = {
@@ -22,6 +26,9 @@ const actions = {
   chooseScale({ commit }, name) {
     commit("CHOOSE_REAL_SCALE", name);
   },
+  chooseLoading({ commit }, flag) {
+    commit("COMMON_LOADING", flag);
+  },
 };
 
 export default {
diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue
index 05117bc92..d1e956474 100644
--- a/src/views/dataBoard/cpts/homeDetails/index.vue
+++ b/src/views/dataBoard/cpts/homeDetails/index.vue
@@ -34,7 +34,20 @@
               <div class="apar_center">
                 <div class="apar_center_flex" :style="{ width: flexWidth + 'px' }">
                   <div v-for="(item, index) in houseMountArr" :key="index" class="floor">
-                    <div class="households" v-for="itm in item" :key="itm.id">{{ itm.doorName }}</div>
+                    <div v-for="itm in item" :key="itm.id" :class="[itm.riskyNum === 0 && itm.importanceNum === 0 ? 'households' : '', itm.riskyNum > 0 ? 'dangerHome' : '', itm.importanceNum > 0 ? 'dangerPeople' : '', itm.rentFlag === '2' ? 'freeHome' : '']">
+                      <div v-if="itm.riskyNum === 0 && itm.importanceNum === 0 && itm.rentFlag != '2'">{{ itm.doorName }}</div>
+                      <div v-if="itm.riskyNum > 0" class="dangerClass">
+                        <div>{{ itm.doorName }}</div>
+                        <img :src="require('@/assets/images/home/dangerHome.png')" alt="" />
+                      </div>
+                      <div v-if="itm.importanceNum > 0" class="dangerClass">
+                        <div>{{ itm.doorName }}</div>
+                        <img :src="require('@/assets/images/home/dangerPeople.png')" alt="" />
+                      </div>
+                      <div v-if="itm.rentFlag === '2'" class="dangerClass">
+                        <div>闲置</div>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -56,10 +69,10 @@
             <el-input v-model.trim="queryParams.ownerPhone" size="small" placeholder="按房主电话"></el-input>
             <el-input v-model.trim="queryParams.ownerIdCard" size="small" placeholder="按房主身份证号"></el-input>
             <el-select popper-class="selectPopClass" clearable v-model="queryParams.residentTag" size="small" placeholder="居民类型">
-              <el-option v-for="item in satisfactionCategoryOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+              <el-option v-for="item in peopleTypeList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
             <el-select popper-class="selectPopClass" clearable v-model="queryParams.riskyFlag" size="small" placeholder="满意度风险家庭">
-              <el-option v-for="item in satisfactionCategoryOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+              <el-option v-for="item in riskHomeList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
             </el-select>
 
             <el-button size="small" class="btn" type="primary" @click="search">查询</el-button>
@@ -69,9 +82,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" width="100" label="门牌号" />
-            <el-table-column prop="fullName" width="120" show-overflow-tooltip label="所属小区" />
-            <el-table-column prop="buildingId" width="120" show-overflow-tooltip label="所属楼栋" />
-            <el-table-column prop="buildingUnitId" width="120" show-overflow-tooltip label="所属单元" />
+            <el-table-column prop="quartersName" width="120" show-overflow-tooltip label="所属小区" />
+            <el-table-column prop="buildingName" width="120" show-overflow-tooltip label="所属楼栋" />
+            <el-table-column prop="buildingUnitName" width="120" show-overflow-tooltip label="所属单元" />
             <el-table-column prop="houseCode" width="120" label="房屋编码" />
             <el-table-column prop="rentFlag" width="120" label="房屋状态">
               <template slot-scope="scope">
@@ -79,14 +92,14 @@
                 <span>{{ getRentFlag(scope.row.rentFlag) }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="houseType" width="120" label="房屋类型">
-              <template slot-scope="scope">
-                <!-- 1楼房，2平房，3别墅 -->
-                <span>{{ getHouseType(scope.row.houseType) }}</span>
+            <!-- <el-table-column prop="houseType" width="120" label="房屋类型">
+              <template slot-scope="scope"> -->
+            <!-- 1楼房，2平房，3别墅 -->
+            <!-- <span>{{ getHouseType(scope.row.houseType) }}</span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="ownerName" width="120" label="房主姓名" />
-            <el-table-column prop="ownerPhone" width="120" label="房主电话">
+            <el-table-column prop="ownerPhone" width="120" show-overflow-tooltip label="房主电话">
               <template slot-scope="scope">
                 {{ $sensitive(scope.row.ownerPhone, 3, 7) }}
               </template>
@@ -148,22 +161,39 @@ export default {
         residentTag: "",
       },
       orgOptions: [],
-      satisfactionSourceOptions: [],
-      satisfactionCategoryOptions: [],
+      peopleTypeList: [],
+      riskHomeList: [
+        {
+          label: "风险",
+          value: "1",
+        },
+        {
+          label: "无风险",
+          value: "0",
+        },
+      ],
       flexWidth: 0,
       loading: false,
       homeMsg: {},
       list: [],
       homeText: "",
       buildingList: [],
-      houseMountArr: [],
+      houseMountArr: [
+        // [
+        //   { doorName: 101, riskyNum: 0, importanceNum: 0, rentFlag: "0" },
+        //   { doorName: 102, riskyNum: 1, importanceNum: 0, rentFlag: "0" },
+        //   { doorName: 103, riskyNum: 0, importanceNum: 1, rentFlag: "0" },
+        //   { doorName: 104, riskyNum: 0, importanceNum: 0, rentFlag: "2" },
+        // ],
+      ],
     };
   },
   watch: {},
   mounted() {
     const buId = this.$route.query.buId || null;
     this.getList(buId);
-    this.getTableData();
+    // this.getTableData(this.$route.query.id);
+    this.getPeopleTypeList();
   },
   methods: {
     getDoorNameList(list) {
@@ -197,6 +227,19 @@ export default {
       return doorNameList;
     },
 
+    getPeopleTypeList() {
+      this.$http
+        .post("sys/dict/data/dictlist", {
+          dictType: "resident_category",
+        })
+        .then((res) => {
+          const { code, data } = res.data;
+          if (code === 0) {
+            this.peopleTypeList = data;
+          }
+        });
+    },
+
     getUnitList(id) {
       this.$http.get(`/actual/base/streetOverview/getUnitHouseList?unitId=` + id).then((res) => {
         const {
@@ -207,7 +250,7 @@ export default {
           let unitInfos = unitInfo || {};
           this.homeMsg = unitInfos;
           this.homeText = (unitInfos.quartersName ? unitInfos.quartersName : "") + (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : "");
-          this.houseMountArr = this.getDoorNameList(this.list);
+          this.houseMountArr = this.getDoorNameList(houseList);
           if (this.houseMountArr.length > 0) {
             this.flexWidth = this.houseMountArr[0].length * 58;
           }
@@ -215,14 +258,17 @@ export default {
       });
     },
 
-    getTableData() {
-      const { id } = this.$route.query;
+    getTableData(id) {
       this.queryParams.unitId = id;
       this.loading = true;
       this.$http.get("/actual/base/streetOverview/getUnitHouseOverviewList?" + this.$paramsFormat(this.queryParams)).then((res) => {
-        const { code, data } = res.data;
+        const {
+          code,
+          data: { list, total },
+        } = res.data;
         if (code === 0) {
-          this.list = data;
+          this.list = list;
+          this.total = total;
           this.loading = false;
         } else {
           this.loading = false;
@@ -230,7 +276,10 @@ export default {
       });
     },
 
-    search() {},
+    search() {
+      this.queryParams.pageNo = 1;
+      this.getTableData();
+    },
 
     getList(buid) {
       const homeType = this.$route.query.typeB;
@@ -247,6 +296,7 @@ export default {
                   if (item.id === buid) {
                     item.ifActive = true;
                     this.getUnitList(item.id);
+                    this.getTableData(item.id);
                   } else {
                     item.ifActive = false;
                   }
@@ -256,6 +306,7 @@ export default {
                   if (i === 0) {
                     item.ifActive = true;
                     this.getUnitList(item.id);
+                    this.getTableData(item.id);
                   } else {
                     item.ifActive = false;
                   }
@@ -269,6 +320,7 @@ export default {
         });
       } else {
         this.getUnitList(this.$route.query.id);
+        this.getTableData(this.$route.query.id);
       }
     },
 
@@ -298,6 +350,7 @@ export default {
         if (item.id === d.id) {
           d.ifActive = true;
           this.getUnitList(item.id);
+          this.getTableData(item.id);
         } else {
           d.ifActive = false;
         }
@@ -337,6 +390,22 @@ export default {
   cursor: pointer;
 }
 
+@mixin homeCommon {
+  height: 58px;
+  background-size: 100% 100%;
+  display: flex;
+  flex: 0 0 48px;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #fff;
+  &:not(:last-child) {
+    margin-right: 10px;
+  }
+}
+
 .top-nav-list {
   display: flex;
   margin-bottom: 16px;
@@ -403,21 +472,29 @@ export default {
           margin-bottom: 20px;
 
           .households {
-            height: 58px;
+            @include homeCommon;
             background: url("@/assets/images/home/hasPeople.png") no-repeat;
-            background-size: 100% 100%;
-            display: flex;
-            flex: 0 0 48px;
-            align-items: center;
-            justify-content: center;
-            font-size: 14px;
-            font-family: PingFang SC;
-            font-weight: 500;
-            color: #7fceff;
-            &:not(:last-child) {
-              margin-right: 10px;
-            }
           }
+          .dangerHome,
+          .dangerPeople {
+            @include homeCommon;
+            background: url("@/assets/images/home/dangerHomeBg.png") no-repeat;
+          }
+          .freeHome {
+            @include homeCommon;
+            background: url("@/assets/images/home/freeHome.png") no-repeat;
+          }
+        }
+      }
+
+      .dangerClass {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        div:first-child {
+          margin-bottom: 5px;
+          font-weight: bold;
         }
       }
 
diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue
index af9b3e2b3..b6b5f6a3c 100644
--- a/src/views/dataBoard/overview/components/jdwgy.vue
+++ b/src/views/dataBoard/overview/components/jdwgy.vue
@@ -126,9 +126,11 @@ export default {
     getData() {
       this.loading = true;
       if (this.currentLevelData.orgLevel == "grid") {
+        this.$store.dispatch("chooseArea/chooseLoading", true);
         const personType = this.ifUnit && this.peopleType === "unit" ? "unit" : this.peopleType;
         this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" + personType + "&level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId).then(({ data: { data } }) => {
           this.loading = false;
+          this.$store.dispatch("chooseArea/chooseLoading", false);
           this.wglist = data;
           this.$emit(
             "setPoint",
diff --git a/src/views/dataBoardMain/main-content.vue b/src/views/dataBoardMain/main-content.vue
index e161f9ef3..d62d01192 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)" :exclude="['homeDetails', 'dissatisfiedPage']">
+      <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)" :exclude="['homeDetails', 'dissatisfiedPage', 'Microgrid']">
         <router-view ref="reloadPage" @changeCustomerName="changeCustomerName" />
       </keep-alive>
     </template>
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 540d4a93e..2731b8a99 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -9,149 +9,90 @@
             </div>
 
             <div class="tabs">
-              <div :class="{ 'z-on': searchData.type == 'jumin' }"
-                   @click="searchDataTab('jumin')">
-                查居民
-              </div>
-              <div :class="{ 'z-on': searchData.type == 'fangwu' }"
-                   @click="searchDataTab('fangwu')">
-                查房屋
-              </div>
+              <div :class="{ 'z-on': searchData.type == 'jumin' }" @click="searchDataTab('jumin')">查居民</div>
+              <div :class="{ 'z-on': searchData.type == 'fangwu' }" @click="searchDataTab('fangwu')">查房屋</div>
             </div>
 
             <div class="search">
               <div class="search-input">
                 <div class="input">
-                  <input type="text"
-                         :placeholder="typePlaceholder[searchData.type]
-										"
-                         v-model="searchData.searchKey"
-                         @keyup.enter="handleClickSearchBtn"/>
-
-                  <div class="close-btn"
-                       v-if="searchData.searchKey != ''"
-                       @click="searchData.searchKey = ''">
-                    <img src="@/assets/img/shequ/close.png"/>
+                  <input type="text" :placeholder="typePlaceholder[searchData.type]" v-model="searchData.searchKey" @keyup.enter="handleClickSearchBtn" />
+
+                  <div class="close-btn" v-if="searchData.searchKey != ''" @click="searchData.searchKey = ''">
+                    <img src="@/assets/img/shequ/close.png" />
                   </div>
                 </div>
-                <div class="btn"
-                     @click="handleClickSearchBtn">
-                  查一下
-                </div>
+                <div class="btn" @click="handleClickSearchBtn">查一下</div>
               </div>
-
             </div>
           </div>
         </div>
-        <div class=" m-pan m-box">
+        <div class="m-pan m-box">
           <div class="header">
-            <img src="@/assets/images/index/title-icon-sqzl.png"/>
+            <img src="@/assets/images/index/title-icon-sqzl.png" />
             <span>组织总览</span>
           </div>
           <div class="flex_box">
             <div class="cnt">
               <div class="cnt-left">
                 <div class="subtitle">
-                  <img src="@/assets/images/index/i-sqjj.png"/>
+                  <img src="@/assets/images/index/i-sqjj.png" />
                   <span>组织简介</span>
                 </div>
                 <p>
-                  {{ pandectData.deptName }}，<span v-if="pandectData.gridCount">划分为{{
-                    pandectData.underCount
-                  }}个{{
-                    pandectData.underName
-                  }}，</span> 现有房屋{{ pandectData.homeCount }}间，自住房屋{{
-                    pandectData.selfStay
-                  }}间、出租房屋{{
-                    pandectData.rentOut
-                  }}间、闲置房屋{{
-                    pandectData.vacantHouse
-                  }}间，现有居民{{ pandectData.resiCount }}户、{{
-                    pandectData.totalResidents
-                  }}人，其中常住人口{{ pandectData.permanentResiCount }}人，流动人口{{
-                    pandectData.floatingResiCount
-                  }}人，各类群体分布如下：
+                  {{ pandectData.deptName }}，<span v-if="pandectData.gridCount">划分为{{ pandectData.underCount }}个{{ pandectData.underName }}，</span> 现有房屋{{ pandectData.homeCount }}间，自住房屋{{ pandectData.selfStay }}间、出租房屋{{ pandectData.rentOut }}间、闲置房屋{{ pandectData.vacantHouse }}间，现有居民{{ pandectData.resiCount }}户、{{ pandectData.totalResidents }}人，其中常住人口{{ pandectData.permanentResiCount }}人，流动人口{{ pandectData.floatingResiCount }}人，各类群体分布如下：
                 </p>
 
                 <div class="subtitle">
-                  <img src="@/assets/images/index/i-fxjg.png"/>
+                  <img src="@/assets/images/index/i-fxjg.png" />
                   <span>分析结果</span>
                 </div>
 
-                <p class="hint"
-                   v-if="resiCategory.list.length > 0">
+                <p class="hint" v-if="resiCategory.list.length > 0">
                   根据数据分析结果，建议重点关注
-                  <b>{{ resiCategory.list[0].name }}、{{
-                      resiCategory.list[1].name
-                    }}、{{ resiCategory.list[2].name }}</b>
+                  <b>{{ resiCategory.list[0].name }}、{{ resiCategory.list[1].name }}、{{ resiCategory.list[2].name }}</b>
                   三类群体，开展相关的社区服务和活动。
                 </p>
               </div>
-              <el-tabs v-model="activeName"
-                       style="width: calc(100% - 240px - 40px);margin-left: auto;">
-                <el-tab-pane label="居民分类统计"
-                             name="resi">
+              <el-tabs v-model="activeName" style="width: calc(100% - 240px - 40px); margin-left: auto">
+                <el-tab-pane label="居民分类统计" name="resi">
                   <div class="cnt-right">
                     <div class="list">
-                      <div class="item"
-                           @click="handleClickCategory(item)"
-                           :key="item.code"
-                           v-for="(
-													item, index
-												) in resiCategory.list">
-                        <div>
-                          {{
-                            ("0" + (index + 1)).substr(-2)
-                          }}.
-                        </div>
+                      <div class="item" @click="handleClickCategory(item)" :key="item.code" v-for="(item, index) in resiCategory.list">
+                        <div>{{ ("0" + (index + 1)).substr(-2) }}.</div>
                         <div class="item-name">
                           {{ item.name }}
                         </div>
                         <div class="item-div"></div>
-                        <div class="item-count">
-                          {{ item.count }}人
-                        </div>
+                        <div class="item-count">{{ item.count }}人</div>
                         <div class="item-progress">
-                          <b :style="{
-														width: item.per + '%',
-													}"></b>
-                        </div>
-                        <div class="item-per">
-                          {{ item.per }} %
+                          <b
+                            :style="{
+                              width: item.per + '%',
+                            }"></b>
                         </div>
+                        <div class="item-per">{{ item.per }} %</div>
                       </div>
                     </div>
                   </div>
                 </el-tab-pane>
-                <el-tab-pane label="智能预测"
-                             name="zhineng">
+                <el-tab-pane label="智能预测" name="zhineng">
                   <div class="cnt-right">
                     <div class="list">
-                      <div class="item"
-                           :key="item.code"
-                           v-for="(
-													item, index
-												) in znycCategory.list">
-                        <div>
-                          {{
-                            ("0" + (index + 1)).substr(-2)
-                          }}.
-                        </div>
+                      <div class="item" :key="item.code" v-for="(item, index) in znycCategory.list">
+                        <div>{{ ("0" + (index + 1)).substr(-2) }}.</div>
                         <div class="item-name">
                           {{ item.name }}
                         </div>
                         <div class="item-div"></div>
-                        <div class="item-count">
-                          {{ item.count }}人
-                        </div>
+                        <div class="item-count">{{ item.count }}人</div>
                         <div class="item-progress">
-                          <b :style="{
-														width: item.per + '%',
-													}"></b>
-                        </div>
-                        <div class="item-per">
-                          {{ item.per }} %
+                          <b
+                            :style="{
+                              width: item.per + '%',
+                            }"></b>
                         </div>
+                        <div class="item-per">{{ item.per }} %</div>
                       </div>
                     </div>
                   </div>
@@ -164,23 +105,15 @@
       <div class="g-row-right">
         <div class="m-box m-tx">
           <div class="header">
-            <img src="@/assets/images/index/title-icon-zntx.png"/>
+            <img src="@/assets/images/index/title-icon-zntx.png" />
             <span>智能提醒</span>
           </div>
-          <div class="more"
-               @click="toNoticePage">更多>
-          </div>
-          <div class="cnt"
-               v-if="noticeData.length > 0">
-            <div @click="handleClickNotice(item)"
-                 class="item"
-                 :key="'notice' + item.targetId + index"
-                 v-for="(item, index) in noticeData">
+          <div class="more" @click="toNoticePage">更多></div>
+          <div class="cnt" v-if="noticeData.length > 0">
+            <div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index" v-for="(item, index) in noticeData">
               <div class="item_left">
-                <i class="i-tag"
-                   v-if="item.readFlag == 1">已读</i>
-                <i class="i-tag"
-                   v-else>未读</i>
+                <i class="i-tag" v-if="item.readFlag == 1">已读</i>
+                <i class="i-tag" v-else>未读</i>
               </div>
               <div class="item_right">
                 <div class="item-date">
@@ -193,10 +126,9 @@
             </div>
           </div>
 
-          <div class="cnt"
-               v-else>
+          <div class="cnt" v-else>
             <div class="empty">
-              <img src="~@/assets/images/shuju/renfang/index/empty.png"/>
+              <img src="~@/assets/images/shuju/renfang/index/empty.png" />
               <span>暂无提醒～</span>
             </div>
           </div>
@@ -204,31 +136,30 @@
         <div class="m-box m-tb">
           <div class="wrap">
             <div class="header">
-              <img src="@/assets/images/index/title-icon-zntb.png"/>
+              <img src="@/assets/images/index/title-icon-zntb.png" />
               <span>不满意事项月度趋势分析</span>
             </div>
           </div>
           <!-- <div class="more">更多></div> -->
           <div class="cnt">
-            <div id="my_chart"
-                 style="width: 100%;height: 230px; position: relative;top:-10px"></div>
+            <div id="my_chart" style="width: 100%; height: 230px; position: relative; top: -10px"></div>
           </div>
         </div>
       </div>
     </div>
-    <fastcall ref="fastcall"/>
+    <fastcall ref="fastcall" />
   </div>
 </template>
 <script>
-import {requestPost, requestGet} from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import resiCategoryMap from "@/views/business/resi-category-map.js";
-import {mapGetters} from "vuex";
+import { mapGetters } from "vuex";
 import nextTick from "dai-js/tools/nextTick";
 import fastcall from "@/views/modules/cpts/fastcall";
-import * as echarts from 'echarts';
+import * as echarts from "echarts";
 
 export default {
-  components: {fastcall},
+  components: { fastcall },
 
   data() {
     return {
@@ -272,10 +203,10 @@ export default {
 
       noticeData: [],
 
-      activeName: 'resi',
+      activeName: "resi",
 
-      myChart: {}
-    }
+      myChart: {},
+    };
   },
   computed: {
     maxTableHeight() {
@@ -303,40 +234,37 @@ export default {
   mounted() {
     this.getApiData();
     this.$nextTick(() => {
-      this.initChart()
-    })
-    console.log(
-        "dynamicMenuRoutes----------------------------",
-        this.$store.state.sidebarMenuList
-    );
+      this.initChart();
+    });
+    console.log("dynamicMenuRoutes----------------------------", this.$store.state.sidebarMenuList);
   },
   methods: {
     initChart() {
-      this.$http.get('/governance/satisfactionOverview/notSatisfactionTrend').then(({data: {data}}) => {
-        this.myChart = echarts.init(document.getElementById('my_chart'));
+      this.$http.get("/governance/satisfactionOverview/notSatisfactionTrend").then(({ data: { data } }) => {
+        this.myChart = echarts.init(document.getElementById("my_chart"));
         let series = data.series.map((item, index) => {
           return {
             ...item,
-            type: 'line',
-          }
-        })
+            type: "line",
+          };
+        });
         let option = {
           tooltip: {
-            trigger: 'axis'
+            trigger: "axis",
           },
           legend: {
-            data: data.series.map(item => item.name),
-            bottom: '10%',
-            icon: 'rect',
+            data: data.series.map((item) => item.name),
+            bottom: "10%",
+            icon: "rect",
             itemWidth: 20,
             itemHeight: 5,
             itemGap: 20,
           },
           grid: {
-            left: '3%',
-            right: '4%',
-            bottom: '25%',
-            containLabel: true
+            left: "3%",
+            right: "4%",
+            bottom: "25%",
+            containLabel: true,
           },
           toolbox: {
             // feature: {
@@ -344,19 +272,18 @@ export default {
             // }
           },
           xAxis: {
-            type: 'category',
+            type: "category",
             boundaryGap: false,
-            data: data.monthTimes.map(item => this.$moment(item).format('M') + '月')
+            data: data.monthTimes.map((item) => this.$moment(item).format("M") + "月"),
           },
           yAxis: {
-            type: 'value'
+            type: "value",
           },
-          series
-        }
-        this.myChart.setOption(option, true)
-        window.addEventListener('resize', this.handleWindowResize);
-      })
-
+          series,
+        };
+        this.myChart.setOption(option, true);
+        window.addEventListener("resize", this.handleWindowResize);
+      });
     },
     handleWindowResize() {
       if (this.myChart) {
@@ -370,24 +297,23 @@ export default {
       this.$router.push({
         name: "base-resi",
         params: {
-          category: item.code
-        }
+          category: item.code,
+        },
       });
-
     },
     async readClearOne(item) {
-      console.log("item", item)
-      const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`
-      const {data, code, msg} = await requestPost(url)
+      console.log("item", item);
+      const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
+      const { data, code, msg } = await requestPost(url);
       if (code == 0) {
-        this.getNoticeData()
+        this.getNoticeData();
       } else if (code >= 8000) {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     handleClickNotice(item) {
-      const {msgType, targetId} = item;
-      this.readClearOne(item)
+      const { msgType, targetId } = item;
+      this.readClearOne(item);
       if (msgType == "community_house") {
         this.$refs.fastcall.showHouseInfo(targetId);
       } else if (msgType == "resident_base_info") {
@@ -403,19 +329,19 @@ export default {
 
     toSearchPage(type, searchKey) {
       this.$router.push({
-        path: "/main/shequ-chaxun"
+        path: "/main/shequ-chaxun",
       });
-      localStorage.setItem('homeSearchType', type)
-      localStorage.setItem('homeSearchKey', searchKey)
+      localStorage.setItem("homeSearchType", type);
+      localStorage.setItem("homeSearchKey", searchKey);
     },
 
     handleClickSearchBtn(str) {
       const {
-        searchData: {type, searchKey},
+        searchData: { type, searchKey },
       } = this;
       if (str) {
         this.toSearchPage(type, searchKey);
-        return
+        return;
       }
       if (!searchKey) return this.$message.error("请输入搜索条件");
       this.toSearchPage(type, searchKey);
@@ -437,7 +363,7 @@ export default {
         level: "",
       };
 
-      const {data, code, msg} = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
         this.orgData = data;
@@ -454,7 +380,7 @@ export default {
         // level: "",
       };
 
-      const {data, code, msg} = await requestGet(url, params);
+      const { data, code, msg } = await requestGet(url, params);
 
       if (code === 0) {
         if (data) {
@@ -472,7 +398,7 @@ export default {
         last: "10",
       };
 
-      const {data, code, msg} = await requestGet(url, params);
+      const { data, code, msg } = await requestGet(url, params);
 
       if (code === 0) {
         if (data) {
@@ -492,7 +418,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) {
@@ -503,9 +429,7 @@ export default {
               code: item.categoryName,
               name: resiCategoryMap[item.categoryName] || "",
               count: item.categoryCount,
-              per: parseInt(
-                  (100 * item.categoryCount) / data.resiCount
-              ),
+              per: ((100 * item.categoryCount) / data.resiCount).toFixed(0),
               const: "const",
             };
           });
@@ -524,7 +448,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) {