Merge branch 'master-v32-lushangqing' into 'master'

本月申报率95以上显示



See merge request !133

@@ -11,6 +11,7 @@ export default {
             allData:{},
             allData:{},
             titleFontSize: 30,
             titleFontSize: 30,
             declareRate: '0%',
             declareRate: '0%',
+            gaugeDataDeclareRate:'',
             declareRateLeft: 0,
             declareRateLeft: 0,
             declareRateRight: '%',
             declareRateRight: '%',
             declareNumer: 0,
             declareNumer: 0,
@@ -70,19 +71,29 @@ export default {
                         declareRateNum = declareRate.split('%')[0]
                         declareRateNum = declareRate.split('%')[0]
                     }
                     }
                     that.declareRate=declareRateNum;
                     that.declareRate=declareRateNum;
+                    if(declareRateNum>95&&declareRateNum<100){
+                        that.gaugeDataDeclareRate=95;
+                    }else{
+                        that.gaugeDataDeclareRate=that.declareRate
+                    }
                     that.declareNumer = that.allData.polyline.declareNumer
                     that.declareNumer = that.allData.polyline.declareNumer
                     that.optionInit();
                     that.optionInit();
 
 
-
                 }
                 }
             });
             });
 
 
         },
         },
         optionInit(){
         optionInit(){
+
             const gaugeData = [
             const gaugeData = [
                 {
                 {
-                    value: this.declareRate,
+                    value: this.gaugeDataDeclareRate,
+                    name:this.declareRate+'%',
+                    title: {
+                        offsetCenter: ['0%', '0%'],
+                    },
                     detail: {
                     detail: {
+                        show:false,
                         valueAnimation: true,
                         valueAnimation: true,
                         offsetCenter: ['0%', '0%']
                         offsetCenter: ['0%', '0%']
                     }
                     }
@@ -133,7 +144,8 @@ export default {
                         },
                         },
                         data: gaugeData,
                         data: gaugeData,
                         title: {
                         title: {
-                            fontSize: 14
+                            fontSize: 14,
+                            color:'#23fffc'
                         },
                         },
                         detail: {
                         detail: {
                             width: 50,
                             width: 50,