diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..e272487 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -40,6 +40,9 @@ 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/Map.vue')['default'] + Map11: typeof import('./components/map/map11.vue')['default'] + Map22: typeof import('./components/map/map22.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/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..e272487 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -40,6 +40,9 @@ 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/Map.vue')['default'] + Map11: typeof import('./components/map/map11.vue')['default'] + Map22: typeof import('./components/map/map22.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/Map.vue b/src/components/map/Map.vue new file mode 100644 index 0000000..3a990d3 --- /dev/null +++ b/src/components/map/Map.vue @@ -0,0 +1,64 @@ + + + + diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..e272487 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -40,6 +40,9 @@ 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/Map.vue')['default'] + Map11: typeof import('./components/map/map11.vue')['default'] + Map22: typeof import('./components/map/map22.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/Map.vue b/src/components/map/Map.vue new file mode 100644 index 0000000..3a990d3 --- /dev/null +++ b/src/components/map/Map.vue @@ -0,0 +1,64 @@ + + + + diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 6dc9515..493fe80 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/map', + redirect: '/home/map', name: 'Home', meta: { title: '首页', @@ -15,7 +15,7 @@ }, children: [ { - path: '/map', + path: 'map', component: () => import('@/views/home/index.vue'), name: 'HomeMap', meta: { @@ -24,11 +24,11 @@ auth: '/home/map', sidebar: false, breadcrumb: false, + activeMenu: '/home', }, }, ], }, - ] export default routes diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..e272487 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -40,6 +40,9 @@ 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/Map.vue')['default'] + Map11: typeof import('./components/map/map11.vue')['default'] + Map22: typeof import('./components/map/map22.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/Map.vue b/src/components/map/Map.vue new file mode 100644 index 0000000..3a990d3 --- /dev/null +++ b/src/components/map/Map.vue @@ -0,0 +1,64 @@ + + + + diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 6dc9515..493fe80 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/map', + redirect: '/home/map', name: 'Home', meta: { title: '首页', @@ -15,7 +15,7 @@ }, children: [ { - path: '/map', + path: 'map', component: () => import('@/views/home/index.vue'), name: 'HomeMap', meta: { @@ -24,11 +24,11 @@ auth: '/home/map', sidebar: false, breadcrumb: false, + activeMenu: '/home', }, }, ], }, - ] export default routes diff --git a/src/router/modules/main.ts b/src/router/modules/main.ts new file mode 100644 index 0000000..ce6dc76 --- /dev/null +++ b/src/router/modules/main.ts @@ -0,0 +1,108 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/recognition', + component: Layout, + redirect: '/map1', + name: 'recognition', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + }, + children: [ + { + path: '/map2', + component: () => import('@/views/recognition/index.vue'), + name: 'recognitionMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/analyse', + component: Layout, + redirect: '/map3', + name: 'analyse', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + }, + children: [ + { + path: '/map4', + component: () => import('@/views/recognition/index.vue'), + name: 'analyseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/database', + component: Layout, + redirect: '/map5', + name: 'database', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + }, + children: [ + { + path: '/map6', + component: () => import('@/views/recognition/index.vue'), + name: 'databaseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/undergroundCavity', + component: Layout, + redirect: '/map7', + name: 'undergroundCavity', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + }, + children: [ + { + path: '/map8', + component: () => import('@/views/recognition/index.vue'), + name: 'undergroundCavityMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, +] + +export default routes diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..e272487 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -40,6 +40,9 @@ 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/Map.vue')['default'] + Map11: typeof import('./components/map/map11.vue')['default'] + Map22: typeof import('./components/map/map22.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/Map.vue b/src/components/map/Map.vue new file mode 100644 index 0000000..3a990d3 --- /dev/null +++ b/src/components/map/Map.vue @@ -0,0 +1,64 @@ + + + + diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 6dc9515..493fe80 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/map', + redirect: '/home/map', name: 'Home', meta: { title: '首页', @@ -15,7 +15,7 @@ }, children: [ { - path: '/map', + path: 'map', component: () => import('@/views/home/index.vue'), name: 'HomeMap', meta: { @@ -24,11 +24,11 @@ auth: '/home/map', sidebar: false, breadcrumb: false, + activeMenu: '/home', }, }, ], }, - ] export default routes diff --git a/src/router/modules/main.ts b/src/router/modules/main.ts new file mode 100644 index 0000000..ce6dc76 --- /dev/null +++ b/src/router/modules/main.ts @@ -0,0 +1,108 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/recognition', + component: Layout, + redirect: '/map1', + name: 'recognition', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + }, + children: [ + { + path: '/map2', + component: () => import('@/views/recognition/index.vue'), + name: 'recognitionMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/analyse', + component: Layout, + redirect: '/map3', + name: 'analyse', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + }, + children: [ + { + path: '/map4', + component: () => import('@/views/recognition/index.vue'), + name: 'analyseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/database', + component: Layout, + redirect: '/map5', + name: 'database', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + }, + children: [ + { + path: '/map6', + component: () => import('@/views/recognition/index.vue'), + name: 'databaseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/undergroundCavity', + component: Layout, + redirect: '/map7', + name: 'undergroundCavity', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + }, + children: [ + { + path: '/map8', + component: () => import('@/views/recognition/index.vue'), + name: 'undergroundCavityMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index e686132..19a4047 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -14,31 +14,31 @@ auth: '/system', }, children: [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, + // { + // path: '/area', + // component: Layout, + // redirect: '/area/list', + // name: 'AreaManage', + // meta: { + // title: '区域管理', + // icon: 'ep:key', + // auth: '/sys/area', + // }, + // children: [ + // { + // path: 'list', + // name: 'AreaList', + // component: () => import('@/views/system/area/listArea.vue'), + // meta: { + // title: '区域管理', + // auth: '/sys/area', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/area', + // }, + // }, + // ], + // }, { path: '/resource', component: Layout, diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..e272487 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -40,6 +40,9 @@ 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/Map.vue')['default'] + Map11: typeof import('./components/map/map11.vue')['default'] + Map22: typeof import('./components/map/map22.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/Map.vue b/src/components/map/Map.vue new file mode 100644 index 0000000..3a990d3 --- /dev/null +++ b/src/components/map/Map.vue @@ -0,0 +1,64 @@ + + + + diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 6dc9515..493fe80 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/map', + redirect: '/home/map', name: 'Home', meta: { title: '首页', @@ -15,7 +15,7 @@ }, children: [ { - path: '/map', + path: 'map', component: () => import('@/views/home/index.vue'), name: 'HomeMap', meta: { @@ -24,11 +24,11 @@ auth: '/home/map', sidebar: false, breadcrumb: false, + activeMenu: '/home', }, }, ], }, - ] export default routes diff --git a/src/router/modules/main.ts b/src/router/modules/main.ts new file mode 100644 index 0000000..ce6dc76 --- /dev/null +++ b/src/router/modules/main.ts @@ -0,0 +1,108 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/recognition', + component: Layout, + redirect: '/map1', + name: 'recognition', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + }, + children: [ + { + path: '/map2', + component: () => import('@/views/recognition/index.vue'), + name: 'recognitionMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/analyse', + component: Layout, + redirect: '/map3', + name: 'analyse', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + }, + children: [ + { + path: '/map4', + component: () => import('@/views/recognition/index.vue'), + name: 'analyseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/database', + component: Layout, + redirect: '/map5', + name: 'database', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + }, + children: [ + { + path: '/map6', + component: () => import('@/views/recognition/index.vue'), + name: 'databaseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/undergroundCavity', + component: Layout, + redirect: '/map7', + name: 'undergroundCavity', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + }, + children: [ + { + path: '/map8', + component: () => import('@/views/recognition/index.vue'), + name: 'undergroundCavityMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index e686132..19a4047 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -14,31 +14,31 @@ auth: '/system', }, children: [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, + // { + // path: '/area', + // component: Layout, + // redirect: '/area/list', + // name: 'AreaManage', + // meta: { + // title: '区域管理', + // icon: 'ep:key', + // auth: '/sys/area', + // }, + // children: [ + // { + // path: 'list', + // name: 'AreaList', + // component: () => import('@/views/system/area/listArea.vue'), + // meta: { + // title: '区域管理', + // auth: '/sys/area', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/area', + // }, + // }, + // ], + // }, { path: '/resource', component: Layout, diff --git a/src/router/routes.ts b/src/router/routes.ts index 6ff434f..56e83b3 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -2,6 +2,7 @@ import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' import homeRoute from './modules/home' +import MainRoute from './modules/main' import inspectionRoute from './modules/inspection' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -125,6 +126,14 @@ }, { meta: { + title: '第三方施工智能识别管理', + icon: '', + auth: '/recognition', + }, + children: MainRoute, + }, + { + meta: { title: '系统设置', icon: '', auth: '/system', diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..e272487 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -40,6 +40,9 @@ 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/Map.vue')['default'] + Map11: typeof import('./components/map/map11.vue')['default'] + Map22: typeof import('./components/map/map22.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/Map.vue b/src/components/map/Map.vue new file mode 100644 index 0000000..3a990d3 --- /dev/null +++ b/src/components/map/Map.vue @@ -0,0 +1,64 @@ + + + + diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 6dc9515..493fe80 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/map', + redirect: '/home/map', name: 'Home', meta: { title: '首页', @@ -15,7 +15,7 @@ }, children: [ { - path: '/map', + path: 'map', component: () => import('@/views/home/index.vue'), name: 'HomeMap', meta: { @@ -24,11 +24,11 @@ auth: '/home/map', sidebar: false, breadcrumb: false, + activeMenu: '/home', }, }, ], }, - ] export default routes diff --git a/src/router/modules/main.ts b/src/router/modules/main.ts new file mode 100644 index 0000000..ce6dc76 --- /dev/null +++ b/src/router/modules/main.ts @@ -0,0 +1,108 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/recognition', + component: Layout, + redirect: '/map1', + name: 'recognition', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + }, + children: [ + { + path: '/map2', + component: () => import('@/views/recognition/index.vue'), + name: 'recognitionMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/analyse', + component: Layout, + redirect: '/map3', + name: 'analyse', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + }, + children: [ + { + path: '/map4', + component: () => import('@/views/recognition/index.vue'), + name: 'analyseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/database', + component: Layout, + redirect: '/map5', + name: 'database', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + }, + children: [ + { + path: '/map6', + component: () => import('@/views/recognition/index.vue'), + name: 'databaseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/undergroundCavity', + component: Layout, + redirect: '/map7', + name: 'undergroundCavity', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + }, + children: [ + { + path: '/map8', + component: () => import('@/views/recognition/index.vue'), + name: 'undergroundCavityMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index e686132..19a4047 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -14,31 +14,31 @@ auth: '/system', }, children: [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, + // { + // path: '/area', + // component: Layout, + // redirect: '/area/list', + // name: 'AreaManage', + // meta: { + // title: '区域管理', + // icon: 'ep:key', + // auth: '/sys/area', + // }, + // children: [ + // { + // path: 'list', + // name: 'AreaList', + // component: () => import('@/views/system/area/listArea.vue'), + // meta: { + // title: '区域管理', + // auth: '/sys/area', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/area', + // }, + // }, + // ], + // }, { path: '/resource', component: Layout, diff --git a/src/router/routes.ts b/src/router/routes.ts index 6ff434f..56e83b3 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -2,6 +2,7 @@ import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' import homeRoute from './modules/home' +import MainRoute from './modules/main' import inspectionRoute from './modules/inspection' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -125,6 +126,14 @@ }, { meta: { + title: '第三方施工智能识别管理', + icon: '', + auth: '/recognition', + }, + children: MainRoute, + }, + { + meta: { title: '系统设置', icon: '', auth: '/system', diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts index 64ebf92..396efbc 100644 --- a/src/store/modules/map.ts +++ b/src/store/modules/map.ts @@ -2,7 +2,7 @@ const useMapStore = defineStore( // 唯一ID - 'user', + 'map', { state: () => ({ amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..e272487 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -40,6 +40,9 @@ 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/Map.vue')['default'] + Map11: typeof import('./components/map/map11.vue')['default'] + Map22: typeof import('./components/map/map22.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/Map.vue b/src/components/map/Map.vue new file mode 100644 index 0000000..3a990d3 --- /dev/null +++ b/src/components/map/Map.vue @@ -0,0 +1,64 @@ + + + + diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 6dc9515..493fe80 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/map', + redirect: '/home/map', name: 'Home', meta: { title: '首页', @@ -15,7 +15,7 @@ }, children: [ { - path: '/map', + path: 'map', component: () => import('@/views/home/index.vue'), name: 'HomeMap', meta: { @@ -24,11 +24,11 @@ auth: '/home/map', sidebar: false, breadcrumb: false, + activeMenu: '/home', }, }, ], }, - ] export default routes diff --git a/src/router/modules/main.ts b/src/router/modules/main.ts new file mode 100644 index 0000000..ce6dc76 --- /dev/null +++ b/src/router/modules/main.ts @@ -0,0 +1,108 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/recognition', + component: Layout, + redirect: '/map1', + name: 'recognition', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + }, + children: [ + { + path: '/map2', + component: () => import('@/views/recognition/index.vue'), + name: 'recognitionMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/analyse', + component: Layout, + redirect: '/map3', + name: 'analyse', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + }, + children: [ + { + path: '/map4', + component: () => import('@/views/recognition/index.vue'), + name: 'analyseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/database', + component: Layout, + redirect: '/map5', + name: 'database', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + }, + children: [ + { + path: '/map6', + component: () => import('@/views/recognition/index.vue'), + name: 'databaseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/undergroundCavity', + component: Layout, + redirect: '/map7', + name: 'undergroundCavity', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + }, + children: [ + { + path: '/map8', + component: () => import('@/views/recognition/index.vue'), + name: 'undergroundCavityMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index e686132..19a4047 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -14,31 +14,31 @@ auth: '/system', }, children: [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, + // { + // path: '/area', + // component: Layout, + // redirect: '/area/list', + // name: 'AreaManage', + // meta: { + // title: '区域管理', + // icon: 'ep:key', + // auth: '/sys/area', + // }, + // children: [ + // { + // path: 'list', + // name: 'AreaList', + // component: () => import('@/views/system/area/listArea.vue'), + // meta: { + // title: '区域管理', + // auth: '/sys/area', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/area', + // }, + // }, + // ], + // }, { path: '/resource', component: Layout, diff --git a/src/router/routes.ts b/src/router/routes.ts index 6ff434f..56e83b3 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -2,6 +2,7 @@ import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' import homeRoute from './modules/home' +import MainRoute from './modules/main' import inspectionRoute from './modules/inspection' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -125,6 +126,14 @@ }, { meta: { + title: '第三方施工智能识别管理', + icon: '', + auth: '/recognition', + }, + children: MainRoute, + }, + { + meta: { title: '系统设置', icon: '', auth: '/system', diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts index 64ebf92..396efbc 100644 --- a/src/store/modules/map.ts +++ b/src/store/modules/map.ts @@ -2,7 +2,7 @@ const useMapStore = defineStore( // 唯一ID - 'user', + 'map', { state: () => ({ amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 diff --git a/src/views/home/index.vue b/src/views/home/index.vue index d8de445..f3993e8 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,47 +1,18 @@ + diff --git a/.env.development b/.env.development index 8354952..60c8720 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 页面标题 VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11639 +VITE_APP_API_BASEURL = http://111.198.10.15:11646 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/src/assets/icons/icon-analyse.svg b/src/assets/icons/icon-analyse.svg new file mode 100644 index 0000000..be4aac5 --- /dev/null +++ b/src/assets/icons/icon-analyse.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-database.svg b/src/assets/icons/icon-database.svg new file mode 100644 index 0000000..5714704 --- /dev/null +++ b/src/assets/icons/icon-database.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-recognition.svg b/src/assets/icons/icon-recognition.svg new file mode 100644 index 0000000..b5f3d9b --- /dev/null +++ b/src/assets/icons/icon-recognition.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-undergroundCavity.svg b/src/assets/icons/icon-undergroundCavity.svg new file mode 100644 index 0000000..fb647a2 --- /dev/null +++ b/src/assets/icons/icon-undergroundCavity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components.d.ts b/src/components.d.ts index 90f2dde..e272487 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -40,6 +40,9 @@ 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/Map.vue')['default'] + Map11: typeof import('./components/map/map11.vue')['default'] + Map22: typeof import('./components/map/map22.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/Map.vue b/src/components/map/Map.vue new file mode 100644 index 0000000..3a990d3 --- /dev/null +++ b/src/components/map/Map.vue @@ -0,0 +1,64 @@ + + + + diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 6dc9515..493fe80 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -6,7 +6,7 @@ { path: '/home', component: Layout, - redirect: '/map', + redirect: '/home/map', name: 'Home', meta: { title: '首页', @@ -15,7 +15,7 @@ }, children: [ { - path: '/map', + path: 'map', component: () => import('@/views/home/index.vue'), name: 'HomeMap', meta: { @@ -24,11 +24,11 @@ auth: '/home/map', sidebar: false, breadcrumb: false, + activeMenu: '/home', }, }, ], }, - ] export default routes diff --git a/src/router/modules/main.ts b/src/router/modules/main.ts new file mode 100644 index 0000000..ce6dc76 --- /dev/null +++ b/src/router/modules/main.ts @@ -0,0 +1,108 @@ +import type { Route } from '@/global' + +const Layout = () => import('@/layouts/index.vue') + +const routes: Route.recordRaw[] = [ + { + path: '/recognition', + component: Layout, + redirect: '/map1', + name: 'recognition', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + }, + children: [ + { + path: '/map2', + component: () => import('@/views/recognition/index.vue'), + name: 'recognitionMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/recognition', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/analyse', + component: Layout, + redirect: '/map3', + name: 'analyse', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + }, + children: [ + { + path: '/map4', + component: () => import('@/views/recognition/index.vue'), + name: 'analyseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/analyse', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/database', + component: Layout, + redirect: '/map5', + name: 'database', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + }, + children: [ + { + path: '/map6', + component: () => import('@/views/recognition/index.vue'), + name: 'databaseMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/database', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, + { + path: '/undergroundCavity', + component: Layout, + redirect: '/map7', + name: 'undergroundCavity', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + }, + children: [ + { + path: '/map8', + component: () => import('@/views/recognition/index.vue'), + name: 'undergroundCavityMap', + meta: { + title: '第三方施工智能识别管理', + icon: 'ep:key', + auth: '/undergroundCavity', + sidebar: false, + breadcrumb: false, + }, + }, + ], + }, +] + +export default routes diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index e686132..19a4047 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -14,31 +14,31 @@ auth: '/system', }, children: [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, + // { + // path: '/area', + // component: Layout, + // redirect: '/area/list', + // name: 'AreaManage', + // meta: { + // title: '区域管理', + // icon: 'ep:key', + // auth: '/sys/area', + // }, + // children: [ + // { + // path: 'list', + // name: 'AreaList', + // component: () => import('@/views/system/area/listArea.vue'), + // meta: { + // title: '区域管理', + // auth: '/sys/area', + // sidebar: false, + // breadcrumb: false, + // activeMenu: '/area', + // }, + // }, + // ], + // }, { path: '/resource', component: Layout, diff --git a/src/router/routes.ts b/src/router/routes.ts index 6ff434f..56e83b3 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -2,6 +2,7 @@ import generatedRoutes from 'virtual:generated-pages' import systemRoute from './modules/system' import homeRoute from './modules/home' +import MainRoute from './modules/main' import inspectionRoute from './modules/inspection' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -125,6 +126,14 @@ }, { meta: { + title: '第三方施工智能识别管理', + icon: '', + auth: '/recognition', + }, + children: MainRoute, + }, + { + meta: { title: '系统设置', icon: '', auth: '/system', diff --git a/src/store/modules/map.ts b/src/store/modules/map.ts index 64ebf92..396efbc 100644 --- a/src/store/modules/map.ts +++ b/src/store/modules/map.ts @@ -2,7 +2,7 @@ const useMapStore = defineStore( // 唯一ID - 'user', + 'map', { state: () => ({ amapSecurityCode: '182a2c5889f7fe6d90546d9b8f4781ad', // 安全密钥 diff --git a/src/views/home/index.vue b/src/views/home/index.vue index d8de445..f3993e8 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,47 +1,18 @@ + diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue index ff21353..f6f3d68 100644 --- a/src/views/inspection/gas/list.vue +++ b/src/views/inspection/gas/list.vue @@ -65,14 +65,14 @@ } list.value = [ { - id: '1', // 主键 - alarmNo: '1', // 报警编号 - alarmTime: '1', // 报警结束时间 - alarmGasConcentration: '1', // 报警燃气浓度 - thresholdValue: '1', // 报警阈值 - taskName: '1', // 巡检任务名称 - position: '1', // 报警位置 - alarmStatus: '1', // 报警状态 + id: 'rqbj1542152632', // 主键 + alarmNo: '54215632', // 报警编号 + alarmTime: '2022-12-02 05:12:59', // 报警结束时间 + alarmGasConcentration: '10.2', // 报警燃气浓度 + thresholdValue: '43.0', // 报警阈值 + taskName: '检查各个位置的燃气浓度', // 巡检任务名称 + position: '永定路', // 报警位置 + alarmStatus: '报警', // 报警状态 }, ] // total.value = parseInt(response.data.total)