diff --git a/public/iconify/nonicons.json b/public/iconify/nonicons.json new file mode 100644 index 0000000..370ea42 --- /dev/null +++ b/public/iconify/nonicons.json @@ -0,0 +1,10 @@ +{ + "prefix": "nonicons", + "lastModified": 1702313196, + "aliases": {}, + "icons": { + "loading-16": { + "body": "" + } + } +} diff --git a/public/iconify/solar.json b/public/iconify/solar.json new file mode 100644 index 0000000..7105b94 --- /dev/null +++ b/public/iconify/solar.json @@ -0,0 +1,12 @@ +{ + "prefix": "solar", + "lastModified": 1702314058, + "aliases": {}, + "width": 24, + "height": 24, + "icons": { + "refresh-outline": { + "body": "" + } + } +} diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue index 9a7dd2d..8eea17f 100644 --- a/src/components/common/log-drawer.vue +++ b/src/components/common/log-drawer.vue @@ -1,9 +1,9 @@ @@ -103,63 +263,132 @@ function openNewTab() { - {{ title }} - + + + + + 日志加载完成 + + + + + + + + + + 日志正在加载 + + {{ title }} + + + + + + + + + + + + + 自动刷新频率 + + - - - - - - {{timestampToDate(message.time_stamp)}}{{`${message.level}`}}{{ `[${message.host}:${message.port}]` }}{{`[${message.thread}]`}}{{`${message.location}: \n`}} -{{`${message.message}`}} - - - - - + - - - - - - {{timestampToDate(message.time_stamp)}}{{`${message.level}`}}{{ `[${message.host}:${message.port}]` }}{{`[${message.thread}]`}}{{`${message.location}: \n`}} -{{`${message.message}`}} + + + + + + + + + + + + + + + 自动刷新频率 + + + + + - - - - + 日志加载完成 + + + + + + + + + + 日志正在加载 + + + + + - -.log-hljs { - &-time { - color: #2db7f5; - } - - &-level { - &-DEBUG { - color: #2647cc; - } - - &-INFO { - color: #5c962c; - } - - &-WARN { - color: #da9816; - } - - &-ERROR { - color: #dc3f41; - } - } - - &-thread { - color: #00a3a3; - } - - &-location { - color: #a771bf; - } + diff --git a/src/components/workflow/modules/common/flow-log-drawer.vue b/src/components/workflow/modules/common/flow-log-drawer.vue index ba5266e..00106c1 100644 --- a/src/components/workflow/modules/common/flow-log-drawer.vue +++ b/src/components/workflow/modules/common/flow-log-drawer.vue @@ -1,7 +1,5 @@ - + - + diff --git a/src/store/modules/log/index.ts b/src/store/modules/log/index.ts deleted file mode 100644 index 778ea9e..0000000 --- a/src/store/modules/log/index.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { defineStore } from 'pinia'; -import { ref } from 'vue'; -import { localStg } from '@/utils/storage'; - -export const useLogStore = defineStore('log', () => { - const taskName = ref(); - const taskBatchId = ref(); - const data = ref([]); - - function setTaskInfo(name: string, id: string) { - taskName.value = name; - taskBatchId.value = id; - } - - function setData(value: Api.JobLog.JobMessage[]) { - data.value = value; - localStg.set('log', { taskName: taskName.value!, taskBatchId: taskBatchId.value!, data: data.value }); - } - - function clear() { - taskName.value = undefined; - taskBatchId.value = undefined; - data.value = []; - localStg.remove('log'); - } - - return { - taskName, - taskBatchId, - data, - clear, - setTaskInfo, - setData - }; -}); diff --git a/src/views/_builtin/log/index.vue b/src/views/_builtin/log/index.vue index a08b70e..b9f695d 100644 --- a/src/views/_builtin/log/index.vue +++ b/src/views/_builtin/log/index.vue @@ -1,38 +1,53 @@ - - - - {{ - `${$t('page.log.title')} ------ ${$t('page.jobBatch.jobName')}: ${data?.taskName}, ${$t('common.batchList')} ID: ${data?.taskBatchId}` - }} - - - - + + + - + diff --git a/src/views/job/batch/modules/job-batch-detail-drawer.vue b/src/views/job/batch/modules/job-batch-detail-drawer.vue index 45bc6b9..a80f16d 100644 --- a/src/views/job/batch/modules/job-batch-detail-drawer.vue +++ b/src/views/job/batch/modules/job-batch-detail-drawer.vue @@ -1,10 +1,8 @@ @@ -114,7 +67,7 @@ onBeforeUnmount(() => { - + diff --git a/src/views/retry/log/modules/retry-log-detail-drawer.vue b/src/views/retry/log/modules/retry-log-detail-drawer.vue index 509d8d0..8670f6b 100644 --- a/src/views/retry/log/modules/retry-log-detail-drawer.vue +++ b/src/views/retry/log/modules/retry-log-detail-drawer.vue @@ -1,9 +1,7 @@ - + @@ -102,8 +53,7 @@ onBeforeUnmount(() => { - - + diff --git a/src/views/retry/task/modules/retry-task-detail-drawer.vue b/src/views/retry/task/modules/retry-task-detail-drawer.vue index a71ba0a..68dd05c 100644 --- a/src/views/retry/task/modules/retry-task-detail-drawer.vue +++ b/src/views/retry/task/modules/retry-task-detail-drawer.vue @@ -109,8 +109,7 @@ onBeforeUnmount(() => { - - +
- - - {{timestampToDate(message.time_stamp)}}{{`${message.level}`}}{{ `[${message.host}:${message.port}]` }}{{`[${message.thread}]`}}{{`${message.location}: \n`}} -{{`${message.message}`}} - - -
{{timestampToDate(message.time_stamp)}}{{`${message.level}`}}{{ `[${message.host}:${message.port}]` }}{{`[${message.thread}]`}}{{`${message.location}: \n`}} -{{`${message.message}`}}
- - - {{timestampToDate(message.time_stamp)}}{{`${message.level}`}}{{ `[${message.host}:${message.port}]` }}{{`[${message.thread}]`}}{{`${message.location}: \n`}} -{{`${message.message}`}} + + + + + + + + + + + + + + + 自动刷新频率 + + + + + - - - -