diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index 1ba1973b..eba599fb 100644 --- a/src/components/scTable/index.vue +++ b/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) { diff --git a/src/views/fac_cal/enstat.vue b/src/views/fac_cal/enstat.vue index 7644dc46..5557b233 100644 --- a/src/views/fac_cal/enstat.vue +++ b/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 { diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue index 076efdce..23bfb168 100644 --- a/src/views/fac_cal/mpointstat.vue +++ b/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 {