@@ -17,6 +19,7 @@
name: 'Layout',
data() {
return {
+ showBack: true,
title: '标题', // 标题
url: 'http://www.baidu.com' // iframe内嵌地址
}
@@ -27,6 +30,9 @@
this.title = this.$route.query.name
this.url = this.$route.query.url
}
+ if(this.baseConfig.toDashboard===false){
+ this.showBack = false
+ }
},
methods: {
backPage() {
diff --git a/src/layout/layoutMapSimple.vue b/src/layout/layoutMapSimple.vue
new file mode 100644
index 0000000..7b2de92
--- /dev/null
+++ b/src/layout/layoutMapSimple.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/permission.js b/src/permission.js
index ba87122..c4f95f2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,10 +5,11 @@
import { Message } from 'element-ui'
import { getToken } from '@/utils/auth' // getToken from cookie
import { getCurrentSys } from './utils/auth'
+import Vue from 'vue'
NProgress.configure({ showSpinner: false })// NProgress configuration
-const whiteList = ['/login', '/applogin', '/appFaceLogin', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/applogin', '/appSubject', '/appFaceLogin', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview', '/full/overview_no_button', '/full/overview_new'] // 不重定向白名单
// 全局钩子
router.beforeEach((to, from, next) => {
NProgress.start() // 加载进度条
@@ -20,9 +21,17 @@
if (to.path === '/login') {
next({ path: '/login' })
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else if (to.path === '/applogin') {
+ next()
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else if (to.path === '/dashboard') {
if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
- next('/appIndex') // 否则全部重定向到登录页
+ const baseConfig = Vue.prototype.baseConfig
+ if (baseConfig.toDashboard) {
+ next('/appIndex') // 否则全部重定向到登录页
+ } else {
+ next({ path: '/applogin' })
+ }
} else {
next()
}
diff --git a/src/router/index.js b/src/router/index.js
index e52e173..d08eda3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -128,6 +128,18 @@
component: () => import('@/views/maps/mapOverview'),
meta: { title: '综合业务', icon: '' }
},
+ {
+ path: '/full/overview_no_button',
+ name: 'FullOverviewNoButton',
+ component: () => import('@/views/maps/mapOverview1'),
+ meta: { title: '综合业务', icon: '' }
+ },
+ {
+ path: '/full/overview_new',
+ name: 'FullOverviewNew',
+ component: () => import('@/views/maps/mapOverview2'),
+ meta: { title: '综合业务', icon: '' }
+ },
// 九宫格
{ path: '/dashboard', component: () => import('@/views/dashboard/index2'), hidden: true }
]
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index a744dcd..d50c75e 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -1,12 +1,22 @@
import md5 from 'js-md5'
-export function getIndex(data) {
- console.log(data)
- const min = Math.min(...data)
- const index = Math.floor(5000 / min)
- console.log(index)
- return index
+// 计算缩放指数
+export function getIndex(data, type = 'max') {
+ if (type === 'max') {
+ console.log(data)
+ const max = Math.max(...data)
+ const index = Math.floor(70000 / max)
+ console.log(index)
+ return index
+ } else {
+ console.log(data)
+ const min = Math.min(...data)
+ const index = Math.floor(5000 / min)
+ console.log(index)
+ return index
+ }
}
+// 获取签名时间戳
export function getSignTimeStamp() {
const username = 'admin'
const key = 'packingdata'
diff --git a/src/views/dashboard/appIndex.vue b/src/views/dashboard/appIndex.vue
index 5a6974b..ccbc7d4 100644
--- a/src/views/dashboard/appIndex.vue
+++ b/src/views/dashboard/appIndex.vue
@@ -76,7 +76,7 @@
if (system.url.indexOf('http') > -1) {
// 跳转数据中台的
const params = '?token=' + this.$store.getters.token + '&url=' + system.url
- const loginUrl = 'http://10.100.252.13:9001/sso/integrationConfig/login'
+ const loginUrl = 'http://59.49.106.24:9001/sso/integrationConfig/login'
// window.location.href = loginUrl + params
this.$router.push({ path: '/appSubject', query: { name: system.name, url: loginUrl + params }})
}
diff --git a/src/views/login/appLogin.vue b/src/views/login/appLogin.vue
index 108abc3..8d66c56 100644
--- a/src/views/login/appLogin.vue
+++ b/src/views/login/appLogin.vue
@@ -100,7 +100,15 @@
this.$store.dispatch('Login', loginForm).then(() => {
this.loading = false
this.$message.success('登录成功')
- this.$router.push({ path: '/appIndex' })
+ // 判断配置项，是要跳转九宫盒还是主页
+ if (this.baseConfig.toDashboard) {
+ this.$router.push({ path: '/appIndex' })
+ } else {
+ this.$store.commit('SET_SYSTEM', { name: '综合业务', url: this.baseConfig.dashUrl })
+ const params = '?token=' + this.$store.getters.token + '&url=' + this.baseConfig.dashUrl
+ const loginUrl = this.baseConfig.biLogin
+ this.$router.push({ path: '/appSubject', query: { name: '综合业务', url: loginUrl + params }})
+ }
}).catch(() => {
this.loading = false
if (this.showKaptcha) {
diff --git a/src/views/maps/mapOverview1.vue b/src/views/maps/mapOverview1.vue
new file mode 100644
index 0000000..7708d99
--- /dev/null
+++ b/src/views/maps/mapOverview1.vue
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/maps/mapOverview2.vue b/src/views/maps/mapOverview2.vue
new file mode 100644
index 0000000..9709de4
--- /dev/null
+++ b/src/views/maps/mapOverview2.vue
@@ -0,0 +1,588 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/maps/pipeOverview.vue b/src/views/maps/pipeOverview.vue
index 1dec381..3883958 100644
--- a/src/views/maps/pipeOverview.vue
+++ b/src/views/maps/pipeOverview.vue
@@ -83,7 +83,8 @@
'霜冻': '11',
'大雾': '12',
'霾': '13',
- '道路结冰': '14'
+ '道路结冰': '14',
+ '雷暴大风': '05'
}, // 灾害与数字对应表
disasterLevel: {
'蓝色': '01',
@@ -179,6 +180,7 @@
unitname: item['WD60_08']
}
})
+ debugger
this.routeData = []
// 遍历所有数据，去除重复数据
for (const route of data) {
@@ -460,6 +462,7 @@
zhdj: item['WD52_13'].trim()
}
})
+ debugger
data = data.filter(item => item.lng != null)
for (const item of data) {
const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 4b2f224..b5d6b69 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -92,6 +92,14 @@
{
name: '部门/组',
value: '04'
+ },
+ {
+ name: '虚拟部门',
+ value: '05'
+ },
+ {
+ name: '站场',
+ value: '06'
}
],
btnLoading: false, // 保存按钮的加载中状态
diff --git a/package.json b/package.json
index 80d9d28..e687665 100644
--- a/package.json
+++ b/package.json
@@ -24,9 +24,9 @@
"js-md5": "^0.7.3",
"jsencrypt": "^3.0.0-rc.1",
"lodash": "^4.17.15",
- "mars3d": "^3.0.20",
+ "mars3d": "^3.0.25",
"mars3d-echarts": "^3.0.3",
- "mars3d-heatmap": "^3.0.5",
+ "mars3d-heatmap": "^3.0.6",
"mars3d-mapv": "^3.0.3",
"mockjs": "1.0.1-beta3",
"moment": "^2.24.0",
diff --git a/src/api/hca.js b/src/api/hca.js
index 9439c1c..34c4ccc 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -3,12 +3,14 @@
*/
import request from '@/utils/request'
import { getSignTimeStamp } from '@/utils/mathUtils'
+import Vue from 'vue'
// 高后果区
export function getHighConsequence() {
+ const baseConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://10.100.252.13:9001/factdata/index/getData',
+ url: baseConfig.biUrl + '/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index 9770a42..54fdd46 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -3,6 +3,8 @@
*/
import request from '@/utils/request'
import { getSignTimeStamp } from '@/utils/mathUtils'
+import Vue from 'vue'
+
// 各地区供需数据
export function getAreaNeedSupply(params) {
return request({
@@ -13,9 +15,10 @@
}
// 各地区供给
export function getAreaSupply(date) {
+ const baseConfig = Vue.prototype.baseConfig
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://10.100.252.13:9001/factdata/index/getData',
+ url: baseConfig.biUrl + '/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -69,9 +72,10 @@
// 各用户供需数据
export function getUserSupply(date) {
+ const baseConfig = Vue.prototype.baseConfig
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://10.100.252.13:9001/factdata/index/getData',
+ url: baseConfig.biUrl + '/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index a5662f8..601501b 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -3,11 +3,14 @@
*/
import request from '@/utils/request'
import { getSignTimeStamp } from '@/utils/mathUtils'
+import Vue from 'vue'
+
// 地震列表
export function getEarthquakeList(date) {
+ const baseConfig = Vue.prototype.baseConfig
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://10.100.252.13:9001/factdata/index/getData',
+ url: baseConfig.biUrl + '/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -33,9 +36,10 @@
}
// 巡线轨迹列表
export function getRoutesData(date) {
+ const baseConfig = Vue.prototype.baseConfig
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://10.100.252.13:9001/factdata/index/getData',
+ url: baseConfig.biUrl + '/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index 51a6f27..21b08f6 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -3,12 +3,14 @@
*/
import request from '@/utils/request'
import { getSignTimeStamp } from '@/utils/mathUtils'
+import Vue from 'vue'
// 水保隐患
export function getWaterThreat() {
+ const baseConfig = Vue.prototype.baseConfig
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://10.100.252.13:9001/factdata/index/getData',
+ url: baseConfig.biUrl + '/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 9f84011..0aa5906 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -3,11 +3,14 @@
*/
import request from '@/utils/request'
import { getSignTimeStamp } from '@/utils/mathUtils'
+import Vue from 'vue'
+
// 气象预报列表
export function getWeatherList(date) {
+ const baseConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://10.100.252.13:9001/factdata/index/getData',
+ url: baseConfig.biUrl + '/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -39,9 +42,10 @@
}
// 气象灾害列表
export function getDisasterList(date) {
+ const baseConfig = Vue.prototype.baseConfig // 注意该行应放在export里面，否则获取不到值
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://10.100.252.13:9001/factdata/index/getData',
+ url: baseConfig.biUrl + '/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/src/assets/button_images/button2_blue.png b/src/assets/button_images/button2_blue.png
new file mode 100644
index 0000000..bbca0b4
--- /dev/null
+++ b/src/assets/button_images/button2_blue.png
Binary files differ
diff --git a/src/assets/button_images/button2_yellow.png b/src/assets/button_images/button2_yellow.png
new file mode 100644
index 0000000..ed1c5cc
--- /dev/null
+++ b/src/assets/button_images/button2_yellow.png
Binary files differ
diff --git a/src/components/Button/button2.vue b/src/components/Button/button2.vue
new file mode 100644
index 0000000..973aa02
--- /dev/null
+++ b/src/components/Button/button2.vue
@@ -0,0 +1,103 @@
+
+
+
+ {{ name }}
+
+
+
+
+
+
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 86a5881..e2fc07a 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -1,6 +1,7 @@
+
+ :class="['mars3d-container', customClass, { 'mars3d-container-compare-rh' : compare }]">
+
+
+
+
diff --git a/src/components/Map/components/hcaHeatLayer.vue b/src/components/Map/components/hcaHeatLayer.vue
new file mode 100644
index 0000000..e4d3a21
--- /dev/null
+++ b/src/components/Map/components/hcaHeatLayer.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Map/components/supplyLayer.vue b/src/components/Map/components/supplyLayer.vue
new file mode 100644
index 0000000..583e546
--- /dev/null
+++ b/src/components/Map/components/supplyLayer.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Map/components/threatLayer.vue b/src/components/Map/components/threatLayer.vue
new file mode 100644
index 0000000..e354278
--- /dev/null
+++ b/src/components/Map/components/threatLayer.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Map/components/weatherLayer.vue b/src/components/Map/components/weatherLayer.vue
new file mode 100644
index 0000000..ad444ae
--- /dev/null
+++ b/src/components/Map/components/weatherLayer.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue
index 15fb190..a099a41 100644
--- a/src/components/SelectTree/singleSelect.vue
+++ b/src/components/SelectTree/singleSelect.vue
@@ -7,17 +7,19 @@
class="select-tree scrollbar"
@show="onShowPopover"
@hide="onHidePopover">
-
+
+
+
@@ -17,6 +19,7 @@
name: 'Layout',
data() {
return {
+ showBack: true,
title: '标题', // 标题
url: 'http://www.baidu.com' // iframe内嵌地址
}
@@ -27,6 +30,9 @@
this.title = this.$route.query.name
this.url = this.$route.query.url
}
+ if(this.baseConfig.toDashboard===false){
+ this.showBack = false
+ }
},
methods: {
backPage() {
diff --git a/src/layout/layoutMapSimple.vue b/src/layout/layoutMapSimple.vue
new file mode 100644
index 0000000..7b2de92
--- /dev/null
+++ b/src/layout/layoutMapSimple.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/permission.js b/src/permission.js
index ba87122..c4f95f2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,10 +5,11 @@
import { Message } from 'element-ui'
import { getToken } from '@/utils/auth' // getToken from cookie
import { getCurrentSys } from './utils/auth'
+import Vue from 'vue'
NProgress.configure({ showSpinner: false })// NProgress configuration
-const whiteList = ['/login', '/applogin', '/appFaceLogin', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/applogin', '/appSubject', '/appFaceLogin', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview', '/full/overview_no_button', '/full/overview_new'] // 不重定向白名单
// 全局钩子
router.beforeEach((to, from, next) => {
NProgress.start() // 加载进度条
@@ -20,9 +21,17 @@
if (to.path === '/login') {
next({ path: '/login' })
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
+ } else if (to.path === '/applogin') {
+ next()
+ NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else if (to.path === '/dashboard') {
if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
- next('/appIndex') // 否则全部重定向到登录页
+ const baseConfig = Vue.prototype.baseConfig
+ if (baseConfig.toDashboard) {
+ next('/appIndex') // 否则全部重定向到登录页
+ } else {
+ next({ path: '/applogin' })
+ }
} else {
next()
}
diff --git a/src/router/index.js b/src/router/index.js
index e52e173..d08eda3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -128,6 +128,18 @@
component: () => import('@/views/maps/mapOverview'),
meta: { title: '综合业务', icon: '' }
},
+ {
+ path: '/full/overview_no_button',
+ name: 'FullOverviewNoButton',
+ component: () => import('@/views/maps/mapOverview1'),
+ meta: { title: '综合业务', icon: '' }
+ },
+ {
+ path: '/full/overview_new',
+ name: 'FullOverviewNew',
+ component: () => import('@/views/maps/mapOverview2'),
+ meta: { title: '综合业务', icon: '' }
+ },
// 九宫格
{ path: '/dashboard', component: () => import('@/views/dashboard/index2'), hidden: true }
]
diff --git a/src/utils/mathUtils.js b/src/utils/mathUtils.js
index a744dcd..d50c75e 100644
--- a/src/utils/mathUtils.js
+++ b/src/utils/mathUtils.js
@@ -1,12 +1,22 @@
import md5 from 'js-md5'
-export function getIndex(data) {
- console.log(data)
- const min = Math.min(...data)
- const index = Math.floor(5000 / min)
- console.log(index)
- return index
+// 计算缩放指数
+export function getIndex(data, type = 'max') {
+ if (type === 'max') {
+ console.log(data)
+ const max = Math.max(...data)
+ const index = Math.floor(70000 / max)
+ console.log(index)
+ return index
+ } else {
+ console.log(data)
+ const min = Math.min(...data)
+ const index = Math.floor(5000 / min)
+ console.log(index)
+ return index
+ }
}
+// 获取签名时间戳
export function getSignTimeStamp() {
const username = 'admin'
const key = 'packingdata'
diff --git a/src/views/dashboard/appIndex.vue b/src/views/dashboard/appIndex.vue
index 5a6974b..ccbc7d4 100644
--- a/src/views/dashboard/appIndex.vue
+++ b/src/views/dashboard/appIndex.vue
@@ -76,7 +76,7 @@
if (system.url.indexOf('http') > -1) {
// 跳转数据中台的
const params = '?token=' + this.$store.getters.token + '&url=' + system.url
- const loginUrl = 'http://10.100.252.13:9001/sso/integrationConfig/login'
+ const loginUrl = 'http://59.49.106.24:9001/sso/integrationConfig/login'
// window.location.href = loginUrl + params
this.$router.push({ path: '/appSubject', query: { name: system.name, url: loginUrl + params }})
}
diff --git a/src/views/login/appLogin.vue b/src/views/login/appLogin.vue
index 108abc3..8d66c56 100644
--- a/src/views/login/appLogin.vue
+++ b/src/views/login/appLogin.vue
@@ -100,7 +100,15 @@
this.$store.dispatch('Login', loginForm).then(() => {
this.loading = false
this.$message.success('登录成功')
- this.$router.push({ path: '/appIndex' })
+ // 判断配置项，是要跳转九宫盒还是主页
+ if (this.baseConfig.toDashboard) {
+ this.$router.push({ path: '/appIndex' })
+ } else {
+ this.$store.commit('SET_SYSTEM', { name: '综合业务', url: this.baseConfig.dashUrl })
+ const params = '?token=' + this.$store.getters.token + '&url=' + this.baseConfig.dashUrl
+ const loginUrl = this.baseConfig.biLogin
+ this.$router.push({ path: '/appSubject', query: { name: '综合业务', url: loginUrl + params }})
+ }
}).catch(() => {
this.loading = false
if (this.showKaptcha) {
diff --git a/src/views/maps/mapOverview1.vue b/src/views/maps/mapOverview1.vue
new file mode 100644
index 0000000..7708d99
--- /dev/null
+++ b/src/views/maps/mapOverview1.vue
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/maps/mapOverview2.vue b/src/views/maps/mapOverview2.vue
new file mode 100644
index 0000000..9709de4
--- /dev/null
+++ b/src/views/maps/mapOverview2.vue
@@ -0,0 +1,588 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/maps/pipeOverview.vue b/src/views/maps/pipeOverview.vue
index 1dec381..3883958 100644
--- a/src/views/maps/pipeOverview.vue
+++ b/src/views/maps/pipeOverview.vue
@@ -83,7 +83,8 @@
'霜冻': '11',
'大雾': '12',
'霾': '13',
- '道路结冰': '14'
+ '道路结冰': '14',
+ '雷暴大风': '05'
}, // 灾害与数字对应表
disasterLevel: {
'蓝色': '01',
@@ -179,6 +180,7 @@
unitname: item['WD60_08']
}
})
+ debugger
this.routeData = []
// 遍历所有数据，去除重复数据
for (const route of data) {
@@ -460,6 +462,7 @@
zhdj: item['WD52_13'].trim()
}
})
+ debugger
data = data.filter(item => item.lng != null)
for (const item of data) {
const img = 'static/images/weather_disaster/' + this.disaster[item.zhlx] + this.disasterLevel[item.zhdj] + '.png'
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index 4b2f224..b5d6b69 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -92,6 +92,14 @@
{
name: '部门/组',
value: '04'
+ },
+ {
+ name: '虚拟部门',
+ value: '05'
+ },
+ {
+ name: '站场',
+ value: '06'
}
],
btnLoading: false, // 保存按钮的加载中状态
diff --git a/static/project.config.json b/static/project.config.json
index 3b5fef6..54a6c07 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -3,6 +3,9 @@
"baseUrl": "http://10.100.252.11:8080/cockpit/",
"biUrl": "http://10.100.252.13:9001",
"sameWindow": false,
+ "toDashboard": false,
+ "biLogin": "http://59.49.106.24:9001/sso/integrationConfig/login",
+ "dashUrl": "http://59.49.106.24:9001/mobile/browse/1/06C7CB6A9DDD4175AC6DDD8EAF977D63?",
"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"