合并zhanibiao分支代码

src/assets/scss/dataBoard/overview/index.scss

@@ -13,12 +13,12 @@
 
 	.g-center {
 		position: relative;
-		width: 888px;
+		width: 910px;
 	}
 
 	.g-center-open {
 		position: relative;
-		width: 888px;
+		width: 910px;
 
 		.m-map {
 			position: relative;
@@ -176,7 +176,7 @@
 	&-top {
 		display: flex;
 		justify-content: space-between;
-		padding-top: 10px;
+		//padding-top: 20px;
 	}
 
 	&-card {
@@ -357,7 +357,7 @@
 }
 
 .m-jdwgy {
-	height: 220px;
+	height: auto!important;
 	padding: 12px 16px;
 }
 
@@ -578,7 +578,7 @@
 }
 
 .m-sqrfph {
-	padding: 24px 16px;
+	padding: 12px 16px;
 
 	.table {
 		.tr {
@@ -653,7 +653,7 @@
 }
 
 .m-sq12345 {
-	padding: 24px 16px;
+	padding: 12px 16px;
 
 	.table {
 		.tr {

src/assets/scss/dataBoard/table.scss

@@ -16,6 +16,7 @@
   }
   /deep/ .el-table tr {
     background: url("@/assets/images/manyidu/table_line.png") no-repeat bottom center!important;
+    background-size: 100%!important;
     &:hover {
       background-color: rgba(26, 149, 255, 0.3) !important;
     }

src/router/index.js

@@ -517,7 +517,7 @@ export const dataBoardRoutes = {
       component: () => import("@/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index"),
       name: "dataBoard-satisfactionEval-dissatisfiedPersonnel",
       meta: {
-        title: "画像匹配同类不满意人员",
+        title: "画像匹配同类潜在不满意人员 ",
         isTab: false,
       },
     },
@@ -527,7 +527,7 @@ export const dataBoardRoutes = {
       component: () => import("@/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail"),
       name: "dataBoard-satisfactionEval-dissatisfiedPersonnel-detail",
       meta: {
-        title: "画像匹配同类不满意人员",
+        title: "画像匹配同类潜在不满意人员 ",
         isTab: false,
       },
     },

src/views/dataBoard/cpts/map/index.vue

@@ -987,8 +987,32 @@ export default {
     opacity: 0.9;
     border-radius: 5px;
     color: #fff;
-    box-shadow: 0 0 20px 3px inset rgba(#22f, 0.1);
+    //box-shadow: 0 0 20px 3px inset rgba(#22f, 0.1);
     width: 416px;
+    padding: 0 20px !important;
+    background: url('@/assets/images/overview/dia_con.png');
+
+    &:before {
+      content: '';
+      display: block;
+      background: url('@/assets/images/overview/dia_head.png');
+      height: 29px;
+      width: 100%;
+      position: absolute;
+      top: -27.5px;
+      left: 0;
+    }
+
+    &:after {
+      content: '';
+      display: block;
+      background: url('@/assets/images/overview/dia_foot.png');
+      height: 26px;
+      width: 100%;
+      left: 0;
+      position: absolute;
+      bottom: -24px;
+    }
   }
 
   /deep/ .l7-popup-close-button {
@@ -1116,8 +1140,8 @@ export default {
     flex-wrap: wrap;
 
     & > div {
-      flex: 0 0 131px;
-      width: 131px;
+      flex: 0 0 33%;
+      width:  33%;
       height: 14px;
       font-size: 14px;
       font-weight: 400;

src/views/dataBoard/overview/components/jdwgy.vue

@@ -151,6 +151,9 @@ export default {
 <style lang="scss" scoped>
 /deep/ .table {
   .el-table {
+    &:before {
+      display: none!important;
+    }
     td {
       padding: 9px 14px !important;
     }

src/views/dataBoard/overview/components/map-top.vue

@@ -69,7 +69,7 @@
     </template>
     <template v-else>
       <div class="item" :class="selectIndex === 'unit' ? 'xz' : ''" @click="selectIcon('unit')">
-        <div class="item-info" >
+        <div class="item-info">
           <div>
             <img src="~@/assets/images/overview/icon_wg.png"/>
             微网格

src/views/dataBoard/overview/familyPortrait/index.vue

@@ -23,7 +23,7 @@ export default {
         name: '概览'
       }, {
         path: '/homeDetails/index',
-        name: '画像匹配同类不满意人员'
+        name: '画像匹配同类潜在不满意人员 '
       }, {
         path: '',
         name: ''

src/views/dataBoard/overview/index.vue

@@ -469,7 +469,7 @@ export default {
           orgId: this.orgId,
           orgLevel: this.currentLevel,
         };
-        // this.peopleType = this.currentLevel === 'grid'?'unit':'staffAgency';
+        this.peopleType = this.currentLevel === 'grid'?'unit':'staffAgency';
       });
     },
 

src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail.vue

@@ -23,7 +23,7 @@ export default {
         name: '满意度评价'
       }, {
         path: '/dataBoard/satisfactionEval/dissatisfiedPersonnel',
-        name: '画像匹配同类不满意人员'
+        name: '画像匹配同类潜在不满意人员 '
       }, {
         path: '',
         name: ''

src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue

@@ -2,7 +2,7 @@
   <div>
     <Breadcrumb :list="breadcrumbList"/>
     <!--    <div class="main-title">
-      <Title :text="`“${title}”画像匹配同类不满意人员`" noBg/>
+      <Title :text="`“${title}”画像匹配同类潜在不满意人员 `" noBg/>
     </div>-->
     <div class="table">
       <el-table :data="list"
@@ -74,7 +74,7 @@ export default {
         },
         {
           path: "",
-          name: "画像匹配同类不满意人员",
+          name: "画像匹配同类潜在不满意人员 ",
         },
       ],
       monthOptions: new Array(12).fill(0).map((_, index) => {

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

@@ -147,6 +147,18 @@ export default {
             return res;
           },
         },
+        dataZoom: [
+          {
+            "type": "slider",
+            "start": 0,
+            "end": 18,
+            "height": 10,
+            "bottom": 0,
+            "showDetail": false,
+            "showDataShadow": false,
+            "borderColor": "transparent"
+          }
+        ],
         legend: {
           // icon: 'circle',
           data: series.map(item => item.name),
@@ -184,6 +196,7 @@ export default {
             },
             axisLabel: {
               align: 'center',
+              interval: 0,
               textStyle: {
                 fontSize: 12,
                 color: '#A3B9DA'
@@ -240,7 +253,7 @@ export default {
             name: '',
             type: 'bar',
 
-            barWidth: 100,
+            barWidth: 80,
             barGap: '-60%',
             data: barArray,
             itemStyle: {