dedsudiyu 2 роки тому
батько
коміт
b55617be27

+ 14 - 14
src/views/comprehensive/laboratoryManagement/subject/deviceList.vue

@@ -228,8 +228,8 @@ import { getSensorList } from "@/api/laboratory/sensor";
               { required: true, message: "请选择设备版本", trigger: "blur" },
               { required: true, message: "请选择设备版本", trigger: "blur" },
             ],
             ],
             relayCode: [
             relayCode: [
-              { 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" }
             ],
             ],
             bit: [
             bit: [
               { required: true, message: "请输入路由", trigger: "blur" },
               { required: true, message: "请输入路由", trigger: "blur" },
@@ -296,7 +296,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.subjectData.deptName,
             deptName:this.subjectData.deptName,
           }
           }
           addHardware(obj).then(response => {
           addHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -311,7 +311,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.form.deptName,
             deptName:this.form.deptName,
           }
           }
           putHardware(obj).then(response => {
           putHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -325,7 +325,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
           }).then(() => {
           }).then(() => {
             //  确定
             //  确定
             delHardware(item.id).then((response) => {
             delHardware(item.id).then((response) => {
-              this.msgSuccess("提交成功")
+              this.msgSuccess(response.msg)
               this.addType = false;
               this.addType = false;
               this.listBySubjectId();
               this.listBySubjectId();
             });
             });
@@ -347,7 +347,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.subjectData.deptName,
             deptName:this.subjectData.deptName,
           }
           }
           addHardware(obj).then(response => {
           addHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -366,7 +366,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.form.deptName,
             deptName:this.form.deptName,
           }
           }
           putHardware(obj).then(response => {
           putHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -380,7 +380,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
           }).then(() => {
           }).then(() => {
             //  确定
             //  确定
             delHardware(item.id).then((response) => {
             delHardware(item.id).then((response) => {
-              this.msgSuccess("提交成功")
+              this.msgSuccess(response.msg)
               this.addType = false;
               this.addType = false;
               this.listBySubjectId();
               this.listBySubjectId();
             });
             });
@@ -400,7 +400,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.subjectData.deptName,
             deptName:this.subjectData.deptName,
           }
           }
           addHardware(obj).then(response => {
           addHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -414,7 +414,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             hardwareNum:this.form.hardwareNum,
             hardwareNum:this.form.hardwareNum,
           }
           }
           putHardware(obj).then(response => {
           putHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -428,7 +428,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
           }).then(() => {
           }).then(() => {
             //  确定
             //  确定
             delHardware(item.id).then((response) => {
             delHardware(item.id).then((response) => {
-              this.msgSuccess("提交成功")
+              this.msgSuccess(response.msg)
               this.addType = false;
               this.addType = false;
               this.listBySubjectId();
               this.listBySubjectId();
             });
             });
@@ -447,7 +447,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             subjectId:this.subjectData.id
             subjectId:this.subjectData.id
           }
           }
           addSensor(obj).then(response => {
           addSensor(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -463,7 +463,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             configStatus:this.form.configStatus,
             configStatus:this.form.configStatus,
           }
           }
           putSensor(obj).then(response => {
           putSensor(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -477,7 +477,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
           }).then(() => {
           }).then(() => {
             //  确定
             //  确定
             delSensor(item.id).then((response) => {
             delSensor(item.id).then((response) => {
-              this.msgSuccess("提交成功")
+              this.msgSuccess(response.msg)
               this.addType = false;
               this.addType = false;
               this.listBySubjectId();
               this.listBySubjectId();
             });
             });

+ 14 - 14
src/views/comprehensive/laboratoryManagement/subject/deviceListOne.vue

@@ -285,8 +285,8 @@ import { getSensorList } from "@/api/laboratory/sensor";
               { required: true, message: "请选择设备版本", trigger: "blur" },
               { required: true, message: "请选择设备版本", trigger: "blur" },
             ],
             ],
             relayCode: [
             relayCode: [
-              { 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" }
             ],
             ],
             bit: [
             bit: [
               { required: true, message: "请输入路由", trigger: "blur" },
               { required: true, message: "请输入路由", trigger: "blur" },
@@ -430,7 +430,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.subjectData.deptName,
             deptName:this.subjectData.deptName,
           }
           }
           addHardware(obj).then(response => {
           addHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -445,7 +445,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.form.deptName,
             deptName:this.form.deptName,
           }
           }
           putHardware(obj).then(response => {
           putHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -459,7 +459,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
           }).then(() => {
           }).then(() => {
             //  确定
             //  确定
             delHardware(item.id).then((response) => {
             delHardware(item.id).then((response) => {
-              this.msgSuccess("提交成功")
+              this.msgSuccess(response.msg)
               this.addType = false;
               this.addType = false;
               this.listBySubjectId();
               this.listBySubjectId();
             });
             });
@@ -481,7 +481,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.subjectData.deptName,
             deptName:this.subjectData.deptName,
           }
           }
           addHardware(obj).then(response => {
           addHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -500,7 +500,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.form.deptName,
             deptName:this.form.deptName,
           }
           }
           putHardware(obj).then(response => {
           putHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -514,7 +514,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
           }).then(() => {
           }).then(() => {
             //  确定
             //  确定
             delHardware(item.id).then((response) => {
             delHardware(item.id).then((response) => {
-              this.msgSuccess("提交成功")
+              this.msgSuccess(response.msg)
               this.addType = false;
               this.addType = false;
               this.listBySubjectId();
               this.listBySubjectId();
             });
             });
@@ -534,7 +534,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             deptName:this.subjectData.deptName,
             deptName:this.subjectData.deptName,
           }
           }
           addHardware(obj).then(response => {
           addHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -548,7 +548,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             hardwareNum:this.form.hardwareNum,
             hardwareNum:this.form.hardwareNum,
           }
           }
           putHardware(obj).then(response => {
           putHardware(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -562,7 +562,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
           }).then(() => {
           }).then(() => {
             //  确定
             //  确定
             delHardware(item.id).then((response) => {
             delHardware(item.id).then((response) => {
-              this.msgSuccess("提交成功")
+              this.msgSuccess(response.msg)
               this.addType = false;
               this.addType = false;
               this.listBySubjectId();
               this.listBySubjectId();
             });
             });
@@ -581,7 +581,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             subjectId:this.subjectData.id
             subjectId:this.subjectData.id
           }
           }
           addSensor(obj).then(response => {
           addSensor(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -597,7 +597,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
             configStatus:this.form.configStatus,
             configStatus:this.form.configStatus,
           }
           }
           putSensor(obj).then(response => {
           putSensor(obj).then(response => {
-            this.msgSuccess("提交成功")
+            this.msgSuccess(response.msg)
             this.addType = false;
             this.addType = false;
             this.listBySubjectId();
             this.listBySubjectId();
           });
           });
@@ -611,7 +611,7 @@ import { getSensorList } from "@/api/laboratory/sensor";
           }).then(() => {
           }).then(() => {
             //  确定
             //  确定
             delSensor(item.id).then((response) => {
             delSensor(item.id).then((response) => {
-              this.msgSuccess("提交成功")
+              this.msgSuccess(response.msg)
               this.addType = false;
               this.addType = false;
               this.listBySubjectId();
               this.listBySubjectId();
             });
             });