heyang 2 years ago
parent
commit
1605d8ef60
1 changed files with 13 additions and 2 deletions
  1. 13 2
      src/views/comprehensive/laboratoryManagement/subject/deviceList.vue

+ 13 - 2
src/views/comprehensive/laboratoryManagement/subject/deviceList.vue

@@ -146,6 +146,15 @@
             </el-form-item>
           </div>
           <div v-if="upType == 3 || upType == 7">
+            <el-form-item label="硬件名称"  prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="请输入名称"
+                clearable
+                size="small"
+                maxLength="8"
+              />
+            </el-form-item>
             <el-form-item label="设备类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择设备类型" style="width:320px;" :disabled="disabledType">
                 <el-option key="1" label="电源开关" value="1"></el-option>
@@ -207,8 +216,8 @@ import { getSensorList } from "@/api/laboratory/sensor";
           // 表单校验
           rules: {
             name:[
-              {required: true, message: '一体机名称不能为空', trigger: 'blur'},
-              { required: true, message: "一体机名称不能为空", validator: this.spaceJudgment, trigger: "blur" }
+              {required: true, message: '名称不能为空', trigger: 'blur'},
+              { required: true, message: "名称不能为空", validator: this.spaceJudgment, trigger: "blur" }
             ],
             type:[
               {required: true, message: '类型不能为空', trigger: 'blur'}
@@ -336,6 +345,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
         //新增控制设备
         addHardwareTwo(){
           let obj = {
+            name:this.form.name,
             type:this.form.type,
             hardwareType:this.form.hardwareType,
             relayCode:this.form.relayCode,
@@ -356,6 +366,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
         putHardwareTwo(){
           let obj = {
             id:this.form.id,
+            name:this.form.name,
             hardwareType:this.form.hardwareType,
             relayCode:this.form.relayCode,
             bit:this.form.bit,