no message

webConfig/src/views/projectManagement.vue

@@ -847,7 +847,7 @@
             </div>
             <div class="box clearfix">
                 <el-form label-width="260px" ref="loadParametersData" :model="loadParametersData" label-position="right" class="clearfix" v-if="monitorType=='loadParameters'">
-                    <el-form-item :label="item.label+item.unit+':'" :key="item.id" v-for="(item) in loadParametersListEN" class="list_box" :prop="item.model" :label-width="item.model=='intell_power'||item.model=='begin_voltage'||item.model=='end_voltage'||item.model=='end_current'?'210px':''" 
+                    <el-form-item :label="item.label+item.unit+':'" :key="item.id" v-for="(item) in loadParametersListEN" class="list_boxEN" :prop="item.model" :label-width="item.model=='intell_power'||item.model=='begin_voltage'||item.model=='end_voltage'||item.model=='end_current'?'210px':''" 
                     :style="{'visibility':
                         ((item.model=='begin_voltage'||item.model=='end_voltage'||item.model=='end_current')&&loadParametersData['intell_power']!='5')
                         ||
@@ -897,7 +897,7 @@
                         </el-select>
                     </el-form-item>
                     <template>
-                        <el-form-item v-for="(item) in batteryParametersList1EN" :label="item.label+item.unit+':'" :key="item.id" class="list_boxEN" :prop="item.model">
+                        <el-form-item v-for="(item) in batteryParametersListEN" :label="item.label+item.unit+':'" :key="item.id" class="list_boxEN" :prop="item.model">
                             <el-input v-model="batteryParametersData[item.model]" v-if="item.type == 'input'" :disabled="!batterySettingIsTrue||!parameterBatteryIsEdit"></el-input>
                             <el-select v-model="batteryParametersData[item.model]" v-if="item.type == 'select'" :disabled="!batterySettingIsTrue||!parameterBatteryIsEdit">
                                 <el-option
@@ -1239,7 +1239,7 @@
                     {model:'end_voltage',label:'智能功率USER1终止电压',unit:'V',type:'select',option:'intell_powerV'},
                     {model:'end_current',label:'智能功率USER1终止电流   ',unit:'A',type:'select',option:'intell_powerC'},
 
-                    {model:'load_current',label:'负载电流',unit:'(A)',type:'select',option:'load_current'},
+                    {model:'load_current',label:'负载电流',unit:'(mA)',type:'select',option:'load_current'},
                     {model:'light_delay',label:'光控延时',unit:'',type:'select',option:'light_delay'},
                     {model:'induction_delay',label:'感应延时',unit:'(S)',type:'select',option:'induction_delay'},
 
@@ -1254,7 +1254,7 @@
                 loadParametersDataNew:{
                     light_voltage:'',
                     intell_power:'',
-                    // load_current:'',
+                    load_current:'',
                     // light_delay:'',
                     // induction_delay:'',
                     first_light_time:'',
@@ -1377,7 +1377,7 @@
                     // {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:'load_current',label:'LedCurrSet',unit:'(A)',type:'select',option:'load_current'},
+                    {model:'load_current',label:'LedCurrSet',unit:'(A)',type:'select',option:'load_current'},
                     // {model:'light_delay',label:'LightCtrlDelayTimeS',unit:'',type:'select',option:'light_delay'},
                     // {model:'induction_delay',label:'SensorDelayTime',unit:'(S)',type:'select',option:'induction_delay'},
 
@@ -1626,8 +1626,8 @@
                     // {model:'dischar_lower_limit_temper',label:'DisChgMinTemper',unit:'(A)',type:'select',option:'limit_temper'},
 
                     // {model:'li_battery_type',label:'lithiumBatteryType',unit:'(V)',type:'select',option:'li_battery_typeEN'},
-
                 ],
+                batteryParametersListEN:[],
                 batteryParametersListOld1EN:[
                     {model:'capacity',label:'Battery capacity',unit:'(Ah)',type:'input'},
                     {model:'vpromotecharge',label:'Overcharge voltage',unit:'(V)',type:'input'},
@@ -1932,10 +1932,10 @@
                 }
                 /*load_current 负载电流*/
                 if(i<=695){
-                    let val = i/100+0.05;
+                    let val = (i/100+0.05)*1000;
                     this.option.load_current.push({
-                        id:val.toFixed(2),
-                        name:val.toFixed(2),
+                        id:val,
+                        name:val,
                     })
                 }
                 /*light_time 亮灯时间*/
@@ -4761,7 +4761,7 @@
                     let parameter = {};
                     let obj = [];
                     let objData = {};
-                    obj = this.batteryParametersList1EN
+                    obj = this.batteryParametersListEN
                     for(let d of obj){
                         console.log(d.model)
                         parameter[d.model] = this.batteryParametersData[d.model]
@@ -5147,7 +5147,7 @@
                                 d.option = 'increa_char_voltage3'
                             }
                         }
-                        for(let d of this.batteryParametersList1EN){
+                        for(let d of this.batteryParametersListEN){
                             if(d.model == 'increa_char_voltage'){
                                 d.option = 'increa_char_voltage3'
                             }
@@ -5187,7 +5187,7 @@
                                 d.option = 'increa_char_voltage6'
                             }
                         }
