智慧燃气

diff --git a/index.html b/index.html index 78c07b2..82a7058 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - 智慧燃气 + 管理者驾驶舱

diff --git a/src/permission.js b/src/permission.js index eb6c110..aca4864 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 2378caa..7d0cec7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -82,6 +82,12 @@ component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, + { + path: '/full/vip', + name: 'Vip', + component: () => import('@/views/maps/vip'), + meta: { title: '重点用户', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index 02a883d..c17ce8d 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -101,6 +101,11 @@ name: 'ConstructionThreatTopic', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工专题', icon: '' } + }, { + path: '/vipTopic', + name: 'vipTopic', + component: () => import('@/views/maps/vip'), + meta: { title: '重点用户', icon: '' } } ] } diff --git a/index.html b/index.html index 78c07b2..82a7058 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - 智慧燃气 + 管理者驾驶舱

diff --git a/src/permission.js b/src/permission.js index eb6c110..aca4864 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 2378caa..7d0cec7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -82,6 +82,12 @@ component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, + { + path: '/full/vip', + name: 'Vip', + component: () => import('@/views/maps/vip'), + meta: { title: '重点用户', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index 02a883d..c17ce8d 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -101,6 +101,11 @@ name: 'ConstructionThreatTopic', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工专题', icon: '' } + }, { + path: '/vipTopic', + name: 'vipTopic', + component: () => import('@/views/maps/vip'), + meta: { title: '重点用户', icon: '' } } ] } diff --git a/src/styles/popup.scss b/src/styles/popup.scss index 2d695de..1172f24 100644 --- a/src/styles/popup.scss +++ b/src/styles/popup.scss @@ -1,5 +1,23 @@ /* div Point 的样式 */ +//.mars3d-popup{ +// margin:0px !important; +// padding:0px !important; +// .divpoint-wrap { +// position: relative; +// padding: 0px !important; +// overflow: hidden; +// } +//} +.popup-win{ + padding:10px; + .title{ + font-size:20px + } + .content{ + font-size:18px; + } +} /*类popup的divpoint样式，黑色字体 + 白色背景*/ .divpoint-color { diff --git a/index.html b/index.html index 78c07b2..82a7058 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - 智慧燃气 + 管理者驾驶舱

diff --git a/src/permission.js b/src/permission.js index eb6c110..aca4864 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 2378caa..7d0cec7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -82,6 +82,12 @@ component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, + { + path: '/full/vip', + name: 'Vip', + component: () => import('@/views/maps/vip'), + meta: { title: '重点用户', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index 02a883d..c17ce8d 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -101,6 +101,11 @@ name: 'ConstructionThreatTopic', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工专题', icon: '' } + }, { + path: '/vipTopic', + name: 'vipTopic', + component: () => import('@/views/maps/vip'), + meta: { title: '重点用户', icon: '' } } ] } diff --git a/src/styles/popup.scss b/src/styles/popup.scss index 2d695de..1172f24 100644 --- a/src/styles/popup.scss +++ b/src/styles/popup.scss @@ -1,5 +1,23 @@ /* div Point 的样式 */ +//.mars3d-popup{ +// margin:0px !important; +// padding:0px !important; +// .divpoint-wrap { +// position: relative; +// padding: 0px !important; +// overflow: hidden; +// } +//} +.popup-win{ + padding:10px; + .title{ + font-size:20px + } + .content{ + font-size:18px; + } +} /*类popup的divpoint样式，黑色字体 + 白色背景*/ .divpoint-color { diff --git a/src/views/maps/vip.vue b/src/views/maps/vip.vue new file mode 100644 index 0000000..f30e8a3 --- /dev/null +++ b/src/views/maps/vip.vue @@ -0,0 +1,189 @@ + + + + + + + +