From 4d08a1854886f202dc7114a9f8b40066593310d5 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Thu, 26 Dec 2024 22:19:30 +0800
Subject: [PATCH] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 orion-visor-ui/src/api/interceptor.ts         |  6 +++--
 .../src/components/app/navbar/index.vue       |  2 ++
 .../components/system/message-box/index.vue   |  1 +
 orion-visor-ui/src/layout/default-layout.vue  | 16 ++++++++----
 orion-visor-ui/src/types/symbol.ts            |  3 +++
 .../components/connect-log-table.vue          | 16 +++++++++---
 .../connect-log/types/table.columns.ts        |  2 +-
 .../components/connect-session-table.vue      |  8 ++++++
 .../connect-session/types/table.columns.ts    |  2 +-
 .../exec-job/components/exec-job-table.vue    | 26 +++++++++----------
 10 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/orion-visor-ui/src/api/interceptor.ts b/orion-visor-ui/src/api/interceptor.ts
index d86dd36c..a6c7028c 100644
--- a/orion-visor-ui/src/api/interceptor.ts
+++ b/orion-visor-ui/src/api/interceptor.ts
@@ -69,8 +69,10 @@ axios.interceptors.response.use(
         if (!responseUrl || !responseUrl.includes('/logout')) {
           await useUserStore().logout();
         }
-        // 重新加载自动跳转登录页面
-        window.location.reload();
+        // 非登录页面就重新加载, 会自动跳转登录页面
+        if (!window.location.pathname.includes('/login')) {
+          window.location.reload();
+        }
       });
     } else {
       // 其他异常 判断是否弹出错误信息
diff --git a/orion-visor-ui/src/components/app/navbar/index.vue b/orion-visor-ui/src/components/app/navbar/index.vue
index db6715d9..4cd73f87 100644
--- a/orion-visor-ui/src/components/app/navbar/index.vue
+++ b/orion-visor-ui/src/components/app/navbar/index.vue
@@ -325,6 +325,8 @@
     }
   };
 
+  defineExpose({ setMessageBoxVisible });
+
   onMounted(() => {
     // 查询未读消息
     pullHasUnreadMessage();
diff --git a/orion-visor-ui/src/components/system/message-box/index.vue b/orion-visor-ui/src/components/system/message-box/index.vue
index eea336a5..8fbed43d 100644
--- a/orion-visor-ui/src/components/system/message-box/index.vue
+++ b/orion-visor-ui/src/components/system/message-box/index.vue
@@ -30,6 +30,7 @@
             <a-button class="header-button"
                       type="text"
                       size="small"
+                      title="清空全部已读消息"
                       @click="clearAllMessage">
               清空
             </a-button>
diff --git a/orion-visor-ui/src/layout/default-layout.vue b/orion-visor-ui/src/layout/default-layout.vue
index 11f959b3..f8a35b83 100644
--- a/orion-visor-ui/src/layout/default-layout.vue
+++ b/orion-visor-ui/src/layout/default-layout.vue
@@ -2,7 +2,7 @@
   <a-layout class="layout" :class="{ mobile: appStore.hideMenu }">
     <!-- tab bar -->
     <div v-if="navbar" class="layout-navbar">
-      <nav-bar />
+      <nav-bar ref="navRef" />
     </div>
     <a-layout style="flex-direction: row;">
       <!-- 左侧菜单栏 -->
@@ -58,7 +58,7 @@
   import { useRoute, useRouter } from 'vue-router';
   import { useAppStore, useUserStore } from '@/store';
   import useResponsive from '@/hooks/responsive';
-  import { toggleDrawerMenuKey } from '@/types/symbol';
+  import { openMessageBox, toggleDrawerMenuKey } from '@/types/symbol';
   import PageLayout from './page-layout.vue';
   import NavBar from '@/components/app/navbar/index.vue';
   import TabBar from '@/components/app/tab-bar/index.vue';
@@ -71,7 +71,8 @@
   const route = useRoute();
   useResponsive(true);
 
-  const isInit = ref(false);
+  const render = ref(false);
+  const navRef = ref();
   const navbarHeight = `60px`;
   const navbar = computed(() => appStore.navbar);
   const renderMenu = computed(() => appStore.menu && !appStore.topMenu);
@@ -95,7 +96,7 @@
 
   // 设置菜单展开状态
   const setCollapsed = (val: boolean) => {
-    if (!isInit.value) return;
+    if (!render.value) return;
     appStore.updateSettings({ menuCollapse: val });
   };
 
@@ -109,8 +110,13 @@
     drawerVisible.value = !drawerVisible.value;
   });
 
+  // 对外暴露打开消息盒子
+  provide(openMessageBox, () => {
+    navRef.value.setMessageBoxVisible();
+  });
+
   onMounted(() => {
-    isInit.value = true;
+    render.value = true;
   });
 </script>
 
diff --git a/orion-visor-ui/src/types/symbol.ts b/orion-visor-ui/src/types/symbol.ts
index db61d91d..be67c90d 100644
--- a/orion-visor-ui/src/types/symbol.ts
+++ b/orion-visor-ui/src/types/symbol.ts
@@ -1,6 +1,9 @@
 // 切换菜单状态
 export const toggleDrawerMenuKey = Symbol();
 
