20251205任务数据分配分页

2025-12-05 10:46:19 +08:00
parent 53900e6208
commit 7140e63b3f
13 changed files with 499 additions and 172 deletions
--- a/src/components/TaskManagement/manage/DataManage.vue
+++ b/src/components/TaskManagement/manage/DataManage.vue
@@ -8,12 +8,18 @@
          prefix-icon="el-icon-search"
          clearable
          size="small"
-          @input="handleSearch"
+          @keyup.enter.native="handleSearch"
        ></el-input>
+        <el-button 
+          class="forest-btn search-btn" 
+          size="small" 
+          icon="el-icon-search" 
+          @click="handleSearch"
+        >搜索</el-button>
      </div>
      <div class="toolbar-actions">
        <el-button class="forest-btn" size="medium" icon="el-icon-download" @click="openBatchDownloadDialog">
-          批量数据下载
+            批量数据下载
        </el-button>
        <el-button class="forest-btn ghost" size="medium" icon="el-icon-copy-document" @click="ExchangeData()">
          任务数据复制
@@ -98,6 +104,18 @@
        </template>
      </el-table-column>
    </el-table>
+    <!-- 分页组件 -->
+    <div class="pagination-container">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
    <el-card class="box-card" v-show="tpkCardV">
      <div slot="header" class="clearfix">
        <span style="float: left; padding: 3px 0; font-size: 16px"
@@ -734,6 +752,11 @@ export default {
      filteredData: [], // 过滤后的数据
      batchDownloadDialogVisible: false, // 批量下载对话框显示
      batchDownloadSelectedTasks: [], // 勾选的任务ID
+      // 分页相关属性
+      pageNum: 1,
+      pageSize: 10,
+      total: 0,
+      totalPages: 0

    };
  },
@@ -771,33 +794,71 @@ export default {

    this.$message.success("批量下载请求已发起");
  },
-    // 搜索处理方法
+    // 搜索处理方法 - 搜索时重置到第一页并重新加载数据
    handleSearch() {
-      if (!this.searchKeyword.trim()) {
-        this.filteredData = [...this.tasksData];
-      } else {
-        const keyword = this.searchKeyword.toLowerCase();
-        this.filteredData = this.tasksData.filter(item => {
-          return (
-            (item.taskName && item.taskName.toLowerCase().includes(keyword)) ||
-            (item.databaseName && item.databaseName.toLowerCase().includes(keyword)) ||
-            (item.introduction && item.introduction.toLowerCase().includes(keyword))
-          );
-        });
-      }
+      this.pageNum = 1;
+      this.init();
+    },
+    // 分页大小改变处理
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNum = 1;
+      this.init();
+    },
+    // 当前页改变处理
+    handleCurrentChange(val) {
+      this.pageNum = val;
+      this.init();
    },

