Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-web

src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue

@@ -76,6 +76,16 @@
         <el-form-item label="识别器编号" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="请输入识别器编号" style="width: 400px"/>
         </el-form-item>
+        <el-form-item label="所属实验室" prop="subjectId">
+          <el-select v-model="form.subjectId" placeholder="请选择实验室" style="width: 400px">
+            <el-option
+              v-for="item in subjectAddOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="IP地址" >
           <el-input v-model="form.ipAddress" placeholder="请输入IP地址" style="width: 400px"/>
         </el-form-item>
@@ -124,16 +134,7 @@
 <!--          <el-input-number v-model="uniformPower[index]" placeholder="请输入设备输出频率" />-->
 <!--        </el-form-item>-->
 
-        <el-form-item label="所属实验室" prop="subjectId">
-          <el-select v-model="form.subjectId" placeholder="请选择实验室">
-            <el-option
-              v-for="item in subjectAddOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
@@ -342,7 +343,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-
+      let _this=this;
       this.open = true;
       this.title = "修改识别器";
       this.form.id=row.id
@@ -353,17 +354,20 @@ export default {
       this.form.channels=row.channels+''
       this.form.sessionIndex=row.sessionIndex+''
       this.form.manufacturerType=row.manufacturerType
-      console.log( this.uniformPower.length)
+      //this.uniformPower=row.uniformPower.split(',')
       this.antennaNum=[];
+      this.uniformPower=[];
       //天线感应距离和检测类型编辑
       let arr=[]
       this.form.uniformPower=row.uniformPower//天线感应距离和检测类型
-      //this.uniformPower=row.uniformPower.split(',')
       arr=row.uniformPower.split(',')
-      for(let i in arr){
-        this.antennaNum.push(i)
-        this.detection.push(arr[i])
-      }
+      arr.forEach(function(item,index) {
+          console.log(item.split(':'))
+        _this.antennaNum.push(index)//天线数量
+        _this.uniformPower.push(item.split(':')[0])
+        _this.detection.push(item.split(':')[1])
+      })
+
     },
     /** 提交按钮 */
     submitForm() {