From 69bad68cbc740afcc20b304f11322968da18a39c Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Sun, 5 May 2024 02:25:31 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=88=86=E7=A6=BB=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=A8=A1=E5=9D=97.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/router/routes/modules/exec.ts         | 19 ++--------
 orion-ops-ui/src/router/routes/modules/job.ts | 36 +++++++++++++++++++
 .../dashboard/workplace/components/docs.vue   |  2 +-
 .../{exec => job}/exec-job-log-view/index.vue |  4 +--
 .../components/exec-job-host-log-table.vue    |  2 +-
 .../components/exec-job-log-clear-modal.vue   |  0
 .../components/exec-job-log-table.vue         |  0
 .../{exec => job}/exec-job-log/index.vue      |  0
 .../{exec => job}/exec-job-log/types/const.ts |  0
 .../exec-job-log/types/table.columns.ts       |  0
 .../components/exec-job-detail-drawer.vue     |  0
 .../components/exec-job-form-drawer.vue       |  0
 .../exec-job/components/exec-job-table.vue    |  0
 .../views/{exec => job}/exec-job/index.vue    |  0
 .../{exec => job}/exec-job/types/const.ts     |  0
 .../exec-job/types/form.rules.ts              |  0
 .../exec-job/types/table.columns.ts           |  0
 17 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 orion-ops-ui/src/router/routes/modules/job.ts
 rename orion-ops-ui/src/views/{exec => job}/exec-job-log-view/index.vue (90%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job-log/components/exec-job-host-log-table.vue (98%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job-log/components/exec-job-log-clear-modal.vue (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job-log/components/exec-job-log-table.vue (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job-log/index.vue (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job-log/types/const.ts (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job-log/types/table.columns.ts (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job/components/exec-job-detail-drawer.vue (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job/components/exec-job-form-drawer.vue (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job/components/exec-job-table.vue (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job/index.vue (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job/types/const.ts (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job/types/form.rules.ts (100%)
 rename orion-ops-ui/src/views/{exec => job}/exec-job/types/table.columns.ts (100%)

diff --git a/orion-ops-ui/src/router/routes/modules/exec.ts b/orion-ops-ui/src/router/routes/modules/exec.ts
index 81c6c20f..9e4eb3b9 100644
--- a/orion-ops-ui/src/router/routes/modules/exec.ts
+++ b/orion-ops-ui/src/router/routes/modules/exec.ts
@@ -14,19 +14,9 @@ const EXEC: AppRouteRecordRaw[] = [
       },
       {
         name: 'execCommandLog',
-        path: '/exec-command-log',
+        path: '/exec-log',
         component: () => import('@/views/exec/exec-command-log/index.vue'),
       },
-      {
-        name: 'execJob',
-        path: '/exec-job',
-        component: () => import('@/views/exec/exec-job/index.vue'),
-      },
-      {
-        name: 'execJobLog',
-        path: '/exec-job-log',
-        component: () => import('@/views/exec/exec-job-log/index.vue'),
-      },
       {
         name: 'execTemplate',
         path: '/exec-template',
@@ -41,14 +31,9 @@ const EXEC: AppRouteRecordRaw[] = [
     children: [
       {
         name: 'execCommandLogView',
-        path: '/exec-command-log-view',
+        path: '/exec-log-view',
         component: () => import('@/views/exec/exec-command-log-view/index.vue'),
       },
-      {
-        name: 'execJobLogView',
-        path: '/exec-job-log-view',
-        component: () => import('@/views/exec/exec-job-log-view/index.vue'),
-      },
     ],
   }
 ];
diff --git a/orion-ops-ui/src/router/routes/modules/job.ts b/orion-ops-ui/src/router/routes/modules/job.ts
new file mode 100644
index 00000000..d16eddc5
--- /dev/null
+++ b/orion-ops-ui/src/router/routes/modules/job.ts
@@ -0,0 +1,36 @@
+import type { AppRouteRecordRaw } from '../types';
+import { DEFAULT_LAYOUT, FULL_LAYOUT } from '../base';
+
+const JOB: AppRouteRecordRaw[] = [
+  {
+    name: 'jobModule',
+    path: '/job-module',
+    component: DEFAULT_LAYOUT,
+    children: [
+      {
+        name: 'execJob',
+        path: '/exec-job',
+        component: () => import('@/views/job/exec-job/index.vue'),
+      },
+      {
+        name: 'execJobLog',
+        path: '/exec-job-log',
+        component: () => import('@/views/job/exec-job-log/index.vue'),
+      },
+    ],
+  },
+  {
+    name: 'jobFullModule',
+    path: '/job-full-module',
+    component: FULL_LAYOUT,
+    children: [
+      {
+        name: 'execJobLogView',
+        path: '/job-log-view',
+        component: () => import('@/views/job/exec-job-log-view/index.vue'),
+      },
+    ],
+  }
+];
+
+export default JOB;
diff --git a/orion-ops-ui/src/views/dashboard/workplace/components/docs.vue b/orion-ops-ui/src/views/dashboard/workplace/components/docs.vue
index a169d03d..2ea97164 100644
--- a/orion-ops-ui/src/views/dashboard/workplace/components/docs.vue
+++ b/orion-ops-ui/src/views/dashboard/workplace/components/docs.vue
@@ -20,7 +20,7 @@
         <a-link target="_blank" href="https://lijiahangmax.github.io/orion-ops-pro">操作文档</a-link>
       </a-col>
       <a-col :span="12">
-        <a-link target="_blank" href="https://lijiahangmax.github.io/orion-ops-pro/#/about/change-log">更新文档</a-link>
+        <a-link target="_blank" href="https://lijiahangmax.github.io/orion-ops-pro/#/about/update-log">更新日志</a-link>
       </a-col>
     </a-row>
   </a-card>
diff --git a/orion-ops-ui/src/views/exec/exec-job-log-view/index.vue b/orion-ops-ui/src/views/job/exec-job-log-view/index.vue
similarity index 90%
rename from orion-ops-ui/src/views/exec/exec-job-log-view/index.vue
rename to orion-ops-ui/src/views/job/exec-job-log-view/index.vue
index a4f1603e..7c6a50e1 100644
--- a/orion-ops-ui/src/views/exec/exec-job-log-view/index.vue
+++ b/orion-ops-ui/src/views/job/exec-job-log-view/index.vue
@@ -17,7 +17,7 @@
 <script lang="ts" setup>
   import { onMounted, ref, nextTick } from 'vue';
   import { useRoute } from 'vue-router';
-  import { getExecCommandLog } from '@/api/exec/exec-command-log';
+  import { getExecJobLog } from '@/api/exec/exec-job-log';
   import ExecLogPanel from '@/components/exec/log/panel/index.vue';
 
   const route = useRoute();
@@ -26,7 +26,7 @@
   // 初始化
   const init = async (id: number) => {
     // 获取执行日志
-    const { data } = await getExecCommandLog(id);
+    const { data } = await getExecJobLog(id);
     // 打开日志
     await nextTick(() => {
       setTimeout(() => {
diff --git a/orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-host-log-table.vue b/orion-ops-ui/src/views/job/exec-job-log/components/exec-job-host-log-table.vue
similarity index 98%
rename from orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-host-log-table.vue
rename to orion-ops-ui/src/views/job/exec-job-log/components/exec-job-host-log-table.vue
index 04ae1ef7..05c8a92e 100644
--- a/orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-host-log-table.vue
+++ b/orion-ops-ui/src/views/job/exec-job-log/components/exec-job-host-log-table.vue
@@ -107,7 +107,7 @@
   import { execHostStatusKey, execHostStatus } from '@/components/exec/log/const';
   import { useDictStore } from '@/store';
   import useLoading from '@/hooks/loading';
-  import columns from '../../exec-command-log/types/host-table.columns';
+  import columns from '@/views/exec/exec-command-log/types/host-table.columns';
   import { useExpandable } from '@/types/table';
   import { dateFormat, formatDuration } from '@/utils';
   import { downloadExecJobLogFile } from '@/api/exec/exec-job-log';
diff --git a/orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-log-clear-modal.vue b/orion-ops-ui/src/views/job/exec-job-log/components/exec-job-log-clear-modal.vue
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-log-clear-modal.vue
rename to orion-ops-ui/src/views/job/exec-job-log/components/exec-job-log-clear-modal.vue
diff --git a/orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue b/orion-ops-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue
rename to orion-ops-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
diff --git a/orion-ops-ui/src/views/exec/exec-job-log/index.vue b/orion-ops-ui/src/views/job/exec-job-log/index.vue
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job-log/index.vue
rename to orion-ops-ui/src/views/job/exec-job-log/index.vue
diff --git a/orion-ops-ui/src/views/exec/exec-job-log/types/const.ts b/orion-ops-ui/src/views/job/exec-job-log/types/const.ts
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job-log/types/const.ts
rename to orion-ops-ui/src/views/job/exec-job-log/types/const.ts
diff --git a/orion-ops-ui/src/views/exec/exec-job-log/types/table.columns.ts b/orion-ops-ui/src/views/job/exec-job-log/types/table.columns.ts
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job-log/types/table.columns.ts
rename to orion-ops-ui/src/views/job/exec-job-log/types/table.columns.ts
diff --git a/orion-ops-ui/src/views/exec/exec-job/components/exec-job-detail-drawer.vue b/orion-ops-ui/src/views/job/exec-job/components/exec-job-detail-drawer.vue
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job/components/exec-job-detail-drawer.vue
rename to orion-ops-ui/src/views/job/exec-job/components/exec-job-detail-drawer.vue
diff --git a/orion-ops-ui/src/views/exec/exec-job/components/exec-job-form-drawer.vue b/orion-ops-ui/src/views/job/exec-job/components/exec-job-form-drawer.vue
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job/components/exec-job-form-drawer.vue
rename to orion-ops-ui/src/views/job/exec-job/components/exec-job-form-drawer.vue
diff --git a/orion-ops-ui/src/views/exec/exec-job/components/exec-job-table.vue b/orion-ops-ui/src/views/job/exec-job/components/exec-job-table.vue
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job/components/exec-job-table.vue
rename to orion-ops-ui/src/views/job/exec-job/components/exec-job-table.vue
diff --git a/orion-ops-ui/src/views/exec/exec-job/index.vue b/orion-ops-ui/src/views/job/exec-job/index.vue
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job/index.vue
rename to orion-ops-ui/src/views/job/exec-job/index.vue
diff --git a/orion-ops-ui/src/views/exec/exec-job/types/const.ts b/orion-ops-ui/src/views/job/exec-job/types/const.ts
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job/types/const.ts
rename to orion-ops-ui/src/views/job/exec-job/types/const.ts
diff --git a/orion-ops-ui/src/views/exec/exec-job/types/form.rules.ts b/orion-ops-ui/src/views/job/exec-job/types/form.rules.ts
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job/types/form.rules.ts
rename to orion-ops-ui/src/views/job/exec-job/types/form.rules.ts
diff --git a/orion-ops-ui/src/views/exec/exec-job/types/table.columns.ts b/orion-ops-ui/src/views/job/exec-job/types/table.columns.ts
similarity index 100%
rename from orion-ops-ui/src/views/exec/exec-job/types/table.columns.ts
rename to orion-ops-ui/src/views/job/exec-job/types/table.columns.ts