|
@@ -237,7 +237,7 @@
|
|
<el-table-column
|
|
<el-table-column
|
|
fixed="right"
|
|
fixed="right"
|
|
align="center"
|
|
align="center"
|
|
- :width="13*remRatio"
|
|
|
|
|
|
+ :width="12.5*remRatio"
|
|
:label="'operation'">
|
|
:label="'operation'">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span class="btn" @click="seeFun(scope.row)" title="See">
|
|
<span class="btn" @click="seeFun(scope.row)" title="See">
|
|
@@ -865,8 +865,7 @@
|
|
||
|
|
||
|
|
((parseInt(loadParametersData['induction_delay'])==0&&(item.model=='first_light_unman_power'||item.model=='second_light_unman_power'||item.model=='third_light_unman_power'||item.model=='fourth_light_unman_power'||item.model=='fifth_light_unman_power'||item.model=='sixth_light_unman_power'||item.model=='seventh_light_unman_power'||item.model=='eighth_light_unman_power'||item.model=='ninth_light_unman_power'||item.model=='tenth_light_unman_power')))
|
|
((parseInt(loadParametersData['induction_delay'])==0&&(item.model=='first_light_unman_power'||item.model=='second_light_unman_power'||item.model=='third_light_unman_power'||item.model=='fourth_light_unman_power'||item.model=='fifth_light_unman_power'||item.model=='sixth_light_unman_power'||item.model=='seventh_light_unman_power'||item.model=='eighth_light_unman_power'||item.model=='ninth_light_unman_power'||item.model=='tenth_light_unman_power')))
|
|
?'hidden':'',
|
|
?'hidden':'',
|
|
- 'width':
|
|
|
|
- (item.model!='intell_power'&&item.model!='light_type')?'33.33%':'50%'}">
|
|
|
|
|
|
+ 'width':'33.33%'}">
|
|
<el-input v-model="loadParametersData[item.model]" v-if="item.type == 'input'" :disabled="!loadSettingIsTrue||!parameterLoadIsEdit"></el-input>
|
|
<el-input v-model="loadParametersData[item.model]" v-if="item.type == 'input'" :disabled="!loadSettingIsTrue||!parameterLoadIsEdit"></el-input>
|
|
<el-select v-model="loadParametersData[item.model]" v-if="item.type == 'select'" :disabled="!loadSettingIsTrue||!parameterLoadIsEdit">
|
|
<el-select v-model="loadParametersData[item.model]" v-if="item.type == 'select'" :disabled="!loadSettingIsTrue||!parameterLoadIsEdit">
|
|
<el-option
|
|
<el-option
|
|
@@ -1393,7 +1392,7 @@
|
|
// {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'},
|
|
|
|
|
|
- {model:'load_current',label:'LedCurrSet',unit:'(A)',type:'select',option:'load_current'},
|
|
|
|
|
|
+ {model:'load_current',label:'LedCurrSet',unit:'(mA)',type:'select',option:'load_current'},
|
|
// {model:'light_delay',label:'LightCtrlDelayTimeS',unit:'',type:'select',option:'light_delay'},
|
|
// {model:'light_delay',label:'LightCtrlDelayTimeS',unit:'',type:'select',option:'light_delay'},
|
|
// {model:'induction_delay',label:'SensorDelayTime',unit:'(S)',type:'select',option:'induction_delay'},
|
|
// {model:'induction_delay',label:'SensorDelayTime',unit:'(S)',type:'select',option:'induction_delay'},
|
|
|
|
|
|
@@ -1712,7 +1711,7 @@
|
|
intell_powerEN:[
|
|
intell_powerEN:[
|
|
{id:'0',name:'Off'},
|
|
{id:'0',name:'Off'},
|
|
{id:'1',name:'High'},
|
|
{id:'1',name:'High'},
|
|
- {id:'2',name:'Centre'},
|
|
|
|
|
|
+ {id:'2',name:'medium'},
|
|
{id:'3',name:'low'},
|
|
{id:'3',name:'low'},
|
|
{id:'4',name:'Automatic'},
|
|
{id:'4',name:'Automatic'},
|
|
{id:'5',name:'USE'},
|
|
{id:'5',name:'USE'},
|
|
@@ -2910,11 +2909,11 @@
|
|
this.$set(this.tableConfig.prop1,this.tableConfig.prop1.length,d.field);
|
|
this.$set(this.tableConfig.prop1,this.tableConfig.prop1.length,d.field);
|
|
this.$set(this.tableConfig.prop,this.tableConfig.prop.length,d.fields1);
|
|
this.$set(this.tableConfig.prop,this.tableConfig.prop.length,d.fields1);
|
|
if(d.fields1 == 'updatetime'){
|
|
if(d.fields1 == 'updatetime'){
|
|
- this.$set(this.tableConfig.width,this.tableConfig.width.length,160);
|
|
|
|
|
|
+ this.$set(this.tableConfig.width,this.tableConfig.width.length,12*this.remRatio);
|
|
}else if(d.fields1 == 'isfaulted'){
|
|
}else if(d.fields1 == 'isfaulted'){
|
|
- this.$set(this.tableConfig.width,this.tableConfig.width.length,160);
|
|
|
|
|
|
+ this.$set(this.tableConfig.width,this.tableConfig.width.length,12*this.remRatio);
|
|
}else{
|
|
}else{
|
|
- this.$set(this.tableConfig.width,this.tableConfig.width.length,(d.enname.length+1)*8+20);
|
|
|
|
|
|
+ this.$set(this.tableConfig.width,this.tableConfig.width.length,((d.enname.length+1)*0.6+1)*this.remRatio);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -5421,11 +5420,12 @@
|
|
this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
|
|
this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
|
|
}
|
|
}
|
|
}else if(val == '2'){
|
|
}else if(val == '2'){
|
|
- if(d.model != 'float_char_voltage'||d.model != 'increa_char_voltage'||d.model != 'equ_char_voltage'||d.model != 'float_char_voltage'){
|
|
|
|
|
|
+ if(d.model != 'battery_count'&&d.model != 'char_limit_voltage'&&d.model != 'float_char_voltage'&&d.model != 'over_dischar_voltage'&&d.model != 'equ_char_voltage'&&d.model != 'increa_char_return_voltage'&&d.model != 'overvoltage'&&d.model != 'increa_char_voltage'&&d.model != 'over_dischar_return_voltage'){
|
|
this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
|
|
this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
|
|
}
|
|
}
|
|
|
|
+
|
|
}else if(val == '3'){
|
|
}else if(val == '3'){
|
|
- if(d.model != 'float_char_voltage'||d.model != 'increa_char_voltage'||d.model != 'equ_char_voltage'||d.model != 'float_char_voltage'){
|
|
|
|
|
|
+ if(d.model != 'battery_count'&&d.model != 'char_limit_voltage'&&d.model != 'float_char_voltage'&&d.model != 'over_dischar_voltage'&&d.model != 'equ_char_voltage'&&d.model != 'increa_char_return_voltage'&&d.model != 'overvoltage'&&d.model != 'increa_char_voltage'&&d.model != 'over_dischar_return_voltage'){
|
|
this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
|
|
this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|