0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#10610 修复仪表盘日期变化问题

This commit is contained in:
jackhoo_98 2023-03-21 13:50:46 +08:00
parent d9c2da7f4e
commit 3bb63f3d41
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/link/DashBoard/components/Cpu.vue
View File

@ -8,7 +8,7 @@
:allowClear="false"
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
v-model="data.time"
v-model:value="data.time"
>
<template #suffixIcon
><AIcon type="CalendarOutlined"
@ -51,7 +51,7 @@ m
<script lang="ts" setup name="Cpu">
import * as echarts from 'echarts';
import { dashboard } from '@/api/link/dashboard';
import moment from 'moment';
import dayjs from 'dayjs';
import {
getTimeFormat,
getTimeByType,
@ -75,6 +75,8 @@ const pickerTimeChange = () => {
const getCPUEcharts = async (val: any) => {
loading.value = true;
console.log(224, val);
const res: any = await dashboard(defulteParamsData('cpu', val));
if (res.success) {
const _cpuOptions = {};
@ -84,10 +86,11 @@ const getCPUEcharts = async (val: any) => {
const value = item.data.value;
const nodeID = item.data.clusterNodeId;
_cpuXAxis.add(
moment(value.timestamp).format(
dayjs(value.timestamp).format(
getTimeFormat(data.value.type),
),
);
if (!_cpuOptions[nodeID]) {
_cpuOptions[nodeID] = [];
}
@ -163,10 +166,9 @@ const handleCpuOptions = (optionsData: any, xAxis: any) => {
watch(
() => data.value.type,
(val) => {
const endTime = moment(new Date());
const startTime = getTimeByType(val);
data.value.time = [startTime, endTime];
(value) => {
const date = getTimeByType(value);
data.value.time = [dayjs(date), dayjs(new Date())];
},
{ immediate: true, deep: true },
);

13
src/views/link/DashBoard/components/Jvm.vue
View File

@ -8,7 +8,7 @@
:allowClear="false"
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
v-model="data.time"
v-model:value="data.time"
>
<template #suffixIcon
><AIcon type="CalendarOutlined"
@ -51,7 +51,7 @@
<script lang="ts" setup name="Jvm">
import * as echarts from 'echarts';
import { dashboard } from '@/api/link/dashboard';
import moment from 'moment';
import dayjs from 'dayjs';
import {
getTimeFormat,
getTimeByType,
@ -95,7 +95,7 @@ const getJVMEcharts = async (val: any) => {
_jvmOptions[nodeID] = [];
}
_jvmXAxis.add(
moment(value.timestamp).format(
dayjs(value.timestamp).format(
getTimeFormat(data.value.type),
),
);
@ -168,10 +168,9 @@ const handleJVMOptions = (optionsData: any, xAxis: any) => {
watch(
() => data.value.type,
(val) => {
const endTime = moment(new Date());
const startTime = getTimeByType(val);
data.value.time = [startTime, endTime];
(value) => {
const date = getTimeByType(value);
data.value.time = [dayjs(date), dayjs(new Date())];
},
{ immediate: true, deep: true },
);

11
src/views/link/DashBoard/components/Network.vue
View File

@ -33,7 +33,7 @@
:allowClear="false"
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
v-model="data.time.time"
v-model:value="data.time.time"
@change="pickerTimeChange"
>
<template #suffixIcon
@ -65,7 +65,7 @@ import {
areaStyle,
networkParams,
} from './tool.ts';
import moment from 'moment';
import dayjs from 'dayjs';
import * as echarts from 'echarts';
import { DataType } from '../typings.d';
@ -79,7 +79,7 @@ const data = ref<DataType>({
},
});
const isEmpty = ref(false);
const pickerTimeChange = () => {
const pickerTimeChange = (value: any) => {
data.value.time.type = undefined;
};
@ -173,9 +173,8 @@ const handleNetworkOptions = (optionsData: any, xAxis: any) => {
watch(
() => data.value.time.type,
(value) => {
const endTime = moment(new Date());
const startTime = getTimeByType(value);
data.value.time.time = [startTime, endTime];
const date = getTimeByType(value);
data.value.time.time = [dayjs(date), dayjs(new Date())];
},
{ immediate: true, deep: true },
);

32
src/views/link/DashBoard/components/tool.ts
View File

@ -1,7 +1,7 @@
import moment from 'moment';
import dayjs from 'dayjs';
import * as echarts from 'echarts';
export const getInterval = (type) => {
export const getInterval = (type: string) => {
switch (type) {
case 'year':
return '30d';
@ -14,7 +14,7 @@ export const getInterval = (type) => {
return '1h';
}
};
export const getTimeFormat = (type) => {
export const getTimeFormat = (type: string) => {
switch (type) {
case 'year':
return 'YYYY-MM-DD';
@ -28,22 +28,22 @@ export const getTimeFormat = (type) => {
}
};
export const getTimeByType = (type) => {
export const getTimeByType = (type: string) => {
switch (type) {
case 'hour':
return moment().subtract(1, 'hours');
return dayjs().subtract(1, 'hours');
case 'week':
return moment().subtract(6, 'days');
return dayjs().subtract(6, 'days');
case 'month':
return moment().subtract(29, 'days');
return dayjs().subtract(29, 'days');
case 'year':
return moment().subtract(365, 'days');
return dayjs().subtract(365, 'days');
default:
return moment().startOf('day');
return dayjs().startOf('day');
}
};
export const arrayReverse = (data) => {
export const arrayReverse = (data: string) => {
const newArray = [];
for (let i = data.length - 1; i >= 0; i--) {
newArray.push(data[i]);
@ -51,7 +51,7 @@ export const arrayReverse = (data) => {
return newArray;
};
export const networkParams = (val) => [
export const networkParams = (val: any) => [
{
dashboard: 'systemMonitor',
object: 'network',
@ -61,12 +61,12 @@ export const networkParams = (val) => [
params: {
type: val.type,
interval: getInterval(val.time.type),
from: moment(val.time.time[0]).valueOf(),
to: moment(val.time.time[1]).valueOf(),
from: dayjs(val.time.time[0]).valueOf(),
to: dayjs(val.time.time[1]).valueOf(),
},
},
];
export const defulteParamsData = (group, val) => [
export const defulteParamsData = (group: any, val: any) => [
{
dashboard: 'systemMonitor',
object: 'stats',
@ -74,8 +74,8 @@ export const defulteParamsData = (group, val) => [
dimension: 'history',
group,
params: {
from: moment(val.time[0]).valueOf(),
to: moment(val.time[1]).valueOf(),
from: dayjs(val.time[0]).valueOf(),
to: dayjs(val.time[1]).valueOf(),
},
},
];