From ba43a647dd11d5517dfb84617f363cae2ad7e60d Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 22 Apr 2024 17:17:29 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=9F=A5=E8=AF=A2=E5=B9=B4=E6=9C=88?= =?UTF-8?q?=E6=97=A5=E6=8E=A7=E4=BB=B6=E6=94=B9=E4=B8=BA=E5=B9=B4=E6=9C=88?= =?UTF-8?q?=E6=97=A5=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/monitor/job/log.vue | 2 ++ src/views/monitor/monitor/index.vue | 51 ++++++++++++++--------------- src/views/system/config/index.vue | 2 ++ src/views/system/dict/index.vue | 2 ++ src/views/system/role/index.vue | 13 ++++++-- src/views/system/user/index.vue | 2 ++ 6 files changed, 43 insertions(+), 29 deletions(-) diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue index 5f40f53d..ab1b7ff7 100644 --- a/src/views/monitor/job/log.vue +++ b/src/views/monitor/job/log.vue @@ -471,6 +471,8 @@ onMounted(() => { v-model:value="queryRangePicker" allow-clear bordered + :show-time="{ format: 'HH:mm:ss' }" + format="YYYY-MM-DD HH:mm:ss" value-format="x" style="width: 100%" > diff --git a/src/views/monitor/monitor/index.vue b/src/views/monitor/monitor/index.vue index 7383db93..4ce4ffa4 100644 --- a/src/views/monitor/monitor/index.vue +++ b/src/views/monitor/monitor/index.vue @@ -40,11 +40,11 @@ let rangePicker = reactive({ t('views.monitor.monitor.endTime'), ], ranges: { - [t('views.monitor.monitor.today')]: [ + [t('views.monitor.monitor.yesterday')]: [ dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day'), ], - [t('views.monitor.monitor.yesterday')]: [dayjs().startOf('day'), dayjs()], + [t('views.monitor.monitor.today')]: [dayjs().startOf('day'), dayjs()], [t('views.monitor.monitor.week')]: [ dayjs().startOf('week'), dayjs().endOf('week'), @@ -66,21 +66,21 @@ let rangePicker = reactive({ function fnGetList() { let startTime = null; let endTime = null; - const dateString = rangePicker.all; - if (dateString[0]) { - startTime = parseStrToDate(dateString[0], YYYY_MM_DD_HH_MM_SS); - endTime = parseStrToDate(dateString[1], YYYY_MM_DD_HH_MM_SS); + const dateNumber = rangePicker.all; + if (dateNumber[0]) { + startTime = dateNumber[0]; + endTime = dateNumber[1]; } else { const now = new Date(); now.setHours(0, 0, 0, 0); - startTime = now; - endTime = new Date(); + startTime = `${now.getTime()}`; + endTime = `${new Date().getTime()}`; } getLoad({ type: 'all', - startTime: startTime.getTime(), - endTime: endTime.getTime(), + startTime: startTime, + endTime: endTime, neType: '#', neId: '#', }).then(res => { @@ -94,10 +94,7 @@ function fnGetList() { }); // 设置初始时间段 - const initRangePicker: [string, string] = [ - parseDateToStr(startTime, YYYY_MM_DD_HH_MM_SS), - parseDateToStr(endTime, YYYY_MM_DD_HH_MM_SS), - ]; + const initRangePicker: [string, string] = [startTime, endTime]; rangePicker.all = initRangePicker; rangePicker.load = initRangePicker; rangePicker.cpu = initRangePicker; @@ -164,7 +161,7 @@ function fnLoadChart(data: Record[]) { type: 'value', name: `${t('views.monitor.monitor.resourceUsage')} ( % )`, position: 'right', - alignTicks: false + alignTicks: false, }, ], grid: { left: '5%', right: '5%', bottom: '20%' }, @@ -446,9 +443,9 @@ onMounted(() => { v-model:value="rangePicker.all" :allow-clear="false" bordered - value-format="YYYY-MM-DD HH:mm:ss" + :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" - show-time + value-format="x" :placeholder="rangePicker.placeholder" :ranges="rangePicker.ranges" style="width: 100%" @@ -480,9 +477,9 @@ onMounted(() => { v-model:value="rangePicker.load" :allow-clear="false" bordered - value-format="YYYY-MM-DD HH:mm:ss" + :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" - show-time + value-format="x" :placeholder="rangePicker.placeholder" style="width: 100%" @change="(_:any, d:[string,string]) => fnGetQuery('load', d)" @@ -510,9 +507,9 @@ onMounted(() => { v-model:value="rangePicker.cpu" :allow-clear="false" bordered - value-format="YYYY-MM-DD HH:mm:ss" + :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" - show-time + value-format="x" :placeholder="rangePicker.placeholder" style="width: 100%" @change="(_:any, d:[string,string]) => fnGetQuery('cpu', d)" @@ -538,9 +535,9 @@ onMounted(() => { v-model:value="rangePicker.memory" :allow-clear="false" bordered - value-format="YYYY-MM-DD HH:mm:ss" + :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" - show-time + value-format="x" :placeholder="rangePicker.placeholder" style="width: 100%" @change="(_:any, d:[string,string]) => fnGetQuery('memory', d)" @@ -568,9 +565,9 @@ onMounted(() => { v-model:value="rangePicker.io" :allow-clear="false" bordered - value-format="YYYY-MM-DD HH:mm:ss" + :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" - show-time + value-format="x" :placeholder="rangePicker.placeholder" style="width: 100%" @change="fnGetQueryIO" @@ -596,9 +593,9 @@ onMounted(() => { v-model:value="rangePicker.network" :allow-clear="false" bordered - value-format="YYYY-MM-DD HH:mm:ss" + :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" - show-time + value-format="x" :placeholder="rangePicker.placeholder" style="width: 100%" @change="fnGetQueryNetwork" diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index 7b866842..0ceb9b2e 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -527,6 +527,8 @@ onMounted(() => { v-model:value="queryRangePicker" allow-clear bordered + :show-time="{ format: 'HH:mm:ss' }" + format="YYYY-MM-DD HH:mm:ss" value-format="x" style="width: 100%" > diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 75d18fc2..4f23a509 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -527,6 +527,8 @@ onMounted(() => { v-model:value="queryRangePicker" allow-clear bordered + :show-time="{ format: 'HH:mm:ss' }" + format="YYYY-MM-DD HH:mm:ss" value-format="x" style="width: 100%" > diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 2b6f266e..a0795d72 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -719,7 +719,11 @@ function fnGetList(pageNum?: number) { } tablePagination.total = res.total; tableState.data = res.rows; - if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) { + if ( + tablePagination.total <= + (queryParams.pageNum - 1) * tablePagination.pageSize && + queryParams.pageNum !== 1 + ) { tableState.loading = false; fnGetList(queryParams.pageNum - 1); } @@ -791,6 +795,8 @@ onMounted(() => { v-model:value="queryRangePicker" allow-clear bordered + :show-time="{ format: 'HH:mm:ss' }" + format="YYYY-MM-DD HH:mm:ss" value-format="x" style="width: 100%" > @@ -1019,7 +1025,10 @@ onMounted(() => { - + {{ modalState.from.roleSort }} diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 42d7a9f0..e15243f9 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -877,6 +877,8 @@ onMounted(() => { v-model:value="queryRangePicker" allow-clear bordered + :show-time="{ format: 'HH:mm:ss' }" + format="YYYY-MM-DD HH:mm:ss" value-format="x" style="width: 100%" >