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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} 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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] 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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue index 44fe758..ab7969e 100644 --- a/src/views/alarm/index.vue +++ b/src/views/alarm/index.vue @@ -1,6 +1,219 @@ - + 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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue index 44fe758..ab7969e 100644 --- a/src/views/alarm/index.vue +++ b/src/views/alarm/index.vue @@ -1,6 +1,219 @@ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 8afc1aa..988d7d3 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,6 +1,23 @@ + + + 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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue index 44fe758..ab7969e 100644 --- a/src/views/alarm/index.vue +++ b/src/views/alarm/index.vue @@ -1,6 +1,219 @@ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 8afc1aa..988d7d3 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,6 +1,23 @@ + + + diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue new file mode 100644 index 0000000..2cae12f --- /dev/null +++ b/src/views/dashboard/map/index.vue @@ -0,0 +1,154 @@ + + + + + + + + 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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue index 44fe758..ab7969e 100644 --- a/src/views/alarm/index.vue +++ b/src/views/alarm/index.vue @@ -1,6 +1,219 @@ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 8afc1aa..988d7d3 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,6 +1,23 @@ + + + diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue new file mode 100644 index 0000000..2cae12f --- /dev/null +++ b/src/views/dashboard/map/index.vue @@ -0,0 +1,154 @@ + + + + + + + + diff --git a/src/views/device/index.vue b/src/views/device/index.vue index a7bd609..02e985a 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -1,6 +1,218 @@ - + 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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue index 44fe758..ab7969e 100644 --- a/src/views/alarm/index.vue +++ b/src/views/alarm/index.vue @@ -1,6 +1,219 @@ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 8afc1aa..988d7d3 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,6 +1,23 @@ + + + diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue new file mode 100644 index 0000000..2cae12f --- /dev/null +++ b/src/views/dashboard/map/index.vue @@ -0,0 +1,154 @@ + + + + + + + + diff --git a/src/views/device/index.vue b/src/views/device/index.vue index a7bd609..02e985a 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -1,6 +1,218 @@ - + diff --git a/src/views/person/index.vue b/src/views/person/index.vue index 8223770..75f6b22 100644 --- a/src/views/person/index.vue +++ b/src/views/person/index.vue @@ -1,6 +1,226 @@ - + 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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue index 44fe758..ab7969e 100644 --- a/src/views/alarm/index.vue +++ b/src/views/alarm/index.vue @@ -1,6 +1,219 @@ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 8afc1aa..988d7d3 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,6 +1,23 @@ + + + diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue new file mode 100644 index 0000000..2cae12f --- /dev/null +++ b/src/views/dashboard/map/index.vue @@ -0,0 +1,154 @@ + + + + + + + + diff --git a/src/views/device/index.vue b/src/views/device/index.vue index a7bd609..02e985a 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -1,6 +1,218 @@ - + diff --git a/src/views/person/index.vue b/src/views/person/index.vue index 8223770..75f6b22 100644 --- a/src/views/person/index.vue +++ b/src/views/person/index.vue @@ -1,6 +1,226 @@ - + diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue new file mode 100644 index 0000000..6b9ba2c --- /dev/null +++ b/src/views/person/personEdit.vue @@ -0,0 +1,249 @@ + + + + + + + + + + + + + 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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue index 44fe758..ab7969e 100644 --- a/src/views/alarm/index.vue +++ b/src/views/alarm/index.vue @@ -1,6 +1,219 @@ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 8afc1aa..988d7d3 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,6 +1,23 @@ + + + diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue new file mode 100644 index 0000000..2cae12f --- /dev/null +++ b/src/views/dashboard/map/index.vue @@ -0,0 +1,154 @@ + + + + + + + + diff --git a/src/views/device/index.vue b/src/views/device/index.vue index a7bd609..02e985a 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -1,6 +1,218 @@ - + diff --git a/src/views/person/index.vue b/src/views/person/index.vue index 8223770..75f6b22 100644 --- a/src/views/person/index.vue +++ b/src/views/person/index.vue @@ -1,6 +1,226 @@ - + diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue new file mode 100644 index 0000000..6b9ba2c --- /dev/null +++ b/src/views/person/personEdit.vue @@ -0,0 +1,249 @@ + + + + + + + + + + + + + diff --git a/src/views/person/personEditDialog.vue b/src/views/person/personEditDialog.vue new file mode 100644 index 0000000..4d978f0 --- /dev/null +++ b/src/views/person/personEditDialog.vue @@ -0,0 +1,216 @@ + + + + + + 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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue index 44fe758..ab7969e 100644 --- a/src/views/alarm/index.vue +++ b/src/views/alarm/index.vue @@ -1,6 +1,219 @@ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 8afc1aa..988d7d3 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,6 +1,23 @@ + + + diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue new file mode 100644 index 0000000..2cae12f --- /dev/null +++ b/src/views/dashboard/map/index.vue @@ -0,0 +1,154 @@ + + + + + + + + diff --git a/src/views/device/index.vue b/src/views/device/index.vue index a7bd609..02e985a 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -1,6 +1,218 @@ - + diff --git a/src/views/person/index.vue b/src/views/person/index.vue index 8223770..75f6b22 100644 --- a/src/views/person/index.vue +++ b/src/views/person/index.vue @@ -1,6 +1,226 @@ - + diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue new file mode 100644 index 0000000..6b9ba2c --- /dev/null +++ b/src/views/person/personEdit.vue @@ -0,0 +1,249 @@ + + + + + + + + + + + + + diff --git a/src/views/person/personEditDialog.vue b/src/views/person/personEditDialog.vue new file mode 100644 index 0000000..4d978f0 --- /dev/null +++ b/src/views/person/personEditDialog.vue @@ -0,0 +1,216 @@ + + + + + + diff --git a/src/views/person/photograph.vue b/src/views/person/photograph.vue new file mode 100644 index 0000000..26552b5 --- /dev/null +++ b/src/views/person/photograph.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 64aa9b4..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 @@ -75,6 +76,7 @@ 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 @@ -152,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'} diff --git a/src/router/modules/person.ts b/src/router/modules/person.ts index 53d011c..5366ecc 100644 --- a/src/router/modules/person.ts +++ b/src/router/modules/person.ts @@ -26,6 +26,18 @@ activeMenu: '/person', }, }, + { + path: 'personedit', + name: 'personedit', + component: () => import('@/views/person/personEdit.vue'), + meta: { + title: '人员编辑/:id?', + auth: '/person', + sidebar: false, + breadcrumb: true, + activeMenu: '/person', + }, + }, ], }, ] diff --git a/src/views/alarm/index.vue b/src/views/alarm/index.vue index 44fe758..ab7969e 100644 --- a/src/views/alarm/index.vue +++ b/src/views/alarm/index.vue @@ -1,6 +1,219 @@ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 8afc1aa..988d7d3 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,6 +1,23 @@ + + + diff --git a/src/views/dashboard/map/index.vue b/src/views/dashboard/map/index.vue new file mode 100644 index 0000000..2cae12f --- /dev/null +++ b/src/views/dashboard/map/index.vue @@ -0,0 +1,154 @@ + + + + + + + + diff --git a/src/views/device/index.vue b/src/views/device/index.vue index a7bd609..02e985a 100644 --- a/src/views/device/index.vue +++ b/src/views/device/index.vue @@ -1,6 +1,218 @@ - + diff --git a/src/views/person/index.vue b/src/views/person/index.vue index 8223770..75f6b22 100644 --- a/src/views/person/index.vue +++ b/src/views/person/index.vue @@ -1,6 +1,226 @@ - + diff --git a/src/views/person/personEdit.vue b/src/views/person/personEdit.vue new file mode 100644 index 0000000..6b9ba2c --- /dev/null +++ b/src/views/person/personEdit.vue @@ -0,0 +1,249 @@ + + + + + + + + + + + + + diff --git a/src/views/person/personEditDialog.vue b/src/views/person/personEditDialog.vue new file mode 100644 index 0000000..4d978f0 --- /dev/null +++ b/src/views/person/personEditDialog.vue @@ -0,0 +1,216 @@ + + + + + + diff --git a/src/views/person/photograph.vue b/src/views/person/photograph.vue new file mode 100644 index 0000000..26552b5 --- /dev/null +++ b/src/views/person/photograph.vue @@ -0,0 +1,179 @@ + + + + + + diff --git a/src/views/scene/index.vue b/src/views/scene/index.vue index d05ad27..24a7a6a 100644 --- a/src/views/scene/index.vue +++ b/src/views/scene/index.vue @@ -1,6 +1,271 @@ - +