diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8f1124f..99a723c 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,12 +2,11 @@ * 人员管理接口 */ import request from '@/utils/request' -// import qs from 'qs' // 获取当前报警列表 export function getRecordList(params) { return request({ - url: '/maintain/listPage', + url: 'bridge/maintain/listPage', method: 'get', params }) diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8f1124f..99a723c 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,12 +2,11 @@ * 人员管理接口 */ import request from '@/utils/request' -// import qs from 'qs' // 获取当前报警列表 export function getRecordList(params) { return request({ - url: '/maintain/listPage', + url: 'bridge/maintain/listPage', method: 'get', params }) diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js index b8f29db..6440f03 100644 --- a/src/api/system/statistics.js +++ b/src/api/system/statistics.js @@ -7,7 +7,7 @@ // 年养护次数统计 export function countByYear(params) { return request({ - url: 'maintain/maintainCount', + url: 'bridge/maintain/maintainCount', method: 'get', params }) diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8f1124f..99a723c 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,12 +2,11 @@ * 人员管理接口 */ import request from '@/utils/request' -// import qs from 'qs' // 获取当前报警列表 export function getRecordList(params) { return request({ - url: '/maintain/listPage', + url: 'bridge/maintain/listPage', method: 'get', params }) diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js index b8f29db..6440f03 100644 --- a/src/api/system/statistics.js +++ b/src/api/system/statistics.js @@ -7,7 +7,7 @@ // 年养护次数统计 export function countByYear(params) { return request({ - url: 'maintain/maintainCount', + url: 'bridge/maintain/maintainCount', method: 'get', params }) diff --git a/src/icons/svg/icon-map.svg b/src/icons/svg/icon-map.svg new file mode 100644 index 0000000..f9ad1a5 --- /dev/null +++ b/src/icons/svg/icon-map.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8f1124f..99a723c 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,12 +2,11 @@ * 人员管理接口 */ import request from '@/utils/request' -// import qs from 'qs' // 获取当前报警列表 export function getRecordList(params) { return request({ - url: '/maintain/listPage', + url: 'bridge/maintain/listPage', method: 'get', params }) diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js index b8f29db..6440f03 100644 --- a/src/api/system/statistics.js +++ b/src/api/system/statistics.js @@ -7,7 +7,7 @@ // 年养护次数统计 export function countByYear(params) { return request({ - url: 'maintain/maintainCount', + url: 'bridge/maintain/maintainCount', method: 'get', params }) diff --git a/src/icons/svg/icon-map.svg b/src/icons/svg/icon-map.svg new file mode 100644 index 0000000..f9ad1a5 --- /dev/null +++ b/src/icons/svg/icon-map.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 48cffff..0a5a234 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,12 +8,9 @@ /* Layout */ import Layout from '@/layout/Layout' -import { overviewRouters } from './modules/overview' import { orderRouters } from './modules/order' import { bridgeRouters } from './modules/bridge' import { statisticsRouters } from './modules/statistics' -import { systemRouters } from './modules/system' -import { exampleRouters } from './modules/example' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -59,8 +56,8 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), - meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } + component: () => import('@/views/overview/overview.vue'), + meta: { title: '桥梁分布', icon: 'icon-map', noCache: true, affix: true } }] } ] @@ -74,11 +71,8 @@ // 异步挂载路由 // 动态需要根据权限加载的路由表 export const asyncRouterMap = [ - ...overviewRouters, ...orderRouters, ...bridgeRouters, ...statisticsRouters, - ...exampleRouters, - ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8f1124f..99a723c 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,12 +2,11 @@ * 人员管理接口 */ import request from '@/utils/request' -// import qs from 'qs' // 获取当前报警列表 export function getRecordList(params) { return request({ - url: '/maintain/listPage', + url: 'bridge/maintain/listPage', method: 'get', params }) diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js index b8f29db..6440f03 100644 --- a/src/api/system/statistics.js +++ b/src/api/system/statistics.js @@ -7,7 +7,7 @@ // 年养护次数统计 export function countByYear(params) { return request({ - url: 'maintain/maintainCount', + url: 'bridge/maintain/maintainCount', method: 'get', params }) diff --git a/src/icons/svg/icon-map.svg b/src/icons/svg/icon-map.svg new file mode 100644 index 0000000..f9ad1a5 --- /dev/null +++ b/src/icons/svg/icon-map.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 48cffff..0a5a234 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,12 +8,9 @@ /* Layout */ import Layout from '@/layout/Layout' -import { overviewRouters } from './modules/overview' import { orderRouters } from './modules/order' import { bridgeRouters } from './modules/bridge' import { statisticsRouters } from './modules/statistics' -import { systemRouters } from './modules/system' -import { exampleRouters } from './modules/example' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -59,8 +56,8 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), - meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } + component: () => import('@/views/overview/overview.vue'), + meta: { title: '桥梁分布', icon: 'icon-map', noCache: true, affix: true } }] } ] @@ -74,11 +71,8 @@ // 异步挂载路由 // 动态需要根据权限加载的路由表 export const asyncRouterMap = [ - ...overviewRouters, ...orderRouters, ...bridgeRouters, ...statisticsRouters, - ...exampleRouters, - ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js index 5879990..554d058 100644 --- a/src/router/modules/overview.js +++ b/src/router/modules/overview.js @@ -8,7 +8,7 @@ redirect: '/overviewBridge', name: 'OverviewBridge', meta: { - title: '运行总览', + title: '桥梁总览', icon: 'icon-overview', // 图标 permission: ['/overviewBridge']// 权限名称 }, diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8f1124f..99a723c 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,12 +2,11 @@ * 人员管理接口 */ import request from '@/utils/request' -// import qs from 'qs' // 获取当前报警列表 export function getRecordList(params) { return request({ - url: '/maintain/listPage', + url: 'bridge/maintain/listPage', method: 'get', params }) diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js index b8f29db..6440f03 100644 --- a/src/api/system/statistics.js +++ b/src/api/system/statistics.js @@ -7,7 +7,7 @@ // 年养护次数统计 export function countByYear(params) { return request({ - url: 'maintain/maintainCount', + url: 'bridge/maintain/maintainCount', method: 'get', params }) diff --git a/src/icons/svg/icon-map.svg b/src/icons/svg/icon-map.svg new file mode 100644 index 0000000..f9ad1a5 --- /dev/null +++ b/src/icons/svg/icon-map.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 48cffff..0a5a234 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,12 +8,9 @@ /* Layout */ import Layout from '@/layout/Layout' -import { overviewRouters } from './modules/overview' import { orderRouters } from './modules/order' import { bridgeRouters } from './modules/bridge' import { statisticsRouters } from './modules/statistics' -import { systemRouters } from './modules/system' -import { exampleRouters } from './modules/example' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -59,8 +56,8 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), - meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } + component: () => import('@/views/overview/overview.vue'), + meta: { title: '桥梁分布', icon: 'icon-map', noCache: true, affix: true } }] } ] @@ -74,11 +71,8 @@ // 异步挂载路由 // 动态需要根据权限加载的路由表 export const asyncRouterMap = [ - ...overviewRouters, ...orderRouters, ...bridgeRouters, ...statisticsRouters, - ...exampleRouters, - ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js index 5879990..554d058 100644 --- a/src/router/modules/overview.js +++ b/src/router/modules/overview.js @@ -8,7 +8,7 @@ redirect: '/overviewBridge', name: 'OverviewBridge', meta: { - title: '运行总览', + title: '桥梁总览', icon: 'icon-overview', // 图标 permission: ['/overviewBridge']// 权限名称 }, diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js index ce9315a..c87490d 100644 --- a/src/router/modules/statistics.js +++ b/src/router/modules/statistics.js @@ -5,7 +5,7 @@ { path: 'statisticsBridge', component: Layout, - redirect: '/statisticsBridge', + redirect: 'bridge/statisticsBridge', name: 'StatisticsBridge', meta: { title: '养护统计', diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8f1124f..99a723c 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,12 +2,11 @@ * 人员管理接口 */ import request from '@/utils/request' -// import qs from 'qs' // 获取当前报警列表 export function getRecordList(params) { return request({ - url: '/maintain/listPage', + url: 'bridge/maintain/listPage', method: 'get', params }) diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js index b8f29db..6440f03 100644 --- a/src/api/system/statistics.js +++ b/src/api/system/statistics.js @@ -7,7 +7,7 @@ // 年养护次数统计 export function countByYear(params) { return request({ - url: 'maintain/maintainCount', + url: 'bridge/maintain/maintainCount', method: 'get', params }) diff --git a/src/icons/svg/icon-map.svg b/src/icons/svg/icon-map.svg new file mode 100644 index 0000000..f9ad1a5 --- /dev/null +++ b/src/icons/svg/icon-map.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 48cffff..0a5a234 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,12 +8,9 @@ /* Layout */ import Layout from '@/layout/Layout' -import { overviewRouters } from './modules/overview' import { orderRouters } from './modules/order' import { bridgeRouters } from './modules/bridge' import { statisticsRouters } from './modules/statistics' -import { systemRouters } from './modules/system' -import { exampleRouters } from './modules/example' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -59,8 +56,8 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), - meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } + component: () => import('@/views/overview/overview.vue'), + meta: { title: '桥梁分布', icon: 'icon-map', noCache: true, affix: true } }] } ] @@ -74,11 +71,8 @@ // 异步挂载路由 // 动态需要根据权限加载的路由表 export const asyncRouterMap = [ - ...overviewRouters, ...orderRouters, ...bridgeRouters, ...statisticsRouters, - ...exampleRouters, - ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js index 5879990..554d058 100644 --- a/src/router/modules/overview.js +++ b/src/router/modules/overview.js @@ -8,7 +8,7 @@ redirect: '/overviewBridge', name: 'OverviewBridge', meta: { - title: '运行总览', + title: '桥梁总览', icon: 'icon-overview', // 图标 permission: ['/overviewBridge']// 权限名称 }, diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js index ce9315a..c87490d 100644 --- a/src/router/modules/statistics.js +++ b/src/router/modules/statistics.js @@ -5,7 +5,7 @@ { path: 'statisticsBridge', component: Layout, - redirect: '/statisticsBridge', + redirect: 'bridge/statisticsBridge', name: 'StatisticsBridge', meta: { title: '养护统计', diff --git a/src/settings.js b/src/settings.js index b568ce0..b8159bf 100644 --- a/src/settings.js +++ b/src/settings.js @@ -3,7 +3,7 @@ * @type {boolean} true | false * @description 是否显示设置按钮 */ - showSettings: true, + showSettings: false, /** * @type {boolean} true | false diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8f1124f..99a723c 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,12 +2,11 @@ * 人员管理接口 */ import request from '@/utils/request' -// import qs from 'qs' // 获取当前报警列表 export function getRecordList(params) { return request({ - url: '/maintain/listPage', + url: 'bridge/maintain/listPage', method: 'get', params }) diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js index b8f29db..6440f03 100644 --- a/src/api/system/statistics.js +++ b/src/api/system/statistics.js @@ -7,7 +7,7 @@ // 年养护次数统计 export function countByYear(params) { return request({ - url: 'maintain/maintainCount', + url: 'bridge/maintain/maintainCount', method: 'get', params }) diff --git a/src/icons/svg/icon-map.svg b/src/icons/svg/icon-map.svg new file mode 100644 index 0000000..f9ad1a5 --- /dev/null +++ b/src/icons/svg/icon-map.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 48cffff..0a5a234 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,12 +8,9 @@ /* Layout */ import Layout from '@/layout/Layout' -import { overviewRouters } from './modules/overview' import { orderRouters } from './modules/order' import { bridgeRouters } from './modules/bridge' import { statisticsRouters } from './modules/statistics' -import { systemRouters } from './modules/system' -import { exampleRouters } from './modules/example' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -59,8 +56,8 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), - meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } + component: () => import('@/views/overview/overview.vue'), + meta: { title: '桥梁分布', icon: 'icon-map', noCache: true, affix: true } }] } ] @@ -74,11 +71,8 @@ // 异步挂载路由 // 动态需要根据权限加载的路由表 export const asyncRouterMap = [ - ...overviewRouters, ...orderRouters, ...bridgeRouters, ...statisticsRouters, - ...exampleRouters, - ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js index 5879990..554d058 100644 --- a/src/router/modules/overview.js +++ b/src/router/modules/overview.js @@ -8,7 +8,7 @@ redirect: '/overviewBridge', name: 'OverviewBridge', meta: { - title: '运行总览', + title: '桥梁总览', icon: 'icon-overview', // 图标 permission: ['/overviewBridge']// 权限名称 }, diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js index ce9315a..c87490d 100644 --- a/src/router/modules/statistics.js +++ b/src/router/modules/statistics.js @@ -5,7 +5,7 @@ { path: 'statisticsBridge', component: Layout, - redirect: '/statisticsBridge', + redirect: 'bridge/statisticsBridge', name: 'StatisticsBridge', meta: { title: '养护统计', diff --git a/src/settings.js b/src/settings.js index b568ce0..b8159bf 100644 --- a/src/settings.js +++ b/src/settings.js @@ -3,7 +3,7 @@ * @type {boolean} true | false * @description 是否显示设置按钮 */ - showSettings: true, + showSettings: false, /** * @type {boolean} true | false diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index ff9f9a1..5782410 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -1,30 +1,8 @@ @@ -32,58 +10,27 @@ import L from 'leaflet' import 'leaflet/dist/leaflet.css' import { getDetail } from '@/api/system/bridge' -// import icon from '/static/images/well/0100.png' -// import { getAllMarker } from '@/api/overview' -// import { getMarkerInfo } from '@/api/marker' -// import { lazyAMapApiLoaderInstance } from 'vue-amap' export default { name: 'Overview', data() { return { - baselayer: [], - url: require('../../assets/global_images/location_green.png'), - bridgeList: [ - {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450}, - {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659}, - {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659} - ], - bridgeInfo: { - id: '', - name: '', - typeName: '', // 桥型名称 - bridgeCode: '', // 柱号 - roadName: '', // 道路名称 - height: '', // 高度 - length: '', // 长度 - buildTime: '', // 开建时间 - position: '', - description: '', - status: '', - statusName: '', - photo: '', - onlineState: '' - }, - currentWindow: { - visible: false, // 窗体显示与否 - position: [this.$store.getters.lng, this.$store.getters.lat], - windowType: 'info' // 窗体类型:详情info或报警alarm - }, // 当前窗体属性 + baseLayer: [], + bridgeList: [], loading: false, - icon: 'cross', map: null, - msg: 'Welcome to Your Vue.js App' } }, mounted() { + this.bridgeList = this.baseConfig.bridges this.initMap() }, methods: { initMap() { const map = L.map('map', { - minZoom: 2, - maxZoom: 30, - center: [27.76062, 116.05071], + minZoom: 15, + maxZoom: 18, + center: this.baseConfig.center, zoom: 16, zoomControl: false, attributionControl: false, @@ -92,54 +39,42 @@ map.doubleClickZoom.disable() this.map = map // data上需要挂载 window.map = map - this.baselayer.push(L.tileLayer( - 'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8', - { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] } - ).addTo(map)) - this.baselayer.push(L.tileLayer( - 'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8', - { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] } - ).addTo(map)) - map.on('click', function(e){ - console.log(e) - // var marker = new L.marker(e.latlng).addTo(map); - }) - var Icon = L.icon({ - iconUrl: require('../../assets/global_images/location_green.png'), - iconSize: [30, 30] + this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map)) + this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map)) + + const Icon = L.icon({ + iconUrl: require('@/assets/global_images/location_green.png'), + iconSize: [32, 32], + iconAnchor: [16, 32], + popupAnchor: [0, -32] }) - for (var i=0; i<3; i++) { - var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], { + for (let i = 0; i < 3; i++) { + const item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], { icon: Icon, id: this.bridgeList[i].id }).addTo(this.map) - item.on('click', function(e) { - if (e.target.dragging._marker._popup) { - e.target.dragging._marker.unbindPopup() + + getDetail(this.bridgeList[i].id).then(response => { + const data = response.data + + let popupStr = '' + + item.bindPopup(popupStr) }) } } @@ -148,157 +83,57 @@ + + diff --git a/config/index.js b/config/index.js index 8abd37a..491c608 100644 --- a/config/index.js +++ b/config/index.js @@ -69,7 +69,7 @@ * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/', + assetsPublicPath: '/bridge/', /** * Source Maps diff --git a/src/api/system/bridge.js b/src/api/system/bridge.js index 4df107b..3841e4c 100644 --- a/src/api/system/bridge.js +++ b/src/api/system/bridge.js @@ -2,12 +2,11 @@ * 桥梁管理接口 */ import request from '@/utils/request' -import qs from 'qs' // 获取桥梁详情 export function getDetail(id) { return request({ - url: '/bridge/detail', + url: 'bridge/bridge/detail', method: 'get', params: { id: id @@ -17,7 +16,7 @@ export function updateBridge(params) { return request({ - url: '/bridge/update', + url: 'bridge/update', method: 'post', params }) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8f1124f..99a723c 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,12 +2,11 @@ * 人员管理接口 */ import request from '@/utils/request' -// import qs from 'qs' // 获取当前报警列表 export function getRecordList(params) { return request({ - url: '/maintain/listPage', + url: 'bridge/maintain/listPage', method: 'get', params }) diff --git a/src/api/system/statistics.js b/src/api/system/statistics.js index b8f29db..6440f03 100644 --- a/src/api/system/statistics.js +++ b/src/api/system/statistics.js @@ -7,7 +7,7 @@ // 年养护次数统计 export function countByYear(params) { return request({ - url: 'maintain/maintainCount', + url: 'bridge/maintain/maintainCount', method: 'get', params }) diff --git a/src/icons/svg/icon-map.svg b/src/icons/svg/icon-map.svg new file mode 100644 index 0000000..f9ad1a5 --- /dev/null +++ b/src/icons/svg/icon-map.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 48cffff..0a5a234 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,12 +8,9 @@ /* Layout */ import Layout from '@/layout/Layout' -import { overviewRouters } from './modules/overview' import { orderRouters } from './modules/order' import { bridgeRouters } from './modules/bridge' import { statisticsRouters } from './modules/statistics' -import { systemRouters } from './modules/system' -import { exampleRouters } from './modules/example' /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) @@ -59,8 +56,8 @@ children: [{ path: 'dashboard', name: 'Dashboard', - component: () => import('@/views/dashboard/index'), - meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } + component: () => import('@/views/overview/overview.vue'), + meta: { title: '桥梁分布', icon: 'icon-map', noCache: true, affix: true } }] } ] @@ -74,11 +71,8 @@ // 异步挂载路由 // 动态需要根据权限加载的路由表 export const asyncRouterMap = [ - ...overviewRouters, ...orderRouters, ...bridgeRouters, ...statisticsRouters, - ...exampleRouters, - ...systemRouters, { path: '*', redirect: '/404', hidden: true } ] diff --git a/src/router/modules/overview.js b/src/router/modules/overview.js index 5879990..554d058 100644 --- a/src/router/modules/overview.js +++ b/src/router/modules/overview.js @@ -8,7 +8,7 @@ redirect: '/overviewBridge', name: 'OverviewBridge', meta: { - title: '运行总览', + title: '桥梁总览', icon: 'icon-overview', // 图标 permission: ['/overviewBridge']// 权限名称 }, diff --git a/src/router/modules/statistics.js b/src/router/modules/statistics.js index ce9315a..c87490d 100644 --- a/src/router/modules/statistics.js +++ b/src/router/modules/statistics.js @@ -5,7 +5,7 @@ { path: 'statisticsBridge', component: Layout, - redirect: '/statisticsBridge', + redirect: 'bridge/statisticsBridge', name: 'StatisticsBridge', meta: { title: '养护统计', diff --git a/src/settings.js b/src/settings.js index b568ce0..b8159bf 100644 --- a/src/settings.js +++ b/src/settings.js @@ -3,7 +3,7 @@ * @type {boolean} true | false * @description 是否显示设置按钮 */ - showSettings: true, + showSettings: false, /** * @type {boolean} true | false diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index ff9f9a1..5782410 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -1,30 +1,8 @@ @@ -32,58 +10,27 @@ import L from 'leaflet' import 'leaflet/dist/leaflet.css' import { getDetail } from '@/api/system/bridge' -// import icon from '/static/images/well/0100.png' -// import { getAllMarker } from '@/api/overview' -// import { getMarkerInfo } from '@/api/marker' -// import { lazyAMapApiLoaderInstance } from 'vue-amap' export default { name: 'Overview', data() { return { - baselayer: [], - url: require('../../assets/global_images/location_green.png'), - bridgeList: [ - {id: 1, name: '永胜桥', lat: 27.763248, lng: 116.043450}, - {id: 2, name: '黄洲桥', lat: 27.760096, lng: 116.053659}, - {id: 3, name: '光明桥', lat: 27.767046, lng: 116.058659} - ], - bridgeInfo: { - id: '', - name: '', - typeName: '', // 桥型名称 - bridgeCode: '', // 柱号 - roadName: '', // 道路名称 - height: '', // 高度 - length: '', // 长度 - buildTime: '', // 开建时间 - position: '', - description: '', - status: '', - statusName: '', - photo: '', - onlineState: '' - }, - currentWindow: { - visible: false, // 窗体显示与否 - position: [this.$store.getters.lng, this.$store.getters.lat], - windowType: 'info' // 窗体类型:详情info或报警alarm - }, // 当前窗体属性 + baseLayer: [], + bridgeList: [], loading: false, - icon: 'cross', map: null, - msg: 'Welcome to Your Vue.js App' } }, mounted() { + this.bridgeList = this.baseConfig.bridges this.initMap() }, methods: { initMap() { const map = L.map('map', { - minZoom: 2, - maxZoom: 30, - center: [27.76062, 116.05071], + minZoom: 15, + maxZoom: 18, + center: this.baseConfig.center, zoom: 16, zoomControl: false, attributionControl: false, @@ -92,54 +39,42 @@ map.doubleClickZoom.disable() this.map = map // data上需要挂载 window.map = map - this.baselayer.push(L.tileLayer( - 'https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8', - { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] } - ).addTo(map)) - this.baselayer.push(L.tileLayer( - 'https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8', - { subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'] } - ).addTo(map)) - map.on('click', function(e){ - console.log(e) - // var marker = new L.marker(e.latlng).addTo(map); - }) - var Icon = L.icon({ - iconUrl: require('../../assets/global_images/location_green.png'), - iconSize: [30, 30] + this.baseLayer.push(L.tileLayer(this.baseConfig.mapUrl).addTo(map)) + this.baseLayer.push(L.tileLayer(this.baseConfig.labelUrl).addTo(map)) + + const Icon = L.icon({ + iconUrl: require('@/assets/global_images/location_green.png'), + iconSize: [32, 32], + iconAnchor: [16, 32], + popupAnchor: [0, -32] }) - for (var i=0; i<3; i++) { - var item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], { + for (let i = 0; i < 3; i++) { + const item = L.marker([this.bridgeList[i].lat, this.bridgeList[i].lng], { icon: Icon, id: this.bridgeList[i].id }).addTo(this.map) - item.on('click', function(e) { - if (e.target.dragging._marker._popup) { - e.target.dragging._marker.unbindPopup() + + getDetail(this.bridgeList[i].id).then(response => { + const data = response.data + + let popupStr = '' + + item.bindPopup(popupStr) }) } } @@ -148,157 +83,57 @@ + + diff --git a/static/project.config.json b/static/project.config.json index e294b08..d0ec703 100644 --- a/static/project.config.json +++ b/static/project.config.json @@ -1,11 +1,16 @@ { "title": "路桥养护子系统", - "baseUrl": "http://192.168.1.108:8083/", + "baseUrl": "http://111.198.10.15:11409/", "mainPage": "http://111.198.10.15:11404/dcms/", "singleSys": true, "city":"崇仁县", "mapUrl":"https://t0.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8", "labelUrl":"https://t0.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=216ee92889e17ab1b083fae665d522b8", - "center":[27.75962, 116.06021], - "zoom":15 + "center":[27.763824, 116.052196], + "zoom":16, + "bridges": [ + { "id": 1, "name": "永胜桥", "lat": 27.763163, "lng": 116.043554 }, + { "id": 2, "name": "黄洲桥", "lat": 27.759709, "lng": 116.053613 }, + { "id": 3, "name": "光明桥", "lat": 27.766585, "lng": 116.059015 } + ] }