+// 打开消息盒子
+export const openMessageBox = Symbol();
+
 // 打开偏好设置
 export const openAppSettingKey = Symbol();
 
diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
index 72747063..ee7000c4 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
+++ b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
@@ -155,11 +155,12 @@
       <!-- 操作 -->
       <template #handle="{ record }">
         <div class="table-handle-wrapper">
-          <!-- 详情 -->
-          <a-button type="text"
+          <!-- 连接 -->
+          <a-button v-permission="['asset:terminal:access']"
+                    type="text"
                     size="mini"
-                    @click="emits('openDetail', record)">
-            详情
+                    @click="openNewRoute({ name: 'terminal', query: { connect: record.hostId, type: record.type } })">
+            连接
           </a-button>
           <!-- 下线 -->
           <a-popconfirm v-if="record.status === TerminalConnectStatus.CONNECTING"
@@ -174,6 +175,12 @@
               下线
             </a-button>
           </a-popconfirm>
+          <!-- 详情 -->
+          <a-button type="text"
+                    size="mini"
+                    @click="emits('openDetail', record)">
+            详情
+          </a-button>
           <!-- 删除 -->
           <a-popconfirm content="确认删除这条记录吗?"
                         position="left"
@@ -210,6 +217,7 @@
   import useLoading from '@/hooks/loading';
   import { copy } from '@/hooks/copy';
   import { dateFormat } from '@/utils';
+  import { openNewRoute } from '@/router';
   import UserSelector from '@/components/user/user/selector/index.vue';
   import HostSelector from '@/components/asset/host/selector/index.vue';
 
diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts b/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts
index 8c9d1872..5e28853b 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts
@@ -50,7 +50,7 @@ const columns = [
   }, {
     title: '操作',
     slotName: 'handle',
-    width: 180,
+    width: 218,
     align: 'left',
     fixed: 'right',
   },
diff --git a/orion-visor-ui/src/views/asset-audit/connect-session/components/connect-session-table.vue b/orion-visor-ui/src/views/asset-audit/connect-session/components/connect-session-table.vue
index 3ee7a9da..fbb60ef5 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-session/components/connect-session-table.vue
+++ b/orion-visor-ui/src/views/asset-audit/connect-session/components/connect-session-table.vue
@@ -95,6 +95,13 @@
       <!-- 操作 -->
       <template #handle="{ record }">
         <div class="table-handle-wrapper">
+          <!-- 连接 -->
+          <a-button v-permission="['asset:terminal:access']"
+                    type="text"
+                    size="mini"
+                    @click="openNewRoute({ name: 'terminal', query: { connect: record.hostId, type: record.type } })">
+            连接
+          </a-button>
           <!-- 下线 -->
           <a-popconfirm content="确认要强制下线吗?"
                         position="left"
@@ -129,6 +136,7 @@
   import columns from '../types/table.columns';
   import useLoading from '@/hooks/loading';
   import { copy } from '@/hooks/copy';
+  import { openNewRoute } from '@/router';
   import UserSelector from '@/components/user/user/selector/index.vue';
   import HostSelector from '@/components/asset/host/selector/index.vue';
 
diff --git a/orion-visor-ui/src/views/asset-audit/connect-session/types/table.columns.ts b/orion-visor-ui/src/views/asset-audit/connect-session/types/table.columns.ts
index 1cb6c0dd..3e5cb850 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-session/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset-audit/connect-session/types/table.columns.ts
@@ -47,7 +47,7 @@ const columns = [
   }, {
     title: '操作',
     slotName: 'handle',
-    width: 118,
+    width: 154,
     align: 'center',
     fixed: 'right',
   },
diff --git a/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue b/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue
index 4cf5123f..628113b8 100644
--- a/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue
@@ -6,13 +6,6 @@
                   @submit="fetchTableData"
                   @reset="fetchTableData"
                   @keyup.enter="() => fetchTableData()">
-      <!-- id -->
-      <a-form-item field="id" label="id">
-        <a-input-number v-model="formModel.id"
-                        placeholder="请输入id"
-                        allow-clear
-                        hide-button />
-      </a-form-item>
       <!-- 任务名称 -->
       <a-form-item field="name" label="任务名称">
         <a-input v-model="formModel.name"
@@ -25,6 +18,19 @@
                  placeholder="请输入执行命令"
                  allow-clear />
       </a-form-item>
+      <!-- 执行用户 -->
+      <a-form-item field="execUserId" label="执行用户">
+        <user-selector v-model="formModel.execUserId"
+                       placeholder="请选择执行用户"
+                       allow-clear />
+      </a-form-item>
+      <!-- id -->
+      <a-form-item field="id" label="id">
+        <a-input-number v-model="formModel.id"
+                        placeholder="请输入id"
+                        allow-clear
+                        hide-button />
+      </a-form-item>
       <!-- 任务状态 -->
       <a-form-item field="status" label="任务状态">
         <a-select v-model="formModel.status"
@@ -32,12 +38,6 @@
                   placeholder="请选择状态"
                   allow-clear />
       </a-form-item>
-      <!-- 执行用户 -->
-      <a-form-item field="execUserId" label="执行用户">
-        <user-selector v-model="formModel.execUserId"
-                       placeholder="请选择执行用户"
-                       allow-clear />
-      </a-form-item>
     </query-header>
   </a-card>
   <!-- 表格 -->