diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index 3b81fac..6ff434f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -111,9 +111,7 @@ icon: '', auth: '/home', }, - children: [ - ...homeRoute, - ], + children: homeRoute, }, { meta: { diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index 3b81fac..6ff434f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -111,9 +111,7 @@ icon: '', auth: '/home', }, - children: [ - ...homeRoute, - ], + children: homeRoute, }, { meta: { diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts new file mode 100644 index 0000000..64ebf92 --- /dev/null +++ b/src/store/modules/map.ts @@ -0,0 +1,16 @@ +// 地图相关 + +const useMapStore = defineStore( + // 唯一ID + 'user', + { + state: () => ({ + amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 + amapKey: 'e1733551f35b56f6d8e9c0a9d4c2523b', // 高德地图key + }), + getters: {}, + actions: {}, + }, +) + +export default useMapStore diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index 3b81fac..6ff434f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -111,9 +111,7 @@ icon: '', auth: '/home', }, - children: [ - ...homeRoute, - ], + children: homeRoute, }, { meta: { diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts new file mode 100644 index 0000000..64ebf92 --- /dev/null +++ b/src/store/modules/map.ts @@ -0,0 +1,16 @@ +// 地图相关 + +const useMapStore = defineStore( + // 唯一ID + 'user', + { + state: () => ({ + amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 + amapKey: 'e1733551f35b56f6d8e9c0a9d4c2523b', // 高德地图key + }), + getters: {}, + actions: {}, + }, +) + +export default useMapStore diff --git a/src/views/home/components/map.vue b/src/views/home/components/map.vue new file mode 100644 index 0000000..3194f1b --- /dev/null +++ b/src/views/home/components/map.vue @@ -0,0 +1 @@ + diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index 3b81fac..6ff434f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -111,9 +111,7 @@ icon: '', auth: '/home', }, - children: [ - ...homeRoute, - ], + children: homeRoute, }, { meta: { diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts new file mode 100644 index 0000000..64ebf92 --- /dev/null +++ b/src/store/modules/map.ts @@ -0,0 +1,16 @@ +// 地图相关 + +const useMapStore = defineStore( + // 唯一ID + 'user', + { + state: () => ({ + amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 + amapKey: 'e1733551f35b56f6d8e9c0a9d4c2523b', // 高德地图key + }), + getters: {}, + actions: {}, + }, +) + +export default useMapStore diff --git a/src/views/home/components/map.vue b/src/views/home/components/map.vue new file mode 100644 index 0000000..3194f1b --- /dev/null +++ b/src/views/home/components/map.vue @@ -0,0 +1 @@ + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index ed6d061..d8de445 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,11 +1,55 @@ diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index 3b81fac..6ff434f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -111,9 +111,7 @@ icon: '', auth: '/home', }, - children: [ - ...homeRoute, - ], + children: homeRoute, }, { meta: { diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts new file mode 100644 index 0000000..64ebf92 --- /dev/null +++ b/src/store/modules/map.ts @@ -0,0 +1,16 @@ +// 地图相关 + +const useMapStore = defineStore( + // 唯一ID + 'user', + { + state: () => ({ + amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 + amapKey: 'e1733551f35b56f6d8e9c0a9d4c2523b', // 高德地图key + }), + getters: {}, + actions: {}, + }, +) + +export default useMapStore diff --git a/src/views/home/components/map.vue b/src/views/home/components/map.vue new file mode 100644 index 0000000..3194f1b --- /dev/null +++ b/src/views/home/components/map.vue @@ -0,0 +1 @@ + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index ed6d061..d8de445 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,11 +1,55 @@ diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue new file mode 100644 index 0000000..89977d3 --- /dev/null +++ b/src/views/inspection/gas/detail.vue @@ -0,0 +1,8 @@ + + + + diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index 3b81fac..6ff434f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -111,9 +111,7 @@ icon: '', auth: '/home', }, - children: [ - ...homeRoute, - ], + children: homeRoute, }, { meta: { diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts new file mode 100644 index 0000000..64ebf92 --- /dev/null +++ b/src/store/modules/map.ts @@ -0,0 +1,16 @@ +// 地图相关 + +const useMapStore = defineStore( + // 唯一ID + 'user', + { + state: () => ({ + amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 + amapKey: 'e1733551f35b56f6d8e9c0a9d4c2523b', // 高德地图key + }), + getters: {}, + actions: {}, + }, +) + +export default useMapStore diff --git a/src/views/home/components/map.vue b/src/views/home/components/map.vue new file mode 100644 index 0000000..3194f1b --- /dev/null +++ b/src/views/home/components/map.vue @@ -0,0 +1 @@ + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index ed6d061..d8de445 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,11 +1,55 @@ diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue new file mode 100644 index 0000000..89977d3 --- /dev/null +++ b/src/views/inspection/gas/detail.vue @@ -0,0 +1,8 @@ + + + + diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue index a19a460..ff21353 100644 --- a/src/views/inspection/gas/list.vue +++ b/src/views/inspection/gas/list.vue @@ -152,7 +152,7 @@ // 详情或者编辑 const handleEdit = (row: IList, pageType: 'edit' | 'detail') => { - // $router.push({ path: `/businessSettlement/${pageType}/${row.id}` }) + $router.push({ path: `/gasAlarm/${pageType}/${row.id}` }) } const alarmStatusMap = ref([]) // 报警状态 diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index 3b81fac..6ff434f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -111,9 +111,7 @@ icon: '', auth: '/home', }, - children: [ - ...homeRoute, - ], + children: homeRoute, }, { meta: { diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts new file mode 100644 index 0000000..64ebf92 --- /dev/null +++ b/src/store/modules/map.ts @@ -0,0 +1,16 @@ +// 地图相关 + +const useMapStore = defineStore( + // 唯一ID + 'user', + { + state: () => ({ + amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 + amapKey: 'e1733551f35b56f6d8e9c0a9d4c2523b', // 高德地图key + }), + getters: {}, + actions: {}, + }, +) + +export default useMapStore diff --git a/src/views/home/components/map.vue b/src/views/home/components/map.vue new file mode 100644 index 0000000..3194f1b --- /dev/null +++ b/src/views/home/components/map.vue @@ -0,0 +1 @@ + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index ed6d061..d8de445 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,11 +1,55 @@ diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue new file mode 100644 index 0000000..89977d3 --- /dev/null +++ b/src/views/inspection/gas/detail.vue @@ -0,0 +1,8 @@ + + + + diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue index a19a460..ff21353 100644 --- a/src/views/inspection/gas/list.vue +++ b/src/views/inspection/gas/list.vue @@ -152,7 +152,7 @@ // 详情或者编辑 const handleEdit = (row: IList, pageType: 'edit' | 'detail') => { - // $router.push({ path: `/businessSettlement/${pageType}/${row.id}` }) + $router.push({ path: `/gasAlarm/${pageType}/${row.id}` }) } const alarmStatusMap = ref([]) // 报警状态 diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue new file mode 100644 index 0000000..c2ea78b --- /dev/null +++ b/src/views/inspection/task/detail.vue @@ -0,0 +1,8 @@ + + + + diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index 3b81fac..6ff434f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -111,9 +111,7 @@ icon: '', auth: '/home', }, - children: [ - ...homeRoute, - ], + children: homeRoute, }, { meta: { diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts new file mode 100644 index 0000000..64ebf92 --- /dev/null +++ b/src/store/modules/map.ts @@ -0,0 +1,16 @@ +// 地图相关 + +const useMapStore = defineStore( + // 唯一ID + 'user', + { + state: () => ({ + amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 + amapKey: 'e1733551f35b56f6d8e9c0a9d4c2523b', // 高德地图key + }), + getters: {}, + actions: {}, + }, +) + +export default useMapStore diff --git a/src/views/home/components/map.vue b/src/views/home/components/map.vue new file mode 100644 index 0000000..3194f1b --- /dev/null +++ b/src/views/home/components/map.vue @@ -0,0 +1 @@ + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index ed6d061..d8de445 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,11 +1,55 @@ diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue new file mode 100644 index 0000000..89977d3 --- /dev/null +++ b/src/views/inspection/gas/detail.vue @@ -0,0 +1,8 @@ + + + + diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue index a19a460..ff21353 100644 --- a/src/views/inspection/gas/list.vue +++ b/src/views/inspection/gas/list.vue @@ -152,7 +152,7 @@ // 详情或者编辑 const handleEdit = (row: IList, pageType: 'edit' | 'detail') => { - // $router.push({ path: `/businessSettlement/${pageType}/${row.id}` }) + $router.push({ path: `/gasAlarm/${pageType}/${row.id}` }) } const alarmStatusMap = ref([]) // 报警状态 diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue new file mode 100644 index 0000000..c2ea78b --- /dev/null +++ b/src/views/inspection/task/detail.vue @@ -0,0 +1,8 @@ + + + + diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue index f5d3dcb..268c876 100644 --- a/src/views/inspection/task/list.vue +++ b/src/views/inspection/task/list.vue @@ -154,7 +154,7 @@ // 详情或者编辑 const handleEdit = (row: IList, pageType: 'edit' | 'detail') => { - // $router.push({ path: `/businessSettlement/${pageType}/${row.id}` }) + $router.push({ path: `/task/${pageType}/${row.id}` }) } // 删除 diff --git a/package.json b/package.json index f840022..98ff571 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", @@ -25,6 +26,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.1.3", + "coordtransform": "^2.1.2", "dayjs": "^1.11.6", "echarts": "^5.4.1", "element-plus": "^2.2.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 372f27b..4c30d93 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 @@ -20,6 +21,7 @@ autoprefixer: ^10.4.13 axios: ^1.1.3 bumpp: ^8.2.1 + coordtransform: ^2.1.2 cz-git: ^1.3.12 dayjs: ^1.11.6 echarts: ^5.4.1 @@ -77,6 +79,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 @@ -84,6 +87,7 @@ '@wangeditor/editor': 5.1.23 '@wangeditor/editor-for-vue': 5.1.12_jd77brrjgbuqi7h246utbcjone axios: 1.1.3 + coordtransform: 2.1.2 dayjs: 1.11.6 echarts: registry.npmmirror.com/echarts/5.4.1 element-plus: registry.npmmirror.com/element-plus/2.2.26_vue@3.2.44 @@ -156,6 +160,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'} @@ -2406,6 +2414,10 @@ resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} dev: true + /coordtransform/2.1.2: + resolution: {integrity: sha512-0xLJApBlrUP+clyLJWIaqg4GXE5JTbAJb5d/CDMqebIksAMMze8eAyO6YfHEIxWJ+c42mXoMHBzWTeUrG7RFhw==} + dev: false + /copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==} engines: {node: '>=0.10.0'} diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index cab582a..6dc9515 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/home/map', + redirect: '/map', name: 'Home', meta: { title: '首页', diff --git a/src/router/modules/inspection.ts b/src/router/modules/inspection.ts index 1db54b9..9b1f3ef 100644 --- a/src/router/modules/inspection.ts +++ b/src/router/modules/inspection.ts @@ -37,6 +37,18 @@ activeMenu: '/task', }, }, + { + path: ':type/:id?', + name: 'TaskDetail', + component: () => import('@/views/inspection/task/detail.vue'), + meta: { + title: '巡检任务管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/task/list', + }, + }, ], }, { @@ -62,6 +74,18 @@ activeMenu: '/gasAlarm', }, }, + { + path: ':type/:id?', + name: 'gasAlarmDetail', + component: () => import('@/views/inspection/gas/detail.vue'), + meta: { + title: '燃气报警管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/gasAlarm/list', + }, + }, ], }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index 3b81fac..6ff434f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -111,9 +111,7 @@ icon: '', auth: '/home', }, - children: [ - ...homeRoute, - ], + children: homeRoute, }, { meta: { diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts new file mode 100644 index 0000000..64ebf92 --- /dev/null +++ b/src/store/modules/map.ts @@ -0,0 +1,16 @@ +// 地图相关 + +const useMapStore = defineStore( + // 唯一ID + 'user', + { + state: () => ({ + amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 + amapKey: 'e1733551f35b56f6d8e9c0a9d4c2523b', // 高德地图key + }), + getters: {}, + actions: {}, + }, +) + +export default useMapStore diff --git a/src/views/home/components/map.vue b/src/views/home/components/map.vue new file mode 100644 index 0000000..3194f1b --- /dev/null +++ b/src/views/home/components/map.vue @@ -0,0 +1 @@ + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index ed6d061..d8de445 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,11 +1,55 @@ diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue new file mode 100644 index 0000000..89977d3 --- /dev/null +++ b/src/views/inspection/gas/detail.vue @@ -0,0 +1,8 @@ + + + + diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue index a19a460..ff21353 100644 --- a/src/views/inspection/gas/list.vue +++ b/src/views/inspection/gas/list.vue @@ -152,7 +152,7 @@ // 详情或者编辑 const handleEdit = (row: IList, pageType: 'edit' | 'detail') => { - // $router.push({ path: `/businessSettlement/${pageType}/${row.id}` }) + $router.push({ path: `/gasAlarm/${pageType}/${row.id}` }) } const alarmStatusMap = ref([]) // 报警状态 diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue new file mode 100644 index 0000000..c2ea78b --- /dev/null +++ b/src/views/inspection/task/detail.vue @@ -0,0 +1,8 @@ + + + + diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue index f5d3dcb..268c876 100644 --- a/src/views/inspection/task/list.vue +++ b/src/views/inspection/task/list.vue @@ -154,7 +154,7 @@ // 详情或者编辑 const handleEdit = (row: IList, pageType: 'edit' | 'detail') => { - // $router.push({ path: `/businessSettlement/${pageType}/${row.id}` }) + $router.push({ path: `/task/${pageType}/${row.id}` }) } // 删除 diff --git a/src/views/login.vue b/src/views/login.vue index 33c03bb..6ad74a3 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -208,7 +208,7 @@