heyang

src/assets/styles/ZDpageCss.scss

@@ -163,7 +163,7 @@
   width:90px!important;
 }
 .recognizer-dialog-box .el-form-item__label{
-  width:120px!important;
+  width:130px!important;
 }
 .recognizer-dialog-box .el-input--medium{
   width:340px!important;

src/views/emergencyEvacuationBig.vue

@@ -231,7 +231,6 @@
               sn:self.trumpetList[i].deviceSn,
               port:self.trumpetList[i].port,
               deviceIp:self.trumpetList[i].deviceIp,
-
               type:"",
               name:"",
               speed:"",

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

@@ -79,19 +79,12 @@
         <el-form-item label="IP地址" >
           <el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
         </el-form-item>
-        <el-form-item label="供应商">
+        <el-form-item label="连接方式">
           <el-select v-model="form.manufacturerType" placeholder="请选择" style="width:320px;">
             <el-option :label="item.dictLabel" :value="item.dictValue" v-for="(item,index) in materialTypeList" :key="index"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="信道数量" >
-          <el-select v-model="form.channels" placeholder="请选择信道数量">
-            <el-option  label="1通道" value="1"></el-option>
-            <el-option  label="4通道" value="4"></el-option>
-            <el-option  label="8通道" value="8"></el-option>
-            <el-option  label="16通道" value="16"></el-option>
-          </el-select>
-        </el-form-item>
+
         <el-form-item label="推送频率" >
           <el-select v-model="form.sessionIndex" placeholder="请选择设备推送频率">
             <el-option  label="最大" value="0"></el-option>
@@ -99,9 +92,19 @@
             <el-option  label="最小" value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="输出频率" >
-          <el-input-number v-model="form.uniformPower" placeholder="请输入设备输出频率" />
+        <el-form-item label="天线数量" >
+          <el-select v-model="form.channels" placeholder="请选择信道数量" @change="antennaNumFun()">
+            <el-option  label="1" value="1"></el-option>
+            <el-option  label="2" value="2"></el-option>
+            <el-option  label="4" value="4"></el-option>
+            <el-option  label="8" value="8"></el-option>
+            <el-option  label="16" value="16"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="(index+1)+'号天线感应距离'" v-for="(item,index) in antennaNum" :key="index">
+          <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
@@ -157,6 +160,7 @@ export default {
         searchValue:'',
         type:'RFID_RECOGNIZER'
       },
+
       // 表单参数
       form: {
         id:'',
@@ -166,10 +170,12 @@ export default {
         ipAddress:'',//ip地址
         channels:4,//信道
         sessionIndex:0,//设备推送频率
-        uniformPower:33,//设备推送频率
+        uniformPower:'',//设备推送频率
         manufacturerType:'',//供应商
       },
       materialTypeList:[],
+      uniformPower:[20,20,20,20],
+      antennaNum:[1,2,3,4],//天线数量
       // 表单校验
       rules: {
         name:[
@@ -192,6 +198,15 @@ export default {
     this.supplierTypeList();
   },
   methods: {
+    antennaNumFun(){
+      console.log(this.uniformPower)
+      this.uniformPower=[];
+      this.antennaNum=[];
+      for(let i=0;i<this.form.channels;i++){
+        this.antennaNum.push(i)
+        this.uniformPower.push(20)
+      }
+    },
     //供应商类型
     supplierTypeList(){
       let _this=this;
@@ -260,7 +275,7 @@ export default {
         ipAddress: null,
         channels: '4',
         sessionIndex: '0',
-        uniformPower: 33,
+        uniformPower: '',
 
       };
       this.resetForm("form");
@@ -281,9 +296,12 @@ export default {
 
       this.open = true;
       this.title = "新增识别器";
+      this.uniformPower=[20,20,20,20];
+        this.antennaNum=[1,2,3,4]//天线数量
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+
       this.open = true;
       this.title = "修改识别器";
       this.form.id=row.id
@@ -293,15 +311,20 @@ export default {
       this.form.ipAddress=row.ipAddress
       this.form.channels=row.channels+''
       this.form.sessionIndex=row.sessionIndex+''
+      this.uniformPower=row.uniformPower.split(',')//天线感应器数量
       this.form.uniformPower=row.uniformPower
       this.form.manufacturerType=row.manufacturerType
-
-
+      console.log( this.uniformPower.length)
+      this.antennaNum=[];
+      for(let i=0;i<this.uniformPower.length;i++){
+        this.antennaNum.push(i)
+      }
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.uniformPower=this.uniformPower.join(',')
           this.form.channels=Number(this.form.channels)
           this.form.sessionIndex=Number(this.form.sessionIndex)