联锁增改弹窗

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

@@ -19,13 +19,13 @@
           <a-col :span="24">
             <a-form-model-item label="仪表状态判定依据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusJuge">
               <a-radio-group name="radioGroup" v-model="model.instrumentStatusJuge" @change="instrumentStatusJugeChange">
-                <a-radio :value="0"> 位号读取 </a-radio>
-                <a-radio :value="1"> 高低限判断 </a-radio>
-                <a-radio :value="2"> 突变超限判断 </a-radio>
+                <a-radio :value="'0'"> 位号读取 </a-radio>
+                <a-radio :value="'1'"> 高低限判断 </a-radio>
+                <a-radio :value="'2'"> 突变超限判断 </a-radio>
               </a-radio-group>
             </a-form-model-item>
           </a-col>
-          <template v-if="model.instrumentStatusJuge === 0">
+          <template v-if="model.instrumentStatusJuge === '0'">
             <a-col :span="24">
               <a-form-model-item label="仪表状态位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentStatusData">
                 <a-cascader
@@ -38,7 +38,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <template v-if="model.instrumentStatusJuge === 1">
+          <template v-if="model.instrumentStatusJuge === '1'">
             <a-col :span="24">
               <a-form-model-item label="原始模拟量位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ysmnlData">
                 <a-cascader
@@ -62,7 +62,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <template v-if="model.instrumentStatusJuge === 2">
+          <template v-if="model.instrumentStatusJuge === '2'">
             <a-col :span="24">
               <a-form-model-item label="原始模拟量位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ysmnlData">
                 <a-cascader
@@ -115,12 +115,12 @@
             <a-form-model-item label="是否旁路" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifBypass">
               <a-radio-group name="radioGroup" v-model="model.ifBypass">
                 <!--  :default-value="model.ifBypass" -->
-                <a-radio :value="1"> 是 </a-radio>
-                <a-radio :value="0"> 否 </a-radio>
+                <a-radio :value="'1'"> 是 </a-radio>
+                <a-radio :value="'0'"> 否 </a-radio>
               </a-radio-group>
             </a-form-model-item>
           </a-col>
-          <template v-if="model.ifBypass === 1">
+          <template v-if="model.ifBypass === '1'">
             <a-col :span="24">
               <a-form-model-item label="旁路位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bypassData">
                 <a-cascader
@@ -133,7 +133,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <template v-if="model.ifBypass === 0">
+          <template v-if="model.ifBypass === '0'">
             <a-col :span="24">
               <a-form-model-item label="旁路状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bypass">
                 <a-input v-model="model.bypass" placeholder="无旁路"></a-input>
@@ -209,7 +209,7 @@
           xs: { span: 24 },
           sm: { span: 16 },
         },
-        confirmLoading: false,
+        confirmLoading: true,
         validatorRules: {
           interlockConditionData: [{
             required: true, message: '请选择联锁条件位号!',
@@ -279,6 +279,7 @@
         postAction(this.url.getTagInfo).then(res => {
           console.log(res)
           this.tagDataOptions = res.result
+          this.confirmLoading = false
         })
       },
       displayRender({ labels }) {
@@ -298,6 +299,21 @@
       edit (record) {
         console.log(record)
         this.model = Object.assign({}, record);
+        // 联锁条件
+        this.model.interlockConditionData = [record.interlockConditionDeviceId, record.interlockConditionModuleName, record.interlockConditionTag+'&'+record.interlockSetValue]
+        // 仪表状态-仪表状态位号
+        this.model.instrumentStatusData = [record.instrumentStatusDeviceId, record.instrumentStatusModuleName, record.instrumentStatusTag+'&'+record.instrumentStatusValue]
+        // 当前值
+        this.model.currentValueData = [record.currentValueDeviceId, record.currentValueModuleName, record.currentValueTag+'&'+record.currentValue]
+        // 旁路
+        this.model.bypassData = [record.bypassDeviceId, record.bypassModuleName, record.bypassTag+'&'+record.bypass]
+        // 输入卡件状态
+        this.model.inputStatusData = [record.inputStatusDeviceId, record.inputStatusModuleName, record.inputStatusTag+'&'+record.inputStatus]
+        // 输出卡件状态
+        this.model.outputStatusData = [record.outputStatusDeviceId, record.outputStatusModuleName, record.outputStatusTag+'&'+record.outputStatus]
+        // MP状态
+        this.model.mpStatusData = [record.mpStatusDeviceId, record.mpStatusModuleName, record.mpStatusTag+'&'+record.mpStatus]
+
         this.visible = true;
       },
       submitForm () {

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

@@ -343,7 +343,10 @@
         // 编辑时获取当前联锁所有详细信息
         getAction(this.url.getLsAllData, {id: record.summaryid}).then(res => {
           console.log(res)
-          this.model = res.result
+          var resultArr = res.result
+          this.model = resultArr
+          this.dataSource = resultArr.interlockDetailEditQueryVOList
+          this.model.interlockOutValueData = [resultArr.deviceld, resultArr.moduleName, resultArr.interlockOutValueTag+'&'+resultArr.interlockOutValue]
         })
         this.visible = true;
       },