XAWDJ0277HWXPT2\Administrator před 5 roky
rodič
revize
aedb5fc2d4

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
web/css/chunk-a80ca5cc.ffdcf673.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
web/index.html


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
web/js/app.2874ba41.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 2
web/js/app.2874ba41.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 0
web/js/app.e75905b4.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 2
web/js/chunk-a80ca5cc.2a04098d.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
web/js/chunk-a80ca5cc.2a04098d.js.map


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 0
web/js/chunk-a80ca5cc.741b6c08.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 0
web/js/chunk-a80ca5cc.741b6c08.js.map


+ 2 - 2
webConfig/src/api/allUel.js

@@ -41,9 +41,9 @@ const urls={
        
 
         workmode:'https://120.77.179.55/api/common/workmode',/*路灯负载模式下拉列表*/
-        loadSetting:'https://120.77.179.55/api/lampcontrol/load_setting',/*读取灯控负载设置*/
+        loadSetting:'https://120.77.179.55/api/lampcontrol/get_load',/*读取灯控负载设置*/
         modbusGetLoad:'https://120.77.179.55/api/lampcontrol/modbus_get_load',/*读取新的灯控负载设置*/
-        setLoad:'https://120.77.179.55/api/lampcontrol/set_load',/*路灯负载设置*/
+        setLoad:'https://120.77.179.55/api/lampcontrol/modbus_set_load',/*路灯负载设置*/
         modbusSetLoad:'https://120.77.179.55/api/lampcontrol/modbus_set_load',/*新的路灯负载设置*/
 
         projectSetPramData:'https://120.77.179.55/api/project/set_pram_data',/*路灯项目负载设置*/

+ 2 - 2
webConfig/src/api/base.js

@@ -142,7 +142,7 @@ export default{
                             }
                             // let res = JSON.parse(event.data)
                             if (data.data.status == 2) {
-                                // websocket.close();
+                                websocket.close();
                                 // console.log('websocket链接关闭')
                             }
                         } catch (e) {
@@ -194,7 +194,7 @@ export default{
                                     }
                                     // let res = JSON.parse(event.data)
                                     if (data.data.code == 2) {
-                                        // websocket.close();
+                                        websocket.close();
                                         // console.log('websocket链接关闭')
                                     }
                                 } catch (e) {

+ 496 - 66
webConfig/src/views/projectManagement.vue

@@ -832,6 +832,10 @@
           class="monitor_box"
           width="95%">
           <div class="wrap">
+            <div class="nav clearfix">
+                <div @click="monitorSwitchFun('loadParameters')" class="parameter_nav" :class="{'monitor_type':monitorType=='loadParameters'}"><span>{{'Load parameter'}}</span></div>
+                <div @click="monitorSwitchFun('batteryParameters')" class="parameter_nav" :class="{'monitor_type':monitorType=='batteryParameters'}"><span>{{'Battery parameters'}}</span></div>
+            </div>
             <div class="button" v-if="monitorType=='loadParameters'">
                 <el-button round icon="el-icon-refresh" v-if="!loading.loadSetting&&batchModificationParameters" @click="loadSettingFun()">Get parameters</el-button>
                 <el-button round icon="el-icon-refresh" v-if="loading.loadSetting&&batchModificationParameters" v-loading="loading.loadSetting">Getting parameters</el-button>
@@ -881,7 +885,7 @@
                 <el-form label-width="260px" ref="batteryParametersData" :model="batteryParametersData" label-position="right" class="clearfix" v-if="monitorType=='batteryParameters'">
                     <!-- {model:'',label:'',unit:'',type:'select',option:'batteryListEN'}, -->
                     <el-form-item label="Battery type:" class="list_boxEN" prop="batterytype">
-                        <el-select v-model="batteryParametersData['batterytype']" :disabled="!batterySettingIsTrue||!parameterBatteryIsEdit">
+                        <el-select v-model="batteryParametersData['battery_type']" :disabled="!batterySettingIsTrue||!parameterBatteryIsEdit">
                             <el-option
                               v-for="item in option['batteryListEN']"
                               :key="item.id"
@@ -890,29 +894,8 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <template v-for="(item) in batteryParametersList0EN" >
-                        <el-form-item :label="item.label+item.unit+':'" :key="item.id" :prop="item.model" v-if="batteryParametersData['batterytype'] == '0'||batteryParametersData['battery_type'] == '0'" class="list_boxEN">
-                            <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
-                                  v-for="item in option[item.option]"
-                                  :key="item.id"
-                                  :label="item.name"
-                                  :value="item.id">
-                                </el-option>
-                            </el-select>
-                              <!-- :controls="false" -->
-                            <el-input-number 
-                              v-if="item.type == 'number'"
-                              controls-position="right"
-                              :disabled="!batterySettingIsTrue||!parameterBatteryIsEdit"
-                              :max="item.max" :min="item.min" :precision="item.precision" :step="item.step"
-                              v-model="batteryParametersData[item.model]">
-                            </el-input-number>
-                        </el-form-item>
-                    </template>
-                    <template  v-for="(item) in batteryParametersList1EN">
-                        <el-form-item :label="item.label+item.unit+':'" :key="item.id" class="list_boxEN" :prop="item.model" v-if="(batteryParametersData['batterytype'] == '1'||batteryParametersData['batterytype'] == '2')||(batteryParametersData['battery_type'] == '1'||batteryParametersData['battery_type'] == '2')">
+                    <template>
+                        <el-form-item v-for="(item) in batteryParametersList1EN" :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
@@ -1611,6 +1594,7 @@
                 ],
                 batteryParametersListNew1EN:[
                     {model:'light_voltage',label:'OpticallyControlledVoltage',unit:'(V)',type:'select',option:'light_voltage'},
+
                     {model:'system_voltage',label:'BatRateVolt',unit:'(V)',type:'select',option:'system_voltage1'},
 
                     {model:'li_battery_type',label:'lithiumBatteryType',unit:'(V)',type:'select',option:'li_battery_typeEN'},
@@ -1624,7 +1608,30 @@
                     {model:'dischar_upper_limit_temper',label:'DisChgMaxTemper',unit:'(℃)',type:'select',option:'limit_temper'},
                     {model:'dischar_lower_limit_temper',label:'DisChgMinTemper',unit:'(℃)',type:'select',option:'limit_temper'},
                 ],
