修改bug 调整样式

src/views/dataBoard/overview/components/MapDialog/index.vue

@@ -190,6 +190,7 @@ export default {
       if (this.type === 'bmysxqk') {
         this.catVal = 1
         this.$http.get('/governance/icEvent/dissatisfyByCategoryType?agencyId=' + orgId).then(({data: {data}}) => {
+          this.catValSub = data[0].datas[0].value
           this.bmysxqkTree = data.map((item, index) => {
             return {
               label: item.type + '(' + item.total + ')',

src/views/dataBoard/renfang/cpts/fwgl.vue

@@ -189,13 +189,24 @@ export default {
       // 设置三个配置值
       this.pieOption.title.text = pandectData.homeCount;
       this.pieData = [
-        {value: pandectData.selfStay, name: "自住房屋"},
-        {value: pandectData.rentOut, name: "出租房屋"},
-        {value: pandectData.vacantHouse, name: "闲置房屋"},
+        {value: pandectData.selfStay, name: "自住"},
+        {value: pandectData.rentOut, name: "出租"},
+        {value: pandectData.vacantHouse, name: "闲置"},
       ];
       this.pieOption.series[0].data = this.pieData;
       console.log(this.pieOption, 'this.pieOption.series')
       this.$refs.pieChart.setOption(this.pieOption);
+        //饼状图点击事件
+      this.$refs.pieChart.myChart.off('click').on('click', (param) =>{  //这里使用箭头函数代替function，this指向VueComponent
+          let index;
+          //当前扇区的dataIndex
+          index = param.dataIndex;
+          //自己的操作，这里是点击跳转路由，并携带参数
+          if (index !== undefined) {
+            console.log(param)
+            this.toListPage(index, param.name)
+          }
+        });
       // this.$refs.pieChart.hideLoading()
     },
 

src/views/dataBoard/renfang/cpts/jmgl.vue

@@ -188,6 +188,16 @@ export default {
       this.pieOption.series[0].data = this.pieData;
       this.$refs.pieChart.setOption(this.pieOption);
       this.$refs.pieChart.myChart.setOption(this.pieOption);
+      this.$refs.pieChart.myChart.off('click').on('click', (param) =>{  //这里使用箭头函数代替function，this指向VueComponent
+        let index;
+        //当前扇区的dataIndex
+        index = param.dataIndex;
+        //自己的操作，这里是点击跳转路由，并携带参数
+        if (index !== undefined) {
+          console.log(param)
+          this.toListPage(index, param.name)
+        }
+      });
       /*this.$refs.pieChart.myChart.on('mouseover', (params) => {
         var oldIndex = currentIndex;
         var currentIndex = params.dataIndex;

src/views/dataBoard/renfang/index.vue

@@ -234,7 +234,6 @@
             <Title v-if="!displayedForecast" text="居民概览">
               <template>
               <div
-              v-if="!displayedForecast"
               class="box-title-btn"
               @click="displayedForecast = true"
               >
@@ -250,15 +249,17 @@
               </div>
               </template>
             </Title>
-            <Title v-else text="居民分类统计-智能预测"/>
-            <div
-                v-else
-                class="box-title-btn"
-                @click="displayedForecast = false"
-            >
-              <img src="~@/assets/images/shuju/main/back-on.png"/>
-              <span style="color: #fff">返回</span>
-            </div>
+            <Title v-else text="居民分类统计-智能预测">
+              <template>
+              <div
+              class="box-title-btn"
+              @click="displayedForecast = false"
+              >
+              <img src="~@/assets/images/shuju/renfang/index/znyc.png"/>
+              <span>居民概览</span>
+              </div>
+              </template>
+            </Title>
           </div>
 
           <div v-if="!displayedForecast">

src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/detail.vue

@@ -64,10 +64,10 @@ export default {
           path: "/dataBoard/satisfactionEval/index",
           name: "满意度评价",
         },
-        {
+    /*    {
           path: "/dataBoard/satisfactionEval/Problem/tddtlxsj",
           name: "同地点同类型重复投诉问题列表",
-        },
+        },*/
         {
           path: "",
           name: "详情",

src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/detail.vue

@@ -64,10 +64,10 @@ export default {
           path: "/dataBoard/satisfactionEval/index",
           name: "满意度评价",
         },
-        {
+   /*     {
           path: "/dataBoard/satisfactionEval/Problem/tyqybtlx",
           name: "同一区域不同类型重复投诉问题列表",
-        },
+        },*/
         {
           path: "",
           name: "详情",

src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue

@@ -30,7 +30,7 @@
           element-loading-spinner="el-icon-loading"
           element-loading-text="加载中..."
       >
-        <el-table-column label="序号" prop="number" width="80">
+        <el-table-column label="序号" prop="number" width="70" align="center">
         <template slot-scope="{$index}">
           {{$index - 0 + 1}}
           </template>
@@ -128,7 +128,7 @@ export default {
   },
   methods: {
     objectSpanMethod({row, column, rowIndex, columnIndex}) {
-      if (columnIndex === 1 || columnIndex === 0 || columnIndex === 4) {
+      if (columnIndex === 1  || columnIndex === 4) {
         if (rowIndex > 0 && row.address === this.data[rowIndex - 1].address) {
           return {
             rowspan: 0,

src/views/dataBoard/satisfactionEval/Problem/tyry/detail.vue

@@ -64,10 +64,10 @@ export default {
           path: "/dataBoard/satisfactionEval/index",
           name: "满意度评价",
         },
-        {
+     /*   {
           path: "/dataBoard/satisfactionEval/Problem/tyry",
           name: "同一人员重复投诉问题列表",
-        },
+        },*/
         {
           path: "",
           name: "详情",

src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue

@@ -19,7 +19,7 @@
           {{ ageClassification }}
         </div>
       </div>
-      <div class="tag red" v-for="residentTag in residentTagArray" >
+      <div class="tag" :class="index === 0?'red':index === 1? 'purple2':index === 2? 'green2':'purple2'" :key="index" v-for="(residentTag,index) in residentTagArray" >
         <div :class="[residentTag.length > 5 ? 'smallSize' : '', 'text']">
           {{ residentTag }}
         </div>
@@ -189,6 +189,8 @@ $light: #2ab6be;
 $green: #1b7d47;
 $orange: #f95619;
 $purple: #6642fd;
+$purple2: #db42fd;
+$green2: #58cc32;
 .personnel-portrait {
   padding: 16px 16px 40px;
 }
@@ -367,6 +369,7 @@ $purple: #6642fd;
     &:nth-of-type(1) {
       left: 48px;
       top: 57px;
+
     }
   }
 
@@ -439,6 +442,24 @@ $purple: #6642fd;
       background: $purple;
     }
   }
+  .purple2 {
+    .text {
+      background: $purple2;
+    }
+
+    &:after {
+      background: $purple2;
+    }
+  }
+  .green2 {
+    .text {
+      background: $green2;
+    }
+
+    &:after {
+      background: $green2;
+    }
+  }
 }
 
 .btn {

src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue

@@ -227,13 +227,13 @@ export default {
       }).then(({data: {data}}) => {
         console.log(data)
         if(type === ''|| type === 1) {
-          this.list = data?data.addressMobileEvents: [] || []
+          this.list = data?data.addressEvent: [] || []
         }
         if(type === ''|| type === 2) {
           this.list2 = data?data.mobileEvent: [] || []
         }
         if(type === ''|| type === 3) {
-          this.data = data?data.addressEvent: [] || []
+          this.data = data?data.addressMobileEvents: [] || []
         }
       })
     },
@@ -346,7 +346,8 @@ export default {
 }
 
 .list-con {
-  overflow: auto;
+  overflow-x: hidden;
+  overflow-y: auto;
   height: 200px;
 }
 .no-data {