diff --git a/package.json b/package.json index 3839c9d..68f0cbb 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "axios": "^1.6.2", "crypto-js": "^4.2.0", "echarts": "^5.4.3", + "echarts4": "npm:echarts@^4.9.0", "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 029a350..db99871 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + dependencies: '@element-plus/icons-vue': specifier: ^2.3.1 @@ -19,6 +23,9 @@ dependencies: echarts: specifier: ^5.4.3 version: 5.4.3 + echarts4: + specifier: npm:echarts@^4.9.0 + version: /echarts@4.9.0 element-plus: specifier: ^2.4.4 version: 2.4.4(vue@3.3.13) @@ -1234,6 +1241,12 @@ packages: resolution: {integrity: sha512-M/MERVDZ8hguvjl6MAlLWSLYLS7PzEyXaTb5gEeJ+SF+e9iUC0sdvlzqe91MMDHBoy+nqw7wKcUOrDSyvMCrRg==} dev: false + /echarts@4.9.0: + resolution: {integrity: sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==} + dependencies: + zrender: 4.3.2 + 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: @@ -1956,12 +1969,12 @@ packages: commander: 9.5.0 dev: false + /zrender@4.3.2: + resolution: {integrity: sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==} + dev: false + /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 - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false diff --git a/src/components/echarts/MyEchart.vue b/src/components/echarts/MyEchart.vue index fd0094f..71ff14a 100644 --- a/src/components/echarts/MyEchart.vue +++ b/src/components/echarts/MyEchart.vue @@ -63,7 +63,7 @@ const initChart = () => { grid: { top: '50px', left: '10px', - right: '40px', + right: '60px', bottom: '40px', containLabel: true }, diff --git a/src/components/echarts/MyEchartMap.vue b/src/components/echarts/MyEchartMap.vue index ad6a691..dd0f366 100644 --- a/src/components/echarts/MyEchartMap.vue +++ b/src/components/echarts/MyEchartMap.vue @@ -8,8 +8,9 @@ diff --git a/src/components/form/area/index.vue b/src/components/form/area/index.vue index b227610..28480c9 100644 --- a/src/components/form/area/index.vue +++ b/src/components/form/area/index.vue @@ -1,9 +1,9 @@ - - \ No newline at end of file + diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue index 3ab2266..a1c45fc 100644 --- a/src/layouts/admin/index.vue +++ b/src/layouts/admin/index.vue @@ -1,8 +1,8 @@ - @@ -166,4 +299,7 @@ onMounted(() => { .map { height: calc(100vh - 120px); } +.tall { + height: calc((100vh - 120px) / 2); +} diff --git a/src/views/dashboard/components/echart.vue b/src/views/dashboard/components/echart.vue index 8b16207..0444f45 100644 --- a/src/views/dashboard/components/echart.vue +++ b/src/views/dashboard/components/echart.vue @@ -98,6 +98,7 @@ const Grade = (list: any) => { } echartsArr.push(item.frequency) }) + voltageStatistics.value = { title: { text: '电压等级' @@ -122,12 +123,10 @@ const Grade = (list: any) => { legend: { data: ['暂降次数'] }, - xAxis: [ - { - name: '电压等级', // 给X轴加单位 - data: echartsndArr - } - ], + xAxis: { + name: '电压等级', + data: echartsndArr + }, yAxis: [ { type: 'value' diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index ab4024f..c11fc22 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,7 +2,7 @@
- + @@ -15,24 +15,30 @@ - +