Merge branch 'feature_approval' of 101.201.121.115:leo/LAPP_MY_WEBFRONT into feature_herui

src/views/reportform/components/LabBarChart.vue

@@ -143,24 +143,18 @@ export default {
           }
         }],
         yAxis: [{
-            type: 'value',
-            name: '欠费户数(个)',
-            // min: 0,
-            // max: 250,
-            // interval: 50,
-            axisLabel: {
-                formatter: '{value} 个'
-            }
+					type: 'value',
+					name: '欠费户数(个)',
+					axisLabel: {
+						formatter: '{value} 个'
+					}
         },
         {
-            type: 'value',
-            name: '欠费金额(万元)',
-            // min: 0,
-            // max: 25,
-            interval: 5,
-            axisLabel: {
-                formatter: '{value} 万元'
-            }
+					type: 'value',
+					name: '欠费金额(万元)',
+					axisLabel: {
+						formatter: '{value} 万元'
+					}
         }],
         series: this.seriesArray
       })

src/views/reportform/parkOwe.vue

@@ -93,6 +93,7 @@ export default {
       this.loading = true
       getOweChargeTotal(this.queryParams).then((response) => {
         this.dataList = response.data
+				this.dataListTable = []
 				let rowPerson = {}
 				let rowMoney = {}
 				if (this.dataList.length > 0) {