Merge branch 'master' of http://gogs.weclouds.xyz:3000/crazycat/IDCOL

webConfig/src/views/projectManagement.vue

@@ -847,7 +847,7 @@
           <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 @click="monitorSwitchFun('batteryParameters')" class="parameter_nav" :class="{'monitor_type':monitorType=='batteryParameters'}"><span>{{'Battery parameter'}}</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>
@@ -1906,7 +1906,7 @@
                             name:'Delay '+i*5+' seconds',
                         });
                     }
-                }else if(i<72){
+                }else if(i<52){
                     j++;
                     this.option.light_delay.push({
                         id:j*60,
@@ -1978,10 +1978,10 @@
                             name:'Delay '+i*10+' seconds',
                         });
                     }
-                }else if(i<72){
+                }else if(i<46){
                     k++;
                     this.option.light_delay_time.push({
-                        id:i*60,
+                        id:k*60,
                         name:'Delay '+k+' minutes',
                     });
                 }
@@ -3553,6 +3553,14 @@
             },
             lightControlFun(){
                 // console.log(this.lightControlData)
+                if(this.lightControlData.address[0] !== 'A'||this.lightControlData.address.length!=10){
+                    this.$message({
+                      showClose: true,
+                      message: 'Invalid wireless module address',
+                      type: 'warning'
+                    });
+                    return
+                }
                 let lamp_id;
                 if(this.lightControlTitle == 'Add Lamp'){
                     lamp_id = 0;