弹窗中装置系统传值，隐藏部分consoleLog

src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -419,7 +419,7 @@
                 }
                 // 回路健康级别合并
                 if (loopHealthLevel === '') {
-                  console.log('第一层')
+                  // console.log('第一层')
                   that.dataSource[i].rowSpan3 = 0
                   // // 判断回路健康级别是否为空（不会出现此类问题）
                   // if (that.dataSource[i].loopHealthLevel != '') {
@@ -433,7 +433,7 @@
                   rowSpan3++
                 } else {
                   if(loopHealthLevel == that.dataSource[i].loopHealthLevel){
-                    console.log(99,i,interlocknamePD,that.dataSource[i+1].interlockname)
+                    // console.log(99,i,interlocknamePD,that.dataSource[i+1].interlockname)
                     if (interlocknamePD == that.dataSource[i+1].interlockname) {
                       // console.log(11111)
                       that.dataSource[i].rowSpan3 = 0
@@ -447,7 +447,7 @@
                       interlocknamePD = that.dataSource[i].interlockname
                     }
                   }else{
-                    console.log('第二层else')
+                    // console.log('第二层else')
                     that.dataSource[i+1].rowSpan3 = rowSpan3
                     that.dataSource[i].rowSpan3 = 0
                     rowSpan3 = 1
@@ -477,6 +477,13 @@
           this.loading = false
         })
       },
+      // 新增传值
+      handleAdd() {
+        this.$refs.modalForm.add();
+        this.$refs.modalForm.title = "新增";
+        this.$refs.modalForm.disableSubmit = false;
+        this.$refs.modalForm.addInterlock = this.selectData;
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

src/views/module_interLock/InterlockSummary/index.vue

@@ -23,7 +23,7 @@ import InterlockSummaryList from './InterlockSummaryList.vue';
         },
         methods: {
             selectEquipment(selectedKeys,e){
-                console.log(99,selectedKeys,e)
+                // console.log(99,selectedKeys,e)
                 if (selectedKeys.length == 0) {
                     this.$nextTick(()=>{
                         this.$refs.summaryList.searchReset();

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

@@ -5,7 +5,7 @@
         <div class="interlock-summary-item">
           <div class="interlock-summary-item-title">联锁基本信息</div>
           <a-row>
-            <a-col :span="12">
+            <!-- <a-col :span="12">
               <a-form-model-item label="装置" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockApparatusId">
                 <a-select
                   v-model="model.interlockApparatusId"
@@ -13,15 +13,11 @@
                   placeholder="请选择装置"
                   @change="handleApparatusChange"
                   >
-                  <!-- option-filter-prop="children" -->
-                  <!-- :filter-option="filterOption" -->
-                  <!-- @focus="handleFocus" -->
-                  <!-- @blur="handleBlur" -->
                   <a-select-option v-for="(item) in apparatusData" :key="item.key" :value="item.key">{{ item.title }}</a-select-option>
                 </a-select>
               </a-form-model-item>
-            </a-col>
-            <a-col :span="12">
+            </a-col> -->
+            <!-- <a-col :span="12">
               <a-form-model-item label="系统" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockSystemId">
                 <a-select
                   v-model="model.interlockSystemId"
@@ -32,10 +28,10 @@
                   <a-select-option v-for="(item) in systemData" :key="item.key" :value="item.key">{{ item.title }}</a-select-option>
                 </a-select>
               </a-form-model-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="12">
               <a-form-model-item label="联锁名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="interlockName">
-                  <a-input v-model="model.interlockName" placeholder="请输入联锁名称"></a-input>
+                <a-input v-model="model.interlockName" placeholder="请输入联锁名称"></a-input>
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -173,7 +169,13 @@
         type: Boolean,
         default: false,
         required: false
-      }
+      },
+      addInterlock: {
+        type: Object,
+        default: function(){
+            return {} // 使用工厂函数返回默认值
+        }
+      },
     },
     data () {
       return {
@@ -302,12 +304,13 @@
         return this.disabled
       },
     },
-    watch: {
-      'model.interlockName'(val) {
-        console.log('value', val);
-      },
-    },
+    // watch: {
+    //   'model.interlockName'(val) {
+    //     console.log('value', val);
+    //   },
+    // },
     created () {
+      console.log('弹窗', this.addInterlock)
       this.getTagInfo()
       this.getData('0', 'apparatusData')
        //备份model原始值
@@ -441,6 +444,12 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
+            // 装置系统id赋值
+            if(this.addInterlock && this.addInterlock.interlockType === '1'){
+              // 当前是新增-用树选择的装置系统进行赋值
+              this.model.interlockApparatusId = this.addInterlock.pid
+              this.model.interlockSystemId = this.addInterlock.id
+            }
             // 转换数据
             this.model.interlockDetailAddDTOList = this.conditionDataSource
             // 联锁输出值位号

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

@@ -9,7 +9,7 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <interlock-summary-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></interlock-summary-form>
+    <interlock-summary-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" :addInterlock="addInterlock"></interlock-summary-form>
   </j-modal>
 </template>
 
@@ -26,7 +26,8 @@
         title:'',
         width:800,
         visible: false,
-        disableSubmit: false
+        disableSubmit: false,
+        addInterlock: null
       }
     },
     methods: {