-                        for(let d of this.batteryParametersList1EN){
+                        for(let d of this.batteryParametersListEN){
                             if(d.model == 'increa_char_voltage'){
                                 d.option = 'increa_char_voltage6'
                             }
@@ -5227,7 +5227,7 @@
                                 d.option = 'increa_char_voltage0'
                             }
                         }
-                        for(let d of this.batteryParametersList1EN){
+                        for(let d of this.batteryParametersListEN){
                             if(d.model == 'increa_char_voltage'){
                                 d.option = 'increa_char_voltage0'
                             }
@@ -5273,51 +5273,44 @@
             },
             'batteryParametersData.battery_type':function(val) {
                 console.log(val)
-                this.batteryParametersData = Object.assign({},this.batteryParametersDataHC)
-                this.batteryParametersData.battery_type = val;
-                if (this.batteryParametersDataHC.type == '默认' && val == 0) {
-                    this.batteryParametersData.overvoltage = '16';
-                    this.batteryParametersData.char_limit_voltage = '15.5';
-                    this.batteryParametersData.equ_char_time = '240';
-                    this.batteryParametersData.increa_char_time = '240';
-                    this.batteryParametersData.char_upper_limit_temper = '65';
-                    this.batteryParametersData.dischar_upper_limit_temper = '65';
-                    this.batteryParametersData.char_lower_limit_temper = '-35';
-                    this.batteryParametersData.dischar_lower_limit_temper = '-35';
-                }
-                this.batteryParametersDataHC.type = '默认';
-                if(val == '2'){
-                    val = '1';
+                this.batteryParametersListEN = [];
+                for(let d of this.batteryParametersList1EN){
+                    if(val == '1'){
+                        if(d.model != 'battery_count'){
+                            this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
+                        }
+                    }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'){
+                            this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
+                        }
+                    }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'){
+                            this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
+                        }
+                    }else{
+                        this.$set(this.batteryParametersListEN,this.batteryParametersListEN.length,d)
+                    }
                 }
-                // this['batteryParametersList'+val+'EN'] = this['batteryParametersListNew'+val+'EN'];
+                // this.batteryParametersData = Object.assign({},this.batteryParametersDataHC)
+                // this.batteryParametersData.battery_type = val;
+                // if (this.batteryParametersDataHC.type == '默认' && val == 0) {
+                //     this.batteryParametersData.overvoltage = '16';
+                //     this.batteryParametersData.char_limit_voltage = '15.5';
+                //     this.batteryParametersData.equ_char_time = '240';
+                //     this.batteryParametersData.increa_char_time = '240';
+                //     this.batteryParametersData.char_upper_limit_temper = '65';
+                //     this.batteryParametersData.dischar_upper_limit_temper = '65';
+                //     this.batteryParametersData.char_lower_limit_temper = '-35';
+                //     this.batteryParametersData.dischar_lower_limit_temper = '-35';
+                // }
+                // this.batteryParametersDataHC.type = '默认';
+                // if(val == '2'){
+                //     val = '1';
+                // }
+                // // this['batteryParametersList'+val+'EN'] = this['batteryParametersListNew'+val+'EN'];
                 
-                this.batteryParametersDataHC = Object.assign({},this.batteryParametersData)
+                // this.batteryParametersDataHC = Object.assign({},this.batteryParametersData)
             },
-            // 'batteryParametersData.batterytype':function(val) {
-            //     // console.log(val,'========================',this.batteryParametersData)
-            //     this.batteryParametersData = Object.assign({},this.batteryParametersDataHC)
-            //     this.batteryParametersData.batterytype = val;
-            //     if(val == '2'){
-            //         val = '1';
-            //     }
-            //     this['batteryParametersList'+val+'EN'] = this['batteryParametersListOld'+val+'EN'];
-            //     if(this.batteryParametersData['capacity'+val]){
-            //         this.batteryParametersData.capacity = this.batteryParametersData['capacity'+val];
-            //     }
-            //     if(this.batteryParametersData['voverdischarge'+val]){
-            //         this.batteryParametersData.voverdischarge = this.batteryParametersData['voverdischarge'+val];
-            //     }
-            //     if(this.batteryParametersData['voverdischargerecover'+val]){
-            //         this.batteryParametersData.voverdischargerecover = this.batteryParametersData['voverdischargerecover'+val];
-            //     }
-            //     if(this.batteryParametersData['vpromotecharge'+val]){
-            //         this.batteryParametersData.vpromotecharge = this.batteryParametersData['vpromotecharge'+val];
-            //     }
-            //     if(this.batteryParametersData['vpromoterecover'+val]){
-            //         this.batteryParametersData.vpromoterecover = this.batteryParametersData['vpromoterecover'+val];
-            //     }
-            //     this.batteryParametersDataHC = Object.assign({},this.batteryParametersData)
-            // },
             "role":function (){
                 for(let key in this.lightControlListEN){
                     if((this.role == 2||this.role == 4)&&this.lightControlListEN[key].model == 'poName'){
@@ -6359,14 +6352,16 @@
                         flex-wrap: wrap;//换行
                         align-content: flex-start;//display flex 布局换行后行间距清空。
                     }
-                    .list_box{
-                        width: 25%;
-                        height: 40px;
-                    }
+                    // .list_box{
+                    //     width: 25%;
+                    //     height: 40px;
+                    // }
                     .list_boxEN{
-                        width: 33.33%;
-                        float: left;
+                        width: 25%;
                         height: 40px;
+                        @media (max-width: 1500px){
+                            width: 33.33%;
+                        }
                     }
                     
                 }