1

admin/src/views/account/pla_account_detail.vue

@@ -177,7 +177,7 @@
                 </div>
                 <div class="priority-total-display">
                     <span>总权重：<strong :class="{ 'weight-warning': totalWeight !== 100 }">{{ totalWeight
-                    }}%</strong></span>
+                            }}%</strong></span>
                 </div>
             </div>
             <div v-else class="empty-config">暂无配置</div>
@@ -357,20 +357,40 @@
                 </div>
                 <TabPane name="tasks" label="任务列表">
                     <div class="tab-content">
-                        <div class="tab-body" v-if="tasksLoading">
-                            <tables :columns="taskColumns" :value="tasksData" 
-                                :pageOption="tasksPageOption" @changePage="queryTasks">
-                            </tables>
+                        <div class="tab-body">
+                            <Table :columns="taskColumns" :data="tasksData" :loading="tasksLoading" border>
+                            </Table>
+                            <Page 
+                                :current="tasksPageOption.page" 
+                                :total="tasksPageOption.total" 
+                                :page-size="tasksPageOption.pageSize"
+                                show-total
+                                show-elevator
+                                show-sizer
+                                @on-change="queryTasks"
+                                @on-page-size-change="handleTasksPageSizeChange"
+                                style="margin-top: 16px; text-align: right;">
+                            </Page>
                         </div>
                     </div>
                 </TabPane>
 
                 <TabPane name="commands" label="指令列表">
                     <div class="tab-content">
-                        <div class="tab-body" v-if="commandsLoading">
-                            <tables :columns="commandColumns" :value="commandsData" 
-                                :pageOption="commandsPageOption" @changePage="queryCommands">
-                            </tables>
+                        <div class="tab-body">
+                            <Table :columns="commandColumns" :data="commandsData" :loading="commandsLoading" border>
+                            </Table>
+                            <Page 
+                                :current="commandsPageOption.page" 
+                                :total="commandsPageOption.total" 
+                                :page-size="commandsPageOption.pageSize"
+                                show-total
+                                show-elevator
+                                show-sizer
+                                @on-change="queryCommands"
+                                @on-page-size-change="handleCommandsPageSizeChange"
+                                style="margin-top: 16px; text-align: right;">
+                            </Page>
                         </div>
                     </div>
                 </TabPane>
@@ -996,15 +1016,11 @@ export default {
                 }
                 const res = await plaAccountServer.getTasks(this.accountId, param)
 
-
+                console.log('res', res);
+             
                 this.tasksData = res.data.rows || []
                 this.tasksPageOption.total = res.data.count || 0
 
-
-
-                setTimeout(() => {
-                    this.$forceUpdate()
-                }, 0)
             } catch (error) {
                 this.$Message.error('加载任务列表失败')
                 this.tasksData = []
@@ -1030,9 +1046,6 @@ export default {
                 this.commandsData = res.data.rows || []
                 this.commandsPageOption.total = res.data.count || 0
 
-                setTimeout(() => {
-                    this.$forceUpdate()
-                }, 0)
             } catch (error) {
                 this.$Message.error('加载指令列表失败')
                 this.commandsData = []
@@ -1064,9 +1077,7 @@ export default {
                         await plaAccountServer.retryCommand(command.id)
                         this.$Message.success('重试指令成功')
                         // 刷新指令列表
-                        setTimeout(() => {
-                            this.queryCommands(this.commandsPageOption.page)
-                        }, 1000)
+                      
                     } catch (error) {
                         console.error('重试指令失败:', error)
                         this.$Message.error(error.message || '重试指令失败')
@@ -1113,6 +1124,20 @@ export default {
             }
         },
 
+        // 任务列表分页大小改变
+        handleTasksPageSizeChange(pageSize) {
+            this.tasksPageOption.pageSize = pageSize
+            this.tasksPageOption.page = 1
+            this.queryTasks(1)
+        },
+
+        // 指令列表分页大小改变
+        handleCommandsPageSizeChange(pageSize) {
+            this.commandsPageOption.pageSize = pageSize
+            this.commandsPageOption.page = 1
+            this.queryCommands(1)
+        },
+
         // 处理刷新
         handleRefresh() {
             if (this.activeTab === 'tasks') {
@@ -1673,13 +1698,23 @@ export default {
 .tab-content {
     display: flex;
     flex-direction: column;
-    min-height: 400px;
+    min-height: 500px;
 }
 
 .tab-body {
     flex: 1;
     padding: 20px;
     overflow: visible;
+    min-height: 500px;
+}
+
+/* TabPane 最小高度 */
+.tabs-card>>>.ivu-tabs-content {
+    min-height: 500px;
+}
+
+.tabs-card>>>.ivu-tabs-tabpane {
+    min-height: 500px;
 }
 
 /* Tab右侧按钮 */