联锁增改弹窗

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

@@ -296,6 +296,7 @@
         this.edit(this.modelDefault);
       },
       edit (record) {
+        console.log(record)
         this.model = Object.assign({}, record);
         this.visible = true;
       },

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

@@ -69,7 +69,7 @@
           size="middle"
           :scroll="{x:true}"
           bordered
-          rowKey="rowIndex"
+          rowKey="rowKey"
           :columns="columns"
           :dataSource="dataSource"
           class="j-table-force-nowrap">
@@ -77,7 +77,7 @@
           <!-- :loading="loading" -->
           <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
           <span slot="action" slot-scope="text, record">
-            <a @click="handleEdit(record)">编辑</a>
+            <a @click="handleEditCondition(record)">编辑</a>
             <a-divider type="vertical" />
             <a @click="handleDelete(record.id)(record)">复制</a>
             <a-divider type="vertical" />
@@ -105,11 +105,14 @@
   import { httpAction, getAction, postAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
   import InterlockConditionForm from './InterlockConditionForm.vue'
+  // import { mixinDevice } from '@/utils/mixin'
+  // import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 
   export default {
     name: 'InterlockSummaryForm',
+    // mixins:[JeecgListMixin, mixinDevice],
     components: {
-        InterlockConditionForm
+      InterlockConditionForm
     },
     props: {
       //表单禁用
@@ -148,6 +151,7 @@
           add: "/summary/interlockSummary/add",
           edit: "/summary/interlockSummary/edit",
           queryById: "/summary/interlockSummary/queryById",
+          getLsAllData: "summary/interlockSummary/xxxxLS",
           getTagInfo: "/iotedgeCollectData/iotedgeCollectData/getTagInfo",
         },
         customFieldNames: {
@@ -314,11 +318,22 @@
       handleAddCondition(){
         this.conditionVisible = true
       },
+      // 编辑联锁条件
+      handleEditCondition(record){
+        this.$refs.conditionForm.edit(record);
+        this.conditionVisible = true
+      },
       add () {  
-        this.edit(this.modelDefault);
+        // this.edit(this.modelDefault);
+        this.visible = true;
       },
       edit (record) {
-        this.model = Object.assign({}, record);
+        // this.model = Object.assign({}, record);
+        // 编辑时获取当前联锁所有详细信息
+        getAction(this.url.getLsAllData, {id: record.id}).then(res => {
+          console.log(res)
+          this.model = res.result
+        })
         this.visible = true;
       },
       submitForm () {