Merge branch 'develop' into 'test'

src/containers/Dashboard/CampusRank/CampusRank.vue

@@ -24,7 +24,7 @@
       <el-radio-group
         class="Dashboard-Radio"
         :value="filters.timeType"
-        @input="val => changeFilterHandle({ timeType: val })"
+        @input="val => updateFilters({ timeType: val })"
       >
         <el-radio
           class="Dashboard-Radio-item"
@@ -42,6 +42,7 @@
       <el-button
         type="primary"
         @click="fetchConsumeList"
+        class="CampusRank-search"
       >搜索</el-button>
     </div>
     <CampusRankChart
@@ -134,5 +135,8 @@ export default {
       height: 100% !important;
     }
   }
+  .CampusRank-search {
+    margin-right: 5px;
+  }
 }
 </style>

src/containers/Dashboard/CustomerData/CustomerData.vue

@@ -5,20 +5,20 @@
         <operator-select
           :accessType="1"
           :value="filters.operateId"
-          @input="val => fetchAllData({operateId: val})"
+          @input="val => updateFilters({operateId: val,areaId:undefined})"
         />
       </search-item>
       <search-item label="区域">
         <dashboard-area-select
           :operateId="filters.operateId"
           :value="filters.areaId"
-          @input="val => fetchAllData({areaId: val})"
+          @input="val => updateFilters({areaId: val})"
         />
       </search-item>
       <el-radio-group
         class="Dashboard-Radio"
         :value="filters.timeType"
-        @input="val => fetchAllData({timeType: val})"
+        @input="val => updateFilters({timeType: val})"
       >
         <el-radio
           class="Dashboard-Radio-item"
@@ -61,7 +61,10 @@ export default {
     ...mapGetters('Dashboard/customerConsumption', ['filters']),
   },
   methods: {
-    ...mapActions('Dashboard/customerConsumption', ['getConsumeOrderList']),
+    ...mapActions('Dashboard/customerConsumption', [
+      'getConsumeOrderList',
+      'updateFilters',
+    ]),
     ...mapActions('Dashboard/customerRecharge', ['getRechargeOrderList']),
     fetchAllData(entity) {
       this.getConsumeOrderList(entity);

src/containers/Dashboard/CustomerRecharge/chart.vue

@@ -249,10 +249,13 @@ export default {
           width: 26,
           height: this.height,
           padding: [20, 0, 20, 0],
-          xAxis: 'rechargeMen',
+          xAxis: 'rechargeMoney',
           yAxis: 'index',
           scales: {
+            min: 0,
+            max: arrLength - 1,
             index: {
+              type: 'linear',
               formatter: val => {
                 return parseInt(val, 10);
               },