|
@@ -292,9 +292,9 @@
|
|
interlockSetValue: [{
|
|
interlockSetValue: [{
|
|
required: true, message: '请输入联锁设定值!',
|
|
required: true, message: '请输入联锁设定值!',
|
|
}],
|
|
}],
|
|
- currentValueData: [{
|
|
|
|
- required: true, message: '请选择当前值!',
|
|
|
|
- }],
|
|
|
|
|
|
+ // currentValueData: [{
|
|
|
|
+ // required: true, message: '请选择当前值!',
|
|
|
|
+ // }],
|
|
ifBypass: [{
|
|
ifBypass: [{
|
|
required: true, message: '请选择是否旁路!',
|
|
required: true, message: '请选择是否旁路!',
|
|
}],
|
|
}],
|
|
@@ -383,7 +383,7 @@
|
|
// this.model.thresholdValueN = (parseInt(record.thresholdValue)*100).toFixed(0)
|
|
// this.model.thresholdValueN = (parseInt(record.thresholdValue)*100).toFixed(0)
|
|
}
|
|
}
|
|
// 当前值
|
|
// 当前值
|
|
- this.model.currentValueData = [record.currentValueDeviceId, record.currentValueModuleName, record.currentValueTag+'&'+record.currentValue]
|
|
|
|
|
|
+ // this.model.currentValueData = [record.currentValueDeviceId, record.currentValueModuleName, record.currentValueTag+'&'+record.currentValue]
|
|
// 旁路
|
|
// 旁路
|
|
if(record.ifBypass === '0'){
|
|
if(record.ifBypass === '0'){
|
|
this.model.bypassNo = record.bypass
|
|
this.model.bypassNo = record.bypass
|
|
@@ -402,12 +402,12 @@
|
|
this.visible = true;
|
|
this.visible = true;
|
|
},
|
|
},
|
|
submitForm () {
|
|
submitForm () {
|
|
- const that = this;
|
|
|
|
|
|
+ // const that = this;
|
|
// 触发表单验证
|
|
// 触发表单验证
|
|
this.$refs.form.validate(valid => {
|
|
this.$refs.form.validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
// 拆分级联选择器的数据传递后端使用-设备id、模块名称、点位、值
|
|
// 拆分级联选择器的数据传递后端使用-设备id、模块名称、点位、值
|
|
- var conditionTableData = {}
|
|
|
|
|
|
+ // var conditionTableData = {}
|
|
// 联锁条件
|
|
// 联锁条件
|
|
this.model.interlockConditionDeviceId = this.model.interlockConditionData[0]
|
|
this.model.interlockConditionDeviceId = this.model.interlockConditionData[0]
|
|
this.model.interlockConditionModuleName = this.model.interlockConditionData[1]
|
|
this.model.interlockConditionModuleName = this.model.interlockConditionData[1]
|
|
@@ -434,10 +434,10 @@
|
|
}
|
|
}
|
|
|
|
|
|
// 当前值
|
|
// 当前值
|
|
- this.model.currentValueDeviceId = this.model.currentValueData[0]
|
|
|
|
- this.model.currentValueModuleName = this.model.currentValueData[1]
|
|
|
|
- this.model.currentValueTag = (this.model.currentValueData[2].split('&'))[0]
|
|
|
|
- this.model.currentValue = (this.model.currentValueData[2].split('&'))[1]
|
|
|
|
|
|
+ // this.model.currentValueDeviceId = this.model.currentValueData[0]
|
|
|
|
+ // this.model.currentValueModuleName = this.model.currentValueData[1]
|
|
|
|
+ // this.model.currentValueTag = (this.model.currentValueData[2].split('&'))[0]
|
|
|
|
+ // this.model.currentValue = (this.model.currentValueData[2].split('&'))[1]
|
|
|
|
|
|
// 旁路位号
|
|
// 旁路位号
|
|
if(this.model.ifBypass === '0'){
|
|
if(this.model.ifBypass === '0'){
|
|
@@ -469,7 +469,6 @@
|
|
this.model.mpStatusModuleName = this.model.mpStatusData[1]
|
|
this.model.mpStatusModuleName = this.model.mpStatusData[1]
|
|
this.model.mpStatusTag = (this.model.mpStatusData[2].split('&'))[0]
|
|
this.model.mpStatusTag = (this.model.mpStatusData[2].split('&'))[0]
|
|
this.model.mpStatus = (this.model.mpStatusData[2].split('&'))[1]
|
|
this.model.mpStatus = (this.model.mpStatusData[2].split('&'))[1]
|
|
-
|
|
|
|
console.log(this.model)
|
|
console.log(this.model)
|
|
this.$emit('ok', this.model)
|
|
this.$emit('ok', this.model)
|
|
}
|
|
}
|