浏览代码

解决联锁条件确定不触发的问题

yuhan 5 月之前
父节点
当前提交
4608f49f8b
共有 1 个文件被更改,包括 10 次插入11 次删除
  1. 10 11
      src/views/module_interLock/InterlockSummary/modules/InterlockConditionForm.vue

+ 10 - 11
src/views/module_interLock/InterlockSummary/modules/InterlockConditionForm.vue

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