Merge remote-tracking branch 'origin/master'

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({

src/layout/components/Navbar.vue

@@ -18,7 +18,7 @@
         <!--        </el-tooltip>-->
 
         <el-tooltip content="返回门户" effect="dark" placement="bottom">
-          <el-button style="margin: auto" size="large" type="success" @click="goToPortal">返回门户</el-button>
+          <el-button class="portal-btn" type="success" round @click="goToPortal">返回门户</el-button>
         </el-tooltip>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect"/>
@@ -148,6 +148,16 @@ function setLayout() {
     vertical-align: top;
   }
 
+  .portal-btn {
+    align-self: center;
+    margin: 0 10px;
+    // default 尺寸高 32px，在 50px 导航栏内留出呼吸空间
+    height: 32px;
+    padding: 0 18px;
+    font-size: 14px;
+    font-weight: 600;
+  }
+
   .right-menu {
     float: right;
     height: 100%;
@@ -180,21 +190,22 @@ function setLayout() {
       margin-right: 40px;
 
       .avatar-wrapper {
-        margin-top: 5px;
+        // 36px 头像在 50px 导航栏内居中：(50 - 36) / 2
+        margin-top: 7px;
         position: relative;
 
         .user-avatar {
           cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
+          width: 36px;
+          height: 36px;
+          border-radius: 9px;
         }
 
         i {
           cursor: pointer;
           position: absolute;
           right: -20px;
-          top: 25px;
+          top: 23px;
           font-size: 12px;
         }
       }

src/layout/components/TagsView/index.vue

@@ -24,28 +24,25 @@
     </scroll-pane>
 
     <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
-      <!--      <li @click="refreshSelectedTag(selectedTag)">-->
-      <!--        <refresh-right style="width: 1em; height: 1em;" /> 刷新页面-->
-      <!--      </li>-->
-      <!-- 👇 首页不显示“关闭当前” -->
-      <!--      <li-->
-      <!--          v-if="!isAffix(selectedTag) && !isHomePage(selectedTag)"-->
-      <!--          @click="closeSelectedTag(selectedTag)"-->
-      <!--      >-->
-      <!--        <close style="width: 1em; height: 1em;" /> 关闭当前-->
-      <!--      </li>-->
-      <!--      <li @click="closeOthersTags">-->
-      <!--        <circle-close style="width: 1em; height: 1em;" /> 关闭其他-->
-      <!--      </li>-->
-      <!--      <li v-if="!isFirstView()" @click="closeLeftTags">-->
-      <!--        <back style="width: 1em; height: 1em;" /> 关闭左侧-->
-      <!--      </li>-->
-      <!--      <li v-if="!isLastView()" @click="closeRightTags">-->
-      <!--        <right style="width: 1em; height: 1em;" /> 关闭右侧-->
-      <!--      </li>-->
-      <!--      <li @click="closeAllTags(selectedTag)">-->
-      <!--        <circle-close style="width: 1em; height: 1em;" /> 全部关闭-->
-      <!--      </li>-->
+      <li @click="refreshSelectedTag(selectedTag)">
+        <refresh-right style="width: 1em; height: 1em;" /> 刷新页面
+      </li>
+      <!-- 固定标签、首页不显示“关闭当前” -->
+      <li
+          v-if="!isAffix(selectedTag) && !isHomePage(selectedTag)"
+          @click="closeSelectedTag(selectedTag)"
+      >
+        <close style="width: 1em; height: 1em;" /> 关闭当前
+      </li>
+      <li @click="closeOthersTags">
+        <circle-close style="width: 1em; height: 1em;" /> 关闭其他
+      </li>
+      <li v-if="!isFirstView()" @click="closeLeftTags">
+        <back style="width: 1em; height: 1em;" /> 关闭左侧
+      </li>
+      <li v-if="!isLastView()" @click="closeRightTags">
+        <right style="width: 1em; height: 1em;" /> 关闭右侧
+      </li>
     </ul>
   </div>
 </template>

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) }
 }