|
@@ -90,7 +90,7 @@
|
|
|
<!--</el-table-column>-->
|
|
|
<el-table-column label="关联化学品柜" align="center" prop="cabinetName" width="160"/>
|
|
|
<el-table-column label="锁柜ID/mac地址" align="center" prop="lockId" width="140">
|
|
|
- <template slot-scope="scope">{{scope.row.lockType==1?scope.row.lockId:scope.row.gatewayMac}}</template>
|
|
|
+ <template slot-scope="scope">{{scope.row.lockType==1?scope.row.lockId:scope.row.lockMac}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="摄像头IP" align="center" prop="ipAddress" width="200"/>
|
|
|
<el-table-column label="采集器编号" align="center" prop="relayCode" width="200"/>
|
|
@@ -212,8 +212,11 @@
|
|
|
<el-form-item label="采集器编号:" prop="relayCode" v-if="form.lockType == 1">
|
|
|
<el-input v-model="form.relayCode" placeholder="请输入采集器编号" maxlength="20" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" style="width:360px;"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="mac地址" prop="gatewayId" v-if="form.lockType == 2">
|
|
|
- <el-select v-model="form.gatewayId" placeholder="请选择mac地址" style="width:360px;">
|
|
|
+ <el-form-item label="mac地址:" prop="lockMac" v-if="form.lockType == 2">
|
|
|
+ <el-input v-model="form.lockMac" placeholder="请输入mac地址" maxlength="20" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" style="width:360px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="蓝牙网关" prop="gatewayId" v-if="form.lockType == 2">
|
|
|
+ <el-select v-model="form.gatewayId" placeholder="请选择蓝牙网关" style="width:360px;">
|
|
|
<el-option v-for="(item,index) in optionsLockGateway" :key="index" :label="item.gatewayName" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
@@ -344,7 +347,7 @@
|
|
|
{ required: true, trigger: "blur", message: "请选择柜锁类型" },
|
|
|
],
|
|
|
gatewayId: [
|
|
|
- { required: true, trigger: "blur", message: "请选择mac地址" },
|
|
|
+ { required: true, trigger: "blur", message: "请选择蓝牙网关" },
|
|
|
],
|
|
|
operateTime: [
|
|
|
{ required: true, trigger: "blur", message: "请输入操作时长" },
|
|
@@ -360,6 +363,10 @@
|
|
|
{ required: true, trigger: "blur", message: "请输入摄像头ip" },
|
|
|
{ required: true, message: "请输入摄像头ip", validator: this.spaceJudgment, trigger: "blur" }
|
|
|
],
|
|
|
+ lockMac: [
|
|
|
+ { required: true, trigger: "blur", message: "请输入mac地址" },
|
|
|
+ { required: true, message: "请输入mac地址", validator: this.spaceJudgment, trigger: "blur" }
|
|
|
+ ],
|
|
|
relayCode: [
|
|
|
{ required: true, trigger: "blur", message: "请输入采集器编号" },
|
|
|
{ required: true, message: "请输入采集器编号", validator: this.spaceJudgment, trigger: "blur" }
|
|
@@ -428,6 +435,7 @@
|
|
|
relayCode:'',
|
|
|
lockType:'',
|
|
|
gatewayId:'',
|
|
|
+ lockMac:'',
|
|
|
});
|
|
|
this.clearClick();
|
|
|
this.addDialogType = true;
|
|
@@ -443,6 +451,7 @@
|
|
|
ipAddress:item.ipAddress,
|
|
|
relayCode:item.relayCode,
|
|
|
lockType:item.lockType,
|
|
|
+ lockMac:item.lockMac,
|
|
|
gatewayId:item.gatewayId,
|
|
|
};
|
|
|
this.$set(this,'form',obj);
|
|
@@ -536,8 +545,29 @@
|
|
|
if (valid) {
|
|
|
if(this.form.id){
|
|
|
//编辑
|
|
|
- this.form.type = "AI_CABINETLOCK";
|
|
|
- updateHardware(this.form).then(response => {
|
|
|
+ let obj = {
|
|
|
+ id:this.form.id,
|
|
|
+ type:'AI_CABINETLOCK',
|
|
|
+ subjectId:this.form.subjectId,
|
|
|
+ name:this.form.name,
|
|
|
+ hardwareNum:this.form.hardwareNum,
|
|
|
+ lockId:this.form.lockId,
|
|
|
+ ipAddress:this.form.ipAddress,
|
|
|
+ relayCode:this.form.relayCode,
|
|
|
+ lockType:this.form.lockType,
|
|
|
+ }
|
|
|
+ if(obj.lockType == 1){
|
|
|
+ obj.lockId=this.form.lockId;
|
|
|
+ obj.relayCode=this.form.relayCode;
|
|
|
+ obj.gatewayId='';
|
|
|
+ obj.lockMac='';
|
|
|
+ }else if(obj.lockType == 2){
|
|
|
+ obj.gatewayId=this.form.gatewayId;
|
|
|
+ obj.lockMac=this.form.lockMac;
|
|
|
+ obj.lockId='';
|
|
|
+ obj.relayCode='';
|
|
|
+ }
|
|
|
+ updateHardware(obj).then(response => {
|
|
|
if (response.code == 200){
|
|
|
this.addDialogType = false;
|
|
|
this.msgSuccess(response.msg);
|
|
@@ -546,8 +576,28 @@
|
|
|
});
|
|
|
}else{
|
|
|
//新增
|
|
|
- this.form.type = "AI_CABINETLOCK";
|
|
|
- addHardware(this.form).then(response => {
|
|
|
+ let obj = {
|
|
|
+ type:'AI_CABINETLOCK',
|
|
|
+ subjectId:this.form.subjectId,
|
|
|
+ name:this.form.name,
|
|
|
+ hardwareNum:this.form.hardwareNum,
|
|
|
+ lockId:this.form.lockId,
|
|
|
+ ipAddress:this.form.ipAddress,
|
|
|
+ relayCode:this.form.relayCode,
|
|
|
+ lockType:this.form.lockType,
|
|
|
+ }
|
|
|
+ if(obj.lockType == 1){
|
|
|
+ obj.lockId=this.form.lockId;
|
|
|
+ obj.relayCode=this.form.relayCode;
|
|
|
+ obj.gatewayId='';
|
|
|
+ obj.lockMac='';
|
|
|
+ }else if(obj.lockType == 2){
|
|
|
+ obj.gatewayId=this.form.gatewayId;
|
|
|
+ obj.lockMac=this.form.lockMac;
|
|
|
+ obj.lockId='';
|
|
|
+ obj.relayCode='';
|
|
|
+ }
|
|
|
+ addHardware(obj).then(response => {
|
|
|
if (response.code == 200){
|
|
|
this.addDialogType = false;
|
|
|
this.msgSuccess(response.msg);
|