00

src/components/PatrolmanStatistics/5.vue

@@ -46,7 +46,7 @@
                       startAngle: 180,
                       clockwise: false,
                       radius: [40, 120],
-                      center: ['55%', '30%'],
+                      center: ['46%', '40%'],
                       color: this.colorArr.map((item) => item.color1),
                       data: [
                           ...chartDataArr,
@@ -73,7 +73,7 @@
                                   }
 
                               },
-                              fontSize: 22
+                              fontSize: 17
                           }
                       },
                       labelLine: {

src/components/index/2.vue

@@ -127,7 +127,8 @@
                         left: 'right',
                         textStyle: {
                             color: "#fff"
-                        }
+                        },
+                      padding:[10, 30,0 ,0],
                     },
                     grid: {
                         left: '30%',
@@ -280,15 +281,16 @@
                         left: 'right',
                         textStyle: {
                             color: "#fff"
-                        }
-                    },
-                    grid: {
-                        left: '30%',
-                        right: '15%',
-                        bottom: '5%',
-                        height: '90%',
-                        containLabel: true
+                        },
+                      padding:[10, 30,0 ,0],
                     },
+                  grid: {
+                    left: '28.5%',
+                    right: '15%',
+                    bottom: '5%',
+                    height: '90%',
+                    containLabel: true
+                  },
                     xAxis: [
                         {
                             type: 'value',

src/components/index/3.vue

@@ -61,7 +61,8 @@
                       textStyle:{//图例文字的样式
                           color:'#ccc',
                           fontSize:16
-                      }
+                      },
+                    padding:[10, 30,0 ,0],
                   },
                   xAxis: {
                       type: 'category',

src/components/index/5.vue

@@ -48,7 +48,7 @@
               waveAnimation: false, // 禁止左右波动
               label: {
                 normal: {
-                  position: ['50%', '50%'],
+                  position: ['50%', '53%'],
                   textStyle: {
                     fontSize: 24,
                     color: '#fff'
@@ -81,16 +81,16 @@
 
               const seriesArr = [];
 
-              const liquidFill1 = this.createLiquidfill({ index: 0, center_x: 14, center_y: 25, text: this.data1.value, value: this.handlerData(this.data1.value) });
+              const liquidFill1 = this.createLiquidfill({ index: 0, center_x: 13, center_y: 30, text: this.data1.value, value: this.handlerData(this.data1.value) });
               seriesArr.push(liquidFill1);
 
-              const liquidFill2 = this.createLiquidfill({ index: 1, center_x: 58, center_y: 25, text: this.data2.value + '%', value: this.handlerData(this.data2.value + '%') });
+              const liquidFill2 = this.createLiquidfill({ index: 1, center_x: 53, center_y: 28, text: this.data2.value + '%', value: this.handlerData(this.data2.value + '%') });
               seriesArr.push(liquidFill2);
 
-              const liquidFill3 = this.createLiquidfill({ index: 2, center_x: 14, center_y: 75, text: this.data3.value, value: this.handlerData(this.data3.value) });
+              const liquidFill3 = this.createLiquidfill({ index: 2, center_x: 13, center_y: 75, text: this.data3.value, value: this.handlerData(this.data3.value) });
               seriesArr.push(liquidFill3);
 
-              const liquidFill4 = this.createLiquidfill({ index: 3, center_x: 58, center_y: 75, text: this.data4.value, value: this.handlerData(this.data4.value) });
+              const liquidFill4 = this.createLiquidfill({ index: 3, center_x: 53, center_y: 75, text: this.data4.value, value: this.handlerData(this.data4.value) });
               seriesArr.push(liquidFill4);
 
               seriesArr.push({
@@ -101,7 +101,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [-55, -80],
+                      offset: [-80, -80],
                       color: '#fff',
                       fontSize: 16,
                       formatter: '巡访平均周期'
@@ -117,7 +117,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [-70, -50],
+                      offset: [-90, -45],
                       color: this.colorArr[0].color1,
                       fontSize: 16,
                       formatter: this.data1.value
@@ -133,7 +133,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [160, -80],
+                      offset: [140, -80],
                       color: '#fff',
                       fontSize: 16,
                       formatter: '子女绑定占比'
@@ -149,7 +149,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [150, -50],
+                      offset: [130, -45],
                       color: this.colorArr[1].color1,
                       fontSize: 16,
                       formatter: `${this.data2.value}%`
@@ -165,7 +165,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [-70, 55],
+                      offset: [-90, 55],
                       color: '#fff',
                       fontSize: 16,
                       formatter: '积分存量'
@@ -181,7 +181,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [-70, 90],
+                      offset: [-90, 90],
                       color: this.colorArr[2].color1,
                       fontSize: 16,
                       formatter: `${this.data3.value}`
@@ -197,7 +197,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [150, 55],
+                      offset: [130, 55],
                       color: '#fff',
                       fontSize: 16,
                       formatter: '兑换比例'
@@ -213,7 +213,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [150, 90],
+                      offset: [130, 90],
                       color: this.colorArr[3].color1,
                       fontSize: 16,
                       formatter: `${this.data4.value}`

src/components/oldStatistics/1.vue

@@ -28,7 +28,7 @@
               const d = this.dataArr[i];
 
               const arr = new Array(this.dataArr.length).fill({});
-              arr[i] = { value: d.value };
+              arr[i] = { value: 130 };
 
               seriesArr.push({
                   type: 'pictorialBar',
@@ -43,14 +43,14 @@
                       },
                       color: this.colorArr[i],
                       fontWeight: 'bold',
-                      offset: [0, 100],
+                      offset: [0, 70],
                       formatter: d.percent
                   },
                   data: arr
               });
 
               const topArr = new Array(this.dataArr.length).fill({});
-              topArr[i] = { value: d.value };
+              topArr[i] = { value: 155 };
 
               seriesArr.push({
                   type: 'pictorialBar',
@@ -65,7 +65,7 @@
                       },
                       color: this.colorArr[i],
                       fontWeight: 'bold',
-                      offset: [0, 70],
+                      offset: [0, 80],
                       formatter: `${d.value}人`
                   },
                   data: topArr

src/components/oldStatistics/2.vue

@@ -34,7 +34,7 @@
                     seriesArr.push({
                         type: 'pie',
                         radius: [38, 70],
-                        center: [`${ i == 0 ? 30 : 70 }%`, '56%'],
+                        center: [`${ i == 0 ?  32: 68 }%`, '60%'],
                         startAngle: 90,
                         clockwise: false,
                         labelLine: {

src/pages/PatrolmanStatistics.vue

@@ -38,7 +38,7 @@
             <span v-else class="bj-shouqi" @click="guanbi"></span>
             <span class="bj-qeuren" @click="queren"></span>
             <span v-if="isZhankai" class="address-title">乡镇(街道)：</span>
-            <el-select v-if="isZhankai" class="input1" clearable :popper-append-to-body="false" v-model="dept4" placeholder="请选择" @change="countyChange">
+            <el-select v-if="isZhankai" style="margin-top: 1%" class="input1" clearable :popper-append-to-body="false" v-model="dept4" placeholder="请选择" @change="countyChange">
                 <el-option
                         v-for="item in countys"
                         :key="item.value"
@@ -544,7 +544,7 @@
     }
 
     .input {
-        width: 15.5%;
+        width: 17%;
         margin-right: 1%;
     }
 
@@ -560,6 +560,7 @@
         width: 60px;
         height: 37px;
         margin-right: 1%;
+        margin-left: 1%;
         vertical-align: bottom;
     }
 
@@ -574,6 +575,7 @@
         width: 60px;
         height: 37px;
         margin-right: 1%;
+        margin-left: 1%;
         vertical-align: bottom;
     }
 

src/pages/oldStatistics.vue

@@ -48,7 +48,7 @@
                 </el-option>
             </el-select>
             <span v-if="isZhankai" class="address-title">村(居)民委员会：</span>
-            <el-select v-if="isZhankai" class="input1" clearable :popper-append-to-body="false" v-model="dept5" placeholder="请选择">
+            <el-select v-if="isZhankai"  style="margin-top: 1%" class="input1" clearable :popper-append-to-body="false" v-model="dept5" placeholder="请选择">
                 <el-option
                         v-for="item in villages"
                         :key="item.value"
@@ -464,7 +464,7 @@
     }
 
     .input {
-        width: 15.5%;
+        width: 17%;
         margin-right: 1%;
     }
 
@@ -480,6 +480,7 @@
         width: 60px;
         height: 37px;
         margin-right: 1%;
+        margin-left: 1%;
         vertical-align: bottom;
     }
 
@@ -494,6 +495,7 @@
         width: 60px;
         height: 37px;
         margin-right: 1%;
+        margin-left: 1%;
         vertical-align: bottom;
     }
 
@@ -508,6 +510,7 @@
         width: 69px;
         height: 37px;
         vertical-align: bottom;
+
     }
 
     .bj-qeuren:hover {