diff --git a/src/App.vue b/src/App.vue index 52ccd6e..81b960d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -88,6 +88,8 @@ hotkeys('alt+i', () => { eventBus.emit('global-system-info-toggle') }) + // const resize = new Event('resize') + // window.dispatchEvent(resize) }) diff --git a/src/App.vue b/src/App.vue index 52ccd6e..81b960d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -88,6 +88,8 @@ hotkeys('alt+i', () => { eventBus.emit('global-system-info-toggle') }) + // const resize = new Event('resize') + // window.dispatchEvent(resize) }) diff --git a/src/api/page/page.ts b/src/api/page/page.ts index f99890a..1bc0346 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -48,3 +48,11 @@ data: params, }) } +// 统计面板-巡检趋势 +export function getDashboardTrend(params: any) { + return request({ + url: '/system/busOverView/taskTime', + method: 'post', + data: params, + }) +} diff --git a/src/App.vue b/src/App.vue index 52ccd6e..81b960d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -88,6 +88,8 @@ hotkeys('alt+i', () => { eventBus.emit('global-system-info-toggle') }) + // const resize = new Event('resize') + // window.dispatchEvent(resize) }) diff --git a/src/api/page/page.ts b/src/api/page/page.ts index f99890a..1bc0346 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -48,3 +48,11 @@ data: params, }) } +// 统计面板-巡检趋势 +export function getDashboardTrend(params: any) { + return request({ + url: '/system/busOverView/taskTime', + method: 'post', + data: params, + }) +} diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..f276842 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -207,7 +207,7 @@ }, }, valueFormatter: (value: string | number) => { - return value ? value + props.unit : '' + return value ? value + props.unit : '0' }, }, // 提示框 xAxis: [ @@ -243,6 +243,10 @@ color: props.axisLineColor, // 轴线的颜色 }, }, + axisLabel: { + show: true, + color: props.fontColor, + }, nameTextStyle: { color: props.fontColor, fontSize: 14, @@ -251,7 +255,7 @@ splitLine: { show: true, lineStyle: { - color: ['#bfbfbf'], + color: props.axisLineColor, type: 'dashed', }, }, @@ -302,21 +306,22 @@ } // 如果开启渐变 if (props.gradient) { - series.areaStyle = { - color: new echarts.graphic.LinearGradient( - 0, 0, 0, 1, // 变化度 ,渐变方向 - [ - { - offset: 0.1, - color: item.color ? getAlphaColor(item.color, 0.6) : getAlphaColor(props.colors[itemIndex] as string, 0.6), - }, - { - offset: 1, - color: '#fff', - }, - ], - ), - } + series.areaStyle = {} + // series.areaStyle = { + // color: new echarts.graphic.LinearGradient( + // 0, 0, 0, 1, // 变化度 ,渐变方向 + // [ + // { + // offset: 0.1, + // color: item.color ? getAlphaColor(item.color, 0.6) : getAlphaColor(props.colors[itemIndex] as string, 0.6), + // }, + // { + // offset: 1, + // color: '#fff', + // }, + // ], + // ), + // } } } newSeries.push(series) diff --git a/src/App.vue b/src/App.vue index 52ccd6e..81b960d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -88,6 +88,8 @@ hotkeys('alt+i', () => { eventBus.emit('global-system-info-toggle') }) + // const resize = new Event('resize') + // window.dispatchEvent(resize) }) diff --git a/src/api/page/page.ts b/src/api/page/page.ts index f99890a..1bc0346 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -48,3 +48,11 @@ data: params, }) } +// 统计面板-巡检趋势 +export function getDashboardTrend(params: any) { + return request({ + url: '/system/busOverView/taskTime', + method: 'post', + data: params, + }) +} diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue index 841e0cb..f276842 100644 --- a/src/components/Echart/LineChart.vue +++ b/src/components/Echart/LineChart.vue @@ -207,7 +207,7 @@ }, }, valueFormatter: (value: string | number) => { - return value ? value + props.unit : '' + return value ? value + props.unit : '0' }, }, // 提示框 xAxis: [ @@ -243,6 +243,10 @@ color: props.axisLineColor, // 轴线的颜色 }, }, + axisLabel: { + show: true, + color: props.fontColor, + }, nameTextStyle: { color: props.fontColor, fontSize: 14, @@ -251,7 +255,7 @@ splitLine: { show: true, lineStyle: { - color: ['#bfbfbf'], + color: props.axisLineColor, type: 'dashed', }, }, @@ -302,21 +306,22 @@ } // 如果开启渐变 if (props.gradient) { - series.areaStyle = { - color: new echarts.graphic.LinearGradient( - 0, 0, 0, 1, // 变化度 ,渐变方向 - [ - { - offset: 0.1, - color: item.color ? getAlphaColor(item.color, 0.6) : getAlphaColor(props.colors[itemIndex] as string, 0.6), - }, - { - offset: 1, - color: '#fff', - }, - ], - ), - } + series.areaStyle = {} + // series.areaStyle = { + // color: new echarts.graphic.LinearGradient( + // 0, 0, 0, 1, // 变化度 ,渐变方向 + // [ + // { + // offset: 0.1, + // color: item.color ? getAlphaColor(item.color, 0.6) : getAlphaColor(props.colors[itemIndex] as string, 0.6), + // }, + // { + // offset: 1, + // color: '#fff', + // }, + // ], + // ), + // } } } newSeries.push(series) diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index b6cc0ba..3763b85 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,7 +1,8 @@