-                batteryParametersList1EN:[],
+                batteryParametersList1EN:[
+                    {model:'battery_count',label:'Number of battery strings',unit:'(V)',type:'select',option:'battery_count'},
+                    {model:'light_voltage',label:'OpticallyControlledVoltage',unit:'(V)',type:'select',option:'light_voltage'},
+                    {model:'light_delay_time',label:'Optical control delay time',unit:'(V)',type:'select',option:'light_delay_time'},
+                    {model:'system_voltage',label:'BatRateVolt',unit:'(V)',type:'select',option:'system_voltage1'},
+                    {model:'overvoltage',label:'BatOverVolt',unit:'(V)',type:'select',option:'increa_char_voltage0'},
+                    {model:'char_limit_voltage',label:'BatChgLimitVolt',unit:'(V)',type:'select',option:'increa_char_voltage0'},
+                    {model:'increa_char_voltage',label:'BatImprovChgVolt',unit:'(V)',type:'select',option:'increa_char_voltage0'},
+                    {model:'float_char_voltage',label:'BatFloatChgVolt',unit:'(V)',type:'select',option:'increa_char_voltage0'},
+                    {model:'increa_char_return_voltage',label:'BatImprovChgBackVolt',unit:'(V)',type:'select',option:'increa_char_voltage0'},
+                    {model:'over_dischar_return_voltage',label:'BatOverDischgBackVolt',unit:'(V)',type:'select',option:'increa_char_voltage0'},
+                    {model:'over_dischar_voltage',label:'BatOverDischgVolt',unit:'(V)',type:'select',option:'increa_char_voltage0'},
+                    {model:'equ_char_time',label:'BatConstChgTime',unit:'(min)',type:'select',option:'equ_char_time'},
+                    {model:'increa_char_time',label:'BatImprovChgTime',unit:'(min)',type:'select',option:'equ_char_time'},
+                    {model:'balan_char_interval',label:'BatConstChgGapTime',unit:'(day)',type:'select',option:'balan_char_interval'},
+                    {model:'temper_compen_coeff',label:'CoeffTemperCompen',unit:'(mV/℃/2V)',type:'select',option:'temper_compen_coeff'},
+                    {model:'char_upper_limit_temper',label:'ChgMaxTemper',unit:'(℃)',type:'select',option:'limit_temper'},
+                    {model:'char_lower_limit_temper',label:'ChgMinTemper',unit:'(℃)',type:'select',option:'limit_temper'},
+                    {model:'dischar_upper_limit_temper',label:'DisChgMaxTemper',unit:'(A)',type:'select',option:'limit_temper'},
+                    {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'},
+
+                ],
                 batteryParametersListOld1EN:[
                     {model:'capacity',label:'Battery capacity',unit:'(Ah)',type:'input'},
                     {model:'vpromotecharge',label:'Overcharge voltage',unit:'(V)',type:'input'},
@@ -1643,6 +1650,7 @@
                     increa_char_voltage3:[],
                     increa_char_voltage6:[],
                     light_voltage:[],
+                    light_delay_time:[],
                     load_current:[],
                     light_time:[],
                     light_power:[],
@@ -1663,10 +1671,10 @@
                         {id:'24',name:'24'},
                     ],
                     system_voltage1:[
-                        {id:'3',name:'3'},
-                        {id:'6',name:'6'},
                         {id:'12',name:'12'},
                         {id:'24',name:'24'},
+                        {id:'36',name:'36'},
+                        {id:'48',name:'48'},
                     ],
                     light_delay:[],
                     induction_delay:[],
@@ -1691,10 +1699,6 @@
                         {id:'0',name:'PWM/MPPT'},
                         {id:'1',name:'ON/OFF'},
                     ],
