|
@@ -60,7 +60,7 @@
|
|
|
<div class='number' v-for='(equip , index) in item.assetTypeList' :key='index'>
|
|
|
<div class="title">
|
|
|
<P>{{equip.category_name}}</p>
|
|
|
- <span v-if='equip.is_exception_num'>{{equip.is_exception_num}}</span>
|
|
|
+ <span :style="{right: equip.is_exception_num > 99 ? '-2rem' : equip.is_exception_num > 9 ? '-1.5rem' :'-1rem'}" v-if='equip.is_exception_num'>{{equip.is_exception_num}}</span>
|
|
|
</div>
|
|
|
<p>
|
|
|
<span>{{equip.asset_num}}</span>
|
|
@@ -254,9 +254,9 @@ export default {
|
|
|
11: { inner: 1000, outer: 2000, offset: 0.04 }
|
|
|
},
|
|
|
barColors :{
|
|
|
- 0: 'linear-gradient(to right, #F54E45 , #F54E45)', // 蓝色
|
|
|
+ 0: 'linear-gradient(to right, #369CF7 , #025BAA)', // 蓝色
|
|
|
1: 'linear-gradient(to right, #F58300 , #F58300)', // 黄色
|
|
|
- 2: 'linear-gradient(to right, #369CF7 , #025BAA)' // 红色
|
|
|
+ 2: 'linear-gradient(to right, #F54E45 , #F54E45)' // 红色
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -351,7 +351,16 @@ export default {
|
|
|
let res = this.provinceCities[JSONName]
|
|
|
this.pantProjectsMap(data, this.currentSysId)
|
|
|
} else {
|
|
|
- this.$router.push({path:'/home/homePage'}) // 点击广场时 直接跳转到详情页 地图不用响应
|
|
|
+ let pathData = {fromGroup: 'true'}
|
|
|
+ let routeData = this.$router.resolve({ // 点击广场时 直接跳转到详情页 地图不用响应
|
|
|
+ name:'/home/homePage',
|
|
|
+ })
|
|
|
+ window.open(routeData.href, '_blank');
|
|
|
+ window.__fromGroupPage = {
|
|
|
+ level: 0,
|
|
|
+ plazaName: data.cname,
|
|
|
+ plazaId: data.ccode
|
|
|
+ }
|
|
|
this.$store.commit('SETPLAZENAME', data.cname)
|
|
|
localStorage.setItem('PLAZAID', data.ccode)
|
|
|
}
|
|
@@ -787,6 +796,7 @@ export default {
|
|
|
* 用于绘制中心下的地图
|
|
|
*/
|
|
|
pantZonesMap(data) {
|
|
|
+ let that = this
|
|
|
this.clearAllLayers()
|
|
|
let name = data.cname.substr(0, 2)
|
|
|
let zone = this.zoneNames[name]
|
|
@@ -803,7 +813,6 @@ export default {
|
|
|
offset = 0.5
|
|
|
}
|
|
|
this.panTo(this.zoneCenter[zone], zoom)
|
|
|
- let that = this
|
|
|
let groupLayer = new L.layerGroup()
|
|
|
data.children.forEach(item => {
|
|
|
let params = {
|
|
@@ -828,19 +837,19 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- this.createPointOnMap(num, groupLayer, contentHtml, center, item, item.cname, 'zone')
|
|
|
+ that.createPointOnMap(num, groupLayer, contentHtml, center, item, item.cname, 'zone')
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
groupLayer.addTo(myMaps)
|
|
|
+
|
|
|
},
|
|
|
|
|
|
/***
|
|
|
* 用于绘制项目的点
|
|
|
*/
|
|
|
pantProjectsMap(data) {
|
|
|
- this.clearAllLayers()
|
|
|
let geo = this.provinceCities[data.cname]
|
|
|
this.panTo(geo.center, geo.zoom)
|
|
|
data.children.forEach(item => {
|
|
@@ -850,13 +859,9 @@ export default {
|
|
|
/**
|
|
|
* 用于绘制广场的点
|
|
|
*/
|
|
|
- pantPlazaMap(item, flag) {
|
|
|
+ pantPlazaMap(item) {
|
|
|
let that = this
|
|
|
let groupLayer = new L.layerGroup()
|
|
|
- if (flag) {
|
|
|
- this.clearAllLayers()
|
|
|
- this.panTo(center, 11)
|
|
|
- }
|
|
|
let params = {
|
|
|
getParams: {
|
|
|
plazaId: item.cid, // 所查对象是广场的时候plazaId必传
|
|
@@ -880,7 +885,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- this.createPointOnMap(num, groupLayer, contentHtml, center, item, item.cname, 'project')
|
|
|
+ that.createPointOnMap(num, groupLayer, contentHtml, center, item, item.cname, 'project')
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -901,7 +906,7 @@ export default {
|
|
|
className: 'my-leaflet-div-icon',
|
|
|
iconSize: 30
|
|
|
})
|
|
|
- setTimeout(()=>{
|
|
|
+
|
|
|
let zoom = myMaps.getZoom()
|
|
|
let sizes = this.circleSize[zoom]
|
|
|
if (color && center) {
|
|
@@ -927,13 +932,21 @@ export default {
|
|
|
this.pantProjectsMap(data, this.currentSysId)
|
|
|
}
|
|
|
if (type === 'project') {
|
|
|
- this.$router.push({path:'/home/homePage' })
|
|
|
+ let routeData = this.$router.resolve({
|
|
|
+ name:'/home/homePage',
|
|
|
+ })
|
|
|
+ window.open(routeData.href, '_blank');
|
|
|
+ window.__fromGroupPage = {
|
|
|
+ level: 0,
|
|
|
+ plazaName: data.cname,
|
|
|
+ plazaId: data.ccode
|
|
|
+ }
|
|
|
this.$store.commit('SETPLAZENAME', data.cname)
|
|
|
localStorage.setItem('PLAZAID', data.ccode)
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- }, 200)
|
|
|
+
|
|
|
},
|
|
|
/**
|
|
|
* 生成弹框HTML
|
|
@@ -1347,6 +1360,9 @@ export default {
|
|
|
width: 20px;
|
|
|
margin-right: 12px;
|
|
|
}
|
|
|
+ em{
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|