|
|
@@ -37,10 +37,6 @@
|
|
|
<p class="p1">{{Number(deviceTotalData.light_num).formatNumberRgx()}}</p>
|
|
|
<p class="p2">Lights</p>
|
|
|
</div>
|
|
|
- <div class="li">
|
|
|
- <p class="p1">{{Number(deviceTotalData.network_num).formatNumberRgx()}}</p>
|
|
|
- <p class="p2">Network</p>
|
|
|
- </div>
|
|
|
<div class="li">
|
|
|
<p class="p1"><span class="span1">{{Number(deviceTotalData.online_num).formatNumberRgx()}}</span><span class="span2">{{deviceTotalData.online_rate}}</span></p>
|
|
|
<p class="p2">On-line</p>
|
|
|
@@ -190,9 +186,9 @@
|
|
|
:show-overflow-tooltip="true"
|
|
|
:min-width="item.minWidth">
|
|
|
<template slot-scope="scope">
|
|
|
- <div v-if="item.prop != 'lampstatus'&&item.prop != 'lighteness'">{{scope.row[item.prop]}}{{item.unit?item.unit:''}}</div>
|
|
|
+ <div v-if="item.prop != 'status'&&item.prop != 'lighteness'">{{scope.row[item.prop]}}{{item.unit?item.unit:''}}</div>
|
|
|
|
|
|
- <div v-if="item.prop == 'lampstatus'" class="State">
|
|
|
+ <div v-if="item.prop == 'status'" class="status">
|
|
|
<img src="../img/projectManagement/Online.png" v-if="scope.row[item.prop] == '1'">
|
|
|
<img src="../img/projectManagement/Offline.png" v-if="scope.row[item.prop] == '0'" >
|
|
|
</div>
|
|
|
@@ -396,54 +392,47 @@
|
|
|
class="solar_dialig details_box"
|
|
|
width="95%">
|
|
|
<div class="wrap">
|
|
|
- <div class="nav clearfix" v-if="version == 0">
|
|
|
- <div class="nav_list"
|
|
|
- :class="{'details_nav_select':detailsNavSelect==item.model}"
|
|
|
- v-for="item in detailsNavList"
|
|
|
- :key="item.label"
|
|
|
- @click="detailsNavSelectFun(item)"><span>{{item.label}}</span></div>
|
|
|
- </div>
|
|
|
- <div class="nav clearfix" v-if="version == 1" style="width: 550px;margin-left: -275px;">
|
|
|
+ <div class="nav clearfix" style="width: 550px;margin-left: -275px;">
|
|
|
<div class="nav_list"
|
|
|
:class="{'details_nav_select':detailsNavSelect==item.model}"
|
|
|
v-for="item in detailsNavListEN"
|
|
|
:key="item.label"
|
|
|
@click="detailsNavSelectFun(item)"><span>{{item.label}}</span></div>
|
|
|
</div>
|
|
|
- <div class="details_list_box clearfix" :class="{'details_list_box_EN':version == 1}" v-loading="loading.detailsFieldList">
|
|
|
- <div class="details_list" :class="{'details_list_min':(windowWidth < 1600 && version == 1)}" v-for="item in detailsFieldList" :key="item.key">
|
|
|
- <template v-if="!(item.key == '网络编号'&&lampcontrolListHC['devicetype'] == '1')&&!(item.model =='lighteness'&&lampLoadtype=='1')">
|
|
|
+ <div class="details_list_box clearfix" :class="{'details_list_box_EN':version == 0}" v-loading="loading.detailsFieldList">
|
|
|
+ <div class="details_list" :class="{'details_list_min':(windowWidth < 1600 && version == 0)}" v-for="item in detailsFieldList" :key="item.key">
|
|
|
+ <template v-if="!(lampcontrolListHC['devicetype'] == '1')&&!(item.model =='lighteness'&&lampLoadtype=='1')">
|
|
|
<span v-if="item.unit">{{item.key+'('+item.unit+'):'}}</span>
|
|
|
<span v-if="!item.unit">{{item.key+':'}}</span>
|
|
|
|
|
|
<span v-if="item.value && item.model!='lampstatus'&&item.model !='status'&&item.model !='devicetype'&&item.model !='battstatus'&&item.model !='chargestage'" :title="item.value">{{item.value}}</span>
|
|
|
- <span v-if="item.model && item.model=='lampstatus' && item.value == '0'" :title="version == 0 ?'关灯' : 'Off'">{{version == 0 ?'关灯' : 'Off'}}</span>
|
|
|
- <span v-if="item.model && item.model=='lampstatus' && item.value == '1'" :title="version == 0 ?'开灯' : 'On'">{{version == 0 ?'开灯' : 'On'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='lampstatus' && item.value == '0'" :title="'Off'">{{'Off'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='lampstatus' && item.value == '1'" :title="'On'">{{'On'}}</span>
|
|
|
|
|
|
- <span v-if="item.model && item.model=='status' && item.value == '0'" :title="version == 0 ?'不在线' : 'Not online'">{{version == 0 ?'不在线' : 'Not online'}}</span>
|
|
|
- <span v-if="item.model && item.model=='status' && item.value == '1'" :title="version == 0 ?'在线' : 'Online'">{{version == 0 ?'在线' : 'Online'}}</span>
|
|
|
- <span v-if="item.model && item.model=='battstatus' && item.value == '0'" :title="version == 0 ?'空闲' : 'idle'">{{version == 0 ?'空闲' : 'idle'}}</span>
|
|
|
- <span v-if="item.model && item.model=='battstatus' && item.value == '1'" :title="version == 0 ?'放电' : 'Discharging'">{{version == 0 ?'放电' : 'Discharging'}}</span>
|
|
|
- <span v-if="item.model && item.model=='battstatus' && item.value == '2'" :title="version == 0 ?'充电' : 'Charging'">{{version == 0 ?'充电' : 'Charging'}}</span>
|
|
|
- <span v-if="item.model && item.model=='battstatus' && item.value == '3'" :title="version == 0 ?'一边充电一边放电' : 'Discharge while charging'">{{version == 0 ?'一边充电一边放电' : 'Discharge while charging'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='status' && item.value == '0'" :title="'Not online'">{{'Not online'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='status' && item.value == '1'" :title="'Online'">{{'Online'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='battstatus' && item.value == '0'" :title="'idle'">{{'idle'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='battstatus' && item.value == '1'" :title="'Discharging'">{{'Discharging'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='battstatus' && item.value == '2'" :title="'Charging'">{{'Charging'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='battstatus' && item.value == '3'" :title="'Discharge while charging'">{{'Discharge while charging'}}</span>
|
|
|
|
|
|
- <span v-if="item.model && item.model=='chargestage' && (item.value == ''||item.value == null)" :title="version == 0 ?'未知状态' : 'Unknown state'">{{version == 0 ?'未知状态' : 'Unknown state'}}</span>
|
|
|
- <span v-if="item.model && item.model=='chargestage' && item.value == '0'" :title="version == 0 ?'未充电' : 'Uncharged'">{{version == 0 ?'未充电' : 'Uncharged'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='chargestage' && (item.value == ''||item.value == null)" :title="'Unknown state'">{{'Unknown state'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='chargestage' && item.value == '0'" :title="'Uncharged'">{{'Uncharged'}}</span>
|
|
|
|
|
|
- <span v-if="item.model && item.model=='chargestage' && item.value == '1'" :title="version == 0 ?'启动充电' : 'Start charging'">{{version == 0 ?'未充电' : 'Uncharged'}}</span>
|
|
|
- <span v-if="item.model && item.model=='chargestage' && item.value == '6'" :title="version == 0 ?'限流' : 'Current limiting'">{{version == 0 ?'未充电' : 'Uncharged'}}</span>
|
|
|
- <span v-if="item.model && item.model=='chargestage' && item.value == '7'" :title="version == 0 ?'充满' : 'Full'">{{version == 0 ?'未充电' : 'Uncharged'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='chargestage' && item.value == '1'" :title="'Start charging'">{{'Uncharged'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='chargestage' && item.value == '6'" :title="'Current limiting'">{{'Uncharged'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='chargestage' && item.value == '7'" :title="'Full'">{{'Uncharged'}}</span>
|
|
|
|
|
|
- <span v-if="item.model && item.model=='chargestage' && item.value == '16'" :title="version == 0 ?'MPPT充电' : 'MPPT charging'">{{version == 0 ?'MPPT充电' : 'MPPT charging'}}</span>
|
|
|
- <span v-if="item.model && item.model=='chargestage' && item.value == '32'" :title="version == 0 ?'均衡充电' : 'Balanced charge'">{{version == 0 ?'均衡充电' : 'Balanced charge'}}</span>
|
|
|
- <span v-if="item.model && item.model=='chargestage' && item.value == '48'" :title="version == 0 ?'提升充电' : 'Increase charging'">{{version == 0 ?'提升充电' : 'Increase charging'}}</span>
|
|
|
- <span v-if="item.model && item.model=='chargestage' && item.value == '64'" :title="version == 0 ?'浮充' : 'Floating charge'">{{version == 0 ?'浮充' : 'Floating charge'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='chargestage' && item.value == '16'" :title="'MPPT charging'">{{'MPPT charging'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='chargestage' && item.value == '32'" :title="'Balanced charge'">{{'Balanced charge'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='chargestage' && item.value == '48'" :title="'Increase charging'">{{'Increase charging'}}</span>
|
|
|
+ <span v-if="item.model && item.model=='chargestage' && item.value == '64'" :title="'Floating charge'">{{'Floating charge'}}</span>
|
|
|
|
|
|
<span v-if="!(item.value)">{{item.value}}</span>
|
|
|
</template>
|
|
|
</div>
|
|
|
<div v-if="detailsFieldList.length == 0 && !loading.detailsFieldList" style="text-align:center;">
|
|
|
- {{version == 0 ?'未查询到相关数据' : 'No relevant data was queried'}}
|
|
|
+ {{'No relevant data was queried'}}
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -560,22 +549,15 @@
|
|
|
<div class="wrap">
|
|
|
<div class="main_list">
|
|
|
<div class="main_list_title">
|
|
|
- <p>{{version == '0'?'路灯编号':'Lamp number'}}</p>
|
|
|
+ <p>{{'Lamp number'}}</p>
|
|
|
</div>
|
|
|
- <div class="main_list_box" :class="{'EN':version == '1'}">
|
|
|
+ <div class="main_list_box" :class="{'EN':version == '0'}">
|
|
|
<div class="lamp_list scroll_show_all">
|
|
|
<div class="li" :class="{'select':item.id==historicalLampId}" v-for="item in historicalLampList" @click="historicalLampClick(item.id)" :key="item.id">
|
|
|
{{item.number}}
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="historicalnav clearfix" v-if="version == 0">
|
|
|
- <div class="nav_list"
|
|
|
- :class="{'details_nav_select':historicalNavSelect==item.model}"
|
|
|
- v-for="item in historicalNavListFor" :key="item.id"
|
|
|
- @click="historicalNavSelectFun(item)"><span :title="item.label">{{item.label}}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="historicalnav clearfix" v-if="version == 1">
|
|
|
+ <div class="historicalnav clearfix">
|
|
|
<div class="nav_list"
|
|
|
:class="{'details_nav_select':historicalNavSelect==item.model}"
|
|
|
v-for="item in historicalNavListENFor" :key="item.id"
|
|
|
@@ -608,7 +590,7 @@
|
|
|
start-placeholder=""
|
|
|
end-placeholder="">
|
|
|
</el-date-picker>
|
|
|
- <el-button size="small" @click="screenDateFun()">{{version=='0'?'确定':'Determine'}}<i class="el-icon-arrow-right"></i></el-button>
|
|
|
+ <el-button size="small" @click="screenDateFun()">{{'Determine'}}<i class="el-icon-arrow-right"></i></el-button>
|
|
|
</div>
|
|
|
<el-button round size="small" @click="exportTableLS()" v-loading="loading.exportTableLS">{{'Export'}}</el-button>
|
|
|
</div>
|
|
|
@@ -623,14 +605,6 @@
|
|
|
style="width: 100%;"
|
|
|
height="374"
|
|
|
:row-class-name="tableRowClassName">
|
|
|
- <!-- <el-table-column
|
|
|
- v-if="version == 0"
|
|
|
- label="序号"
|
|
|
- prop="LSLD_index"
|
|
|
- align="center"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- width="82">
|
|
|
- </el-table-column> -->
|
|
|
<el-table-column
|
|
|
label="Number"
|
|
|
prop="LSLD_index"
|
|
|
@@ -674,10 +648,10 @@
|
|
|
<div></div>
|
|
|
<div>
|
|
|
<div class="screen_date_select">
|
|
|
- <div class="li" :class="{'select':LSDataType == '0'}" @click="LSDataTypeFun('0',1)">1{{version=='0'?'天':'Day'}}</div>
|
|
|
- <div class="li" :class="{'select':LSDataType == '1'}" @click="LSDataTypeFun('1',3)">3{{version=='0'?'天':'Day'}}</div>
|
|
|
- <div class="li" :class="{'select':LSDataType == '2'}" @click="LSDataTypeFun('2',7)">7{{version=='0'?'天':'Day'}}</div>
|
|
|
- <div class="li" :class="{'select':LSDataType == '3'}" @click="LSDataTypeFun('3',14)">14{{version=='0'?'天':'Day'}}</div>
|
|
|
+ <div class="li" :class="{'select':LSDataType == '0'}" @click="LSDataTypeFun('0',1)">1{{'Day'}}</div>
|
|
|
+ <div class="li" :class="{'select':LSDataType == '1'}" @click="LSDataTypeFun('1',3)">3{{'Day'}}</div>
|
|
|
+ <div class="li" :class="{'select':LSDataType == '2'}" @click="LSDataTypeFun('2',7)">7{{'Day'}}</div>
|
|
|
+ <div class="li" :class="{'select':LSDataType == '3'}" @click="LSDataTypeFun('3',14)">14{{'Day'}}</div>
|
|
|
</div>
|
|
|
<div class="screen_date">
|
|
|
<el-date-picker
|
|
|
@@ -698,19 +672,19 @@
|
|
|
</div>
|
|
|
<div class="history_echarts" v-loading="loading.historyEcharts" v-show="historyDataInfo.list.updatetime"></div>
|
|
|
<div class="history_echarts_noData" v-show="!historyDataInfo.list.updatetime">
|
|
|
- <h3>{{version=='0'?'查询不到数据':'No data can be queried'}}</h3>
|
|
|
+ <h3>{{'No data can be queried'}}</h3>
|
|
|
</div>
|
|
|
<div class="echarts_bottom echarts_line">
|
|
|
<div class="echarts_bottom_text">{{version=='0'?'采样周期':'sampling period'}}: {{historyDataInfo.patrolinterval}}{{version=='0'?'分钟':'minutes'}}</div>
|
|
|
<div class="data_type_nav">
|
|
|
- <div class="li" :class="{'select':dataLSType == '0'}" @click="dataLSTypeFun('0')">{{version=='0'?'曲线图':'Diagram'}}</div>
|
|
|
- <div class="li" :class="{'select':dataLSType == '1'}" @click="dataLSTypeFun('1')">{{version=='0'?'列表':'list'}}</div>
|
|
|
+ <div class="li" :class="{'select':dataLSType == '0'}" @click="dataLSTypeFun('0')">{{'Diagram'}}</div>
|
|
|
+ <div class="li" :class="{'select':dataLSType == '1'}" @click="dataLSTypeFun('1')">{{'list'}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="left_data">
|
|
|
<p><img src="../img/projectManagement/data.png">{{'Statistical extremum'}}</p>
|
|
|
- <div class="ul" :class="{'EN':version == '1'}">
|
|
|
+ <div class="ul" :class="{'EN':version == '0'}">
|
|
|
<div class="li" v-if="historicalNavSelect != '3'">
|
|
|
<span class="span1">{{'Maximum voltage'}}</span>
|
|
|
<span class="span_r">
|
|
|
@@ -803,28 +777,28 @@
|
|
|
</span>
|
|
|
</div>
|
|
|
<div class="li" v-if="historicalNavSelect == '3'">
|
|
|
- <span class="span1">{{version=='0'?'最大充电安时数':'Max charge ampere hours'}}</span>
|
|
|
+ <span class="span1">{{'Max charge ampere hours'}}</span>
|
|
|
<span class="span_r">
|
|
|
<span class="span2" :title="historyDataInfo.maxdaychargeah">{{historyDataInfo.maxdaychargeah}}</span>
|
|
|
<span class="span3">AH</span>
|
|
|
</span>
|
|
|
</div>
|
|
|
<div class="li" v-if="historicalNavSelect == '3'">
|
|
|
- <span class="span1">{{version=='0'?'最小充电安时数':'Min charge ampere hours'}}</span>
|
|
|
+ <span class="span1">{{'Min charge ampere hours'}}</span>
|
|
|
<span class="span_r">
|
|
|
<span class="span2" :title="historyDataInfo.mindaychargeah">{{historyDataInfo.mindaychargeah}}</span>
|
|
|
<span class="span3">AH</span>
|
|
|
</span>
|
|
|
</div>
|
|
|
<div class="li" v-if="historicalNavSelect == '3'">
|
|
|
- <span class="span1">{{version=='0'?'最大放电安时数':'Max discharge amperes'}}</span>
|
|
|
+ <span class="span1">{{'Max discharge amperes'}}</span>
|
|
|
<span class="span_r">
|
|
|
<span class="span2" :title="historyDataInfo.maxdaydischarah">{{historyDataInfo.maxdaydischarah}}</span>
|
|
|
<span class="span3">AH</span>
|
|
|
</span>
|
|
|
</div>
|
|
|
<div class="li" v-if="historicalNavSelect == '3'">
|
|
|
- <span class="span1">{{version=='0'?'最小放电安时数':'Min discharge amperes'}}</span>
|
|
|
+ <span class="span1">{{'Min discharge amperes'}}</span>
|
|
|
<span class="span_r">
|
|
|
<span class="span2" :title="historyDataInfo.mindaydischarah">{{historyDataInfo.mindaydischarah}}</span>
|
|
|
<span class="span3">AH</span>
|
|
|
@@ -835,8 +809,8 @@
|
|
|
</div>
|
|
|
<div class="echarts_bottom" v-if="dataLSType == '1'">
|
|
|
<div class="data_type_nav">
|
|
|
- <div class="li" :class="{'select':dataLSType == '0'}" @click="dataLSTypeFun('0')">{{version=='0'?'曲线图':'Diagram'}}</div>
|
|
|
- <div class="li" :class="{'select':dataLSType == '1'}" @click="dataLSTypeFun('1')">{{version=='0'?'列表':'list'}}</div>
|
|
|
+ <div class="li" :class="{'select':dataLSType == '0'}" @click="dataLSTypeFun('0')">{{'Diagram'}}</div>
|
|
|
+ <div class="li" :class="{'select':dataLSType == '1'}" @click="dataLSTypeFun('1')">{{'list'}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1928,6 +1902,8 @@
|
|
|
online:this.online,
|
|
|
download:downloadVal,
|
|
|
section:this.roadId,
|
|
|
+ type:this.sideBarCompanyType,
|
|
|
+ company:this.companyId,
|
|
|
},
|
|
|
{},
|
|
|
data =>{
|
|
|
@@ -2005,6 +1981,8 @@
|
|
|
client_key:this.client_key,
|
|
|
token:this.token,
|
|
|
project_id:id,
|
|
|
+ type:this.sideBarCompanyType,
|
|
|
+ company:this.companyId,
|
|
|
},
|
|
|
{},
|
|
|
data =>{
|
|
|
@@ -2086,7 +2064,7 @@
|
|
|
}
|
|
|
}
|
|
|
this.$set(data.data[0],'isOpen',true)
|
|
|
- this.companyId = data.data.cId;
|
|
|
+ this.companyId = data.data[0].cId;
|
|
|
if(data.data[0].projectList.length>0){
|
|
|
this.projectId = data.data[0].projectList[0].id;
|
|
|
this.$set(data.data[0].projectList[0],'isOpen',true)
|
|
|
@@ -2145,7 +2123,7 @@
|
|
|
}
|
|
|
}
|
|
|
this.$set(data.data[0],'isOpen',true)
|
|
|
- this.companyId = data.data.cId;
|
|
|
+ this.companyId = data.data[0].cId;
|
|
|
if(data.data[0].projectList.length>0){
|
|
|
this.projectId = data.data[0].projectList[0].id;
|
|
|
this.$set(data.data[0].projectList[0],'isOpen',true)
|
|
|
@@ -2182,6 +2160,7 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ console.log(this.companyId)
|
|
|
this.projectNav = data.data;
|
|
|
},
|
|
|
this)
|
|
|
@@ -2223,11 +2202,18 @@
|
|
|
/*侧边栏里展开收起*/
|
|
|
sideBarListIsOpen(data){
|
|
|
console.log(data)
|
|
|
+ // var storage = window.localStorage;
|
|
|
+ // this.companyId = data.cId;
|
|
|
+ // storage.setItem('companyId',data.cId);
|
|
|
+ // storage.setItem('projectId',false);
|
|
|
+ // this.projectId = '';
|
|
|
+ // this.roadId = '';
|
|
|
if(data.isOpen){
|
|
|
data.isOpen = false;
|
|
|
}else{
|
|
|
data.isOpen = true;
|
|
|
}
|
|
|
+ // this.getLightList(this.currentPage);
|
|
|
},
|
|
|
projectAll(){
|
|
|
this.projectId = 0;
|
|
|
@@ -2236,7 +2222,7 @@
|
|
|
storage.setItem('projectId',false);
|
|
|
storage.setItem('companyId',false);
|
|
|
},
|
|
|
- projectSelectFun(type,data){
|
|
|
+ projectSelectFun(type,data,d){
|
|
|
var storage = window.localStorage;
|
|
|
if(!data.isOpen||this.projectId != data.id){
|
|
|
this.$set(data,'isOpen',true)
|
|
|
@@ -2244,21 +2230,29 @@
|
|
|
this.$set(data,'isOpen',false)
|
|
|
}
|
|
|
console.log(type,data)
|
|
|
- if(type != 0){
|
|
|
- storage.setItem('projectId',data.id);
|
|
|
- this.projectId = data.id;
|
|
|
- this.roadId = '';
|
|
|
+ storage.setItem('projectId',data.id);
|
|
|
+ if(d.cId != this.companyId){
|
|
|
+ this.companyId = d.cId;
|
|
|
+ storage.setItem('companyId',d.cId);
|
|
|
}
|
|
|
+ this.projectId = data.id;
|
|
|
+ this.roadId = '';
|
|
|
this.getLightList(this.currentPage);
|
|
|
+ this.getProjectData(this.projectId)
|
|
|
},
|
|
|
- roadSelectFun(data,obj){
|
|
|
+ roadSelectFun(data,obj,d){
|
|
|
var storage = window.localStorage;
|
|
|
+ if(d.cId != this.companyId){
|
|
|
+ this.companyId = d.cId;
|
|
|
+ storage.setItem('companyId',d.cId);
|
|
|
+ }
|
|
|
if(data.id != this.projectId){
|
|
|
storage.setItem('projectId',data.id);
|
|
|
this.projectId = data.id;
|
|
|
}
|
|
|
this.roadId = obj.name;
|
|
|
this.getLightList(this.currentPage);
|
|
|
+ this.getProjectData(this.projectId)
|
|
|
|
|
|
// if(d.id != this.companyId){
|
|
|
// storage.setItem('companyId',d.id);
|
|
|
@@ -2620,9 +2614,9 @@
|
|
|
this.lampId = data.id;
|
|
|
this.lampLoadtype = data.loadtype;
|
|
|
if(data.loadtype == '1'){
|
|
|
- this.detailsNavList[0].label = this.version =='0'?'捕虫器':'Insect trap';
|
|
|
+ this.detailsNavList[0].label ='Insect trap';
|
|
|
}else{
|
|
|
- this.detailsNavList[0].label = this.version =='0'?'路灯':'lamp';
|
|
|
+ this.detailsNavList[0].label ='lamp';
|
|
|
}
|
|
|
this.detailsNavSelect = 'lamp_info_log';
|
|
|
this.lampcontrolViewloglist('lamp_info_log',data => {
|
|
|
@@ -2632,6 +2626,7 @@
|
|
|
for(var d of this.streetlightDetails){
|
|
|
let obj = {};
|
|
|
for(let dd of fieldList){
|
|
|
+ console.log(dd.fields1,d.model)
|
|
|
if(dd.fields1 == 'number'){
|
|
|
dd.fields1 = 'lamp_no'
|
|
|
}
|
|
|
@@ -2642,41 +2637,23 @@
|
|
|
dd.fields1 = 'project_name'
|
|
|
}
|
|
|
if(dd.fields1 == d.model){
|
|
|
- if(this.version == 0){
|
|
|
- obj.key = dd.name
|
|
|
- }else if(this.version == 1){
|
|
|
- obj.key = dd.enname
|
|
|
- }
|
|
|
+ obj.key = dd.enname
|
|
|
}
|
|
|
}
|
|
|
if(this.lampLoadtype == '1'){
|
|
|
- if(this.version == '0'){
|
|
|
- if(d.model == 'lampstatus'){
|
|
|
- obj.key = '捕虫器状态'
|
|
|
- }
|
|
|
- if(d.model == 'lampvoltage'){
|
|
|
- obj.key = '捕虫器电压'
|
|
|
- }
|
|
|
- if(d.model == 'lampcurrent'){
|
|
|
- obj.key = '捕虫器电流'
|
|
|
- }
|
|
|
- if(d.model == 'lamppower'){
|
|
|
- obj.key = '捕虫器功率'
|
|
|
- }
|
|
|
- }else{
|
|
|
- if(d.model == 'lampstatus'){
|
|
|
- obj.key = 'Insect trap status'
|
|
|
- }
|
|
|
- if(d.model == 'lampvoltage'){
|
|
|
- obj.key = 'Insect trap voltage'
|
|
|
- }
|
|
|
- if(d.model == 'lampcurrent'){
|
|
|
- obj.key = 'Insect trap current'
|
|
|
- }
|
|
|
- if(d.model == 'lamppower'){
|
|
|
- obj.key = 'Insect trap power'
|
|
|
- }
|
|
|
+ if(d.model == 'lampstatus'){
|
|
|
+ obj.key = 'Insect trap status'
|
|
|
}
|
|
|
+ if(d.model == 'lampvoltage'){
|
|
|
+ obj.key = 'Insect trap voltage'
|
|
|
+ }
|
|
|
+ if(d.model == 'lampcurrent'){
|
|
|
+ obj.key = 'Insect trap current'
|
|
|
+ }
|
|
|
+ if(d.model == 'lamppower'){
|
|
|
+ obj.key = 'Insect trap power'
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
if(d.model == 'monthly_can_usage'){
|
|
|
obj.key = '套餐总量'
|
|
|
@@ -2720,46 +2697,24 @@
|
|
|
dd.fields1 = 'project_name'
|
|
|
}
|
|
|
if(dd.fields1 == d.model){
|
|
|
- if(this.version == 0){
|
|
|
- obj.key = dd.name
|
|
|
- }else if(this.version == 1){
|
|
|
- obj.key = dd.enname
|
|
|
- }
|
|
|
+ obj.key = dd.enname
|
|
|
}
|
|
|
}
|
|
|
if(this.lampLoadtype == '1'){
|
|
|
- if(this.version == '0'){
|
|
|
- if(d.model == 'lampstatus'){
|
|
|
- obj.key = '捕虫器状态'
|
|
|
- }
|
|
|
- if(d.model == 'lampvoltage'){
|
|
|
- obj.key = '捕虫器电压'
|
|
|
- }
|
|
|
- if(d.model == 'lampcurrent'){
|
|
|
- obj.key = '捕虫器电流'
|
|
|
- }
|
|
|
- if(d.model == 'lamppower'){
|
|
|
- obj.key = '捕虫器功率'
|
|
|
- }
|
|
|
- if(d.model == 'lamp_no'){
|
|
|
- obj.key = '捕虫器编号'
|
|
|
- }
|
|
|
- }else{
|
|
|
- if(d.model == 'lampstatus'){
|
|
|
- obj.key = 'Insect trap status'
|
|
|
- }
|
|
|
- if(d.model == 'lampvoltage'){
|
|
|
- obj.key = 'Insect trap voltage'
|
|
|
- }
|
|
|
- if(d.model == 'lampcurrent'){
|
|
|
- obj.key = 'Insect trap current'
|
|
|
- }
|
|
|
- if(d.model == 'lamppower'){
|
|
|
- obj.key = 'Insect trap power'
|
|
|
- }
|
|
|
- if(d.model == 'lamp_no'){
|
|
|
- obj.key = 'Insect trap number'
|
|
|
- }
|
|
|
+ if(d.model == 'lampstatus'){
|
|
|
+ obj.key = 'Insect trap status'
|
|
|
+ }
|
|
|
+ if(d.model == 'lampvoltage'){
|
|
|
+ obj.key = 'Insect trap voltage'
|
|
|
+ }
|
|
|
+ if(d.model == 'lampcurrent'){
|
|
|
+ obj.key = 'Insect trap current'
|
|
|
+ }
|
|
|
+ if(d.model == 'lamppower'){
|
|
|
+ obj.key = 'Insect trap power'
|
|
|
+ }
|
|
|
+ if(d.model == 'lamp_no'){
|
|
|
+ obj.key = 'Insect trap number'
|
|
|
}
|
|
|
}
|
|
|
if(d.model == 'monthly_can_usage'){
|
|
|
@@ -3475,6 +3430,314 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ historyEcharts(data,type){
|
|
|
+ let this_ = this,series = [],dataListMax = 3,gridLeft,legendData = [],legendSelected = {};
|
|
|
+ if(type == '0'){
|
|
|
+ series = [
|
|
|
+ {
|
|
|
+ name:'Voltage',
|
|
|
+ id:'V_0',
|
|
|
+ data:data.lampvoltage,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#15CA56',
|
|
|
+ showSymbol:false,
|
|
|
+ },{
|
|
|
+ name:'Current',
|
|
|
+ id:'A_1',
|
|
|
+ data:data.lampcurrent,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#F3BC12',
|
|
|
+ showSymbol:false,
|
|
|
+ },{
|
|
|
+ name:'power',
|
|
|
+ id:'W_2',
|
|
|
+ data:data.lamppower,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#3898F8',
|
|
|
+ showSymbol:false,
|
|
|
+ },{
|
|
|
+ name:'brightness',
|
|
|
+ id:'%_3',
|
|
|
+ data:data.lighteness,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#F05904',
|
|
|
+ showSymbol:false,
|
|
|
+ },
|
|
|
+ ];
|
|
|
+ legendData = [
|
|
|
+ {name:'Voltage',icon:'circle'},
|
|
|
+ {name:'Current',icon:'circle'},
|
|
|
+ {name:'power',icon:'circle'},
|
|
|
+ {name:'brightness',icon:'circle',select:false}
|
|
|
+ ];
|
|
|
+ legendSelected['Voltage'] = true;
|
|
|
+ legendSelected['Current'] = true;
|
|
|
+ legendSelected['power'] = true;
|
|
|
+ legendSelected['brightness'] = false;
|
|
|
+ for(let d of data.lamppower){
|
|
|
+ d = parseInt(d);
|
|
|
+ if(d > dataListMax){
|
|
|
+ dataListMax = d;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ dataListMax = dataListMax +'00'
|
|
|
+ gridLeft = dataListMax.length*10;
|
|
|
+ }
|
|
|
+ if(type == '1'){
|
|
|
+ series = [
|
|
|
+ {
|
|
|
+ name:'Voltage',
|
|
|
+ id:'V_0',
|
|
|
+ data:data.battvoltage,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#15CA56',
|
|
|
+ showSymbol:false,
|
|
|
+ },{
|
|
|
+ name:'Current',
|
|
|
+ id:'A_1',
|
|
|
+ data:data.batterycurrent,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#F3BC12',
|
|
|
+ showSymbol:false,
|
|
|
+ },{
|
|
|
+ name:'power',
|
|
|
+ id:'W_2',
|
|
|
+ data:data.batterypower,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#3898F8',
|
|
|
+ showSymbol:false,
|
|
|
+ }
|
|
|
+ ];
|
|
|
+ legendData = [
|
|
|
+ {name:'Voltage',icon:'circle'},
|
|
|
+ {name:'Current',icon:'circle'},
|
|
|
+ {name:'power',icon:'circle'},
|
|
|
+ ];
|
|
|
+ legendSelected['Voltage'] = true;
|
|
|
+ legendSelected['Current'] = true;
|
|
|
+ legendSelected['power'] = true;
|
|
|
+ for(let d of data.batterypower){
|
|
|
+ d = parseInt(d);
|
|
|
+ if(d > dataListMax){
|
|
|
+ dataListMax = d;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ dataListMax = dataListMax +'00'
|
|
|
+ gridLeft = dataListMax.length*10;
|
|
|
+ }
|
|
|
+ if(type == '2'){
|
|
|
+ series = [
|
|
|
+ {
|
|
|
+ name:'Voltage',
|
|
|
+ id:'V_0',
|
|
|
+ data:data.solarvoltage,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#15CA56',
|
|
|
+ showSymbol:false,
|
|
|
+ },{
|
|
|
+ name:'Current',
|
|
|
+ id:'A_1',
|
|
|
+ data:data.solarcurrent,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#F3BC12',
|
|
|
+ showSymbol:false,
|
|
|
+ },{
|
|
|
+ name:'power',
|
|
|
+ id:'W_2',
|
|
|
+ data:data.solarpower,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#3898F8',
|
|
|
+ showSymbol:false,
|
|
|
+ },
|
|
|
+ ];
|
|
|
+ legendData = [
|
|
|
+ {name:'Voltage',icon:'circle'},
|
|
|
+ {name:'Current',icon:'circle'},
|
|
|
+ {name:'power',icon:'circle'},
|
|
|
+ ];
|
|
|
+ legendSelected['Voltage'] = true;
|
|
|
+ legendSelected['Current'] = true;
|
|
|
+ legendSelected['power'] = true;
|
|
|
+ for(let d of data.solarpower){
|
|
|
+ d = parseInt(d);
|
|
|
+ if(d > dataListMax){
|
|
|
+ dataListMax = d;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ dataListMax = dataListMax +'00'
|
|
|
+ gridLeft = dataListMax.length*10;
|
|
|
+ }
|
|
|
+ if(type == '3'){
|
|
|
+ series = [
|
|
|
+ {
|
|
|
+ name:'Charge',
|
|
|
+ id:'AH_0',
|
|
|
+ data:data.daychargeah,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#15CA56',
|
|
|
+ showSymbol:false,
|
|
|
+ },{
|
|
|
+ name:'Discharge',
|
|
|
+ id:'AH_1',
|
|
|
+ data:data.daydischarah,
|
|
|
+ type: 'line',
|
|
|
+ smooth: true,
|
|
|
+ color:'#F3BC12',
|
|
|
+ showSymbol:false,
|
|
|
+ }
|
|
|
+ ];
|
|
|
+ legendData = [
|
|
|
+ {name:'Charge',icon:'circle'},
|
|
|
+ {name:'Discharge',icon:'circle'},
|
|
|
+ ];
|
|
|
+ legendSelected['Charge'] = true;
|
|
|
+ legendSelected['Discharge'] = true;
|
|
|
+ for(let d of data.daychargeah){
|
|
|
+ d = parseInt(d);
|
|
|
+ if(d > dataListMax){
|
|
|
+ dataListMax = d;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for(let d of data.daydischarah){
|
|
|
+ d = parseInt(d);
|
|
|
+ if(d > dataListMax){
|
|
|
+ dataListMax = d;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ dataListMax = dataListMax +'00'
|
|
|
+ gridLeft = dataListMax.length*10;
|
|
|
+ }
|
|
|
+
|
|
|
+ // console.log(data,'------')
|
|
|
+ let legendOrient = 'horizontal';
|
|
|
+ if(document.body.offsetWidth <1500){
|
|
|
+ this_.legendWidth = '180px';
|
|
|
+ // if(type == '3'){
|
|
|
+ // legendOrient = 'vertical';
|
|
|
+ // }
|
|
|
+ }else{
|
|
|
+ this_.legendWidth = 'auto';
|
|
|
+ // legendOrient = 'horizontal';
|
|
|
+ }
|
|
|
+ this.$nextTick(function(){
|
|
|
+ if(document.getElementsByClassName('history_echarts')[0]){
|
|
|
+ const myChart = this.$echarts.init(document.getElementsByClassName('history_echarts')[0]);
|
|
|
+ let arry = [],hh,month,dd,mm;
|
|
|
+ for(let d of data.updatetime){
|
|
|
+ d = new Date(d);month = d.getMonth()+1;dd = d.getDate();
|
|
|
+ hh = d.getHours()<10?'0'+d.getHours():d.getHours();
|
|
|
+ mm = d.getMinutes()<10?'0'+d.getMinutes():d.getMinutes();
|
|
|
+ arry.push(month+'-'+dd+' '+hh+':'+mm)
|
|
|
+ }
|
|
|
+ let option = {
|
|
|
+ tooltip:{
|
|
|
+ trigger:'axis',
|
|
|
+ axisPointer:{
|
|
|
+ snap:true,
|
|
|
+ lineStyle:{
|
|
|
+ width:2,
|
|
|
+ color:'rgba(252, 130, 61, 0.19)',
|
|
|
+ type:'dashed',
|
|
|
+ }
|
|
|
+ },
|
|
|
+ padding:0,
|
|
|
+ backgroundColor:'rgba(0,0,0,0.6)',
|
|
|
+ formatter: function (params) {
|
|
|
+ var tls,p='';
|
|
|
+ for(let key in params){
|
|
|
+ // console.log('sapn_'+params[key].seriesId.split('_')[1])
|
|
|
+ p=p+'<p><span class="span_'+params[key].seriesId.split('_')[1]+'"></span>'+params[key].seriesName+': '+params[key].data+' '+params[key].seriesId.split('_')[0]+'</p>'
|
|
|
+ }
|
|
|
+ tls = '<div class="history_echarts_tooltip"><p>'+data.updatetime[params[0].dataIndex]+'</p>'+p+'</div>'
|
|
|
+ return tls;
|
|
|
+ },
|
|
|
+ },
|
|
|
+ grid:{
|
|
|
+ top:60,
|
|
|
+ left:gridLeft,
|
|
|
+ bottom:20,
|
|
|
+ right:40,
|
|
|
+ },
|
|
|
+ legend: {
|
|
|
+ data:legendData,
|
|
|
+ selected:legendSelected,
|
|
|
+ orient:legendOrient,
|
|
|
+ type: 'scroll',
|
|
|
+ left: '20px',
|
|
|
+ top: '0px',
|
|
|
+ width:this_.legendWidth,
|
|
|
+ itemWidth: 12,
|
|
|
+ itemHeight: 12,
|
|
|
+ textStyle:{
|
|
|
+ color:'rgba(102,102,102,1)',
|
|
|
+ fontSize:14,
|
|
|
+ fontWeight:500,
|
|
|
+ },
|
|
|
+ },
|
|
|
+ xAxis: {
|
|
|
+ data: arry,
|
|
|
+ type: 'category',
|
|
|
+ boundaryGap: false,
|
|
|
+ axisLabel:{
|
|
|
+ color:'rgba(136, 136, 136, 1)',
|
|
|
+ fontSize:'12',
|
|
|
+ },
|
|
|
+ axisTick:{
|
|
|
+ show:false
|
|
|
+ },
|
|
|
+ axisLine:{
|
|
|
+ show:false
|
|
|
+ },
|
|
|
+ },
|
|
|
+ yAxis: {
|
|
|
+ type: 'value',
|
|
|
+ nameGap:6,
|
|
|
+ // interval:6,
|
|
|
+ // max:
|
|
|
+ axisLabel:{
|
|
|
+ color:'rgba(136, 136, 136, 1)',
|
|
|
+ fontSize:'12',
|
|
|
+ },
|
|
|
+ axisTick:{
|
|
|
+ show:false
|
|
|
+ },
|
|
|
+ axisLine:{
|
|
|
+ show:false
|
|
|
+ },
|
|
|
+ splitNumber:4,
|
|
|
+ splitLine:{
|
|
|
+ lineStyle:{
|
|
|
+ color:'rgba(240, 240, 240, 1)',
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ series: series,
|
|
|
+ };
|
|
|
+ myChart.setOption(option,true);
|
|
|
+
|
|
|
+ window.onresize = function(){
|
|
|
+ if(document.body.offsetWidth <1500){
|
|
|
+ this_.legendWidth = '180px';
|
|
|
+ }else{
|
|
|
+ this_.legendWidth = 'auto';
|
|
|
+ }
|
|
|
+ myChart.setOption(option,true);
|
|
|
+ myChart.resize();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
historicalNavSelectFun(obj){
|
|
|
this.historicalNavSelect = obj.model;
|
|
|
if(this.dataLSType == '0'){
|
|
|
@@ -4971,8 +5234,12 @@
|
|
|
}
|
|
|
.details_list_box{
|
|
|
padding-top: 126px;
|
|
|
+ display: flex;
|
|
|
+ // justify-content: space-between;
|
|
|
+ flex-direction: row;
|
|
|
+ flex-wrap: wrap;
|
|
|
.details_list{
|
|
|
- float: left;
|
|
|
+ // float: left;
|
|
|
width: 25%;
|
|
|
position: relative;
|
|
|
margin-bottom: 30px;
|
DESKTOP-Q87JERS\YiGe