|
@@ -47,12 +47,13 @@
|
|
|
</div>
|
|
|
<span>{{item.smsxtname}}</span>
|
|
|
</div>
|
|
|
- <div class="system-equipments" >
|
|
|
+ <div class="system-equipments" v-if="item.assetTypeList">
|
|
|
<div class="number" v-for="(equip , index) in item.assetTypeList" :key="index">
|
|
|
<p>{{equip.category_name}}<span v-if="equip.is_exception_num">{{equip.is_exception_num}}</span></p>
|
|
|
<p><span>{{equip.asset_num}}</span><span>台</span></p>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div v-else style="width:65%;text-align:center;">暂无数据</div>
|
|
|
</li>
|
|
|
</ul>
|
|
|
</div>
|
|
@@ -511,17 +512,9 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
let color = that.paintColorByData(num)
|
|
|
- let layer = L.geoJSON(JsonData.features, {
|
|
|
- style:function(){
|
|
|
- return {
|
|
|
- 'weight': 1,
|
|
|
- 'color': color.border,
|
|
|
- 'fillColor':color.area
|
|
|
- }
|
|
|
- }
|
|
|
- }).addTo(maps);
|
|
|
-
|
|
|
+
|
|
|
let center = JsonData.features[0].properties.center
|
|
|
+
|
|
|
let marker = L.divIcon({
|
|
|
html: JsonData.features[0].properties.name,
|
|
|
iconSize:30
|
|
@@ -821,6 +814,17 @@ export default {
|
|
|
contextmenu: true,
|
|
|
contextmenuWidth: 140,
|
|
|
})
|
|
|
+ let JsonData = require("../../assets/geoData/china.json")
|
|
|
+ let layer = L.geoJSON(JsonData.features, {
|
|
|
+ style:function(){
|
|
|
+ return {
|
|
|
+ 'weight': 1,
|
|
|
+ 'color': '#B3D2FF',
|
|
|
+ 'fillColor':'#DEECFF'
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }).addTo(maps);
|
|
|
+ return
|
|
|
if(this.currentLevel === 1) { //1集团 3区域 0广场
|
|
|
this.pantGroupMap(this.currentDistrictData[0],"1001")
|
|
|
} else if (this.currentLevel === 2) { // 2中心
|
|
@@ -834,13 +838,13 @@ export default {
|
|
|
maps.eachLayer(function(layer){
|
|
|
maps.removeLayer(layer)
|
|
|
})
|
|
|
- let data = require(`../../assets/geoData/ChinaBorder.json`)
|
|
|
+ let data = require(`../../assets/geoData/china.json`)
|
|
|
L.geoJSON(data.features, {
|
|
|
style:function(){
|
|
|
return {
|
|
|
'weight': 1,
|
|
|
'color': 'black',
|
|
|
- 'fillColor':'#f1f1f1'
|
|
|
+ 'fillColor':'#e0ebff'
|
|
|
}
|
|
|
}
|
|
|
}).addTo(maps);
|
|
@@ -964,7 +968,9 @@ export default {
|
|
|
let result = res.data
|
|
|
if (result && Array.isArray(result)) {
|
|
|
result.forEach(item => {
|
|
|
- item.assetTypeList = item.assetTypeList.splice(0,3)
|
|
|
+ if (item.assetTypeList) {
|
|
|
+ item.assetTypeList = item.assetTypeList.splice(0,3)
|
|
|
+ }
|
|
|
})
|
|
|
res.data.forEach(item => {
|
|
|
item.selected = false
|
|
@@ -1150,7 +1156,7 @@ export default {
|
|
|
ul{
|
|
|
li.system-item{
|
|
|
display: flex;
|
|
|
- justify-content: space-around;
|
|
|
+ justify-content: flex-start;
|
|
|
align-items: center;
|
|
|
width: calc(100% - 3.2rem);
|
|
|
margin-left: 1.6rem;
|