no message

webConfig/src/views/projectManagement.vue

@@ -851,8 +851,9 @@
                         ((item.model=='begin_voltage'||item.model=='end_voltage'||item.model=='end_current')&&loadParametersData['intell_power']!='5')
                         ||
                         ((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':'','width':
-                        (item.model!='intell_power'&&item.model!='begin_voltage'&&item.model!='end_voltage'&&item.model!='end_current')?'33.33%':''}">
+                        ?'hidden':'',
+                        'width':
+                        (item.model!='intell_power'&&item.model!='light_type')?'33.33%':'50%'}">
                         <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-option
@@ -1247,29 +1248,12 @@
 
                     {model:'tenth_light_time',label:'晨亮时间',unit:'(HH:MM)',type:'timeSelect'},
                 ],
-                catcherloadParametersListENNew:[{model:'intell_power',label:'SpecialPowerCtrl',unit:'',type:'select',option:'intell_powerEN'},
-                    {model:'begin_voltage',label:'AutoPowerStartUser1Volt',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:'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'},
-
-                    {model:'first_light_time',label:'LoadTime1',unit:'(HH:MM)',type:'timeSelect'},
-
-                    {model:'second_light_time',label:'LoadTime2',unit:'(HH:MM)',type:'timeSelect'},
-
-                    {model:'third_light_time',label:'LoadTime3',unit:'(HH:MM)',type:'timeSelect'},
-
-                    {model:'tenth_light_time',label:'LoadMorningLightTime',unit:'(HH:MM)',type:'timeSelect'},
-                ],
                 loadParametersDataNew:{
                     light_voltage:'',
                     intell_power:'',
-                    load_current:'',
-                    light_delay:'',
-                    induction_delay:'',
+                    // load_current:'',
+                    // light_delay:'',
+                    // induction_delay:'',
                     first_light_time:'',
                     first_light_human_power:'',
                     first_light_unman_power:'',
@@ -1291,18 +1275,18 @@
                     seventh_light_time:'',
                     seventh_light_human_power:'',
                     seventh_light_unman_power:'',
-                    eighth_light_time:'',
-                    eighth_light_human_power:'',
-                    eighth_light_unman_power:'',
-                    ninth_light_time:'',
-                    ninth_light_human_power:'',
-                    ninth_light_unman_power:'',
+                    // eighth_light_time:'',
+                    // eighth_light_human_power:'',
+                    // eighth_light_unman_power:'',
+                    // ninth_light_time:'',
+                    // ninth_light_human_power:'',
+                    // ninth_light_unman_power:'',
                     tenth_light_time:'',
                     tenth_light_human_power:'',
                     tenth_light_unman_power:'',
-                    begin_voltage:'',
-                    end_voltage:'',
-                    end_current:'',
+                    // begin_voltage:'',
+                    // end_voltage:'',
+                    // end_current:'',
                 },
                 loadParametersListNew:[
                     {model:'intell_power',label:'智能功率',unit:'',type:'select',option:'intell_power'},
@@ -1385,13 +1369,14 @@
                 ],
                 loadParametersListENNew:[
                     {model:'intell_power',label:'SpecialPowerCtrl',unit:'',type:'select',option:'intell_powerEN'},
-                    {model:'begin_voltage',label:'AutoPowerStartUser1Volt',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:'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:'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:'light_delay',label:'LightCtrlDelayTimeS',unit:'',type:'select',option:'light_delay'},
-                    {model:'induction_delay',label:'SensorDelayTime',unit:'(S)',type:'select',option:'induction_delay'},
+                    // {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'},
 
                     {model:'first_light_time',label:'LoadTime1',unit:'(HH:MM)',type:'timeSelect'},
                     {model:'first_light_human_power',label:'LoadSensorOnPower1',unit:'(%)',type:'select',option:'light_power'},
@@ -1421,13 +1406,13 @@
                     {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_human_power',label:'LoadSensorOnPower8',unit:'%',type:'select',option:'light_power'},
-                    {model:'eighth_light_unman_power',label:'LoadSensorOffPower8',unit:'%',type:'select',option:'light_power'},
+                    // {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_unman_power',label:'LoadSensorOffPower8',unit:'%',type:'select',option:'light_power'},
 
-                    {model:'ninth_light_time',label:'LoadTime9',unit:'(HH:MM)',type:'timeSelect'},
-                    {model:'ninth_light_human_power',label:'LoadSensorOnPower9',unit:'%',type:'select',option:'light_power'},
-                    {model:'ninth_light_unman_power',label:'LoadSensorOffPower9',unit:'%',type:'select',option:'light_power'},
+                    // {model:'ninth_light_time',label:'LoadTime9',unit:'(HH:MM)',type:'timeSelect'},
+                    // {model:'ninth_light_human_power',label:'LoadSensorOnPower9',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_human_power',label:'LoadMornLightSensorOnPower',unit:'%',type:'select',option:'light_power'},
@@ -1457,6 +1442,8 @@
                     tempcompmax:'',
                     tempcompmin:'',
                     turnfloatingcurrent:'',
+                    reduced_start_voltage:'',
+                    reduced_stop_voltage:'',
                     // capacity:'',
                     // vpromotecharge:'',
                     // vpromoterecover:'',
@@ -1471,7 +1458,7 @@
                     overvoltage:'',
                     char_limit_voltage:'',
                     equ_char_voltage:'',
-                    li_battery_type:'',
+                    // li_battery_type:'',
                     increa_char_voltage:'',
                     float_char_voltage:'',
                     increa_char_return_voltage:'',
@@ -1615,6 +1602,7 @@
                     {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:'equ_char_voltage',label:'BatConstChgVolt',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'},
@@ -1623,13 +1611,18 @@
                     {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'},
+                    {model:'reduced_start_voltage',label:'Smart power starting voltage',unit:'(V)',type:'input'},
+                    {model:'reduced_stop_voltage',label:'Smart power end voltage',unit:'(V)',type:'input'},
+
+                    // {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:[
@@ -1654,6 +1647,16 @@
                     load_current:[],
                     light_time:[],
                     light_power:[],
+                    light_type:[
+                        {id:'0',name:'策略'},
+                        {id:'1',name:'灯控'},
+                        {id:'2',name:'手动'},
+                    ],
+                    light_type_en:[
+                        {id:'0',name:'strategy'},
+                        {id:'1',name:'Lamp control'},
+                        {id:'2',name:'Manual'},
+                    ],
 
                     balan_char_interval:[],
                     intell_powerV:[],
@@ -2480,64 +2483,10 @@
                                 this.loading.loadSetting = true;
                                 this.batterySettingIsTrue = false;
                                 this.loading.batterySetting = true;
-                                if(oldBoolean){
-                                    this.lampProtocoltype = '0';
-                                    baseApi.ajax_post(
-                                        allUrl.project.workmode,
-                                        {
-                                            username:this.username,
-                                            client_key:this.client_key,
-                                            token:this.token,
-                                        },
-                                        {},
-                                        data =>{
-                                            this.option.workmodeList = [];
-                                            for(let key in data.data){
-                                                this.option.workmodeList.push({
-                                                    id:key,
-                                                    name:data.data[key],
-                                                })
-                                            }
-                                        },
-                                    this)
-                                    this.loadParametersData = this.loadParametersDataOld;
-                                    if(catcherBoolean){
-                                        this.loadtype = '1';
-                                        if(this.version == '0'){
-                                            this.loadParametersList = this.catcherloadParametersListOld;
-                                        }else{
-                                            this.loadParametersListEN = this.catcherloadParametersListENOld
-                                        }
-                                    }else{
-                                        this.loadtype = '0';
-                                        if(this.version == '0'){
-                                            this.loadParametersList = this.loadParametersListOld;
-                                        }else{
-                                            this.loadParametersListEN = this.loadParametersListENOld
-                                        }
-                                    }
-                                }
-                                if(newBoolean){
-                                    if(catcherBoolean){
-                                        this.lampProtocoltype = '1';
-                                        this.loadtype = '1';
-                                        this.loadParametersData = this.loadParametersDataNew;
-                                        if(this.version == '0'){
-                                            this.loadParametersList = this.catcherloadParametersListNew
-                                        }else{
-                                            this.loadParametersListEN = this.catcherloadParametersListENNew;
-                                        }
-                                    }else{
-                                        this.lampProtocoltype = '1';
-                                        this.loadtype = '0';
-                                        this.loadParametersData = this.loadParametersDataNew;
-                                        if(this.version == '0'){
-                                            this.loadParametersList = this.loadParametersListNew;
-                                        }else{
-                                            this.loadParametersListEN = this.loadParametersListENNew
-                                        }
-                                    }
-                                }
+                                this.lampProtocoltype = '1';
+                                this.loadtype = '0';
+                                this.loadParametersData = this.loadParametersDataNew;
+                                this.loadParametersListEN = this.loadParametersListENNew
                                 for(let key in this.loadParametersData){
                                     this.loadParametersData[key] = '';
                                 }
@@ -4453,13 +4402,8 @@
                 this.monitorDialog = true;
                 this.parameterLoadIsEdit = false;
                 this.parameterBatteryIsEdit = false;
-                if(data.loadtype == '0'){
-                    this.loadParametersData = this.loadParametersDataNew;
-                    this.loadParametersListEN = this.loadParametersListENNew
-                }else{
-                    this.loadParametersData = this.loadParametersDataNew;
-                    this.loadParametersListEN = this.catcherloadParametersListENNew;
-                }
+                this.loadParametersData = this.loadParametersDataNew;
+                this.loadParametersListEN = this.loadParametersListENNew
                 for(let key in this.loadParametersData){
                     this.loadParametersData[key] = '';
                 }
@@ -4691,10 +4635,10 @@
                             )
                         }
                         if(data.data.status == '2'){
-                            if(data.data.code == '0000'){
+                            if(data.code == '0000'){
                                 this.$message({
                                   showClose: true,
-                                  message:data.data.msg,
+                                  message:data.msg,
                                   type: 'success'
                                 });
                                 this.loading.setBatteryFun = false;
@@ -4702,7 +4646,7 @@
                             }else{
                                 this.$message({
                                   showClose: true,
-                                  message:data.data.msg,
+                                  message:data.msg,
                                   type: 'warning'
                                 });
                                 this.loading.setBatteryFun = false;
@@ -5228,31 +5172,31 @@
                 
                 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)
-            },
+            // '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'){