From 844391632076dca5c04bcd9422e751236d640309 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 6 Dec 2024 15:36:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20base=20query=E5=8F=AF=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scTable/index.vue | 3 +++
 1 file changed, 3 insertions(+)

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) {

From 9292cfe61de5b650959fb69aa65194c9d848e53d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 6 Dec 2024 15:37:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20enstatvue=20=E5=B0=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fac_cal/enstat.vue     | 3 +--
 src/views/fac_cal/mpointstat.vue | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

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 {