-    // formatter(row, column) {
-    //   return row.address;
-    // },
+    //读取数据库 初始化数据 - 使用分页接口获取数据
    init() {
      let that = this;
-      // 从 store 获取数据
-      const taskData = that.$store.state.taskData.selectTaskHasCreated || [];
-      that.tasksData = taskData;
-      that.filteredData = [...that.tasksData]; // 初始化过滤数据
-      that.srcTaskOptions = taskData;
-      that.destTaskOptions = taskData;
+      // 构建请求参数
+      const params = {
+        pageNum: that.pageNum,
+        pageSize: that.pageSize,
+        keyword: that.searchKeyword && that.searchKeyword.trim() ? that.searchKeyword.trim() : ''
+      };
+      
+      request({
+        url: "/task/selectTaskHasCreatedPaginated",
+        method: "get",
+        params: params
+      }).then(function (response) {
+        if (response.data.success === true) {
+          const result = response.data.data;
+          
+          // 从返回的数据结构中提取数据数组和分页信息
+          that.tasksData = result.data || [];
+          
+          // 分页信息在 pageInfo 对象中
+          if (result.pageInfo) {
+            that.total = result.pageInfo.total || 0;
+            that.totalPages = result.pageInfo.totalPages || 0;
+            that.pageNum = result.pageInfo.pageNum || 1;
+            that.pageSize = result.pageInfo.pageSize || 10;
+          } else {
+            // 兼容旧格式（如果 pageInfo 不存在）
+            that.total = result.total || 0;
+            that.totalPages = result.totalPages || 0;
+            that.pageNum = result.pageNum || 1;
+            that.pageSize = result.pageSize || 10;
+          }
+          
+          that.filteredData = [...that.tasksData];
+          that.srcTaskOptions = that.tasksData;
+          that.destTaskOptions = that.tasksData;
+        } else if (response.data.status === "401") {
+          that.$alert(response.data.message);
+          that.$router.push({ path: "/login" });
+        } else {
+          that.$message.error(response.data.message || "获取数据失败");
+        }
+      }).catch(function (error) {
+        console.error("获取数据失败:", error);
+        that.$message.error("获取数据失败，请稍后重试");
+      });
    },
    beforeTpkUpload(file) {
      if (file.type != "tpk") {
@@ -1563,11 +1624,20 @@ export default {

 .search-box {
  flex: 0 0 auto;
+  display: flex;
+  align-items: center;
+  gap: 12px;
  width: 450px;
 }

 :deep(.search-box .el-input) {
-  width: 100%;
+  flex: 1;
+}
+
+.search-btn {
+  flex-shrink: 0;
+  padding: 0 20px;
+  min-width: 80px;
 }

 .toolbar-actions {
@@ -1600,6 +1670,13 @@ export default {
  filter: brightness(1.05);
 }

+.pagination-container {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 20px;
+  padding: 16px 0;
+}
+
 #tableStyle {
  margin-bottom: 30px;
  background: rgba(255, 255, 255, 0.92);
--- a/src/components/TaskManagement/manage/ManualAllocate.vue
+++ b/src/components/TaskManagement/manage/ManualAllocate.vue
@@ -768,16 +768,16 @@ export default {
            // 从 store 获取数据
            const taskData = this.$store.state.taskData.selectAllWithTableName || [];
            let current = taskData.find((item) => {
-              return item.id == this.taskId;
-            });
+                  return item.id == this.taskId;
+                });
            if (current) {
-              this.taskValue = {
-                value: current.databaseName,
-                label: current.taskName,
-                id: current.id,
-                tableNames: current.tableNames,
-              };
-            }
+                this.taskValue = {
+                  value: current.databaseName,
+                  label: current.taskName,
+                  id: current.id,
+                  tableNames: current.tableNames,
+                };
+              }
          }
        })
        .catch((error) => {
--- a/src/components/TaskManagement/manage/TaskManage.vue
+++ b/src/components/TaskManagement/manage/TaskManage.vue
@@ -8,8 +8,14 @@
        prefix-icon="el-icon-search"
        clearable
        size="small"
-        @input="handleSearch"
+        @keyup.enter.native="handleSearch"
      ></el-input>
+      <el-button 
+        class="forest-btn-small search-btn" 
+        size="small" 
+        icon="el-icon-search" 
+        @click="handleSearch"
+      >搜索</el-button>
    </div>
    
    <el-table
@@ -42,11 +48,12 @@
          </el-dropdown>
        </template>
        <template slot-scope="scope">
-          <el-checkbox
-            label="需要分配"
+          <el-switch
            v-model="scope.row.isAllocationOptional"
-            @change="changeisAllocationOptional(scope.row.id)"
-          ></el-checkbox>
+            active-color="#4CAF50"
+            inactive-color="#E0E0E0"
+            @change="changeisAllocationOptional(scope.row.id, scope.row)"
+          ></el-switch>
        </template>
      </el-table-column>
      <el-table-column min-width="95" filterable label="是否已分配" sortable>
@@ -144,6 +151,18 @@
        </template>
      </el-table-column>
    </el-table>
+    <!-- 分页组件 -->
+    <div class="pagination-container">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>

    <el-dialog
      v-dialogDrag
@@ -294,52 +313,53 @@ export default {
        },
      ],
      searchKeyword: "", // 搜索关键词
+      // 分页相关属性
+      pageNum: 1,
+      pageSize: 10,
+      total: 0,
+      totalPages: 0
    };
  },
  methods: {
-    // 搜索处理方法
+    // 搜索处理方法 - 搜索时重置到第一页并重新加载数据
    handleSearch() {
-      this.applyFilter();
+      this.pageNum = 1;
+      this.init();
+    },
+    // 分页大小改变处理
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNum = 1;
+      this.init();
+    },
+    // 当前页改变处理
+    handleCurrentChange(val) {
+      this.pageNum = val;
+      this.init();
    },

