From ce5af3975ec00aa44dff0c248377d8bfc08579fd Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Fri, 28 Jul 2023 16:17:48 +0800
Subject: [PATCH] =?UTF-8?q?RMSSOH=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=80=E6=9D=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9B=E5=85=A5=E6=9F=A5=E7=9C=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=8C=E8=A7=A3=E6=9E=90=E6=96=87=E4=BB=B6=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=B9=B6=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/imsData/stateOfHealth/rmssoh.vue |  4 +++-
 src/views/statistics/imsProducts/arr/index.vue        |  2 ++
 src/views/statistics/imsProducts/rrr/index.vue        | 10 ++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/statistics/imsData/stateOfHealth/rmssoh.vue b/src/views/statistics/imsData/stateOfHealth/rmssoh.vue
index 00eb945..15a4da2 100644
--- a/src/views/statistics/imsData/stateOfHealth/rmssoh.vue
+++ b/src/views/statistics/imsData/stateOfHealth/rmssoh.vue
@@ -16,7 +16,6 @@
         :list="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :canSelect="false"
         @change="handleTableChange"
         @detail="handleDetail"
       >
@@ -137,10 +136,12 @@ export default {
       this.isFileDetail = flag
     },
     handleDetail(record) {
+      console.log(record);
       this.currSampleId = record.sohId
       this.isFileDetail = true
     },
     searchQueryData() {
+      this.loading = true
       let days = compareDate(this.queryParam.startTime, this.queryParam.endTime)
       if (days <= 10) { 
         this.isImmediate = false
@@ -155,6 +156,7 @@ export default {
           pageSize: 10
         }
         getAction(this.url.list, params).then((res) => {
+          this.loading = false
           if (res.success) {
             this.ipagination.current = res.result.current
             this.ipagination.pageSize = res.result.size
diff --git a/src/views/statistics/imsProducts/arr/index.vue b/src/views/statistics/imsProducts/arr/index.vue
index f94ad0e..51dfc91 100644
--- a/src/views/statistics/imsProducts/arr/index.vue
+++ b/src/views/statistics/imsProducts/arr/index.vue
@@ -141,6 +141,7 @@ export default {
       this.isFileDetail = true
     },
     searchQueryData() {
+      this.loading = true
       let days = compareDate(this.queryParam.startTime, this.queryParam.endTime)
       if (days <= 10) { 
         this.isImmediate = false
@@ -155,6 +156,7 @@ export default {
           pageSize: 10
         }
         getAction(this.url.list, params).then((res) => {
+          this.loading = false
           if (res.success) {
             this.ipagination.current = res.result.current
             this.ipagination.pageSize = res.result.size
diff --git a/src/views/statistics/imsProducts/rrr/index.vue b/src/views/statistics/imsProducts/rrr/index.vue
index 0107989..11b1679 100644
--- a/src/views/statistics/imsProducts/rrr/index.vue
+++ b/src/views/statistics/imsProducts/rrr/index.vue
@@ -141,8 +141,9 @@ export default {
       this.isFileDetail = true
     },
     searchQueryData() {
+      this.loading = true
       let days = compareDate(this.queryParam.startTime, this.queryParam.endTime)
-      // if (days <= 10) { 
+      if (days <= 10) { 
         this.isImmediate = false
         // this.queryParam = {
         //   startTime: "2023-01-01",
@@ -155,6 +156,7 @@ export default {
           pageSize: 10
         }
         getAction(this.url.list, params).then((res) => {
+          this.loading = false
           if (res.success) {
             this.ipagination.current = res.result.current
             this.ipagination.pageSize = res.result.size
@@ -164,9 +166,9 @@ export default {
             this.$message.warning("This operation fails. Contact your system administrator")
           }
         })
-      // } else {
-        // this.$message.info("Maximum timespan duration is 10 days. Please, change start or end date.")
-      // }
+      } else {
+        this.$message.info("Maximum timespan duration is 10 days. Please, change start or end date.")
+      }
     },
     findStationList() {
       getAction(this.url.findStationList, { menuName: '' }).then((res) => {