diff --git a/src/assets/images/business-supervision/bg/sidebar/bg-sidebar-bottom-panel.png b/src/assets/images/business-supervision/bg/sidebar/bg-sidebar-bottom-panel.png new file mode 100644 index 0000000..c58b281 Binary files /dev/null and b/src/assets/images/business-supervision/bg/sidebar/bg-sidebar-bottom-panel.png differ diff --git a/src/assets/images/business-supervision/bg/sidebar/bg-sidebar-panel.png b/src/assets/images/business-supervision/bg/sidebar/bg-sidebar-panel.png new file mode 100644 index 0000000..ab574b1 Binary files /dev/null and b/src/assets/images/business-supervision/bg/sidebar/bg-sidebar-panel.png differ diff --git a/src/plugins/echarts.ts b/src/plugins/echarts.ts index 0cba96d..5dede43 100644 --- a/src/plugins/echarts.ts +++ b/src/plugins/echarts.ts @@ -1,4 +1,4 @@ -import { BarChart, LineChart, PieChart } from 'echarts/charts'; +import { BarChart, LineChart, PictorialBarChart, PieChart } from 'echarts/charts'; import { DataZoomComponent, GraphicComponent, @@ -15,7 +15,6 @@ import { CanvasRenderer, SVGRenderer } from 'echarts/renderers'; import type { App } from 'vue'; const { use } = echarts; - use([ PieChart, BarChart, @@ -31,6 +30,7 @@ use([ TooltipComponent, DataZoomComponent, VisualMapComponent, + PictorialBarChart, ]); /** diff --git a/src/views/business-supervision/business-supervision-left/charts/sideBottom.ts b/src/views/business-supervision/business-supervision-content/charts/contentBottom.ts similarity index 87% rename from src/views/business-supervision/business-supervision-left/charts/sideBottom.ts rename to src/views/business-supervision/business-supervision-content/charts/contentBottom.ts index 35fe0c2..0368790 100644 --- a/src/views/business-supervision/business-supervision-left/charts/sideBottom.ts +++ b/src/views/business-supervision/business-supervision-content/charts/contentBottom.ts @@ -10,13 +10,7 @@ const option = ref(); option.value = { tooltip: { trigger: 'axis', - axisPointer: { - type: 'shadow', - shadowStyle: { - shadowColor: '#66FFFF', - shadowBlur: 10, - }, - }, + axisPointer: { type: 'shadow', shadowStyle: { shadowColor: '#66FFFF', shadowBlur: 10 } }, }, grid: { top: '9%', right: '0%', left: '6%', bottom: '9%', containLabel: false }, xAxis: [ @@ -58,10 +52,10 @@ option.value = { { offset: 0, color: '#00CCD2' }, { offset: 1, color: '#00A2FF' }, ]), - emphasis: { - shadowBlur: 10, // 取消阴影模糊 - shadowColor: '#000', // 取消阴影颜色 - }, + }, + emphasis: { + shadowBlur: 10, // 取消阴影模糊 + shadowColor: '#000', // 取消阴影颜色 }, label: { show: true, position: 'top', color: '#fff', fontSize: 14 }, data: [10, 52, 200, 334, 390, 330, 220, 500, 482, 499, 999, 444], diff --git a/src/views/business-supervision/business-supervision-content/components/content-bottom.vue b/src/views/business-supervision/business-supervision-content/components/content-bottom.vue index 697a000..2d91caf 100644 --- a/src/views/business-supervision/business-supervision-content/components/content-bottom.vue +++ b/src/views/business-supervision/business-supervision-content/components/content-bottom.vue @@ -3,7 +3,7 @@ import { onMounted, ref } from 'vue'; import TimeSelect from '@/components/TimeSelect/index.vue'; import { TimeSelectType } from '@/components/TimeSelect/type'; -import { renderEcharts } from '@/views/business-supervision/business-supervision-left/charts/sideBottom'; +import { renderEcharts } from '@/views/business-supervision/business-supervision-content/charts/contentBottom'; const chartYear = ref(); diff --git a/src/views/business-supervision/business-supervision-right/chart/bottom-chart.vue b/src/views/business-supervision/business-supervision-right/chart/bottom-chart.vue new file mode 100644 index 0000000..48fa3d5 --- /dev/null +++ b/src/views/business-supervision/business-supervision-right/chart/bottom-chart.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/business-supervision/business-supervision-right/components/sidebar-right-bottom.vue b/src/views/business-supervision/business-supervision-right/components/sidebar-right-bottom.vue index 20a0b61..d33622d 100644 --- a/src/views/business-supervision/business-supervision-right/components/sidebar-right-bottom.vue +++ b/src/views/business-supervision/business-supervision-right/components/sidebar-right-bottom.vue @@ -1,4 +1,18 @@ - + - + diff --git a/src/views/business-supervision/business-supervision-right/components/sidebar-right-middle.vue b/src/views/business-supervision/business-supervision-right/components/sidebar-right-middle.vue index 8e01a57..7b00780 100644 --- a/src/views/business-supervision/business-supervision-right/components/sidebar-right-middle.vue +++ b/src/views/business-supervision/business-supervision-right/components/sidebar-right-middle.vue @@ -1,4 +1,11 @@ - + - +