From 07ee26b965f4c4a9c70b287e9ce3330665406d42 Mon Sep 17 00:00:00 2001 From: Li ZongYing Date: Mon, 13 Nov 2023 18:44:58 +0800 Subject: [PATCH] auto refresh --- web/ui/src/views/JobsView.vue | 62 +++++++++++++++++++++++++++----- web/ui/src/views/NodesView.vue | 8 ++--- web/ui/src/views/RecordsView.vue | 8 ++--- web/ui/src/views/SpidersView.vue | 10 +++--- web/ui/src/views/TasksView.vue | 10 +++--- 5 files changed, 69 insertions(+), 29 deletions(-) diff --git a/web/ui/src/views/JobsView.vue b/web/ui/src/views/JobsView.vue index dce1547..4212e70 100644 --- a/web/ui/src/views/JobsView.vue +++ b/web/ui/src/views/JobsView.vue @@ -5,7 +5,7 @@ > @@ -63,8 +63,6 @@ Rerun Stop - Delete - More @@ -148,6 +146,41 @@ cron + + + + + + + + + + @@ -283,7 +316,7 @@ const columns = [ { title: 'Action', dataIndex: 'action', - width: 250, + width: 200, fixed: 'right', }, ]; @@ -314,10 +347,10 @@ const jobStatusName = (status) => { const refresh = () => { jobsStore.GetJobs() } -const checked1 = ref(false) -const checked1Disable = ref(false) +const checked1 = ref(true) +const checked1Disable = ref(true) -let interval = null +let interval = setInterval(refresh, 1000) const changeSwitch = () => { if (checked1.value) { interval = setInterval(refresh, 1000) @@ -386,6 +419,10 @@ const formJob = reactive({ func: '', args: '{}', mode: '1', + specType: 'h', + specValue: 1, + timeoutType: 'h', + timeoutValue: 0, }) const openJob = ref(false); const newJob = () => { @@ -409,13 +446,20 @@ const handleJob = () => { formJob.args = JSON.stringify(js) openJob.value = false; - jobsStore.RunJob({ + const data = { "timeout": 0, "name": formJob.name, "func": formJob.func, "args": formJob.args, "mode": parseInt(formJob.mode) - }) + } + if (formJob.mode === '3') { + data.spec = formJob.specValue + formJob.specType + } + if (formJob.timeoutValue > 0) { + data.timeout = formJob.timeoutValue * parseInt(formJob.timeoutType) + } + jobsStore.RunJob(data) } catch (e) { console.log(e) message.error('Argument error'); diff --git a/web/ui/src/views/NodesView.vue b/web/ui/src/views/NodesView.vue index 4b1f1a8..a9e5403 100644 --- a/web/ui/src/views/NodesView.vue +++ b/web/ui/src/views/NodesView.vue @@ -4,7 +4,7 @@ :sub-title="'Total: '+nodesStore.Count" > @@ -244,10 +244,10 @@ nodesStore.GetNodes() const refresh = () => { nodesStore.GetNodes() } -const checked1 = ref(false) -const checked1Disable = ref(false) +const checked1 = ref(true) +const checked1Disable = ref(true) -let interval = null +let interval = setInterval(refresh, 1000) const changeSwitch = () => { if (checked1.value) { interval = setInterval(refresh, 1000) diff --git a/web/ui/src/views/RecordsView.vue b/web/ui/src/views/RecordsView.vue index 1af8670..bd5d33b 100644 --- a/web/ui/src/views/RecordsView.vue +++ b/web/ui/src/views/RecordsView.vue @@ -4,7 +4,7 @@ :sub-title="'Total: '+recordsStore.Count" > @@ -142,10 +142,10 @@ const activeKey = ref('1'); const refresh = () => { recordsStore.GetRecords() } -const checked1 = ref(false) -const checked1Disable = ref(false) +const checked1 = ref(true) +const checked1Disable = ref(true) -let interval = null +let interval = setInterval(refresh, 1000) const changeSwitch = () => { if (checked1.value) { interval = setInterval(refresh, 1000) diff --git a/web/ui/src/views/SpidersView.vue b/web/ui/src/views/SpidersView.vue index eb4ba35..21f49e2 100644 --- a/web/ui/src/views/SpidersView.vue +++ b/web/ui/src/views/SpidersView.vue @@ -4,7 +4,7 @@ :sub-title="'Total: '+spidersStore.Count" > @@ -85,8 +85,6 @@ Run - Delete - More @@ -322,10 +320,10 @@ const taskStatusName = (status) => { const refresh = () => { spidersStore.GetSpiders() } -const checked1 = ref(false) -const checked1Disable = ref(false) +const checked1 = ref(true) +const checked1Disable = ref(true) -let interval = null +let interval = setInterval(refresh, 1000) const changeSwitch = () => { if (checked1.value) { interval = setInterval(refresh, 1000) diff --git a/web/ui/src/views/TasksView.vue b/web/ui/src/views/TasksView.vue index 9ba1e24..2fc988c 100644 --- a/web/ui/src/views/TasksView.vue +++ b/web/ui/src/views/TasksView.vue @@ -4,7 +4,7 @@ :sub-title="'Total: '+tasksStore.Count" > @@ -59,8 +59,6 @@