Merge remote-tracking branch 'origin/master'

src/views/module_interLock/InterlockSummary/modules/InterlockConditionForm.vue

@@ -367,7 +367,7 @@
         console.log(record)
         this.model = Object.assign({}, record);
         // 联锁条件
-        this.model.interlockConditionData = [record.interlockConditionDeviceId, record.interlockConditionModuleName, record.interlockConditionTag+'&'+record.interlockSetValue]
+        this.model.interlockConditionData = [record.interlockConditionDeviceId, record.interlockConditionModuleName, record.interlockConditionTag+'&'+record.interlockCondition]
         // 仪表状态
         if(record.instrumentStatusJuge === '0'){
           // 仪表状态-仪表状态位号

src/views/module_interLock/InterlockSummary/modules/InterlockSummaryForm.vue

@@ -222,7 +222,7 @@
         // 设备-模块-位号
         tagDataOptions: [],
         // 新增联锁条件
-        conditionTitle: '新增联锁条件',
+        conditionTitle: '设置联锁条件',
         conditionVisible: false,
         // 联锁条件表格
         conditionDataSource: [],