|
@@ -57,7 +57,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="echarts_map_box">
|
|
|
- <div class="echarts_title"><img src="../img/iconfont/map.png"><span>Bangladesh Map</span></div>
|
|
|
+ <div class="echarts_title"><img src="../img/iconfont/map.png"><span style="cursor: pointer;" @click="mapReturn()">Bangladesh Map</span></div>
|
|
|
<div class="echarts_map"></div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -109,19 +109,19 @@
|
|
|
<p class="p2">Power</p>
|
|
|
</div> -->
|
|
|
<div class="li">
|
|
|
- <p class="p1" :title="statisticInfo.electricity">{{statisticInfo.electricity}}</p>
|
|
|
+ <p class="p1" :title="statisticInfo.electricity">{{statisticInfo.electricity?statisticInfo.electricity:0}}</p>
|
|
|
<p class="p2">Electricity(Wh)</p>
|
|
|
</div>
|
|
|
<div class="li">
|
|
|
- <p class="p1" :title="statisticInfo.CO2_reduction">{{statisticInfo.CO2_reduction}}</p>
|
|
|
+ <p class="p1" :title="statisticInfo.CO2_reduction">{{statisticInfo.CO2_reduction?statisticInfo.CO2_reduction:0}}</p>
|
|
|
<p class="p2">CO2 reduction(Kg)</p>
|
|
|
</div>
|
|
|
<div class="li">
|
|
|
- <p class="p1" :title="statisticInfo.SO2_reduction">{{statisticInfo.SO2_reduction}}</p>
|
|
|
+ <p class="p1" :title="statisticInfo.SO2_reduction">{{statisticInfo.SO2_reduction?statisticInfo.SO2_reduction:0}}</p>
|
|
|
<p class="p2">SO2 reduction(g)</p>
|
|
|
</div>
|
|
|
<div class="li">
|
|
|
- <p class="p1" :title="statisticInfo.TCE_reduction">{{statisticInfo.TCE_reduction}}</p>
|
|
|
+ <p class="p1" :title="statisticInfo.TCE_reduction">{{statisticInfo.TCE_reduction?statisticInfo.TCE_reduction:0}}</p>
|
|
|
<p class="p2">Tce reduction(Kg)</p>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -394,7 +394,7 @@
|
|
|
|
|
|
this.deviceArr = [
|
|
|
{prop:'name',label:'Company',align:'left',minWidth:this.remRatio*10,type:1},
|
|
|
- {prop:'total',label:'Total',minWidth:this.remRatio*3,type:1},
|
|
|
+ {prop:'total',label:'Total',minWidth:this.remRatio*4,type:1},
|
|
|
{prop:'onlineCount',label:'On-line',minWidth:this.remRatio*3},
|
|
|
{prop:'offlineCount',label:'Off-line',minWidth:this.remRatio*3},
|
|
|
{prop:'faultCount',label:'Fault',minWidth:this.remRatio*3},
|
|
@@ -691,6 +691,29 @@
|
|
|
this.deviceBarInit(this.deviceList,this.chartType);
|
|
|
}
|
|
|
},
|
|
|
+ mapReturn(){
|
|
|
+ this.home_get_province(()=>{
|
|
|
+ if(this.provinceList.length){
|
|
|
+ // this.provinceId = this.provinceList[0].id
|
|
|
+ this.provinceId = null;
|
|
|
+ this.home_get_city(()=>{
|
|
|
+ if(this.cityList.length){
|
|
|
+ // this.cityId = this.cityList[0].id
|
|
|
+ this.cityId = null;
|
|
|
+ this.getData();
|
|
|
+ this.getSta_info();
|
|
|
+ this.getDev_list();
|
|
|
+ this.getAlarm_list();
|
|
|
+ }else{
|
|
|
+ this.cityId = null;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ this.provinceId = null;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.home_pro_dev_count('bangladesh');
|
|
|
+ },
|
|
|
echartsMapInit(mapName,list,cityName){
|
|
|
console.log(list)
|
|
|
let this_ = this;
|