no message

webConfig/src/views/projectManagement.vue

@@ -863,9 +863,10 @@
                     :style="{'visibility':
                         ((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')))
+                        ((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')))||
+                        (loadParametersData['induction_delay_status'] == 0&&item.model=='induction_delay')
                         ?'hidden':'',
-                        'width':'33.33%'}">
+                        'width':(item.model=='induction_delay'||item.model=='induction_delay_status')?'50%':'33.33%'}">
                         <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
@@ -1394,7 +1395,8 @@
                     
                     {model:'load_current',label:'LedCurrSet',unit:'(mA)',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:'induction_delay_status',label:'Induction delay switch',unit:'',type:'select',option:'induction_delay_status'},
+                    {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'},
@@ -1597,26 +1599,10 @@
                     {model:'dischar_upper_limit_temper',label:'放电上限温度',unit:'(℃)',type:'select',option:'limit_temper'},
                     {model:'dischar_lower_limit_temper',label:'放电下限温度',unit:'(℃)',type:'select',option:'limit_temper'},
                 ],
-                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'},
-
-                    {model:'increa_char_voltage',label:'BatImprovChgVolt',unit:'(V)',type:'input'},
-                    {model:'float_char_voltage',label:'BatFloatChgVolt',unit:'(V)',type:'input'},
-                    {model:'over_dischar_return_voltage',label:'BatOverDischgBackVolt',unit:'(V)',type:'input'},
-                    {model:'over_dischar_voltage',label:'BatOverDischgVolt',unit:'(V)',type:'input'},
-                    {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:'(℃)',type:'select',option:'limit_temper'},
-                    {model:'dischar_lower_limit_temper',label:'DisChgMinTemper',unit:'(℃)',type:'select',option:'limit_temper'},
-                ],
                 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:'(min)',type:'select',option:'light_delay_time'},
+                    {model:'light_delay_time',label:'Optical control delay time',unit:'(s)',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'},
@@ -1679,10 +1665,6 @@
                     balan_char_interval:[],
                     intell_powerV:[],
                     intell_powerC:[],
-                    li_battery_type:[
-                        {id:'0',name:'磷酸铁锂'},
-                        {id:'1',name:'三元锂'},
-                    ],
                     li_battery_typeEN:[
                         {id:'0',name:'LiFePO4'},
                         {id:'1',name:'NCM'},
@@ -1699,6 +1681,10 @@
                     ],
                     light_delay:[],
                     induction_delay:[],
+                    induction_delay_status:[
+                        {id:'0',name:'Off'},
+                        {id:'1',name:'On'},
+                    ],
                     workmodeList:[],
                     intell_power:[
                         {id:'0',name:'关'},
@@ -1766,10 +1752,10 @@
                         {id:'-5',name:'-5'},
                     ],
                     batteryListEN:[
-                        {id:'1',name:'Lithium iron phosphate'},
-                        {id:'2',name:'Ternary lithium'},
-                        {id:'3',name:'Super capacitor'},
-                        {id:'4',name:'Lead-acid batteries'},
+                        {id:1,name:'Lithium iron phosphate'},
+                        {id:2,name:'Ternary lithium'},
+                        {id:3,name:'Super capacitor'},
+                        {id:4,name:'Lead-acid batteries'},
                     ],
                     onOff:[
                         {id:'1',name:'开启'},
@@ -1913,22 +1899,22 @@
                     }else{
                         this.option.induction_delay.push({
                             id:i*5+'',
-                            name:'Delay'+i+'seconds',
+                            name:'Delay'+i*5+'seconds',
                         });
                         this.option.light_delay.push({
-                            id:i*5+'',
-                            name:'Delay'+i+'seconds',
+                            id:i*5,
+                            name:'Delay'+i*5+'seconds',
                         });
                     }
                 }else if(i<72){
                     j++;
                     this.option.light_delay.push({
-                        id:j*60+'',
-                        name:this.version=='0'?'延时'+j+'分钟':'Delay'+j+'minutes',
+                        id:j*60,
+                        name:'Delay'+j+'minutes',
                     });
                     this.option.induction_delay.push({
                         id:j*60+'',
-                        name:this.version=='0'?'延时'+j+'分钟':'Delay'+j+'minutes',
+                        name:'Delay'+j+'minutes',
                     });
                 }
                 /*智能电压*/
@@ -1965,7 +1951,7 @@
                 }
                 /*light_power 亮度*/
                 if(i<=100){
-                    let val = (i)+'';
+                    let val = i+'';
                     this.option.light_power.push({
                         id:val,
                         name:val,
@@ -1973,24 +1959,36 @@
                 }
                 /*light_voltage 光控电压*/
                 if(i<=8){
-                    let val = (i+3)+'';
+                    let val = (i+3);
                     this.option.light_voltage.push({
                         id:val,
                         name:val,
                     })
                 }
-                /*light_voltage 光控电压延时*/
-                if(i<=8){
-                    let val = (i+3)+'';
+                /*light_delay_time 光控电压延时*/
+                if(i<=5){
+                    if(i==0){
+                        this.option.light_delay_time.push({
+                            id:i*10,
+                            name:'Non-inductive function',
+                        });
+                    }else{
+                        this.option.light_delay_time.push({
+                            id:i*10,
+                            name:'Delay'+i*10+'seconds',
+                        });
+                    }
+                }else if(i<72){
+                    j++;
                     this.option.light_delay_time.push({
-                        id:val,
-                        name:val,
-                    })
+                        id:j*60,
+                        name:'Delay'+j+'minutes',
+                    });
                 }
                 
                 /*increa_char_voltage0 提升充电电压*/
                 if(i<=95){
-                    let val = (i/10+7.5)+'';
+                    let val = (i/10+7.5);
                     this.option.increa_char_voltage0.push({
                         id:val,
                         name:val,
@@ -1998,7 +1996,7 @@
                 }
                 /*increa_char_voltage3 提升充电电压*/
                 if(i<=17){
-                    let val = (i/10+2.5)+'';
+                    let val = (i/10+2.5);
                     this.option.increa_char_voltage3.push({
                         id:val,
                         name:val,
@@ -2006,7 +2004,7 @@
                 }
                 /*increa_char_voltage6 提升充电电压*/
                 if(i<=34){
-                    let val = (i/10+5.0)+'';
+                    let val = (i/10+5.0);
                     this.option.increa_char_voltage6.push({
                         id:val,
                         name:val,
@@ -2014,7 +2012,7 @@
                 }
                 /*limit_temper 温度*/
                 if(i<=160){
-                    let val = (i-40)+'';
+                    let val = (i-40);
                     this.option.limit_temper.push({
                         id:val,
                         name:val,
@@ -2022,7 +2020,7 @@
                 }
                 /*temper_compen_coeff 温度补偿系数*/
                 if(i<=10){
-                    let val = i+'';
+                    let val = i;
                     this.option.temper_compen_coeff.push({
                         id:val,
                         name:val,
@@ -2030,7 +2028,7 @@
                 }
                 /*equ_char_time 充电时间*/
                 if(i<=60){
-                    let val = i*10+'';
+                    let val = i*10;
                     this.option.equ_char_time.push({
                         id:val,
                         name:val,
@@ -2045,8 +2043,8 @@
                     });
                 }else{
                     this.option.balan_char_interval.push({
-                        id:i_1*5+'',
-                        name:i_1*5+'',
+                        id:i_1*5,
+                        name:i_1*5,
                     });
                 }
             }