diff --git a/apps/web-antd/src/router/routes/local.ts b/apps/web-antd/src/router/routes/local.ts index e6b24cf..7997ceb 100644 --- a/apps/web-antd/src/router/routes/local.ts +++ b/apps/web-antd/src/router/routes/local.ts @@ -32,6 +32,7 @@ export const localMenuList: RouteRecordStringComponent[] = [ { component: 'BasicLayout', meta: { + icon: 'svg:material-symbols--dashboard-outline', order: -1, title: 'page.dashboard.title', // 不使用基础布局(仅在顶级生效) @@ -46,6 +47,7 @@ export const localMenuList: RouteRecordStringComponent[] = [ path: '/overview', component: '/dashboard/overview/index', meta: { + icon: 'svg:ant-design--dashboard-outlined', affixTab: true, title: '概览页', }, diff --git a/apps/web-antd/src/views/dashboard/overview/overview-traffic-revenue.vue b/apps/web-antd/src/views/dashboard/overview/overview-traffic-revenue.vue index c7c169c..0552ff7 100644 --- a/apps/web-antd/src/views/dashboard/overview/overview-traffic-revenue.vue +++ b/apps/web-antd/src/views/dashboard/overview/overview-traffic-revenue.vue @@ -28,9 +28,9 @@ const generateDateLabels = (type: string) => { switch (type) { case 'halfyear': { // 半年(180天,每10天一个数据点) - for (let i = 17; i >= 0; i--) { + for (let i = 179; i >= 0; i--) { const date = new Date(today); - date.setDate(date.getDate() - i * 10); + date.setDate(date.getDate() - i); labels.push( `${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`, ); @@ -85,26 +85,26 @@ const chartData = computed(() => { switch (props.type) { case 'halfyear': { - trafficData = generateRandomData(dataCount, 50, 800); - deviceData = generateRandomData(dataCount, 100, 1000); + trafficData = generateRandomData(dataCount, 1000, 10_000); + deviceData = generateRandomData(dataCount, 10, 100); maxValue = 1500; break; } case 'month': { - trafficData = generateRandomData(dataCount, 80, 600); - deviceData = generateRandomData(dataCount, 200, 900); + trafficData = generateRandomData(dataCount, 800, 6000); + deviceData = generateRandomData(dataCount, 10, 100); maxValue = 1200; break; } case 'week': { - trafficData = generateRandomData(dataCount, 100, 500); - deviceData = generateRandomData(dataCount, 300, 800); + trafficData = generateRandomData(dataCount, 1000, 5000); + deviceData = generateRandomData(dataCount, 10, 100); maxValue = 1000; break; } default: { - trafficData = generateRandomData(dataCount, 100, 500); - deviceData = generateRandomData(dataCount, 300, 800); + trafficData = generateRandomData(dataCount, 1000, 5000); + deviceData = generateRandomData(dataCount, 10, 100); maxValue = 1000; } } @@ -171,26 +171,19 @@ onMounted(() => { color: '#666', }, }, - yAxis: { - type: 'value', - max: 1000, - axisLine: { - lineStyle: { - color: '#e0e0e0', - }, + yAxis: [ + { + type: 'value', + name: '流量', + min: 0, }, - axisTick: { - show: false, - }, - axisLabel: { - color: '#666', - }, - splitLine: { - lineStyle: { - color: '#f0f0f0', - }, - }, - }, + // { + // type: 'value', + // name: '设备数', + // min: 0, + // position: 'right', + // }, + ], series: [ { name: '流量', @@ -212,6 +205,7 @@ onMounted(() => { itemStyle: { color: '#2D72FF', }, + // yAxisIndex: 0, // areaStyle: { // color: { // type: 'linear', @@ -252,6 +246,7 @@ onMounted(() => { itemStyle: { color: '#1FC5AE', }, + // yAxisIndex: 1, // areaStyle: { // color: { // type: 'linear', diff --git a/apps/web-antd/src/views/device/device/index.vue b/apps/web-antd/src/views/device/device/index.vue index 0c82c0b..84b9509 100644 --- a/apps/web-antd/src/views/device/device/index.vue +++ b/apps/web-antd/src/views/device/device/index.vue @@ -1,15 +1,7 @@