From c91886a5e9c09e7aa1a4102ec940260fd88bb7e6 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Wed, 8 Nov 2023 17:00:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9B=B4=E6=8E=A5=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E6=B5=8F=E8=A7=88=E5=99=A8=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8CCompare=E5=BC=B9=E7=AA=97=E4=B8=AD=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8=E7=9A=84=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E7=9A=84=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modals/CompareFileListModal.vue           | 113 ++++++++++--------
 1 file changed, 66 insertions(+), 47 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/CompareFileListModal.vue b/src/views/spectrumAnalysis/components/Modals/CompareFileListModal.vue
index dd873f1..cc6f2a6 100644
--- a/src/views/spectrumAnalysis/components/Modals/CompareFileListModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/CompareFileListModal.vue
@@ -1,11 +1,12 @@
 <template>
   <custom-modal v-model="visible" :width="1200" title="File List">
-    <search-form :items="formItems" v-model="queryParam" @search="searchQuery"></search-form>
+    <search-form :items="formItems" v-model="queryParam" @search="handleSearch"></search-form>
     <custom-table
+      rowKey="name"
       :columns="columns"
       :list="dataSource"
-      :loading="loading"
-      :pagination="ipagination"
+      :loading="isLoading"
+      :pagination="pagination"
       :selectedRowKeys.sync="selectedRowKeys"
       :selectionRows.sync="selectionRows"
       :scroll="{ y: 440 }"
@@ -20,7 +21,6 @@
 
 <script>
 import { getAction } from '@/api/manage'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import ModalMixin from '@/mixins/ModalMixin'
 
 const columns = [
@@ -29,79 +29,98 @@ const columns = [
     dataIndex: 'name',
     width: '45%',
     align: 'left',
-    ellipsis: true
+    ellipsis: true,
   },
   {
     title: 'UpdateDate',
     dataIndex: 'updateDate',
-    align: 'left'
+    align: 'left',
   },
   {
     title: 'Size',
     dataIndex: 'size',
-    align: 'left'
-  }
+    align: 'left',
+  },
 ]
 
 const formItems = [
   {
     label: '',
     type: 'a-input',
-    name: 'searchName',
+    name: 'name',
     props: {
-      placeholder: 'search...'
-    }
-  }
+      placeholder: 'search...',
+    },
+  },
 ]
 
 export default {
-  mixins: [ModalMixin, JeecgListMixin],
+  mixins: [ModalMixin],
   data() {
     this.columns = columns
     this.formItems = formItems
 
     return {
+      inited: false,
       queryParam: {},
+      dataSource: [],
       selectedRowKeys: [],
-      selectionRows: []
+      selectionRows: [],
+      pagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '30'],
+        showTotal: (total, range) => {
+          const { current, pageSize } = this.pagination
+          return `Total ${total} items　Page ${current} / ${Math.ceil(total / pageSize)}`
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0,
+      },
     }
   },
   methods: {
     beforeModalOpen() {
       this.selectedRowKeys = []
-    },
-
-    loadData(arg) {
-      //加载数据 若传入参数1则加载第一页的内容
-      if (arg === 1) {
-        this.ipagination.current = 1
+      if(!this.inited) {
+        this.inited = true
+        this.getList()
       }
-      this.onClearSelected()
-
-      const params = this.getQueryParams() //查询条件
-      const searchName = this.queryParam.searchName
-      params.name = searchName
-      this.loading = true
-      getAction('/spectrumFile/get', params)
-        .then(res => {
-          if (res.success) {
-            this.dataSource = res.result.records
-            this.dataSource.forEach((item, index) => {
-              item.id = index
-            })
-            if (res.result.total) {
-              this.ipagination.total = res.result.total
-            } else {
-              this.ipagination.total = 0
-            }
-          } else {
-            this.$message.warning(res.message)
-          }
-        })
-        .finally(() => {
-          this.loading = false
-        })
     },
+
+    async getList() {
+      try {
+        this.isLoading = true
+        const params = {
+          ...this.queryParam,
+          pageNo: this.pagination.current,
+          pageSize: this.pagination.pageSize,
+        }
+        const { success, result, message } = await getAction('/spectrumFile/get', params)
+        if (success) {
+          this.dataSource = result.records
+          this.pagination.total = result.total
+        } else {
+          this.$message.error(message)
+        }
+      } catch (error) {
+        console.error(error)
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    handleTableChange(pagination, filters, sorter) {
+      this.pagination = pagination
+      this.getList()
+    },
+
+    handleSearch() {
+      this.pagination.current = 1
+      this.getList()
+    },
+
     async handleOk() {
       if (!this.selectedRowKeys.length) {
         this.$message.warn('Please Select A File to Compare')
@@ -110,8 +129,8 @@ export default {
 
       this.$emit('fileSelect', this.selectionRows[0].name)
       this.visible = false
-    }
-  }
+    },
+  },
 }
 </script>