diff --git a/package.json b/package.json index 2282653..0614b76 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@vueuse/core": "^10.7.0", "axios": "^1.6.2", "crypto-js": "^4.2.0", + "echarts": "^5.4.3", "element-plus": "^2.4.4", "lodash-es": "^4.17.21", "mitt": "^3.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6f8d881..f0f5c9d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,12 @@ dependencies: crypto-js: specifier: ^4.2.0 version: 4.2.0 + default-passive-events: + specifier: ^2.0.0 + version: 2.0.0 + echarts: + specifier: ^5.4.3 + version: 5.4.3 element-plus: specifier: ^2.4.4 version: 2.4.4(vue@3.3.13) @@ -734,11 +740,22 @@ packages: resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==, tarball: https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz} dev: true + /default-passive-events@2.0.0: + resolution: {integrity: sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ==, tarball: https://registry.npmmirror.com/default-passive-events/-/default-passive-events-2.0.0.tgz} + dev: false + /delayed-stream@1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==, tarball: https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz} engines: {node: '>=0.4.0'} dev: false + /echarts@5.4.3: + resolution: {integrity: sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz} + dependencies: + tslib: 2.3.0 + zrender: 5.4.4 + dev: false + /element-plus@2.4.4(vue@3.3.13): resolution: {integrity: sha512-TlKubXJgxwhER0dw+8ULn9hr9kZjraV4R6Q/eidwWUwCKxwXYPBGmMKsZ/85tlxlhMYbcLZd/YZh6G3QkHX4fg==, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.4.4.tgz} peerDependencies: @@ -1074,6 +1091,10 @@ packages: is-number: 7.0.0 dev: true + /tslib@2.3.0: + resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==, tarball: https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz} + dev: false + /typescript@5.3.3: resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==, tarball: https://registry.npmmirror.com/typescript/-/typescript-5.3.3.tgz} engines: {node: '>=14.17'} @@ -1181,3 +1202,9 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==, tarball: https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz} dev: true + + /zrender@5.4.4: + resolution: {integrity: sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==, tarball: https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz} + dependencies: + tslib: 2.3.0 + dev: false diff --git a/src/components/echarts/MyEchart.vue b/src/components/echarts/MyEchart.vue new file mode 100644 index 0000000..22c6ccc --- /dev/null +++ b/src/components/echarts/MyEchart.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/components/echarts/MyEchartMap.vue b/src/components/echarts/MyEchartMap.vue new file mode 100644 index 0000000..6636f6b --- /dev/null +++ b/src/components/echarts/MyEchartMap.vue @@ -0,0 +1,217 @@ + + + + + + diff --git a/src/components/echarts/echarts.ts b/src/components/echarts/echarts.ts new file mode 100644 index 0000000..08a463c --- /dev/null +++ b/src/components/echarts/echarts.ts @@ -0,0 +1,84 @@ +import * as echarts from 'echarts/core' + +//引入需要的图表,需要什么就加什么 +import { + BarChart, + LineChart, + PieChart, + ScatterChart, + EffectScatterChart, + RadarChart, + GaugeChart +} from 'echarts/charts' + +// 引入提示框,标题,直角坐标系,数据集,内置数据转换器组件,组件后缀都为 Component +import { + TitleComponent, + TooltipComponent, + GridComponent, + LegendComponent, + ToolboxComponent, + // 数据集组件 + DatasetComponent, + // 内置数据转换器组件 (filter, sort) + TransformComponent +} from 'echarts/components' + +// 标签自动布局,全局过渡动画等特性 +import { LabelLayout, UniversalTransition } from 'echarts/features' + +// 引入 Canvas 渲染器,注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步 +import { CanvasRenderer } from 'echarts/renderers' + +import type { + // 系列类型的定义后缀都为 SeriesOption + BarSeriesOption, + LineSeriesOption +} from 'echarts/charts' + +import type { + // 组件类型的定义后缀都为 ComponentOption + TitleComponentOption, + TooltipComponentOption, + GridComponentOption, + LegendComponentOption, + ToolboxComponentOption, + DatasetComponentOption +} from 'echarts/components' +import type { ComposeOption } from 'echarts/core' + +// 通过 ComposeOption 来组合出一个只有必须组件和图表的 Option 类型 +type ECOption = ComposeOption< + | BarSeriesOption + | LineSeriesOption + | TitleComponentOption + | TooltipComponentOption + | GridComponentOption + | DatasetComponentOption + | LegendComponentOption + | ToolboxComponentOption +> + +// 注册必须的组件,上面引入的都需要在此注册 +echarts.use([ + TitleComponent, + TooltipComponent, + GridComponent, + DatasetComponent, + LegendComponent, + ToolboxComponent, + TransformComponent, + BarChart, + LineChart, + PieChart, + ScatterChart, + LabelLayout, + UniversalTransition, + CanvasRenderer, + EffectScatterChart, + RadarChart, + GaugeChart +]) + +// 导出 +export default echarts diff --git a/src/layouts/admin/components/aside.vue b/src/layouts/admin/components/aside.vue index caa5fc4..018a616 100644 --- a/src/layouts/admin/components/aside.vue +++ b/src/layouts/admin/components/aside.vue @@ -27,8 +27,8 @@ const menuWidth = computed(() => config.menuWidth()) diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6cc54a7..e0085e2 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,8 +1,21 @@ - - \ No newline at end of file + +