#### What this PR does / why we need it?

#### Summary of your change

#### Please indicate you've done the following:

- [ ] Made sure tests are passing and test coverage is added if needed.
- [ ] Made sure commit message follow the rule of [Conventional Commits specification](https://www.conventionalcommits.org/).
- [ ] Considered the docs impact and opened a new docs issue or PR with docs changes if needed.
pull/1730/head
wangdan-fit2cloud 1 year ago committed by GitHub
parent 03ed4c8071
commit f556038425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,5 +1,5 @@
<template> <template>
<div :id="id" class="v-charts" ref="chartRef" :style="{ height: height, width: width }" /> <div :id="id" ref="LineChartRef" :style="{ height: height, width: width }" />
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted, nextTick, watch, onBeforeUnmount } from 'vue'; import { onMounted, nextTick, watch, onBeforeUnmount } from 'vue';
@ -10,7 +10,7 @@ const globalStore = GlobalStore();
const props = defineProps({ const props = defineProps({
id: { id: {
type: String, type: String,
default: 'VChartsId', default: 'lineChartId',
}, },
width: { width: {
type: String, type: String,
@ -20,10 +20,6 @@ const props = defineProps({
type: String, type: String,
default: '200px', default: '200px',
}, },
type: {
type: String,
default: 'line',
},
dataZoom: { dataZoom: {
type: Boolean, type: Boolean,
default: false, default: false,

@ -0,0 +1,164 @@
<template>
<div :id="id" ref="PieChartRef" :style="{ height: height, width: width }" />
</template>
<script lang="ts" setup>
import { onMounted, nextTick, watch, onBeforeUnmount } from 'vue';
import * as echarts from 'echarts';
import { GlobalStore } from '@/store';
const globalStore = GlobalStore();
const props = defineProps({
id: {
type: String,
default: 'pieChartId',
},
width: {
type: String,
default: '100%',
},
height: {
type: String,
default: '200px',
},
option: {
type: Object,
required: true,
}, // option: { title , data }
});
function initChart() {
let myChart = echarts?.getInstanceByDom(document.getElementById(props.id) as HTMLElement);
if (myChart === null || myChart === undefined) {
myChart = echarts.init(document.getElementById(props.id) as HTMLElement);
}
const theme = globalStore.$state.themeConfig.theme || 'light';
let percentText = String(props.option.data).split('.');
const option = {
title: [
{
text: `{a|${percentText[0]}.}{b|${percentText[1] || 0} %}`,
textStyle: {
rich: {
a: {
fontSize: '22',
},
b: {
fontSize: '14',
padding: [5, 0, 0, 0],
},
},
color: theme === 'dark' ? '#ffffff' : '#0f0f0f',
lineHeight: 25,
// fontSize: 20,
fontWeight: 500,
},
left: '49%',
top: '32%',
subtext: props.option.title,
subtextStyle: {
color: theme === 'dark' ? '#BBBFC4' : '#646A73',
fontSize: 13,
},
textAlign: 'center',
},
],
polar: {
radius: ['71%', '80%'],
center: ['50%', '50%'],
},
angleAxis: {
max: 100,
show: false,
},
radiusAxis: {
type: 'category',
show: true,
axisLabel: {
show: false,
},
axisLine: {
show: false,
},
axisTick: {
show: false,
},
},
series: [
{
type: 'bar',
roundCap: true,
barWidth: 30,
showBackground: true,
coordinateSystem: 'polar',
backgroundStyle: {
color: theme === 'dark' ? 'rgba(255, 255, 255, 0.05)' : 'rgba(0, 94, 235, 0.05)',
},
color: [
new echarts.graphic.LinearGradient(0, 1, 0, 0, [
{
offset: 0,
color: 'rgba(81, 192, 255, .1)',
},
{
offset: 1,
color: '#4261F6',
},
]),
],
label: {
show: false,
},
data: [props.option.data],
},
{
type: 'pie',
radius: ['0%', '60%'],
center: ['50%', '50%'],
label: {
show: false,
},
color: theme === 'dark' ? '#16191D' : '#fff',
data: [
{
value: 0,
itemStyle: {
shadowColor: theme === 'dark' ? '#16191D' : 'rgba(0, 94, 235, 0.1)',
shadowBlur: 5,
},
},
],
},
],
};
//
myChart.setOption(option, true);
}
function changeChartSize() {
echarts.getInstanceByDom(document.getElementById(props.id) as HTMLElement)?.resize();
}
watch(
() => props.option,
(val) => {
if (val) {
nextTick(() => {
initChart();
});
}
},
);
onMounted(() => {
nextTick(() => {
initChart();
window.addEventListener('resize', changeChartSize);
});
});
onBeforeUnmount(() => {
echarts.getInstanceByDom(document.getElementById(props.id) as HTMLElement).dispose();
window.removeEventListener('resize', changeChartSize);
});
</script>
<style lang="scss" scoped></style>

@ -1,8 +1,9 @@
<template> <template>
<component :is="typeComponentMap[type]" :height="height" :option="option" :dataZoom="dataZoom" /> <component :is="typeComponentMap[type]" :height="height" :option="option" :dataZoom="dataZoom" class="v-charts" />
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import line from './components/Line.vue'; import line from './components/Line.vue';
import pie from './components/Pie.vue';
defineOptions({ name: 'VCharts' }); defineOptions({ name: 'VCharts' });
defineProps({ defineProps({
type: { type: {
@ -20,5 +21,5 @@ defineProps({
}, // { title , xDatas, yDatas, formatStr } }, // { title , xDatas, yDatas, formatStr }
}); });
const typeComponentMap = { line }; const typeComponentMap = { line, pie };
</script> </script>

@ -125,7 +125,7 @@ html {
font-size: 12px; font-size: 12px;
word-break: break-all; word-break: break-all;
color: #8f959e; color: #8f959e;
width: 110%; width: 100%;
display: inline-block; display: inline-block;
} }

@ -1,7 +1,7 @@
<template> <template>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6" align="center"> <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6" align="center">
<el-popover placement="bottom" :width="300" trigger="hover"> <el-popover placement="bottom" :width="300" trigger="hover" v-if="chartsOption['cpu']">
<div> <div>
<el-tooltip <el-tooltip
effect="dark" effect="dark"
@ -29,7 +29,13 @@
</el-col> </el-col>
</el-row> </el-row>
<template #reference> <template #reference>
<div id="cpu" class="chartClass"></div> <v-charts
height="160px"
id="cpu"
type="pie"
:option="chartsOption['cpu']"
v-if="chartsOption['cpu']"
/>
</template> </template>
</el-popover> </el-popover>
<span class="input-help"> <span class="input-help">
@ -37,14 +43,20 @@
</span> </span>
</el-col> </el-col>
<el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6" align="center"> <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6" align="center">
<div id="memory" class="chartClass"></div> <v-charts
height="160px"
id="memory"
type="pie"
:option="chartsOption['memory']"
v-if="chartsOption['memory']"
/>
<span class="input-help"> <span class="input-help">
( {{ formatNumber(currentInfo.memoryUsed / 1024 / 1024) }} / ( {{ formatNumber(currentInfo.memoryUsed / 1024 / 1024) }} /
{{ formatNumber(currentInfo.memoryTotal / 1024 / 1024) }} ) MB {{ formatNumber(currentInfo.memoryTotal / 1024 / 1024) }} ) MB
</span> </span>
</el-col> </el-col>
<el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6" align="center"> <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6" align="center">
<el-popover placement="bottom" :width="200" trigger="hover"> <el-popover placement="bottom" :width="200" trigger="hover" v-if="chartsOption['load']">
<el-tag class="tagClass"> <el-tag class="tagClass">
{{ $t('home.loadAverage', [1]) }}: {{ formatNumber(currentInfo.load1) }} {{ $t('home.loadAverage', [1]) }}: {{ formatNumber(currentInfo.load1) }}
</el-tag> </el-tag>
@ -55,7 +67,13 @@
{{ $t('home.loadAverage', [15]) }}: {{ formatNumber(currentInfo.load15) }} {{ $t('home.loadAverage', [15]) }}: {{ formatNumber(currentInfo.load15) }}
</el-tag> </el-tag>
<template #reference> <template #reference>
<div id="load" class="chartClass"></div> <v-charts
height="160px"
id="load"
type="pie"
:option="chartsOption['load']"
v-if="chartsOption['load']"
/>
</template> </template>
</el-popover> </el-popover>
<span class="input-help">{{ loadStatus(currentInfo.loadUsagePercent) }}</span> <span class="input-help">{{ loadStatus(currentInfo.loadUsagePercent) }}</span>
@ -71,7 +89,7 @@
:key="index" :key="index"
v-show="showMore || index < 4" v-show="showMore || index < 4"
> >
<el-popover placement="bottom" :width="300" trigger="hover"> <el-popover placement="bottom" :width="300" trigger="hover" v-if="chartsOption[`disk${index}`]">
<el-row :gutter="5"> <el-row :gutter="5">
<el-tag style="font-weight: 500">{{ $t('home.baseInfo') }}:</el-tag> <el-tag style="font-weight: 500">{{ $t('home.baseInfo') }}:</el-tag>
</el-row> </el-row>
@ -108,7 +126,13 @@
</el-col> </el-col>
</el-row> </el-row>
<template #reference> <template #reference>
<div :id="`disk${index}`" class="chartClass"></div> <v-charts
height="160px"
:id="`disk${index}`"
type="pie"
:option="chartsOption[`disk${index}`]"
v-if="chartsOption[`disk${index}`]"
/>
</template> </template>
</el-popover> </el-popover>
<span class="input-help">{{ computeSize(item.used) }} / {{ computeSize(item.total) }}</span> <span class="input-help">{{ computeSize(item.used) }} / {{ computeSize(item.total) }}</span>
@ -141,11 +165,7 @@
import { Dashboard } from '@/api/interface/dashboard'; import { Dashboard } from '@/api/interface/dashboard';
import { computeSize } from '@/utils/util'; import { computeSize } from '@/utils/util';
import i18n from '@/lang'; import i18n from '@/lang';
import * as echarts from 'echarts'; import { nextTick, ref } from 'vue';
import { nextTick, onBeforeUnmount, onMounted, ref } from 'vue';
import { GlobalStore } from '@/store';
const globalStore = GlobalStore();
const showMore = ref(true); const showMore = ref(true);
const baseInfo = ref<Dashboard.BaseInfo>({ const baseInfo = ref<Dashboard.BaseInfo>({
@ -201,18 +221,32 @@ const currentInfo = ref<Dashboard.CurrentInfo>({
shotTime: new Date(), shotTime: new Date(),
}); });
const chartsOption = ref({ cpu: null, memory: null, load: null });
const acceptParams = (current: Dashboard.CurrentInfo, base: Dashboard.BaseInfo, isInit: boolean): void => { const acceptParams = (current: Dashboard.CurrentInfo, base: Dashboard.BaseInfo, isInit: boolean): void => {
currentInfo.value = current; currentInfo.value = current;
baseInfo.value = base; baseInfo.value = base;
freshChart('cpu', 'CPU', formatNumber(currentInfo.value.cpuUsedPercent)); chartsOption.value['cpu'] = {
freshChart('memory', i18n.global.t('monitor.memory'), formatNumber(currentInfo.value.MemoryUsedPercent)); title: 'CPU',
freshChart('load', i18n.global.t('home.load'), formatNumber(currentInfo.value.loadUsagePercent)); data: formatNumber(currentInfo.value.cpuUsedPercent),
};
chartsOption.value['memory'] = {
title: i18n.global.t('monitor.memory'),
data: formatNumber(currentInfo.value.MemoryUsedPercent),
};
chartsOption.value['load'] = {
title: i18n.global.t('home.load'),
data: formatNumber(currentInfo.value.loadUsagePercent),
};
currentInfo.value.diskData = currentInfo.value.diskData || []; currentInfo.value.diskData = currentInfo.value.diskData || [];
nextTick(() => { nextTick(() => {
for (let i = 0; i < currentInfo.value.diskData.length; i++) { for (let i = 0; i < currentInfo.value.diskData.length; i++) {
let itemPath = currentInfo.value.diskData[i].path; let itemPath = currentInfo.value.diskData[i].path;
itemPath = itemPath.length > 12 ? itemPath.substring(0, 9) + '...' : itemPath; itemPath = itemPath.length > 12 ? itemPath.substring(0, 9) + '...' : itemPath;
freshChart('disk' + i, itemPath, formatNumber(currentInfo.value.diskData[i].usedPercent)); chartsOption.value['disk' + i] = {
title: itemPath,
data: formatNumber(currentInfo.value.diskData[i].usedPercent),
};
} }
if (currentInfo.value.diskData.length > 5) { if (currentInfo.value.diskData.length > 5) {
showMore.value = isInit ? false : showMore.value || false; showMore.value = isInit ? false : showMore.value || false;
@ -220,116 +254,6 @@ const acceptParams = (current: Dashboard.CurrentInfo, base: Dashboard.BaseInfo,
}); });
}; };
const freshChart = (chartName: string, Title: string, Data: number) => {
let myChart = echarts.getInstanceByDom(document.getElementById(chartName) as HTMLElement);
if (myChart === null || myChart === undefined) {
myChart = echarts.init(document.getElementById(chartName) as HTMLElement);
}
const theme = globalStore.$state.themeConfig.theme || 'light';
let percentText = String(Data).split('.');
const option = {
title: [
{
text: `{a|${percentText[0]}.}{b|${percentText[1] || 0} %}`,
textStyle: {
rich: {
a: {
fontSize: '22',
},
b: {
fontSize: '14',
padding: [5, 0, 0, 0],
},
},
color: theme === 'dark' ? '#ffffff' : '#0f0f0f',
lineHeight: 25,
// fontSize: 20,
fontWeight: 500,
},
left: '49%',
top: '32%',
subtext: Title,
subtextStyle: {
color: theme === 'dark' ? '#BBBFC4' : '#646A73',
fontSize: 13,
},
textAlign: 'center',
},
],
polar: {
radius: ['71%', '80%'],
center: ['50%', '50%'],
},
angleAxis: {
max: 100,
show: false,
},
radiusAxis: {
type: 'category',
show: true,
axisLabel: {
show: false,
},
axisLine: {
show: false,
},
axisTick: {
show: false,
},
},
series: [
{
type: 'bar',
roundCap: true,
barWidth: 30,
showBackground: true,
coordinateSystem: 'polar',
backgroundStyle: {
color: theme === 'dark' ? 'rgba(255, 255, 255, 0.05)' : 'rgba(0, 94, 235, 0.05)',
},
color: [
new echarts.graphic.LinearGradient(0, 1, 0, 0, [
{
offset: 0,
color: 'rgba(81, 192, 255, .1)',
},
{
offset: 1,
color: '#4261F6',
},
]),
],
label: {
show: false,
},
data: [Data],
},
{
type: 'pie',
radius: ['0%', '60%'],
center: ['50%', '50%'],
label: {
show: false,
},
color: theme === 'dark' ? '#16191D' : '#fff',
data: [
{
value: 0,
itemStyle: {
shadowColor: theme === 'dark' ? '#16191D' : 'rgba(0, 94, 235, 0.1)',
shadowBlur: 5,
},
},
],
},
],
};
nextTick(function () {
myChart.setOption(option, true);
});
};
function loadStatus(val: number) { function loadStatus(val: number) {
if (val < 30) { if (val < 30) {
return i18n.global.t('home.runSmoothly'); return i18n.global.t('home.runSmoothly');
@ -347,33 +271,6 @@ function formatNumber(val: number) {
return Number(val.toFixed(2)); return Number(val.toFixed(2));
} }
function changeChartSize() {
echarts.getInstanceByDom(document.getElementById('cpu') as HTMLElement)?.resize();
echarts.getInstanceByDom(document.getElementById('memory') as HTMLElement)?.resize();
echarts.getInstanceByDom(document.getElementById('load') as HTMLElement)?.resize();
for (let i = 0; i < currentInfo.value.diskData.length; i++) {
echarts.getInstanceByDom(document.getElementById('disk' + i) as HTMLElement)?.resize();
}
}
function disposeChart() {
echarts.getInstanceByDom(document.getElementById('cpu') as HTMLElement)?.dispose();
echarts.getInstanceByDom(document.getElementById('memory') as HTMLElement)?.dispose();
echarts.getInstanceByDom(document.getElementById('load') as HTMLElement)?.dispose();
for (let i = 0; i < currentInfo.value.diskData.length; i++) {
echarts.getInstanceByDom(document.getElementById('disk' + i) as HTMLElement)?.dispose();
}
}
onMounted(() => {
window.addEventListener('resize', changeChartSize);
});
onBeforeUnmount(() => {
disposeChart();
window.removeEventListener('resize', changeChartSize);
});
defineExpose({ defineExpose({
acceptParams, acceptParams,
}); });
@ -383,10 +280,7 @@ defineExpose({
.tagClass { .tagClass {
margin-top: 3px; margin-top: 3px;
} }
.chartClass {
width: 100%;
height: 160px;
}
.buttonClass { .buttonClass {
margin-top: 28%; margin-top: 28%;
font-size: 14px; font-size: 14px;

Loading…
Cancel
Save