Merge branch 'master' into jinan-web

src/views/comprehensive/laboratoryManagement/subject/deviceList.vue

@@ -93,6 +93,15 @@
       <el-dialog :title="title" :visible.sync="addType" v-if="addType" width="500px" append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="110px">
           <div v-if="upType == 1 || upType == 5">
+            <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;">
                 <el-option
@@ -146,6 +155,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>
@@ -173,6 +191,15 @@
             </el-form-item>
           </div>
           <div v-if="upType == 4 || upType == 8">
+            <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="hardwareNum">
               <el-input v-model="form.hardwareNum" placeholder="摄像头编号"
                         maxlength="30" style="width:320px;"/>
@@ -207,8 +234,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'}
@@ -290,6 +317,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
         addHardwareThree(){
           let obj = {
             type:4,
+            name:this.form.name,
             hardwareNum:this.form.hardwareNum,
             subjectId:this.subjectData.id,
             deptId:this.subjectData.deptId,
@@ -305,6 +333,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
         putHardwareThree(){
           let obj = {
             id:this.form.id,
+            name:this.form.name,
             hardwareNum:this.form.hardwareNum,
             subjectId:this.form.subjectId,
             deptId:this.form.deptId,
@@ -336,6 +365,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 +386,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,
@@ -439,6 +470,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
         //添加传感器
         addSensor(){
           let obj = {
+            name:this.form.name,
             type:this.form.type,
             gatewayId:this.form.gatewayId,
             routeNum:this.form.routeNum,
@@ -455,6 +487,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
         //编辑传感器
         putSensor(){
           let obj = {
+            name:this.form.name,
             type:this.form.type,
             id:this.form.id,
             gatewayId:this.form.gatewayId,