修改bug调整样式 新增需求分类统计时间参数

src/assets/scss/dataBoard/renfang/index.scss

@@ -353,20 +353,25 @@
 
   .item {
     display: flex;
-    width: 120px;
+    width: 140px;
+    background: url('@/assets/images/shuju/renfang/index/per/bg.png') no-repeat;
+    height: 70px;
+    justify-content: center;
+    align-items: center;
+    padding-top: 6px;
 
     .item-info {
       font-size: 14px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
       color: rgba(255, 255, 255, 0.65);
-      line-height: 40px;
+      //line-height: 40px;
       vertical-align: bottom;
 
       div {
-        margin-bottom: 6px;
 
         &:first-child {
+          margin-bottom: 6px;
           line-height: 20px;
         }
       }
@@ -380,9 +385,22 @@
       }
 
       b {
+        width: 61px;
+        height: 23px;
+        font-size: 30px;
+        //font-weight: bold;
+        font-style: italic;
+        color: #64C1FF;
         font-weight: 500;
-        font-size: 24px;
+      }
-        color: #ffffff;
+      .blue {
+        color: #3CF5FF;
+      }
+      .orange {
+        color: #FFB73C;
+      }
+      .red {
+        color: #F37346;
       }
     }
   }

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

@@ -22,19 +22,19 @@ export default {
   data() {
     return {
       dateList: [{
-        label: '上月',
+        label: '当月',
         value: 1
       }, {
-        label: '近三个月',
+        label: '前三个月',
-        value: 2
+        value: 3
       }, {
         label: '近半年',
-        value: 3
+        value: 6
       }, {
         label: '近一年',
-        value: 4
+        value: 12
       }],
-      date: 4
+      date: 12
     }
   },
   mounted() {
@@ -42,10 +42,10 @@ export default {
   },
   methods: {
     timeChange() {
-
+      this.initChart();
     },
     initChart() {
-      this.$http.post('/governance/userdemand/countByCategory').then(({data:{data}}) => {
+      this.$http.post('/governance/userdemand/countByCategory',{monthTime: this.date} ).then(({data:{data}}) => {
         let div = document.getElementById('DemandCharts');
         this.myChart = echarts.init(div);
         var getname = data.map(item => item.categoryName); // 课程名

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

@@ -22,19 +22,19 @@ export default {
   data() {
     return {
       dateList: [{
-        label: '上月',
+        label: '当月',
         value: 1
       }, {
-        label: '近三个月',
+        label: '前三个月',
-        value: 2
+        value: 3
       }, {
         label: '近半年',
-        value: 3
+        value: 6
       }, {
         label: '近一年',
-        value: 4
+        value: 12
       }],
-      date: 4
+      date: 12
     }
   },
   mounted() {
@@ -42,10 +42,10 @@ export default {
   },
   methods: {
     timeChange() {
-
+      this.initChart();
     },
     initChart() {
-      this.$http.post('/governance/commonDemand/countByCategory').then(({data:{data}}) => {
+      this.$http.post('/governance/commonDemand/countByCategory',{monthTime: this.date}).then(({data:{data}}) => {
         let div = document.getElementById('DemandCharts2');
         this.myChart = echarts.init(div);
         var getname = data.map(item => item.categoryName); // 课程名

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

@@ -110,7 +110,7 @@ export default {
       let params = {
         ...this.queryParams,
         agencyId: this.currentLevelData.orgId,
-        secondIdList: [this.catVal]
+        satisfactionCategory: this.catVal
       }
       this.$http.get("/governance/satisfactionDetailList/getUnsatisfiedMattersList?" + this.$paramsFormat(params)).then(({data: {data}}) => {
         this.list = data.list;

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

@@ -484,7 +484,8 @@ export default {
 
     .pie {
       flex: 0 0 280px;
-      height: 146px;
+      min-height: 146px;
+      height: 100%;
       margin-top: 32px;
     }
   }

src/views/dataBoard/renfang/cpts/rkfxPieOption.js

@@ -30,35 +30,28 @@ export function pieOption() {
 				avoidLabelOverlap: true,
 				labelLine: {
 					show: true,
+					normal: {
+						length: 3,
+						length2: 0
+					}
 				},
 				label: {
-
 					normal: {
 						show: true,
 						color: "#FFFFFF",
 						formatter: '{name|{b}}\n{rate|{d}%}',
-						minMargin: 5,
-						edgeDistance: 1,
-						lineHeight: 15,
 						fontSize: 14,
 						// distanceToLabelLine: -60,
 						rich: {
 							name: {
-								padding: [0, 0, 10, 0],
+								padding: [0, 0, 2, 0],
 							},
 							rate: {
-								padding: [10, 0, 0, 0],
+								padding: [2, 0, 0, 0],
 							}
 						}
 					},
 				},
-				emphasis: {
-					label: {
-						show: true,
-						// fontSize: 36,
-						fontWeight: "bold",
-					},
-				},
 				data: [],
 			},
 		],

src/views/dataBoard/renfang/index.vue

@@ -45,7 +45,7 @@
                   />低保人员
                 </div>
                 <div>
-                  <b>{{ perInfo.SUBSISTENCE_ALLOWANCE_FLAG }}</b>
+                  <b class="blue">{{ perInfo.SUBSISTENCE_ALLOWANCE_FLAG }}</b>
                   %
                 </div>
               </div>
@@ -58,7 +58,7 @@
                   />失业人员
                 </div>
                 <div>
-                  <b>{{ perInfo.UNEMPLOYED_FLAG }}</b>
+                  <b class="blue">{{ perInfo.UNEMPLOYED_FLAG }}</b>
                   %
                 </div>
               </div>
@@ -71,7 +71,7 @@
                   />党员
                 </div>
                 <div>
-                  <b>{{ perInfo.PARTY_FLAG }}</b>
+                  <b class="orange">{{ perInfo.PARTY_FLAG }}</b>
                   %
                 </div>
               </div>
@@ -84,7 +84,7 @@
                   />志愿者
                 </div>
                 <div>
-                  <b>{{ perInfo.VOLUNTEER_FLAG }}</b>
+                  <b class="red">{{ perInfo.VOLUNTEER_FLAG }}</b>
                   %
                 </div>
               </div>
@@ -93,7 +93,7 @@
               <div class="item-info">
                 <div>
                   <img
-                      src="~@/assets/images/shuju/renfang/index/per/zyz.png"
+                      src="~@/assets/images/shuju/renfang/index/per/tsrq.png"
                   />特殊人群
                 </div>
                 <div>

src/views/dataBoard/satisfactionEval/components/Title/index.vue

@@ -28,7 +28,7 @@ export default {
 .title {
   // width: 100%;
   height: 40px;
-  background: url(../../../../../assets/images/shuju/overview/title-bg.png) no-repeat;
+  background: url(@/assets/images/shuju/overview/title-bg.png) no-repeat;
   background-size: 100% 100%;
   padding: 8px 16px 8px 45px;
   display: flex;

src/views/dataBoard/satisfactionEval/index.vue

@@ -1,9 +1,11 @@
 <template>
   <div class="satisfaction-eval">
-    <el-row :gutter="20">
+    <el-row :gutter="15">
-      <el-col :span="8" class="bgImg">
+      <el-col :span="8" class="">
+        <div class="bgImg">
           <Title text="12345数据分析"/>
           <eventAnalysis/>
+        </div>
       </el-col>
       <el-col :span="8">
         <!-- <EventSituation /> -->
@@ -61,7 +63,8 @@
 <script>
 import TypesOfDissatisfaction from "./modules/TypesOfDissatisfaction";
 import RiskStatistics from "./modules/RiskStatistics";
-import Title from "@/views/dataBoard/satisfactionEval/components/Title";
+import Title from "@/views/dataBoard/satisfactionEval/components/Title/index.vue";
+
 import EventSituation from "@/views/dataBoard/satisfactionEval/modules/EventSituation";
 import SelfTrend from "@/views/dataBoard/satisfactionEval/modules/SelfTrend";
 import EventStatistics from "@/views/dataBoard/satisfactionEval/modules/EventStatistics";
@@ -176,9 +179,14 @@ export default {
   .el-date-picker__header--bordered {
     border-bottom: solid 1px #006cff;
   }
+
   .el-month-table td.disabled .cell {
-    background: none;
     opacity: .5;
+    background: none;
   }
 }
+
+/deep/ .title {
+  padding-left: 58px;
+}
 </style>