-                    minusnocharge:[
-                        {id:'0',name:'可以充电'},
-                        {id:'1',name:'禁止充电'},
-                    ],
                     minusnochargeEN:[
                         {id:'0',name:'Can charge'},
                         {id:'1',name:'Prohibited chargeing'},
@@ -1703,6 +1707,24 @@
                         {id:'12',name:'12'},
                         {id:'24',name:'24'},
                     ],
+                    battery_count:[
+                        {id:'0',name:'0'},
+                        {id:'1',name:'1'},
+                        {id:'2',name:'2'},
+                        {id:'3',name:'3'},
+                        {id:'4',name:'4'},
+                        {id:'5',name:'5'},
+                        {id:'6',name:'6'},
+                        {id:'7',name:'7'},
+                        {id:'8',name:'8'},
+                        {id:'9',name:'9'},
+                        {id:'10',name:'10'},
+                        {id:'11',name:'11'},
+                        {id:'12',name:'12'},
+                        {id:'13',name:'13'},
+                        {id:'14',name:'14'},
+                        {id:'15',name:'15'},
+                    ],
                     balancechargetime:[
                         {id:'0',name:'0'},
                         {id:'1',name:'1'},
@@ -1722,15 +1744,10 @@
                         {id:'-4',name:'-4'},
                         {id:'-5',name:'-5'},
                     ],
-                    batteryList:[
-                        {id:'0',name:'铅酸电池'},
-                        {id:'1',name:'锂电池'},
-                        {id:'2',name:'超级电容'},
-                    ],
                     batteryListEN:[
-                        {id:'0',name:'Lead-acid batteries'},
-                        {id:'1',name:'lithium battery'},
-                        {id:'2',name:'Supercapacitor'},
+                        {id:'1',name:'Lead-acid batteries'},
+                        {id:'2',name:'lithium battery'},
+                        {id:'3',name:'Supercapacitor'},
                     ],
                     onOff:[
                         {id:'1',name:'开启'},
@@ -1781,6 +1798,7 @@
                     deviceList:false,
                     lampLightSlider:false,
                     lampcontrolUpdate:false,
+                    setBatteryFun:false,
                     exportTableLS:false,
                     batchProcessingFun:false,
                 }
