Просмотр исходного кода

巡检人员下拉数据改成调用不需要权限的接口

zengy 2 дней назад
Родитель
Сommit
2364db5555

+ 8 - 0
src/api/system/user.js

@@ -10,6 +10,14 @@ export function listUser(query) {
   })
 }
 
+// 查询全部启用状态的用户(不分页)
+export function enabledAll() {
+  return request({
+    url: '/system/user/enabledAll',
+    method: 'get'
+  })
+}
+
 // 查询用户详细
 export function getUser(userId) {
   return request({

+ 6 - 6
src/views/subSystem/pipeNetwork/pworkOrder/Pdayinspect.vue

@@ -302,7 +302,7 @@ import RepairImagePanel from '@/components/RepairImagePanel'
 import { listWorkOrder, getWorkOrderDetail, addWorkOrder, dispatchWorkOrder, verifyWorkOrder, processWorkOrder, completeWorkOrder, closeWorkOrder, cancelWorkOrder } from '@/api/work/order'
 import { getEquipmentFullPage } from '@/api/pipeNetwork/basic'
 import { listDept } from '@/api/system/dept'
-import { listUser } from '@/api/system/user'
+import { enabledAll, listUser } from '@/api/system/user/'
 import { handleTree } from '@/utils/ruoyi'
 import { ORDER_STATUS_MAP, ORDER_LEVEL_MAP, orderStatusText, orderStatusType, orderLevelText, orderLevelType, orderLogText, orderLogType, canOperate, timeText } from './workOrderDict'
 
@@ -405,11 +405,11 @@ function userNames(ids) {
 }
 async function loadUsers() {
   try {
-    const res = await listUser({ pageNum: 1, pageSize: 200 })
-    if (res.rows) {
-      userOptions.value = res.rows
-      userMap.value = Object.fromEntries(res.rows.map(u => [u.userId, u.nickName || u.userName]))
-    }
+    const res = await enabledAll()
+    // 不分页接口:兼容 data / rows / 直接返回数组三种形态
+    const list = res?.data || res?.rows || (Array.isArray(res) ? res : [])
+    userOptions.value = list
+    userMap.value = Object.fromEntries(list.map(u => [u.userId, u.nickName || u.userName]))
   } catch(e) { console.warn('加载用户列表失败', e) }
 }