From da3e09e84743e13b480605f5bfe97a04c6f85f71 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Thu, 7 Sep 2023 15:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BC=B9=E7=AA=97=E4=B8=ADlo?=
 =?UTF-8?q?ading=E7=9A=84=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98=20=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=99=AE=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/LoadFromFileModal.vue   | 83 ++++++++++---------
 1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
index abdc09f..32273c5 100644
--- a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
@@ -52,42 +52,42 @@
       <!-- 底部按钮结束 -->
     </custom-modal>
     <a-modal v-model="visible_file" :width="1200" title="File List" @cancel="cancelFileModale">
-      <div style="position: relative;padding-bottom: 40px;height: 460px;overflow: hidden;">
-        <a-table 
-          v-if="tableType=='multiple'"
-          :data-source="list_file" 
-          :columns="columns_file" 
-          :loading="loading_file"
-          :pagination="false"
-          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        >
-        </a-table>
-        <custom-table
-          v-if="tableType=='single'"
-          rowKey="id"
-          size="middle"
-          :columns="columns_file"
-          :list="list_file"
-          :pagination="false"
-          :loading="loading_file_edit"
-          :selectedRowKeys.sync="selectedRowKeys_edit"
-          :selectionRows.sync="selectionRows_edit"
-        >
-    </custom-table>
-        <a-pagination 
-          size="small"
-          v-model="ipagination.current" 
-          :pageSize="ipagination.pageSize"
-          :page-size-options="ipagination.pageSizeOptions"
-          show-size-changer
-          show-quick-jumper
-          :total="ipagination.total"
-          :show-total="(total, range) => `Total ${total} items　Page ${ipagination.current} / ${Math.ceil(total / ipagination.pageSize)}`"
-          show-less-items 
-          @change="handlePageChange"
-          @showSizeChange="handleSizeChange"
-        />
-      </div>
+      <a-spin :spinning="loading_file">
+        <div style="position: relative;padding-bottom: 40px;height: 460px;overflow: hidden;">
+          <a-table 
+            v-if="tableType=='multiple'"
+            :data-source="list_file" 
+            :columns="columns_file"
+            :pagination="false"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          >
+          </a-table>
+          <custom-table
+            v-if="tableType=='single'"
+            rowKey="id"
+            size="middle"
+            :columns="columns_file"
+            :list="list_file"
+            :pagination="false"
+            :selectedRowKeys.sync="selectedRowKeys_edit"
+            :selectionRows.sync="selectionRows_edit"
+          >
+          </custom-table>
+          <a-pagination 
+            size="small"
+            v-model="ipagination.current" 
+            :pageSize="ipagination.pageSize"
+            :page-size-options="ipagination.pageSizeOptions"
+            show-size-changer
+            show-quick-jumper
+            :total="ipagination.total"
+            :show-total="(total, range) => `Total ${total} items　Page ${ipagination.current} / ${Math.ceil(total / ipagination.pageSize)}`"
+            show-less-items 
+            @change="handlePageChange"
+            @showSizeChange="handleSizeChange"
+          />
+        </div>
+      </a-spin>
       <template slot="footer">
         <a-space class="operators" :size="20">
           <a-button type="success" @click="saveFileName">Save</a-button>
@@ -200,7 +200,6 @@ export default {
       uploading: false,
       currRowData: {},
       currFileType: "_S_",
-      loading_file_edit: false,
       selectedRowKeys_edit: [],
       selectionRows_edit: [],
       tableType: "multiple"
@@ -231,13 +230,21 @@ export default {
     },
     getSpectrumFile(params) {
       this.loading_file = true
-      getAction("/spectrumFile/get", params).then(res => {
+      let params_arg = {}
+      if (this.tableType==="multiple") {
+        params_arg = {...params}
+      } else {
+        params_arg = {...params,name:this.currFileType}
+      }
+      getAction("/spectrumFile/get", params_arg).then(res => {
         this.loading_file = false
         if (res.success) {
           res.result.records.forEach((item,index) => {
             item.id = index
           })
           this.ipagination.total = res.result.total
+          this.ipagination.current = res.result.current
+          this.ipagination.pageSize = res.result.size
           this.list_file = res.result.records
         } else {
           this.$message.warning("This operation fails. Contact your system administrator")