@@ -1840,6 +1858,175 @@
         },
         mounted(){
             let this_ =this;
+
+            this.option.light_delay = [];
+            this.option.induction_delay = [];
+            this.option.load_current = [];
+            this.option.light_time = [];
+            this.option.light_power = [];
+            this.option.light_voltage = [];
+            this.option.light_delay_time = [];
+            this.option.increa_char_voltage0 = [];
+            this.option.increa_char_voltage3 = [];
+            this.option.increa_char_voltage6 = [];
+            this.option.limit_temper = [];
+            this.option.temper_compen_coeff = [];
+            this.option.equ_char_time = [];
+            this.option.intell_powerV = [];
+            this.option.intell_powerC = [];
+            let j = 0;
+            for(let i = 0; i<=700;i++){
+                if(i<=11){
+                    if(i==0){
+                        // this.option.light_delay.push({
+                        //  id:i*5+'',
+                        //  name:this.version=='0'?'无延时':'No delay',
+                        // });
+                        this.option.induction_delay.push({
+                            id:i*5+'',
+                            name:'Non-inductive function',
+                        });
+                    }else{
+                        this.option.induction_delay.push({
+                            id:i*5+'',
+                            name:'Delay'+i+'seconds',
+                        });
+                        this.option.light_delay.push({
+                            id:i*5+'',
+                            name:'Delay'+i+'seconds',
+                        });
+                    }
+                }else if(i<72){
+                    j++;
+                    this.option.light_delay.push({
+                        id:j*60+'',
+                        name:this.version=='0'?'延时'+j+'分钟':'Delay'+j+'minutes',
+                    });
+                    this.option.induction_delay.push({
+                        id:j*60+'',
+                        name:this.version=='0'?'延时'+j+'分钟':'Delay'+j+'minutes',
+                    });
+                }
+                /*智能电压*/
+                if(i<=145){
+                    let val = i/10+2.5;
+                    this.option.intell_powerV.push({
+                        id:val.toFixed(1),
+                        name:val.toFixed(1),
+                    })
+                }
+                /*智能电流*/
+                if(i<=85){
+                    let val = i/100+0.15;
+                    this.option.intell_powerC.push({
+                        id:val.toFixed(2),
+                        name:val.toFixed(2),
+                    })
+                }
+                /*load_current 负载电流*/
+                if(i<=695){
+                    let val = i/100+0.05;
+                    this.option.load_current.push({
+                        id:val.toFixed(2),
+                        name:val.toFixed(2),
+                    })
+                }
+                /*light_time 亮灯时间*/
+                if(i<=30){
+                    let val = i/2;
+                    this.option.light_time.push({
+                        id:val.toFixed(1),
+                        name:val.toFixed(1),
+                    })
+                }
+                /*light_power 功率*/
+                if(i<=20){
+                    let val = (i*5)+'';
+                    this.option.light_power.push({
+                        id:val,
+                        name:val,
+                    })
+                }
+                /*light_voltage 光控电压*/
+                if(i<=8){
+                    let val = (i+3)+'';
+                    this.option.light_voltage.push({
+                        id:val,
+                        name:val,
+                    })
+                }
+                /*light_voltage 光控电压延时*/
+                if(i<=8){
+                    let val = (i+3)+'';
+                    this.option.light_delay_time.push({
+                        id:val,
+                        name:val,
+                    })
+                }
+                
+                /*increa_char_voltage0 提升充电电压*/
+                if(i<=95){
+                    let val = (i/10+7.5)+'';
+                    this.option.increa_char_voltage0.push({
+                        id:val,
+                        name:val,
+                    })
+                }
+                /*increa_char_voltage3 提升充电电压*/
+                if(i<=17){
+                    let val = (i/10+2.5)+'';
+                    this.option.increa_char_voltage3.push({
+                        id:val,
+                        name:val,
+                    })
+                }
+                /*increa_char_voltage6 提升充电电压*/
+                if(i<=34){
+                    let val = (i/10+5.0)+'';
+                    this.option.increa_char_voltage6.push({
+                        id:val,
+                        name:val,
+                    })
+                }
+                /*limit_temper 温度*/
+                if(i<=160){
+                    let val = (i-40)+'';
+                    this.option.limit_temper.push({
+                        id:val,
+                        name:val,
+                    })
+                }
+                /*temper_compen_coeff 温度补偿系数*/
+                if(i<=10){
+                    let val = i+'';
+                    this.option.temper_compen_coeff.push({
+                        id:val,
+                        name:val,
+                    })
+                }
+                /*equ_char_time 充电时间*/
+                if(i<=60){
+                    let val = i*10+'';
+                    this.option.equ_char_time.push({
+                        id:val,
+                        name:val,
+                    })
+                }
+            }
+            for(let i_1 = 0; i_1<52;i_1++){
+                if(i_1==0){
+                    this.option.balan_char_interval.push({
+                        id:i_1,
+                        name:this.version == '0'?'禁止均衡功能':'Prohibited Equilibrium Function',
+                    });
+                }else{
+                    this.option.balan_char_interval.push({
+                        id:i_1*5+'',
+                        name:i_1*5+'',
+                    });
+                }
+            }
+
             setInterval(function(){
                 this_.currentTime = new Date();
             },1000)
@@ -2519,6 +2706,9 @@
                                     this.getLightList(this.currentPage);
                                     this.networkSectionList();
                                     this.loading.batchProcessingFun = false;
+                                    let storage = window.localStorage;
+                                    let searchType = storage.getItem("searchType");
+                                    this.sideBarCompanyList('',searchType)
                                 },
                               this)
                             }).catch(() => {
@@ -3408,6 +3598,9 @@
                                 });
                                 this.getLightList(this.currentPage);
                                 this.addLightControlDialog = false;
