Merge branch '03/18VipActive' into test

src/views/trainStatistics/index.vue

@@ -154,9 +154,9 @@ export default {
             this.$refs.item.toggle();
         },
         okBtn() {
-            if(this.formatStartTime && this.formatEndTime) {
-                this.onResetList()
-            }
+            // if(this.formatStartTime && this.formatEndTime) {
+            //     }
+            this.onResetList()
             this.$refs.item.toggle();
         },
         onChangeDate(type) {
@@ -197,13 +197,8 @@ export default {
         },
         async getList() {
             let params = this.params;
-            if(this.formatStartTime && this.formatEndTime) {
-                params.startTime = this.formatStartTime
-                params.endTime = this.formatEndTime
-            } else {
-                params.startTime = null
-                params.endTime = null
-            }
+            params.startTime = this.formatStartTime || null
+            params.endTime = this.formatEndTime || null
             try {
                 let res = await countStudentTrain(params)
                 let result = res.data;