1011

src/views/zhinengxunjian/qiangxiuguanli.vue

@@ -35,7 +35,7 @@
           </div>
 
           <div class="filter-item">
-            <el-select v-model="executor" placeholder="维修人" :loading="loadingUsers">
+            <el-select v-model="sendPerson" placeholder="维修人" :loading="loadingUsers">
               <el-option label="全部维修人" value="all"></el-option>
               <el-option v-for="user in usersList" :key="user.id" :label="user.name" :value="user.id"></el-option>
             </el-select>
@@ -419,7 +419,7 @@ import { qiangxiuDetail, qiangxiulist, addqiangxiu, updateqiangxiu } from '@/api
 import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
 const taskStatus = ref('');
 const planType = ref('all');
-const executor = ref('all');
+const sendPerson = ref('all');
 const keyword = ref('');
 // 任务数据 - 添加了更多字段以展示滚动效果
 const tasks = ref([]);
@@ -457,7 +457,7 @@ const handleSearch = () => {
 const resetFilters = () => {
   taskStatus.value = 'all';
   planType.value = 'all';
-  executor.value = 'all';
+  sendPerson.value = 'all';
   keyword.value = '';
   currentPage.value = 1;
   getTaskList();
@@ -1074,9 +1074,8 @@ async function getTaskList() {
     // 构建请求参数，包含筛选条件
     const requestParams = {
       projectId: 1,
-      pageNum: currentPage.value,
-      pageSize: pageSize.value
-      // 严格匹配JSON数据结构
+      pageNum: parseInt(currentPage.value, 10),
+      pageSize: parseInt(pageSize.value, 10)
     };
 
     // 添加任务状态筛选条件 - 严格匹配JSON数据中的status字段
@@ -1088,7 +1087,7 @@ async function getTaskList() {
         'completed': '3',
         'delayed': '4'
       };
-      requestParams.status = statusMap[taskStatus.value] || taskStatus.value;
+      requestParams.status = String(statusMap[taskStatus.value] || taskStatus.value);
     }
 
     // 添加故障类型筛选条件 - 严格匹配JSON数据中的type字段
@@ -1101,13 +1100,13 @@ async function getTaskList() {
         'network': '4',
         'environment': '5'
       };
-      requestParams.type = typeMap[planType.value] || planType.value;
+      requestParams.type = String(typeMap[planType.value] || planType.value);
     }
 
     // 添加维修人员筛选条件 - 严格匹配JSON数据中的sendPerson字段
-    if (executor.value && executor.value !== 'all') {
-      // 直接使用用户ID作为sendPerson参数
-      requestParams.sendPerson = executor.value;
+    if (sendPerson.value && sendPerson.value !== 'all' && sendPerson.value !== '') {
+      // 转换为数字类型以匹配API期望的格式
+      requestParams.sendPerson = parseInt(sendPerson.value, 10);
     }
 
     // 添加关键词搜索条件
@@ -1132,7 +1131,7 @@ async function getTaskList() {
         // 严格匹配JSON数据中的reportName字段
         reporter: item.reportName || '未知报修人',
         // 严格匹配JSON数据中的sendPerson和sendPersonVo字段
-        maintainer: item.sendPersonVo?.userName || '未分配',
+        maintainer: item.sendPersonVo?.userName || (item.sendPerson ? `用户ID: ${item.sendPerson}` : '未分配'),
 
         completeTime: item.reportFinishTime ? formatDate(item.reportFinishTime) : '',
         actionText: getActionText(item.status),
@@ -1165,7 +1164,11 @@ async function getTaskList() {
         : mapped;
 
       tasks.value = filtered;
-      total.value = kw ? filtered.length : res.total || filtered.length;
+      if (res.total !== undefined) {
+        total.value = kw ? filtered.length : res.total;
+      } else {
+        total.value = filtered.length;
+      }
     } else {
       tasks.value = [];
       total.value = 0;