Merge branch 'master' of http://git.cc-lotus.info/roose/MZbigScreen

src/components/index/5.vue

@@ -81,16 +81,16 @@
 
               const seriesArr = [];
 
-              const liquidFill1 = this.createLiquidfill({ index: 0, center_x: 15, center_y: 30, text: this.data1.value, value: this.handlerData(this.data1.value) });
+              const liquidFill1 = this.createLiquidfill({ index: 0, center_x: 16, center_y: 28, text: this.data1.value, value: this.handlerData(this.data1.value) });
               seriesArr.push(liquidFill1);
 
-              const liquidFill2 = this.createLiquidfill({ index: 1, center_x: 53, center_y: 28, text: this.data2.value + '%', value: this.handlerData(this.data2.value + '%') });
+              const liquidFill2 = this.createLiquidfill({ index: 1, center_x: 58, center_y: 28, text: this.data2.value + '%', value: this.handlerData(this.data2.value + '%') });
               seriesArr.push(liquidFill2);
 
-              const liquidFill3 = this.createLiquidfill({ index: 2, center_x: 15, center_y: 74, text: this.data3.value, value: this.handlerData(this.data3.value) });
+              const liquidFill3 = this.createLiquidfill({ index: 2, center_x: 16, center_y: 78, text: this.data3.value, value: this.handlerData(this.data3.value) });
               seriesArr.push(liquidFill3);
 
-              const liquidFill4 = this.createLiquidfill({ index: 3, center_x: 53, center_y: 77, text: this.data4.value, value: this.handlerData(this.data4.value) });
+              const liquidFill4 = this.createLiquidfill({ index: 3, center_x: 58, center_y: 78, 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: [-75, -80],
+                      offset: [-45, -90],
                       color: '#fff',
                       fontSize: 16,
                       formatter: '巡访平均周期'
@@ -117,7 +117,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [-85, -45],
+                      offset: [-60, -55],
                       color: this.colorArr[0].color1,
                       fontSize: 16,
                       formatter: this.data1.value
@@ -133,7 +133,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [140, -80],
+                      offset: [160, -90],
                       color: '#fff',
                       fontSize: 16,
                       formatter: '子女绑定占比'
@@ -149,7 +149,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [130, -45],
+                      offset: [150, -55],
                       color: this.colorArr[1].color1,
                       fontSize: 16,
                       formatter: `${this.data2.value}%`
@@ -165,7 +165,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [-90, 55],
+                      offset: [-60, 40],
 
                       color: '#fff',
                       fontSize: 16,
@@ -182,7 +182,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [-85, 90],
+                      offset: [-60, 75],
                       color: this.colorArr[2].color1,
                       fontSize: 16,
                       formatter: `${this.data3.value}`
@@ -198,7 +198,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [130, 55],
+                      offset: [150, 40],
                       color: '#fff',
                       fontSize: 16,
                       formatter: '兑换比例'
@@ -214,7 +214,7 @@
                   label: {
                       show: true,
                       position: 'top',
-                      offset: [130, 90],
+                      offset: [150, 80],
                       color: this.colorArr[3].color1,
                       fontSize: 16,
                       formatter: `${this.data4.value}`

src/pages/Ranking.vue

@@ -75,9 +75,8 @@
                               :src="scrollTextisColor1(index)"></el-image>
                     <div v-else class="top11-number">{{index+1}}</div>
                 </el-col>
-                <el-col :span="4" class="name">{{item.name}}</el-col>
-                <el-col :span="7" class="name">{{item.address}}</el-col>
-                <el-col :span="7" class="name">
+                <el-col :span="7" class="name">{{item.name}}</el-col>
+                <el-col :span="10" class="name">
                     <el-progress :stroke-width="15" :show-text="isText" :percentage="formatNum(item.num)"></el-progress>
                 </el-col>
                 <el-col :span="3" class="name">{{item.num}}</el-col>
@@ -93,7 +92,7 @@
                 <el-col :span="4" class="name">{{item.name}}</el-col>
                 <el-col :span="7" class="name">{{item.address}}</el-col>
                 <el-col :span="7" class="name">
-                    <el-progress :stroke-width="15" :show-text="isText" :percentage="formatNum(item.num)"></el-progress>
+                    <el-progress :stroke-width="15" :show-text="isText" :percentage="formatNum1(item.num)"></el-progress>
                 </el-col>
                 <el-col :span="3" class="name">{{item.num}}</el-col>
             </el-row>
@@ -265,6 +264,12 @@
                 return function(num){
                     return num / this.listData[0].num * 100
                 }
+            },
+
+            formatNum1() {
+                return function(num){
+                    return num / this.listData1[0].num * 100
+                }
             }
         }
     };