|
|
@@ -955,6 +955,7 @@
|
|
|
division:'',
|
|
|
networkId:'0',
|
|
|
lamptype:1,
|
|
|
+ legendWidth:'',
|
|
|
divisionNav:[{id:'0',name:'All'}],
|
|
|
rightDate:'',
|
|
|
rightDateNav:[{id:'0',name:'Today'}],
|
|
|
@@ -3939,6 +3940,16 @@
|
|
|
}
|
|
|
this.lampHistoryData();
|
|
|
}else{
|
|
|
+
|
|
|
+ this.LSDataType = '4';
|
|
|
+ // console.log(this.screenDateLS);
|
|
|
+ // if(this.dataLSType == '0'){
|
|
|
+ // this.lampHistoryData();
|
|
|
+ // }else{
|
|
|
+ // this.currentPageLS = 1;
|
|
|
+ // this.historicalTableList = this[this.historicalNavSelect+'TableListEN'];
|
|
|
+ // this.lampcontrolHistorylist(1);
|
|
|
+ // }
|
|
|
if(historicalNavSelect == '3'){
|
|
|
this.historicalNavSelect = 'lamp_info_log';
|
|
|
}
|
|
|
@@ -4029,12 +4040,12 @@
|
|
|
{name:'Voltage',icon:'circle'},
|
|
|
{name:'Current',icon:'circle'},
|
|
|
{name:'power',icon:'circle'},
|
|
|
- {name:'brightness',icon:'circle',select:false}
|
|
|
+ // {name:'brightness',icon:'circle',select:false}
|
|
|
];
|
|
|
legendSelected['Voltage'] = true;
|
|
|
legendSelected['Current'] = true;
|
|
|
legendSelected['power'] = true;
|
|
|
- legendSelected['brightness'] = false;
|
|
|
+ // legendSelected['brightness'] = false;
|
|
|
for(let d of data.lamppower){
|
|
|
d = parseInt(d);
|
|
|
if(d > dataListMax){
|
|
|
@@ -4176,17 +4187,17 @@
|
|
|
gridLeft = dataListMax.length*10;
|
|
|
}
|
|
|
|
|
|
- // console.log(data,'------')
|
|
|
let legendOrient = 'horizontal';
|
|
|
if(document.body.offsetWidth <1500){
|
|
|
this_.legendWidth = '180px';
|
|
|
- // if(type == '3'){
|
|
|
- // legendOrient = 'vertical';
|
|
|
- // }
|
|
|
+ if(type == '3'){
|
|
|
+ legendOrient = 'vertical';
|
|
|
+ }
|
|
|
}else{
|
|
|
this_.legendWidth = 'auto';
|
|
|
- // legendOrient = 'horizontal';
|
|
|
+ legendOrient = 'horizontal';
|
|
|
}
|
|
|
+ console.log(data,'------',document.body.offsetWidth,legendData,legendSelected,legendOrient)
|
|
|
this.$nextTick(function(){
|
|
|
if(document.getElementsByClassName('history_echarts')[0]){
|
|
|
const myChart = this.$echarts.init(document.getElementsByClassName('history_echarts')[0]);
|
|
|
@@ -6272,8 +6283,8 @@
|
|
|
width: 10rem;
|
|
|
border-right: 2px solid rgba(240, 240, 240, 1);
|
|
|
.li{
|
|
|
- height:4.9rem;
|
|
|
- line-height: 4.9rem;
|
|
|
+ height:3.5rem;
|
|
|
+ line-height: 3.5rem;
|
|
|
|
|
|
font-size:1rem;
|
|
|
font-family:PingFang-SC-Medium;
|
|
|
@@ -6295,8 +6306,8 @@
|
|
|
}
|
|
|
.nav_list{
|
|
|
padding-left: 2rem;
|
|
|
- height: 5rem;
|
|
|
- line-height: 5rem;
|
|
|
+ height: 4rem;
|
|
|
+ line-height: 4rem;
|
|
|
font-size: 1rem;
|
|
|
border-bottom: 1px solid rgba(240, 240, 240, 1);
|
|
|
// background-color:rgba(255, 255, 255, 1);
|
|
|
@@ -6326,6 +6337,7 @@
|
|
|
justify-content: space-between;
|
|
|
>div{
|
|
|
display: flex;
|
|
|
+ align-items: center;
|
|
|
}
|
|
|
.el-pager{
|
|
|
padding-top: 0.5rem;
|
|
|
@@ -6415,15 +6427,15 @@
|
|
|
}
|
|
|
.data_type_nav{
|
|
|
display: flex;
|
|
|
- width: 20rem;
|
|
|
- height: 3.2rem;line-height: 3.2rem;
|
|
|
+ width: 15rem;
|
|
|
+ height: 2.5rem;line-height: 2.5rem;
|
|
|
border: 1px solid rgba(232, 232, 232, 1);
|
|
|
border-radius: 1.6rem;
|
|
|
overflow: hidden;
|
|
|
text-align: center;
|
|
|
margin-top: 1rem;
|
|
|
position: relative;
|
|
|
- margin-left: -10rem;
|
|
|
+ margin-left: -12rem;
|
|
|
left: 50%;
|
|
|
.li{
|
|
|
flex: 1;
|
|
|
@@ -6431,7 +6443,7 @@
|
|
|
}
|
|
|
.select{
|
|
|
color: #fff;
|
|
|
- height:3.2rem;
|
|
|
+ height:2.5rem;
|
|
|
background:linear-gradient(270deg,rgba(54,130,251,1) 0%,rgba(56,161,246,1) 100%);
|
|
|
border-radius:10rem;
|
|
|
}
|
|
|
@@ -6457,19 +6469,18 @@
|
|
|
}
|
|
|
.screen_date_select{
|
|
|
margin-right: 2rem;
|
|
|
- width: 24rem;
|
|
|
- height: 3rem;line-height: 3rem;
|
|
|
+ width: 20rem;
|
|
|
+ height: 2.5rem;line-height: 2.5rem;
|
|
|
border: 1px solid #DCDFE6;
|
|
|
- border-radius: 2rem;
|
|
|
+ border-radius: 2.5em;
|
|
|
overflow: hidden;
|
|
|
text-align: center;
|
|
|
display: flex;
|
|
|
- font-size: 1.2rem;
|
|
|
cursor: pointer;
|
|
|
.li{
|
|
|
flex:1;
|
|
|
border-right: 1px solid #DCDFE6;
|
|
|
- font-size: 1.2rem;
|
|
|
+ font-size: 1rem;
|
|
|
&:last-child{
|
|
|
border-right: none;
|
|
|
}
|
|
|
@@ -6481,6 +6492,38 @@
|
|
|
.history_echarts{
|
|
|
width: 100%;
|
|
|
height: calc(100% - 6rem);
|
|
|
+ .history_echarts_tooltip{
|
|
|
+ background-color:#fff;
|
|
|
+ color: rgba(102, 102, 102, 1);
|
|
|
+ padding:14px;
|
|
|
+ border: 1px solid rgba(211, 181, 164, 1);
|
|
|
+ p{
|
|
|
+ position:relative;
|
|
|
+ span{
|
|
|
+ display: inline-block;
|
|
|
+ width: 5px;height: 5px;
|
|
|
+ position: relative;
|
|
|
+ top: -2px;
|
|
|
+ margin-right: 10px;
|
|
|
+ }
|
|
|
+ .span_0{
|
|
|
+ background-color: #15CA56;
|
|
|
+ }
|
|
|
+ .span_1{
|
|
|
+ background-color: #F3BC12;
|
|
|
+ }
|
|
|
+ .span_2{
|
|
|
+ background-color: #3898F8;
|
|
|
+ }
|
|
|
+ .span_3{
|
|
|
+ background-color: #F05904;
|
|
|
+ }
|
|
|
+ margin-bottom: 12px;
|
|
|
+ &:last-child{
|
|
|
+ margin: 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
.history_echarts_noData{
|
|
|
width: 100%;
|
|
|
@@ -6513,8 +6556,8 @@
|
|
|
}
|
|
|
.ul{
|
|
|
.li{
|
|
|
- height:4rem;
|
|
|
- line-height: 4rem;
|
|
|
+ height:3rem;
|
|
|
+ line-height: 3rem;
|
|
|
background:rgba(249,240,233,1);
|
|
|
border-radius:0.4rem;
|
|
|
display: flex;
|
|
|
@@ -6522,7 +6565,7 @@
|
|
|
justify-content: space-between;
|
|
|
margin-bottom: 1rem;
|
|
|
.span1{
|
|
|
- font-size:1rem;
|
|
|
+ font-size:0.8rem;
|
|
|
font-family:PingFang-SC-Medium;
|
|
|
font-weight:500;
|
|
|
color:rgba(102,102,102,1);
|
|
|
@@ -6530,7 +6573,7 @@
|
|
|
}
|
|
|
.span_r{
|
|
|
display: flex;
|
|
|
- height: 4rem;
|
|
|
+ height: 3rem;
|
|
|
align-items: center;
|
|
|
flex: 1;
|
|
|
justify-content: flex-end;
|
|
|
@@ -6552,7 +6595,7 @@
|
|
|
}
|
|
|
.span3{
|
|
|
margin-right: 1rem;
|
|
|
- font-size:1.4rem;
|
|
|
+ font-size:1.2rem;
|
|
|
font-family:PingFang-SC-Medium;
|
|
|
font-weight:500;
|
|
|
color:rgba(153,153,153,1);
|
|
|
@@ -6584,7 +6627,7 @@
|
|
|
margin-top: 1rem;
|
|
|
height: 3.2rem;
|
|
|
line-height: 3.2rem;
|
|
|
- font-size:1.2rem;
|
|
|
+ font-size:1rem;
|
|
|
font-family:PingFang-SC-Medium;
|
|
|
font-weight:500;
|
|
|
color:rgba(102,102,102,1);
|
XAWDJ0277HWXPT2\Administrator