+                                let storage = window.localStorage;
+                                let searchType = storage.getItem("searchType");
+                                this.sideBarCompanyList('',searchType)
                                 // this.networkSectionList();
                             },
                         this)
@@ -4245,45 +4438,27 @@
                     }
                 )
             },
-
             /*参数弹框*/
             monitorFun(data){
                 console.log(data,'-------')
                 this.lampId = data.id;
+                this.lampProtocoltype = data.lampProtocoltype;
                 this.loadtype = data.loadtype;
                 this.monitorType = 'loadParameters';
                 this.monitorDialog = true;
                 this.parameterLoadIsEdit = false;
                 this.parameterBatteryIsEdit = false;
-                baseApi.ajax_post(
-                    allUrl.project.workmode,
-                    {
-                        username:this.username,
-                        client_key:this.client_key,
-                        token:this.token,
-                    },
-                    {},
-                    data =>{
-                        this.option.workmodeList = [];
-                        // console.log(data,'路灯负载模式下拉列表')
-                        for(let key in data.data){
-                            this.option.workmodeList.push({
-                                id:key,
-                                name:data.data[key],
-                            })
-                        }
-                    },
-                this)
-                this.loadParametersData = this.loadParametersDataOld;
-                if(data.loadtype == '1'){
-                    this.loadParametersListEN = this.catcherloadParametersListENOld
+                if(data.loadtype == '0'){
+                    this.loadParametersData = this.loadParametersDataNew;
+                    this.loadParametersListEN = this.loadParametersListENNew
                 }else{
-                    this.loadParametersListEN = this.loadParametersListENOld
+                    this.loadParametersData = this.loadParametersDataNew;
+                    this.loadParametersListEN = this.catcherloadParametersListENNew;
                 }
                 for(let key in this.loadParametersData){
                     this.loadParametersData[key] = '';
                 }
-                
+            
                 this.loadSetting();
                 
                 for(let key in this.batteryParametersData){
@@ -4485,7 +4660,7 @@
                     let parameter = {};
                     let obj = [];
                     let objData = {};
-                    obj = this['batteryParametersList'+this.batteryParametersData.batterytype+'EN']
+                    obj = this.batteryParametersList1EN
                     for(let d of obj){
                         console.log(d.model)
                         parameter[d.model] = this.batteryParametersData[d.model]
@@ -4780,7 +4955,27 @@
                     }
                 )
             },
+            /*参数切换*/
+            monitorSwitchFun(type){
+                this.monitorType = type;
+            },
 
+            datezhuanhuan(date){
+                date = new Date(date)
+                // console.log(date,'----s-------s------s')
+                let h = '',m = '';
+                if(date.getHours()<10){
+                    h = '0'+date.getHours();
+                }else{
+                    h = date.getHours();
+                }
+                if(date.getMinutes()<10){
+                    m = '0'+date.getMinutes();
+                }else{
+                    m = date.getMinutes();
+                }
+                return h+':'+m;
+            },
             //百度坐标转高德(传入经度、纬度)
             bd_decrypt(bd_lng, bd_lat) {
                 var X_PI = Math.PI * 3000.0 / 180.0;
@@ -4822,6 +5017,237 @@
                 }
                 this.$set(this,'lightControlListEN_for',list)
             },
