Merge pull request 'fix :修复分页问题' (#230) from dj into master

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/230

auto-imports.d.ts

@@ -6,7 +6,6 @@ export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
   const ElMessage: typeof import('element-plus/es')['ElMessage']
-  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
   const computed: typeof import('vue')['computed']
   const createApp: typeof import('vue')['createApp']
   const customRef: typeof import('vue')['customRef']

src/views/home/index.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="call-history">
       <h3>历史通话记录</h3>
-      <fvTable ref="tableIns" :tableConfig="tableConfig" :data="currentHistoryData" :total="currentHistoryTotal" :isLoading="isLoading"></fvTable>
+      <fvTable ref="tableIns" :tableConfig="tableConfig" :data="currentHistoryData" :total="currentHistoryTotal" :isLoading="isLoading" @getBaseQuery="getBaseQuery"></fvTable>
       <voice ref="voiceRef" title="语音详情" :rowUrl="rowUrl" />
       <infoLiveCall ref="infoLiveCallRef" v-model:value="historyData" />
     </div>
@@ -149,18 +149,29 @@ const tableConfig = reactive({
   params: {
   }
 })
-const getOrder=()=>{
+const getOrder=(pageNum=1,pageSize=10)=>{
   // isLoading.value=true
+  nextTick(()=>{
+    tableIns.value.updateLoading(true)
+  })
   orderGetList({
-    pageNum: 1,
-    pageSize: 10
+    pageNum: pageNum,
+    pageSize: pageSize
   }).then(res=>{
+    console.log('res',res)
     currentHistoryData.value=res.data.rows
     currentHistoryTotal.value=res.data.total
-    // isLoading.value=false
+    nextTick(()=>{
+      tableIns.value.updateLoading(false)
+    })
   })
 }
 getOrder()
+const getBaseQuery=(params)=>{
+  console.log('params',params)
+  // tableConfig.params=params
+  getOrder(params.pageNum,params.pageSize)
+}
 const handleVoice = (row) => {
   if (row.recordUrl !== null) {
     voiceRef.value.open(true)

vite.config.js

@@ -76,8 +76,9 @@ export default defineConfig({
       //   rewrite: (path) => path.replace(/^\/api/, ""),
       // },
       "/api": {
-        // target: "http://frp.feashow.cn:31800/",
-        target: "http://10.8.105.91:28080/",
+        target: "http://frp.feashow.cn:31800/",
+        // target: "http://10.8.105.91:28080/",
+        // target: "http://112.19.165.99:20002/",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ""),
       },