Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/components/scTable/index.vue

@@ -218,6 +218,9 @@ export default {
         // delete reqData[config.request.page]
         // delete reqData[config.request.pageSize]
       }
+      if (this.query[this.orderStr]){
+        reqData[this.orderStr] = this.query[this.orderStr]
+      }
       var c = Object.assign({}, this.query, this.tableParams, reqData)
       try {
         if (this.apiObj) {

src/views/fac_cal/enstat.vue

@@ -46,7 +46,6 @@
 					:apiObj="apiObj"
 					row-key="id"
 					stripe
-					:params="params"
 					:query="query"
 					highlightCurrentRow
 				>
@@ -103,7 +102,7 @@ export default {
     },
     methods: {
         handleQuery() {
-            if (this.timeRange) {
+            if (this.timeRange.length > 0) {
                 this.query.start_time = this.timeRange[0]
                 this.query.end_time = this.timeRange[1]
             } else {

src/views/fac_cal/mpointstat.vue

@@ -271,7 +271,7 @@ export default {
 	},
 		handle_add() {},
 		handleQuery() {
-            if (this.timeRange) {
+            if (this.timeRange.length > 0) {
                 this.query.start_time = this.timeRange[0]
                 this.query.end_time = this.timeRange[1]
             } else {