-
+
+ content-class="message-popover"
+ position="br"
+ :show-arrow="false"
+ :popup-style="{ marginLeft: '198px' }"
+ :content-style="{ padding: 0, width: '428px' }"
+ @hide="pullHasUnreadMessage">
-
-
- 未开始
- 已开通
- 进行中
- 即将到期
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
- {{ item.title }}
-
- {{ item.subTitle }}
-
-
-
-
-
-
-
-
- {{ item.content }}
-
-
- {{ item.time }}
-
-
-
-
+
+
+
+
diff --git a/orion-ops-ui/src/router/routes/modules/exec.ts b/orion-ops-ui/src/router/routes/modules/exec.ts
index d62abb9a..0c55f355 100644
--- a/orion-ops-ui/src/router/routes/modules/exec.ts
+++ b/orion-ops-ui/src/router/routes/modules/exec.ts
@@ -1,51 +1,37 @@
import type { AppRouteRecordRaw } from '../types';
-import { DEFAULT_LAYOUT, FULL_LAYOUT } from '../base';
+import { DEFAULT_LAYOUT } from '../base';
-const EXEC: AppRouteRecordRaw[] = [
- {
- name: 'execModule',
- path: '/exec-module',
- component: DEFAULT_LAYOUT,
- children: [
- {
- name: 'execCommand',
- path: '/exec-command',
- component: () => import('@/views/exec/exec-command/index.vue'),
- },
- {
- name: 'execCommandLog',
- path: '/exec-log',
- component: () => import('@/views/exec/exec-command-log/index.vue'),
- },
- {
- name: 'batchUpload',
- path: '/batch-upload',
- component: () => import('@/views/exec/batch-upload/index.vue'),
- },
- {
- name: 'uploadTask',
- path: '/upload-task',
- component: () => import('@/views/exec/upload-task/index.vue'),
- },
- {
- name: 'execTemplate',
- path: '/exec-template',
- component: () => import('@/views/exec/exec-template/index.vue'),
- },
- ],
- },
- {
- name: 'execFullModule',
- path: '/exec-full-module',
- component: FULL_LAYOUT,
- children: [
- {
- name: 'execCommandLogView',
- path: '/exec-log-view',
- component: () => import('@/views/exec/exec-command-log-view/index.vue'),
- },
- ],
- }
-];
+const EXEC: AppRouteRecordRaw = {
+ name: 'execModule',
+ path: '/exec-module',
+ component: DEFAULT_LAYOUT,
+ children: [
+ {
+ name: 'execCommand',
+ path: '/exec-command',
+ component: () => import('@/views/exec/exec-command/index.vue'),
+ },
+ {
+ name: 'execCommandLog',
+ path: '/exec-log',
+ component: () => import('@/views/exec/exec-command-log/index.vue'),
+ },
+ {
+ name: 'batchUpload',
+ path: '/batch-upload',
+ component: () => import('@/views/exec/batch-upload/index.vue'),
+ },
+ {
+ name: 'uploadTask',
+ path: '/upload-task',
+ component: () => import('@/views/exec/upload-task/index.vue'),
+ },
+ {
+ name: 'execTemplate',
+ path: '/exec-template',
+ component: () => import('@/views/exec/exec-template/index.vue'),
+ },
+ ],
+};
export default EXEC;
diff --git a/orion-ops-ui/src/utils/setup-mock.ts b/orion-ops-ui/src/utils/setup-mock.ts
index 816ec285..feaafea9 100644
--- a/orion-ops-ui/src/utils/setup-mock.ts
+++ b/orion-ops-ui/src/utils/setup-mock.ts
@@ -7,12 +7,12 @@ export default ({ mock, setup }: { mock?: boolean; setup: () => void }) => {
export const successResponseWrap = (data: unknown) => {
return {
data,
- msg: '请求成功',
+ msg: 'success',
code: 200,
};
};
-export const failResponseWrap = (data: unknown, msg: string, code = 5000) => {
+export const failResponseWrap = (data: unknown, msg: string, code = 500) => {
return {
data,
msg,
diff --git a/orion-ops-ui/src/views/dashboard/workplace/mock.ts b/orion-ops-ui/src/views/dashboard/workplace/mock.ts
index ef436f41..e037190f 100644
--- a/orion-ops-ui/src/views/dashboard/workplace/mock.ts
+++ b/orion-ops-ui/src/views/dashboard/workplace/mock.ts
@@ -7,99 +7,18 @@ import setupMock, { successResponseWrap } from '@/utils/setup-mock';
const textList = [
{
key: 1,
- clickNumber: '346.3w+',
- title: '经济日报：财政政策要精准提升…',
+ clickNumber: '1w+',
+ title: 'text...',
increases: 35,
},
{
key: 2,
- clickNumber: '324.2w+',
- title: '双12遇冷，消费者厌倦了电商平…',
+ clickNumber: '2w+',
+ title: 'text...',
increases: 22,
},
- {
- key: 3,
- clickNumber: '318.9w+',
- title: '致敬坚守战“疫”一线的社区工作…',
- increases: 9,
- },
- {
- key: 4,
- clickNumber: '257.9w+',
- title: '普高还是职高？家长们陷入选择…',
- increases: 17,
- },
- {
- key: 5,
- clickNumber: '124.2w+',
- title: '人民快评：没想到“浓眉大眼”的…',
- increases: 37,
- },
-];
-const imageList = [
- {
- key: 1,
- clickNumber: '15.3w+',
- title: '杨涛接替陆慷出任外交部美大司…',
- increases: 15,
- },
- {
- key: 2,
- clickNumber: '12.2w+',
- title: '图集：龙卷风袭击美国多州房屋…',
- increases: 26,
- },
- {
- key: 3,
- clickNumber: '18.9w+',
- title: '52岁大姐贴钱照顾自闭症儿童八…',
- increases: 9,
- },
- {
- key: 4,
- clickNumber: '7.9w+',
- title: '杭州一家三口公园宿营取暖中毒',
- increases: 0,
- },
- {
- key: 5,
- clickNumber: '5.2w+',
- title: '派出所副所长威胁市民？警方调…',
- increases: 4,
- },
-];
-const videoList = [
- {
- key: 1,
- clickNumber: '367.6w+',
- title: '这是今日10点的南京',
- increases: 5,
- },
- {
- key: 2,
- clickNumber: '352.2w+',
- title: '立陶宛不断挑衅致经济受损民众…',
- increases: 17,
- },
- {
- key: 3,
- clickNumber: '348.9w+',
- title: '韩国艺人刘在石确诊新冠',
- increases: 30,
- },
- {
- key: 4,
- clickNumber: '346.3w+',
- title: '关于北京冬奥会，文在寅表态',
- increases: 12,
- },
- {
- key: 5,
- clickNumber: '271.2w+',
- title: '95后现役军人荣立一等功',
- increases: 2,
- },
];
+
setupMock({
setup() {
Mock.mock(new RegExp('/api/content-data'), () => {
@@ -117,13 +36,11 @@ setupMock({
});
Mock.mock(new RegExp('/api/popular/list'), (params: GetParams) => {
const { type = 'text' } = qs.parseUrl(params.url).query;
- if (type === 'image') {
- return successResponseWrap([...videoList]);
+ if (type === 'text') {
+ return successResponseWrap([...textList]);
+ } else {
+ return successResponseWrap([]);
}
- if (type === 'video') {
- return successResponseWrap([...imageList]);
- }
- return successResponseWrap([...textList]);
});
},
});
diff --git a/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue b/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue
index 733a1ec0..e4c81fa9 100644
--- a/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue
+++ b/orion-ops-ui/src/views/exec/batch-upload/components/upload-panel.vue
@@ -76,7 +76,7 @@
const { loading, setLoading } = useLoading();
- const pullStatusId = ref();
+ const pullIntervalId = ref();
const taskId = ref();
const task = ref({} as UploadTaskQueryResponse);
const selectedHost = ref();
@@ -266,12 +266,12 @@
// 设置轮询状态
onMounted(() => {
- pullStatusId.value = setInterval(pullTaskStatus, 5000);
+ pullIntervalId.value = setInterval(pullTaskStatus, 5000);
});
// 卸载状态查询
onUnmounted(() => {
- clearInterval(pullStatusId.value);
+ clearInterval(pullIntervalId.value);
});
diff --git a/orion-ops-ui/src/views/exec/batch-upload/index.vue b/orion-ops-ui/src/views/exec/batch-upload/index.vue
index ec372558..7c67d048 100644
--- a/orion-ops-ui/src/views/exec/batch-upload/index.vue
+++ b/orion-ops-ui/src/views/exec/batch-upload/index.vue
@@ -28,10 +28,14 @@
await dictStore.loadKeys(dictKeys);
});
+ // 跳转日志
onMounted(async () => {
const idParam = route.query.id;
+ const keyParam = route.query.key;
if (idParam) {
await panel.value?.openLog(Number.parseInt(idParam as string));
+ } else if (keyParam) {
+ await panel.value?.openLog(Number.parseInt(keyParam as string));
}
});
diff --git a/orion-ops-ui/src/views/exec/exec-command-log-view/index.vue b/orion-ops-ui/src/views/exec/exec-command-log-view/index.vue
deleted file mode 100644
index 6e49ef8b..00000000
--- a/orion-ops-ui/src/views/exec/exec-command-log-view/index.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
- ([]);
const tableRenderData = ref([]);
@@ -343,7 +343,7 @@
};
// 加载状态
- const fetchTaskStatus = async () => {
+ const pullExecStatus = async () => {
const unCompleteIdList = tableRenderData.value
.filter(s => s.status === execStatus.WAITING || s.status === execStatus.RUNNING)
.map(s => s.id);
@@ -374,7 +374,7 @@
host.status = s.status;
host.startTime = s.startTime;
host.finishTime = s.finishTime;
- host.exitStatus = s.exitStatus;
+ host.exitCode = s.exitCode;
host.errorMessage = s.errorMessage;
});
};
@@ -409,12 +409,12 @@
// 加载数据
fetchTableData();
// 注册状态轮询
- intervalId.value = setInterval(fetchTaskStatus, 10000);
+ pullIntervalId.value = setInterval(pullExecStatus, 10000);
});
onUnmounted(() => {
// 卸载状态轮询
- clearInterval(intervalId.value);
+ clearInterval(pullIntervalId.value);
});
diff --git a/orion-ops-ui/src/views/exec/exec-command-log/index.vue b/orion-ops-ui/src/views/exec/exec-command-log/index.vue
index 1c305a02..6869de2e 100644
--- a/orion-ops-ui/src/views/exec/exec-command-log/index.vue
+++ b/orion-ops-ui/src/views/exec/exec-command-log/index.vue
@@ -69,7 +69,7 @@
if (newWindow) {
// 跳转新页面
openNewRoute({
- name: 'execCommandLogView',
+ name: 'execCommand',
query: {
id
}
diff --git a/orion-ops-ui/src/views/exec/exec-command-log/types/host-table.columns.ts b/orion-ops-ui/src/views/exec/exec-command-log/types/host-table.columns.ts
index cb18fd99..04997dc3 100644
--- a/orion-ops-ui/src/views/exec/exec-command-log/types/host-table.columns.ts
+++ b/orion-ops-ui/src/views/exec/exec-command-log/types/host-table.columns.ts
@@ -18,12 +18,12 @@ const columns = [
tooltip: true,
}, {
title: '退出码',
- dataIndex: 'exitStatus',
- slotName: 'exitStatus',
+ dataIndex: 'exitCode',
+ slotName: 'exitCode',
align: 'left',
width: 118,
render: ({ record }) => {
- return isNumber(record.exitStatus) ? record.exitStatus : '-';
+ return isNumber(record.exitCode) ? record.exitCode : '-';
},
}, {
title: '执行状态',
diff --git a/orion-ops-ui/src/views/exec/exec-command/index.vue b/orion-ops-ui/src/views/exec/exec-command/index.vue
index 2af0d7d3..d1329e65 100644
--- a/orion-ops-ui/src/views/exec/exec-command/index.vue
+++ b/orion-ops-ui/src/views/exec/exec-command/index.vue
@@ -26,10 +26,13 @@
import useVisible from '@/hooks/visible';
import { useDictStore } from '@/store';
import { dictKeys } from '@/components/exec/log/const';
+ import { useRoute } from 'vue-router';
+ import { getExecCommandLog } from '@/api/exec/exec-command-log';
import ExecCommandPanel from './components/exec-command-panel.vue';
import ExecLogPanel from '@/components/exec/log/panel/index.vue';
const { visible: logVisible, setVisible: setLogVisible } = useVisible();
+ const route = useRoute();
const log = ref();
@@ -41,12 +44,30 @@
});
};
+ // 打开日志
+ const openLogWithId = async (id: number) => {
+ setLogVisible(true);
+ // 查询日志
+ const { data } = await getExecCommandLog(id);
+ openLog(data);
+ };
+
// 加载字典值
onMounted(async () => {
const dictStore = useDictStore();
await dictStore.loadKeys(dictKeys);
});
+ // 跳转日志
+ onMounted(async () => {
+ const idParam = route.query.id;
+ const keyParam = route.query.key;
+ if (idParam) {
+ await openLogWithId(Number.parseInt(idParam as string));
+ } else if (keyParam) {
+ await openLogWithId(Number.parseInt(keyParam as string));
+ }
+ });
-
-
-
-
-
-
-
-
diff --git a/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue b/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
index 85cafa0f..0ac7e2cf 100644
--- a/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
+++ b/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
@@ -236,7 +236,7 @@
const { loading, setLoading } = useLoading();
const { toOptions, getDictValue } = useDictStore();
- const intervalId = ref();
+ const pullIntervalId = ref();
const tableRef = ref();
const selectedKeys = ref
-
-