+            'batteryParametersData.li_battery_type':function(curVal){
+                if(curVal == '0'){
+                    if(this.batteryParametersData.system_voltage == '3'){
+                        this.batteryParametersData.increa_char_voltage = '3.6';
+                        this.batteryParametersData.float_char_voltage = '3.4';
+                        this.batteryParametersData.over_dischar_return_voltage = '3.2';
+                        this.batteryParametersData.over_dischar_voltage = '2.5';
+                    }
+                    if(this.batteryParametersData.system_voltage == '6'){
+                        this.batteryParametersData.increa_char_voltage = '7.2';
+                        this.batteryParametersData.float_char_voltage = '6.8';
+                        this.batteryParametersData.over_dischar_return_voltage = '6.4';
+                        this.batteryParametersData.over_dischar_voltage = '5.0';
+                    }
+                    if(this.batteryParametersData.system_voltage == '12'||this.batteryParametersData.system_voltage == '24'){
+                        this.batteryParametersData.increa_char_voltage = '14.4';
+                        this.batteryParametersData.float_char_voltage = '13.6';
+                        this.batteryParametersData.over_dischar_return_voltage = '12.0';
+                        this.batteryParametersData.over_dischar_voltage = '10.2';
+                    }
+                }else{
+                    if(this.batteryParametersData.system_voltage == '3'){
+                        this.batteryParametersData.increa_char_voltage = '4.2';
+                        this.batteryParametersData.float_char_voltage = '4.0';
+                        this.batteryParametersData.over_dischar_return_voltage = '3.6';
+                        this.batteryParametersData.over_dischar_voltage = '3.0';
+                    }
+                    if(this.batteryParametersData.system_voltage == '6'){
+                        this.batteryParametersData.increa_char_voltage = '8.4';
+                        this.batteryParametersData.float_char_voltage = '8.0';
+                        this.batteryParametersData.over_dischar_return_voltage = '7.2';
+                        this.batteryParametersData.over_dischar_voltage = '6.0';
+                    }
+                    if(this.batteryParametersData.system_voltage == '12'||this.batteryParametersData.system_voltage == '24'){
+                        this.batteryParametersData.increa_char_voltage = '12.5';
+                        this.batteryParametersData.float_char_voltage = '12.0';
+                        this.batteryParametersData.over_dischar_return_voltage = '10.2';
+                        this.batteryParametersData.over_dischar_voltage = '9.2';
+                    }
+
+                }
+            },
+            'batteryParametersData.system_voltage':function(curVal,oldVal){
+                console.log(curVal,oldVal,this.batteryParametersData.batterytype,'-------')
+                if(this.batteryParametersData.batterytype == '1'||this.batteryParametersData.battery_type == '1'||this.batteryParametersData.batterytype == '2'||this.batteryParametersData.battery_type == '2'){
+                    if(curVal == '3'){
+                        for(let d of this.batteryParametersList1){
+                            if(d.model == 'increa_char_voltage'){
+                                d.option = 'increa_char_voltage3'
+                            }
+                            if(d.model == 'float_char_voltage'){
+                                d.option = 'increa_char_voltage3'
+                            }
+                            if(d.model == 'over_dischar_return_voltage'){
+                                d.option = 'increa_char_voltage3'
+                            }
+                            if(d.model == 'over_dischar_voltage'){
+                                d.option = 'increa_char_voltage3'
+                            }
+                        }
+                        for(let d of this.batteryParametersList1EN){
+                            if(d.model == 'increa_char_voltage'){
+                                d.option = 'increa_char_voltage3'
+                            }
+                            if(d.model == 'float_char_voltage'){
+                                d.option = 'increa_char_voltage3'
+                            }
+                            if(d.model == 'over_dischar_return_voltage'){
+                                d.option = 'increa_char_voltage3'
+                            }
+                            if(d.model == 'over_dischar_voltage'){
+                                d.option = 'increa_char_voltage3'
+                            }
+                        }
+                        if(this.batteryParametersData.li_battery_type == '0'){
+                            this.batteryParametersData.increa_char_voltage = '3.6';
+                            this.batteryParametersData.float_char_voltage = '3.4';
+                            this.batteryParametersData.over_dischar_return_voltage = '3.2';
+                            this.batteryParametersData.over_dischar_voltage = '2.5';
+                        }else{
+                            this.batteryParametersData.increa_char_voltage = '4.2';
+                            this.batteryParametersData.float_char_voltage = '4.0';
+                            this.batteryParametersData.over_dischar_return_voltage = '3.6';
+                            this.batteryParametersData.over_dischar_voltage = '3.0';
+                        }
+                    }else if(curVal == '6'){
+                        for(let d of this.batteryParametersList1){
+                            if(d.model == 'increa_char_voltage'){
+                                d.option = 'increa_char_voltage6'
+                            }
+                            if(d.model == 'float_char_voltage'){
+                                d.option = 'increa_char_voltage6'
+                            }
+                            if(d.model == 'over_dischar_return_voltage'){
+                                d.option = 'increa_char_voltage6'
+                            }
+                            if(d.model == 'over_dischar_voltage'){
+                                d.option = 'increa_char_voltage6'
+                            }
+                        }
+                        for(let d of this.batteryParametersList1EN){
+                            if(d.model == 'increa_char_voltage'){
+                                d.option = 'increa_char_voltage6'
+                            }
+                            if(d.model == 'float_char_voltage'){
+                                d.option = 'increa_char_voltage6'
+                            }
+                            if(d.model == 'over_dischar_return_voltage'){
+                                d.option = 'increa_char_voltage6'
+                            }
+                            if(d.model == 'over_dischar_voltage'){
+                                d.option = 'increa_char_voltage6'
+                            }
+                        }
+                        if(this.batteryParametersData.li_battery_type == '0'){
+                            this.batteryParametersData.increa_char_voltage = '7.2';
+                            this.batteryParametersData.float_char_voltage = '6.8';
+                            this.batteryParametersData.over_dischar_return_voltage = '6.4';
+                            this.batteryParametersData.over_dischar_voltage = '5.0';
+                        }else{
+                            this.batteryParametersData.increa_char_voltage = '8.4';
+                            this.batteryParametersData.float_char_voltage = '8.0';
+                            this.batteryParametersData.over_dischar_return_voltage = '7.2';
+                            this.batteryParametersData.over_dischar_voltage = '6.0';
+                        }
+                    }else{
+                        for(let d of this.batteryParametersList1){
+                            if(d.model == 'increa_char_voltage'){
+                                d.option = 'increa_char_voltage0'
+                            }
+                            if(d.model == 'float_char_voltage'){
+                                d.option = 'increa_char_voltage0'
+                            }
+                            if(d.model == 'over_dischar_return_voltage'){
+                                d.option = 'increa_char_voltage0'
+                            }
+                            if(d.model == 'over_dischar_voltage'){
+                                d.option = 'increa_char_voltage0'
+                            }
+                        }
+                        for(let d of this.batteryParametersList1EN){
+                            if(d.model == 'increa_char_voltage'){
+                                d.option = 'increa_char_voltage0'
+                            }
+                            if(d.model == 'float_char_voltage'){
+                                d.option = 'increa_char_voltage0'
+                            }
+                            if(d.model == 'over_dischar_return_voltage'){
+                                d.option = 'increa_char_voltage0'
+                            }
+                            if(d.model == 'over_dischar_voltage'){
+                                d.option = 'increa_char_voltage0'
+                            }
+                        }
+                        if(this.batteryParametersData.li_battery_type == '0'){
+                            if(curVal == '12'){
+                                this.batteryParametersData.increa_char_voltage = '14.4';
+                                this.batteryParametersData.float_char_voltage = '13.6';
+                                this.batteryParametersData.over_dischar_return_voltage = '12.0';
+                                this.batteryParametersData.over_dischar_voltage = '10.2';
+                            }
+                            if(curVal == '24'){
+                                this.batteryParametersData.increa_char_voltage = '14.4';
+                                this.batteryParametersData.float_char_voltage = '13.6';
+                                this.batteryParametersData.over_dischar_return_voltage = '12.0';
+                                this.batteryParametersData.over_dischar_voltage = '10.2';
+                            }
+                        }else{
+                            if(curVal == '12'){
+                                this.batteryParametersData.increa_char_voltage = '12.5';
+                                this.batteryParametersData.float_char_voltage = '12.0';
+                                this.batteryParametersData.over_dischar_return_voltage = '10.2';
+                                this.batteryParametersData.over_dischar_voltage = '9.2';
+                            }
+                            if(curVal == '24'){
+                                this.batteryParametersData.increa_char_voltage = '12.5';
+                                this.batteryParametersData.float_char_voltage = '12.0';
+                                this.batteryParametersData.over_dischar_return_voltage = '10.2';
+                                this.batteryParametersData.over_dischar_voltage = '9.2';
+                            }
+                        }
+                    }
+                }
+            },
+            '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['batteryParametersList'+val+'EN'] = this['batteryParametersListNew'+val+'EN'];
+                
+                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'){
@@ -5857,9 +6283,13 @@
                 .box{
                     // overflow: auto;
                     // padding-right: 75px;
+                    .el-form{
+                        display: flex;
+                        flex-wrap: wrap;//换行
+                        align-content: flex-start;//display flex 布局换行后行间距清空。
+                    }
                     .list_box{
                         width: 25%;
-                        float: left;
                         height: 40px;
                     }
                     .list_boxEN{