-    // 应用筛选和搜索
-    applyFilter() {
-      let filtered = [...this.tasksData];
-      
-      // 先应用分配状态筛选
-      if (this.currentFilter === 'need') {
-        filtered = filtered.filter(item => item.isAllocationOptional === true);
-      } else if (this.currentFilter === 'notNeed') {
-        filtered = filtered.filter(item => item.isAllocationOptional === false);
-      }
-      
-      // 再应用搜索关键词筛选
-      if (this.searchKeyword.trim()) {
-        const keyword = this.searchKeyword.toLowerCase();
-        filtered = filtered.filter(item => {
-          return item.taskName && item.taskName.toLowerCase().includes(keyword);
-        });
-      }
-      
-      this.filteredData = filtered;
-    },
-
-    // 筛选处理方法
+    // 筛选处理方法 - 筛选时重置到第一页并重新加载数据
    handleFilter(command) {
      this.currentFilter = command;
-      this.applyFilter();
+      this.pageNum = 1;
+      // 筛选是在前端进行的，因为后端接口不支持分配状态筛选
+      // 所以需要重新获取数据后应用筛选
+      this.init();
    },

    // 修改方法参数，从index改为taskId
-    changeisAllocationOptional(taskId) {
-      let row = this.tasksData.find(item => item.id === taskId);
+    changeisAllocationOptional(taskId, row) {
      if (!row) return;
      
+      // 保存原始状态，用于请求失败时恢复
+      const originalValue = !row.isAllocationOptional;
+      const newValue = row.isAllocationOptional;
+      
      let that = this;
-      let str = row.isAllocationOptional === true
+      let str = newValue === true
        ? "确认任务需要分配吗？"
        : "确认任务无需分配吗？";
-      let res = row.isAllocationOptional === true ? 0 : 1;
+      let res = newValue === true ? 0 : 1;

      this.$confirm(str, "提示", {})
        .then(() => {
@@ -353,41 +373,97 @@ export default {
          }).then(function (response) {
            if (response.data.success == true) {
              that.$message.success("设置成功");
-              
-              // 重新获取数据以确保状态同步
-              that.init();
+              // 请求成功，状态已经改变，不需要额外操作
            } else if (response.data.status == "401") {
+              // 请求失败，恢复原始状态
+              row.isAllocationOptional = originalValue;
              that.$alert(response.data.message);
              that.$router.push({ path: "/login" });
            } else {
+              // 请求失败，恢复原始状态
+              row.isAllocationOptional = originalValue;
              that.$message.error("设置失败");
            }
+          }).catch(function (error) {
+            // 请求异常，恢复原始状态
+            row.isAllocationOptional = originalValue;
+            console.error("设置失败:", error);
+            that.$message.error("设置失败，请稍后重试");
          });
        })
        .catch(() => {
-          // 取消操作，不需要回滚状态
+          // 用户取消操作，恢复原始状态
+          row.isAllocationOptional = originalValue;
        });
    },
    init() {
      let that = this;
-      // 从 store 获取数据
-      const taskData = that.$store.state.taskData.selectTaskHasCreated || [];
-      that.tasksData = taskData;
-      //0表示需要分配
-      for (var i = 0; i < that.tasksData.length; i++) {
-        if (that.tasksData[i].isAllocationOptional == 0) {
-          that.tasksData[i].isAllocationOptional = true;
+      // 构建请求参数
+      const params = {
+        pageNum: that.pageNum,
+        pageSize: that.pageSize,
+        keyword: that.searchKeyword && that.searchKeyword.trim() ? that.searchKeyword.trim() : ''
+      };
+      
+      request({
+        url: "/task/selectTaskHasCreatedPaginated",
+        method: "get",
+        params: params
+      }).then(function (response) {
+        if (response.data.success === true) {
+          const result = response.data.data;
+          
+          // 从返回的数据结构中提取数据数组和分页信息
+          that.tasksData = result.data || [];
+          
+          // 分页信息在 pageInfo 对象中
+          if (result.pageInfo) {
+            that.total = result.pageInfo.total || 0;
+            that.totalPages = result.pageInfo.totalPages || 0;
+            that.pageNum = result.pageInfo.pageNum || 1;
+            that.pageSize = result.pageInfo.pageSize || 10;
+          } else {
+            // 兼容旧格式（如果 pageInfo 不存在）
+            that.total = result.total || 0;
+            that.totalPages = result.totalPages || 0;
+            that.pageNum = result.pageNum || 1;
+            that.pageSize = result.pageSize || 10;
+          }
+          
+          //0表示需要分配
+          for (var i = 0; i < that.tasksData.length; i++) {
+            if (that.tasksData[i].isAllocationOptional == 0) {
+              that.tasksData[i].isAllocationOptional = true;
+            } else {
+              that.tasksData[i].isAllocationOptional = false;
+            }
+            if (that.tasksData[i].allocated == "true") {
+              that.tasksData[i].allocated = true;
+            } else {
+              that.tasksData[i].allocated = false;
+            }
+          }
+          
+          // 应用当前筛选（只应用分配状态筛选，搜索已由后端处理）
+          let filtered = [...that.tasksData];
+          if (that.currentFilter === 'need') {
+            filtered = filtered.filter(item => item.isAllocationOptional === true);
+          } else if (that.currentFilter === 'notNeed') {
+            filtered = filtered.filter(item => item.isAllocationOptional === false);
+          }
+          that.filteredData = filtered;
+        } else if (response.data.status === "401") {
+          that.$alert(response.data.message);
+          that.$router.push({ path: "/login" });
        } else {
-          that.tasksData[i].isAllocationOptional = false;
+          that.$message.error(response.data.message || "获取数据失败");
        }
-        if (that.tasksData[i].allocated == "true") {
-          that.tasksData[i].allocated = true;
-        } else {
-          that.tasksData[i].allocated = false;
-        }
-      }
-      // 应用当前筛选和搜索
-      that.applyFilter();
+      }).catch(function (error) {
+        console.error("获取数据失败:", error);
+        that.$message.error("获取数据失败，请稍后重试");
+      });
+      
+      // 获取工作人员列表
      request({
        url: "/user/all_worker",
        method: "get",
@@ -611,12 +687,21 @@ export default {

 .search-box {
  flex: 0 0 auto;
+  display: flex;
+  align-items: center;
+  gap: 12px;
  width: 450px;
  margin-bottom: 20px;
 }

 :deep(.search-box .el-input) {
-  width: 100%;
+  flex: 1;
+}
+
+.search-btn {
+  flex-shrink: 0;
+  padding: 0 20px;
+  min-width: 80px;
 }

 .forest-btn-small {
@@ -657,6 +742,13 @@ export default {
  box-shadow: 0 14px 28px rgba(76, 175, 80, 0.12);
 }

+.pagination-container {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 20px;
+  padding: 16px 0;
+}
+
 :deep(#tableStyle .el-table__header-wrapper th) {
  background: linear-gradient(90deg, #e0f0e2, #f2fbf3) !important;
  color: #1b5e20 !important;
@@ -708,18 +800,34 @@ export default {
  transform: translateY(-1px);
 }

-:deep(#tableStyle .el-checkbox__input.is-checked .el-checkbox__inner) {
+/* Switch 组件样式 */
+:deep(#tableStyle .el-switch.is-checked .el-switch__core) {
  background-color: #4caf50 !important;
  border-color: #4caf50 !important;
 }

-:deep(#tableStyle .el-checkbox__inner) {
+:deep(#tableStyle .el-switch__core) {
  border-color: rgba(129, 199, 132, 0.5) !important;
+  background-color: #e0e0e0 !important;
+  transition: all 0.3s ease !important;
 }

-:deep(#tableStyle .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner) {
-  background-color: rgba(76, 175, 80, 0.5) !important;
-  border-color: rgba(76, 175, 80, 0.5) !important;
+:deep(#tableStyle .el-switch.is-checked .el-switch__core::after) {
+  background-color: #ffffff !important;
+}
+
+:deep(#tableStyle .el-switch__core::after) {
+  background-color: #ffffff !important;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) !important;
+}
+
+:deep(#tableStyle .el-switch:hover .el-switch__core) {
+  border-color: rgba(76, 175, 80, 0.8) !important;
+}
+
+:deep(#tableStyle .el-switch.is-checked:hover .el-switch__core) {
+  background-color: #66bb6a !important;
+  border-color: #66bb6a !important;
 }

 .el-dropdown-link {
--- a/src/components/TaskManagement/manage/UserManage.vue
+++ b/src/components/TaskManagement/manage/UserManage.vue
@@ -522,7 +522,7 @@ export default {
  border-radius: 20px;
  box-shadow: 0 14px 32px rgba(76, 175, 80, 0.12);
  border: 1px solid rgba(129, 199, 132, 0.25);
-}
+  }

 .toolbar-container {
  display: flex;