Merge remote-tracking branch 'origin/master'

src/views/data-statistics/echars-components/crosswiseColumnarChart.vue

@@ -39,7 +39,8 @@ export default {
           trigger: 'axis',
           axisPointer: {
             type: 'shadow'
-          }
+          },
+          valueFormatter: (value) => value + _this.unit
         },
         legend: {
           left: 'right'

src/views/data-statistics/echars-components/radar-chart-for-petowner-hospital.vue

@@ -33,7 +33,7 @@ export default {
         },
         tooltip: {
           show: true,
-          valueFormatter: (value) => value + '人'
+          valueFormatter: (value) => (value || 0) + '人'
         },
         legend: {
           data: ['绑定宠物数量', '就诊宠物数量'],

src/views/data-statistics/echars-components/radar-chart-for-petowner-platfrom.vue

@@ -34,7 +34,8 @@ export default {
           }
         },
         tooltip: {
-          show: true
+          show: true,
+          valueFormatter: (value) => value + '人'
         },
         legend: {
           data: ['年消费额', '年充值额'],

src/views/data-statistics/echars-components/radar-chart-one-linel.vue

@@ -8,7 +8,7 @@
 
 export default {
   name: 'RadarChartOneLine',
-  props: ['title', 'yData', 'name', 'indicator', 'lineStartColor', 'lineEndColor', 'areaStartColor', 'areaEndColor'],
+  props: ['title', 'yData', 'name', 'indicator', 'lineStartColor', 'lineEndColor', 'areaStartColor', 'areaEndColor', 'unit'],
   data() {
     return {}
   },
@@ -34,7 +34,7 @@ export default {
         },
         tooltip: {
           show: true,
-          valueFormatter: (value) => value + '项'
+          valueFormatter: (value) => value + _this.unit
         },
         legend: {
           data: [_this.name],

src/views/data-statistics/echars-components/twoLineChart.vue

@@ -104,20 +104,22 @@ export default {
             const label1 = _this.yData1.label
             const unit1 = _this.yData1.unit
             const color1 = _this.yData1.line_color
+            const fixNum1 = this.yData1.fixNum
             const label2 = _this.yData2.label
             const unit2 = _this.yData2.unit
             const color2 = _this.yData2.line_color
+            const fixNum2 = this.yData2.fixNum
             return `<div>
                 <div>${axis[0].name}</div>
                 <div style="display: flex">
                     <div style="background-color: ${color1};width: 10px;height: 10px;margin-top: 7px;margin-right:5px;border-radius: 10px"></div>
                     <span>${label1}</span>
-                    <span style="margin-left: 5px;color: ${color1}">${Number(axis[0].value).toFixed(2)}${unit1}</span>
+                    <span style="margin-left: 5px;color: ${color1}">${Number(axis[0].value).toFixed(fixNum1)}${unit1}</span>
                 </div>
                 <div style="display: flex">
                     <div style="background-color: ${color2};width: 10px;height: 10px;margin-top: 7px;margin-right:5px;border-radius: 10px"></div>
                     <span>${label2}</span>
-                    <span style="margin-left: 5px;color: ${color2}">${Number(axis[1].value).toFixed(2)}${unit2}</span>
+                    <span style="margin-left: 5px;color: ${color2}">${Number(axis[1].value).toFixed(fixNum2)}${unit2}</span>
               </div>
             </div>`
           }

src/views/data-statistics/hospital-data-statistics/hospital-data-statistics.vue

@@ -358,14 +358,16 @@ export default {
         data: [],
         line_color: '#3490CE',
         area_color: 'rgba(52,144,206,0.3)',
-        unit: '万元'
+        unit: '万元',
+        fixNum: 2
       },
       yData2: {
         label: '预储值余额总额',
         data: [],
         line_color: '#5FB54B',
         area_color: 'rgba(95,181,75,0.3)',
-        unit: '万元'
+        unit: '万元',
+        fixNum: 2
       },
       hospitalPrestoredRank: [],
       hospitalTimeRank: [],

src/views/data-statistics/pet-data-statistics/pet-data-statistics.vue

@@ -638,28 +638,32 @@ export default {
         data: [],
         line_color: '#3490CE',
         area_color: 'rgba(52,144,206,0.3)',
-        unit: '人'
+        unit: '人',
+        fixNum: 0
       },
       yData2: {
         label: '活跃用户量',
         data: [],
         line_color: '#5FB54B',
         area_color: 'rgba(95,181,75,0.3)',
-        unit: '人'
+        unit: '人',
+        fixNum: 0
       },
       yData1_2: {
         label: '新增会员卡余额',
         data: [],
         line_color: '#3490CE',
         area_color: 'rgba(52,144,206,0.3)',
-        unit: '万元'
+        unit: '万元',
+        fixNum: 2
       },
       yData2_2: {
         label: '会员卡余额总额',
         data: [],
         line_color: '#5FB54B',
         area_color: 'rgba(95,181,75,0.3)',
-        unit: '万元'
+        unit: '万元',
+        fixNum: 2
       },
       petOwnerConsumeRank: [],
       vipTopUpRank: [],

src/views/data-statistics/service-statistics/service-statistics.vue

@@ -189,6 +189,7 @@
               :line-end-color="projectUnitPriceDistributionRadarData.lineEndColor"
               :area-start-color="projectUnitPriceDistributionRadarData.areaStartColor"
               :area-end-color="projectUnitPriceDistributionRadarData.areaEndColor"
+              unit="项"
             />
             <empty-tool v-else title="现有服务项目单价分布" />
           </div>
@@ -205,6 +206,7 @@
               :line-end-color="projectIncomeDistributionRadarData.lineEndColor"
               :area-start-color="projectIncomeDistributionRadarData.areaStartColor"
               :area-end-color="projectIncomeDistributionRadarData.areaEndColor"
+              unit="次"
             />
             <empty-tool v-else title="服务项目收益分布" />
           </div>