Merge remote-tracking branch 'origin/master'

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

@@ -364,7 +364,7 @@
             this.model.interlockConditionDeviceId = this.model.interlockConditionData[0]
             this.model.interlockConditionModuleName = this.model.interlockConditionData[1]
             this.model.interlockConditionTag = (this.model.interlockConditionData[2].split('&'))[0]
-            this.model.interlockSetValue = (this.model.interlockConditionData[2].split('&'))[1]
+            this.model.interlockCondition = (this.model.interlockConditionData[2].split('&'))[1]
             // 仪表状态
             if(this.model.instrumentStatusJuge === '0'){
               // 仪表状态-仪表状态位号
@@ -396,7 +396,7 @@
               // 否
               this.model.bypass = this.model.bypassNo
             }
-            if(this.model.ifBypass === '0'){
+            if(this.model.ifBypass === '1'){
               // 是
               this.model.bypassDeviceId = this.model.bypassData[0]
               this.model.bypassModuleName = this.model.bypassData[1]

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

@@ -69,7 +69,7 @@
           size="middle"
           :scroll="{x:true}"
           bordered
-          rowKey="rowKey"
+          :rowKey="(record,index)=>{return index}"
           :columns="columns"
           :dataSource="dataSource"
           class="j-table-force-nowrap">