diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..f830785 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..f830785 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue new file mode 100644 index 0000000..1c760ca --- /dev/null +++ b/src/views/data/electricity/components/branchAdd.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..f830785 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue new file mode 100644 index 0000000..1c760ca --- /dev/null +++ b/src/views/data/electricity/components/branchAdd.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue new file mode 100644 index 0000000..7f81ed6 --- /dev/null +++ b/src/views/data/electricity/components/busbarAdd.vue @@ -0,0 +1,288 @@ + + + + + + diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..f830785 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue new file mode 100644 index 0000000..1c760ca --- /dev/null +++ b/src/views/data/electricity/components/branchAdd.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue new file mode 100644 index 0000000..7f81ed6 --- /dev/null +++ b/src/views/data/electricity/components/busbarAdd.vue @@ -0,0 +1,288 @@ + + + + + + diff --git a/src/views/data/electricity/components/deviceAdd.vue b/src/views/data/electricity/components/deviceAdd.vue new file mode 100644 index 0000000..3bad63d --- /dev/null +++ b/src/views/data/electricity/components/deviceAdd.vue @@ -0,0 +1,220 @@ + + + + + + diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..f830785 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue new file mode 100644 index 0000000..1c760ca --- /dev/null +++ b/src/views/data/electricity/components/branchAdd.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue new file mode 100644 index 0000000..7f81ed6 --- /dev/null +++ b/src/views/data/electricity/components/busbarAdd.vue @@ -0,0 +1,288 @@ + + + + + + diff --git a/src/views/data/electricity/components/deviceAdd.vue b/src/views/data/electricity/components/deviceAdd.vue new file mode 100644 index 0000000..3bad63d --- /dev/null +++ b/src/views/data/electricity/components/deviceAdd.vue @@ -0,0 +1,220 @@ + + + + + + diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue new file mode 100644 index 0000000..8d137c0 --- /dev/null +++ b/src/views/data/electricity/components/networkBranch.vue @@ -0,0 +1,192 @@ + + + + diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..f830785 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue new file mode 100644 index 0000000..1c760ca --- /dev/null +++ b/src/views/data/electricity/components/branchAdd.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue new file mode 100644 index 0000000..7f81ed6 --- /dev/null +++ b/src/views/data/electricity/components/busbarAdd.vue @@ -0,0 +1,288 @@ + + + + + + diff --git a/src/views/data/electricity/components/deviceAdd.vue b/src/views/data/electricity/components/deviceAdd.vue new file mode 100644 index 0000000..3bad63d --- /dev/null +++ b/src/views/data/electricity/components/deviceAdd.vue @@ -0,0 +1,220 @@ + + + + + + diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue new file mode 100644 index 0000000..8d137c0 --- /dev/null +++ b/src/views/data/electricity/components/networkBranch.vue @@ -0,0 +1,192 @@ + + + + diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue new file mode 100644 index 0000000..5386ea1 --- /dev/null +++ b/src/views/data/electricity/components/networkBusbar.vue @@ -0,0 +1,193 @@ + + + + diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..f830785 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue new file mode 100644 index 0000000..1c760ca --- /dev/null +++ b/src/views/data/electricity/components/branchAdd.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue new file mode 100644 index 0000000..7f81ed6 --- /dev/null +++ b/src/views/data/electricity/components/busbarAdd.vue @@ -0,0 +1,288 @@ + + + + + + diff --git a/src/views/data/electricity/components/deviceAdd.vue b/src/views/data/electricity/components/deviceAdd.vue new file mode 100644 index 0000000..3bad63d --- /dev/null +++ b/src/views/data/electricity/components/deviceAdd.vue @@ -0,0 +1,220 @@ + + + + + + diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue new file mode 100644 index 0000000..8d137c0 --- /dev/null +++ b/src/views/data/electricity/components/networkBranch.vue @@ -0,0 +1,192 @@ + + + + diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue new file mode 100644 index 0000000..5386ea1 --- /dev/null +++ b/src/views/data/electricity/components/networkBusbar.vue @@ -0,0 +1,193 @@ + + + + diff --git a/src/views/data/electricity/device.vue b/src/views/data/electricity/device.vue new file mode 100644 index 0000000..1c66e48 --- /dev/null +++ b/src/views/data/electricity/device.vue @@ -0,0 +1,179 @@ + + + + diff --git a/package.json b/package.json index 8aabc3d..7453a14 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5683eda..9ad6979 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.4 specifiers: + '@amap/amap-jsapi-loader': ^1.0.1 '@antfu/eslint-config': ^0.29.4 '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 @@ -72,11 +73,10 @@ vue-tsc: ^1.0.9 vue3-print-nb: ^0.1.4 vuedraggable: ^4.1.0 - vxe-table: ^4.3.11 - xe-utils: '3' xlsx: ^0.18.5 dependencies: + '@amap/amap-jsapi-loader': 1.0.1 '@element-plus/icons-vue': registry.npmmirror.com/@element-plus/icons-vue/2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 @@ -106,8 +106,6 @@ vue-router: 4.1.6_vue@3.2.44 vue3-print-nb: 0.1.4 vuedraggable: registry.npmmirror.com/vuedraggable/4.1.0_vue@3.2.44 - vxe-table: 4.3.11_vue@3.2.44+xe-utils@3.5.7 - xe-utils: 3.5.7 xlsx: 0.18.5 devDependencies: @@ -156,6 +154,10 @@ packages: + /@amap/amap-jsapi-loader/1.0.1: + resolution: {integrity: sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==} + dev: false + /@ampproject/remapping/2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -8175,16 +8177,6 @@ vue: 3.2.44 dev: false - /vxe-table/4.3.11_vue@3.2.44+xe-utils@3.5.7: - resolution: {integrity: sha512-n2OXuUaKurVxxhRz0b1DojLdvtYwKkidRAqI9oGDw2IQ0y2IPs2Oq+lX2V6ar3glFdjjkS3BqnDBAk0elt6e0Q==} - peerDependencies: - vue: ^3.2.28 - xe-utils: ^3.5.0 - dependencies: - vue: 3.2.44 - xe-utils: 3.5.7 - dev: false - /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: @@ -8306,10 +8298,6 @@ signal-exit: 3.0.7 dev: true - /xe-utils/3.5.7: - resolution: {integrity: sha512-3H+fDBKBR2wLJgyA7k9C/w1Xljx6Maml5ukV0WDY06HjYyGs2FEz6XhcwRCLIDXX4pBP3Gu0nX9DbCeuuRA2Ew==} - dev: false - /xlsx/0.18.5: resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} engines: {node: '>=0.8'} diff --git a/src/components.d.ts b/src/components.d.ts index 29c1f82..1bd3d1b 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -41,6 +41,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] LineChart: typeof import('./components/Echart/LineChart.vue')['default'] + Map: typeof import('./components/map/index.vue')['default'] MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] diff --git a/src/components/map/index.vue b/src/components/map/index.vue new file mode 100644 index 0000000..63ee0a9 --- /dev/null +++ b/src/components/map/index.vue @@ -0,0 +1,133 @@ + + + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..f830785 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue new file mode 100644 index 0000000..1c760ca --- /dev/null +++ b/src/views/data/electricity/components/branchAdd.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue new file mode 100644 index 0000000..7f81ed6 --- /dev/null +++ b/src/views/data/electricity/components/busbarAdd.vue @@ -0,0 +1,288 @@ + + + + + + diff --git a/src/views/data/electricity/components/deviceAdd.vue b/src/views/data/electricity/components/deviceAdd.vue new file mode 100644 index 0000000..3bad63d --- /dev/null +++ b/src/views/data/electricity/components/deviceAdd.vue @@ -0,0 +1,220 @@ + + + + + + diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue new file mode 100644 index 0000000..8d137c0 --- /dev/null +++ b/src/views/data/electricity/components/networkBranch.vue @@ -0,0 +1,192 @@ + + + + diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue new file mode 100644 index 0000000..5386ea1 --- /dev/null +++ b/src/views/data/electricity/components/networkBusbar.vue @@ -0,0 +1,193 @@ + + + + diff --git a/src/views/data/electricity/device.vue b/src/views/data/electricity/device.vue new file mode 100644 index 0000000..1c66e48 --- /dev/null +++ b/src/views/data/electricity/device.vue @@ -0,0 +1,179 @@ + + + + diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue index 4275323..881f988 100644 --- a/src/views/data/electricity/index.vue +++ b/src/views/data/electricity/index.vue @@ -2,6 +2,7 @@ + + + + + + diff --git a/src/router/modules/dashboard.ts b/src/router/modules/dashboard.ts new file mode 100644 index 0000000..7f6df80 --- /dev/null +++ b/src/router/modules/dashboard.ts @@ -0,0 +1,33 @@ +// 碳足迹预警 +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') +const routes: Route.recordRaw[] = [ + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard/index', + name: 'Dashboard', + meta: { + title: '首页', + icon: 'ep:key', + auth: '/dashboard', + }, + children: [ + { + path: 'index', + name: 'index', + component: () => import('@/views/dashboard/index.vue'), + meta: { + title: '首页', + auth: '/dashboard', + sidebar: false, + breadcrumb: true, + activeMenu: '/dashboard', + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 5b4eba3..249f816 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import footprintRoute from './modules/carbonFootprint' import evaluateRoute from './modules/carbonEvaluate' import warningRoute from './modules/carbonWarning' +import dashboard from './modules/dashboard' // import decisionRoute from './modules/carbonDecision' import countRoute from './modules/carbonCount' import type { Route } from '@/global' @@ -17,7 +18,7 @@ path: '/', redirect: '/dashboard', meta: { - title: '', + title: '首页', }, }, { @@ -123,6 +124,16 @@ // }, { meta: { + title: '首页', + icon: '', + auth: '/dashboard', + }, + children: [ + ...dashboard, + ], + }, + { + meta: { title: '碳足迹监测', icon: '', auth: '/footprint', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..f830785 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,34 @@ + + + + + + diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue new file mode 100644 index 0000000..1c760ca --- /dev/null +++ b/src/views/data/electricity/components/branchAdd.vue @@ -0,0 +1,276 @@ + + + + + + diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue new file mode 100644 index 0000000..7f81ed6 --- /dev/null +++ b/src/views/data/electricity/components/busbarAdd.vue @@ -0,0 +1,288 @@ + + + + + + diff --git a/src/views/data/electricity/components/deviceAdd.vue b/src/views/data/electricity/components/deviceAdd.vue new file mode 100644 index 0000000..3bad63d --- /dev/null +++ b/src/views/data/electricity/components/deviceAdd.vue @@ -0,0 +1,220 @@ + + + + + + diff --git a/src/views/data/electricity/components/networkBranch.vue b/src/views/data/electricity/components/networkBranch.vue new file mode 100644 index 0000000..8d137c0 --- /dev/null +++ b/src/views/data/electricity/components/networkBranch.vue @@ -0,0 +1,192 @@ + + + + diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue new file mode 100644 index 0000000..5386ea1 --- /dev/null +++ b/src/views/data/electricity/components/networkBusbar.vue @@ -0,0 +1,193 @@ + + + + diff --git a/src/views/data/electricity/device.vue b/src/views/data/electricity/device.vue new file mode 100644 index 0000000..1c66e48 --- /dev/null +++ b/src/views/data/electricity/device.vue @@ -0,0 +1,179 @@ + + + + diff --git a/src/views/data/electricity/index.vue b/src/views/data/electricity/index.vue index 4275323..881f988 100644 --- a/src/views/data/electricity/index.vue +++ b/src/views/data/electricity/index.vue @@ -2,6 +2,7 @@