|
@@ -1389,7 +1389,7 @@
|
|
loadParametersListENNew:[
|
|
loadParametersListENNew:[
|
|
{model:'intell_power',label:'SpecialPowerCtrl',unit:'',type:'select',option:'intell_powerEN'},
|
|
{model:'intell_power',label:'SpecialPowerCtrl',unit:'',type:'select',option:'intell_powerEN'},
|
|
// {model:'begin_voltage',label:'AutoPowerStartUser1Volt',unit:'(V)',type:'select',option:'intell_powerV'},
|
|
// {model:'begin_voltage',label:'AutoPowerStartUser1Volt',unit:'(V)',type:'select',option:'intell_powerV'},
|
|
- {model:'light_type',label:'Lamp control mode',unit:'(V)',type:'select',option:'light_type_en'},
|
|
|
|
|
|
+ {model:'light_type',label:'Lamp control mode',unit:'',type:'select',option:'light_type_en'},
|
|
// {model:'end_voltage',label:'AutoPowerStopUser1Volt',unit:'(V)',type:'select',option:'intell_powerV'},
|
|
// {model:'end_voltage',label:'AutoPowerStopUser1Volt',unit:'(V)',type:'select',option:'intell_powerV'},
|
|
// {model:'end_current',label:'AutoPowerStopUser1Power',unit:'(A)',type:'select',option:'intell_powerC'},
|
|
// {model:'end_current',label:'AutoPowerStopUser1Power',unit:'(A)',type:'select',option:'intell_powerC'},
|
|
|
|
|
|
@@ -1407,24 +1407,24 @@
|
|
{model:'second_light_unman_power',label:'LoadSensorOffPower2',unit:'(%)',type:'select',option:'light_power'},
|
|
{model:'second_light_unman_power',label:'LoadSensorOffPower2',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
|
|
{model:'third_light_time',label:'LoadTime3',unit:'(HH:MM)',type:'timeSelect'},
|
|
{model:'third_light_time',label:'LoadTime3',unit:'(HH:MM)',type:'timeSelect'},
|
|
- {model:'third_light_human_power',label:'LoadSensorOnPower3',unit:'%',type:'select',option:'light_power'},
|
|
|
|
- {model:'third_light_unman_power',label:'LoadSensorOffPower3',unit:'%',type:'select',option:'light_power'},
|
|
|
|
|
|
+ {model:'third_light_human_power',label:'LoadSensorOnPower3',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
+ {model:'third_light_unman_power',label:'LoadSensorOffPower3',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
|
|
{model:'fourth_light_time',label:'LoadTime4',unit:'(HH:MM)',type:'timeSelect'},
|
|
{model:'fourth_light_time',label:'LoadTime4',unit:'(HH:MM)',type:'timeSelect'},
|
|
- {model:'fourth_light_human_power',label:'LoadSensorOnPower4',unit:'%',type:'select',option:'light_power'},
|
|
|
|
- {model:'fourth_light_unman_power',label:'LoadSensorOffPower4',unit:'%',type:'select',option:'light_power'},
|
|
|
|
|
|
+ {model:'fourth_light_human_power',label:'LoadSensorOnPower4',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
+ {model:'fourth_light_unman_power',label:'LoadSensorOffPower4',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
|
|
{model:'fifth_light_time',label:'LoadTime5',unit:'(HH:MM)',type:'timeSelect'},
|
|
{model:'fifth_light_time',label:'LoadTime5',unit:'(HH:MM)',type:'timeSelect'},
|
|
- {model:'fifth_light_human_power',label:'LoadSensorOnPower5',unit:'%',type:'select',option:'light_power'},
|
|
|
|
- {model:'fifth_light_unman_power',label:'LoadSensorOffPower5',unit:'%',type:'select',option:'light_power'},
|
|
|
|
|
|
+ {model:'fifth_light_human_power',label:'LoadSensorOnPower5',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
+ {model:'fifth_light_unman_power',label:'LoadSensorOffPower5',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
|
|
{model:'sixth_light_time',label:'LoadTime6',unit:'(HH:MM)',type:'timeSelect'},
|
|
{model:'sixth_light_time',label:'LoadTime6',unit:'(HH:MM)',type:'timeSelect'},
|
|
- {model:'sixth_light_human_power',label:'LoadSensorOnPower6',unit:'%',type:'select',option:'light_power'},
|
|
|
|
- {model:'sixth_light_unman_power',label:'LoadSensorOffPower6',unit:'%',type:'select',option:'light_power'},
|
|
|
|
|
|
+ {model:'sixth_light_human_power',label:'LoadSensorOnPower6',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
+ {model:'sixth_light_unman_power',label:'LoadSensorOffPower6',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
|
|
{model:'seventh_light_time',label:'LoadTime7',unit:'(HH:MM)',type:'timeSelect'},
|
|
{model:'seventh_light_time',label:'LoadTime7',unit:'(HH:MM)',type:'timeSelect'},
|
|
- {model:'seventh_light_human_power',label:'LoadSensorOnPower7',unit:'%',type:'select',option:'light_power'},
|
|
|
|
- {model:'seventh_light_unman_power',label:'LoadSensorOffPower7',unit:'%',type:'select',option:'light_power'},
|
|
|
|
|
|
+ {model:'seventh_light_human_power',label:'LoadSensorOnPower7',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
+ {model:'seventh_light_unman_power',label:'LoadSensorOffPower7',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
|
|
// {model:'eighth_light_time',label:'LoadTime8',unit:'(HH:MM)',type:'timeSelect'},
|
|
// {model:'eighth_light_time',label:'LoadTime8',unit:'(HH:MM)',type:'timeSelect'},
|
|
// {model:'eighth_light_human_power',label:'LoadSensorOnPower8',unit:'%',type:'select',option:'light_power'},
|
|
// {model:'eighth_light_human_power',label:'LoadSensorOnPower8',unit:'%',type:'select',option:'light_power'},
|
|
@@ -1435,8 +1435,8 @@
|
|
// {model:'ninth_light_unman_power',label:'LoadSensorOffPower9',unit:'%',type:'select',option:'light_power'},
|
|
// {model:'ninth_light_unman_power',label:'LoadSensorOffPower9',unit:'%',type:'select',option:'light_power'},
|
|
|
|
|
|
{model:'tenth_light_time',label:'LoadMorningLightTime',unit:'(HH:MM)',type:'timeSelect'},
|
|
{model:'tenth_light_time',label:'LoadMorningLightTime',unit:'(HH:MM)',type:'timeSelect'},
|
|
- {model:'tenth_light_human_power',label:'LoadMornLightSensorOnPower',unit:'%',type:'select',option:'light_power'},
|
|
|
|
- {model:'tenth_light_unman_power',label:'LoadMornLightSensorOffPower',unit:'%',type:'select',option:'light_power'},
|
|
|
|
|
|
+ {model:'tenth_light_human_power',label:'LoadMornLightSensorOnPower',unit:'(%)',type:'select',option:'light_power'},
|
|
|
|
+ {model:'tenth_light_unman_power',label:'LoadMornLightSensorOffPower',unit:'(%)',type:'select',option:'light_power'},
|
|
],
|
|
],
|
|
monitorDialog:false,
|
|
monitorDialog:false,
|
|
projectLoadDialog:false,
|
|
projectLoadDialog:false,
|
|
@@ -1899,22 +1899,22 @@
|
|
}else{
|
|
}else{
|
|
this.option.induction_delay.push({
|
|
this.option.induction_delay.push({
|
|
id:i*5+'',
|
|
id:i*5+'',
|
|
- name:'Delay'+i*5+'seconds',
|
|
|
|
|
|
+ name:'Delay '+i*5+' seconds',
|
|
});
|
|
});
|
|
this.option.light_delay.push({
|
|
this.option.light_delay.push({
|
|
id:i*5,
|
|
id:i*5,
|
|
- name:'Delay'+i*5+'seconds',
|
|
|
|
|
|
+ name:'Delay '+i*5+' seconds',
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}else if(i<72){
|
|
}else if(i<72){
|
|
j++;
|
|
j++;
|
|
this.option.light_delay.push({
|
|
this.option.light_delay.push({
|
|
id:j*60,
|
|
id:j*60,
|
|
- name:'Delay'+j+'minutes',
|
|
|
|
|
|
+ name:'Delay '+j+' minutes',
|
|
});
|
|
});
|
|
this.option.induction_delay.push({
|
|
this.option.induction_delay.push({
|
|
id:j*60+'',
|
|
id:j*60+'',
|
|
- name:'Delay'+j+'minutes',
|
|
|
|
|
|
+ name:'Delay '+j+' minutes',
|
|
});
|
|
});
|
|
}
|
|
}
|
|
/*智能电压*/
|
|
/*智能电压*/
|
|
@@ -1975,14 +1975,14 @@
|
|
}else{
|
|
}else{
|
|
this.option.light_delay_time.push({
|
|
this.option.light_delay_time.push({
|
|
id:i*10,
|
|
id:i*10,
|
|
- name:'Delay'+i*10+'seconds',
|
|
|
|
|
|
+ name:'Delay '+i*10+' seconds',
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}else if(i<72){
|
|
}else if(i<72){
|
|
j++;
|
|
j++;
|
|
this.option.light_delay_time.push({
|
|
this.option.light_delay_time.push({
|
|
id:j*60,
|
|
id:j*60,
|
|
- name:'Delay'+j+'minutes',
|
|
|
|
|
|
+ name:'Delay '+j+' minutes',
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2039,7 +2039,7 @@
|
|
if(i_1==0){
|
|
if(i_1==0){
|
|
this.option.balan_char_interval.push({
|
|
this.option.balan_char_interval.push({
|
|
id:i_1,
|
|
id:i_1,
|
|
- name:this.version == '0'?'禁止均衡功能':'Prohibited Equilibrium Function',
|
|
|
|
|
|
+ name:'Prohibited Equilibrium Function',
|
|
});
|
|
});
|
|
}else{
|
|
}else{
|
|
this.option.balan_char_interval.push({
|
|
this.option.balan_char_interval.push({
|
|
@@ -2692,19 +2692,11 @@
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}else if(this.lampcontrolOperationType == '-1'){
|
|
}else if(this.lampcontrolOperationType == '-1'){
|
|
- if(this.version == 0){
|
|
|
|
- this.$message({
|
|
|
|
- showClose: true,
|
|
|
|
- message:'Please select the modified type first',
|
|
|
|
- type: 'warning'
|
|
|
|
- });
|
|
|
|
- }else{
|
|
|
|
- this.$message({
|
|
|
|
- showClose: true,
|
|
|
|
- message:'Please select the modification type',
|
|
|
|
- type: 'warning'
|
|
|
|
- });
|
|
|
|
- }
|
|
|
|
|
|
+ this.$message({
|
|
|
|
+ showClose: true,
|
|
|
|
+ message:'Please select the modification type',
|
|
|
|
+ type: 'warning'
|
|
|
|
+ });
|
|
}else if(this.lampcontrolOperationType == 'strategy'){
|
|
}else if(this.lampcontrolOperationType == 'strategy'){
|
|
if(this.multipleSelection.length == 0){
|
|
if(this.multipleSelection.length == 0){
|
|
this.$message({
|
|
this.$message({
|
|
@@ -2835,6 +2827,21 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ lampcontrolGetData(type,callback){
|
|
|
|
+ baseApi.ajax_post(
|
|
|
|
+ allUrl.project.lampcontrolGetData,
|
|
|
|
+ {
|
|
|
|
+ username:this.username,
|
|
|
|
+ client_key:this.client_key,
|
|
|
|
+ token:this.token,
|
|
|
|
+ type:type,
|
|
|
|
+ },
|
|
|
|
+ {},
|
|
|
|
+ data =>{
|
|
|
|
+ callback(data)
|
|
|
|
+ },
|
|
|
|
+ this)
|
|
|
|
+ },
|
|
GMTToZero2(time){
|
|
GMTToZero2(time){
|
|
let now = new Date(time);
|
|
let now = new Date(time);
|
|
let hour = now.getHours();//得到小时
|
|
let hour = now.getHours();//得到小时
|
|
@@ -3869,7 +3876,7 @@
|
|
}else{
|
|
}else{
|
|
this_.$message({
|
|
this_.$message({
|
|
showClose: true,
|
|
showClose: true,
|
|
- message: this_.version==0?'无法识别,请更改搜索内容':'Unrecognized, please change the search content',
|
|
|
|
|
|
+ message: 'Unrecognized, please change the search content',
|
|
type: 'warning'
|
|
type: 'warning'
|
|
});
|
|
});
|
|
this_.positionPicker.start()
|
|
this_.positionPicker.start()
|