Browse Source

装置系统配置(两级)

yuhan 9 months ago
parent
commit
fc67c9ef1a

+ 2 - 2
src/views/module_interLock/baseInterLock/BaseInterLockList.vue

@@ -4,11 +4,11 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="类型">
               <j-dict-select-tag placeholder="请选择类型" v-model="queryParam.interlockType" dictCode="interlock_type"/>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="名称">
               <a-input placeholder="请输入名称" v-model="queryParam.interlockName"></a-input>

+ 20 - 5
src/views/module_interLock/baseInterLock/modules/BaseInterLockModal.vue

@@ -21,7 +21,7 @@
         </a-form-model-item>
         <template v-if="model.interlockType !== '0'">
           <a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
-            <j-tree-select
+            <!-- <j-tree-select
               ref="treeSelect"
               placeholder="请选择父级节点"
               v-model="model.pid"
@@ -31,14 +31,20 @@
               pidValue="0"
               hasChildField="has_child"
               >
-            </j-tree-select>
-            <!-- <a-tree-select
+            </j-tree-select> -->
+            <a-tree-select
               v-model="model.pid"
               style="width: 100%"
               :tree-data="interlockTwoTree"
               placeholder="请选择"
               tree-default-expand-all
-              ></a-tree-select> -->
+              :replaceFields="{
+                children: 'children',
+                key: 'id',
+                value: 'id',
+                title: 'interlockName',
+              }"
+              ></a-tree-select>
               <!-- :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" -->
           </a-form-model-item>
         </template>
@@ -50,7 +56,7 @@
 
 <script>
 
-  import { httpAction } from '@/api/manage'
+  import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
   export default {
     name: "InterlockBaseModal",
@@ -82,6 +88,7 @@
         url: {
           add: "/base/interlockBase/add",
           edit: "/base/interlockBase/edit",
+          lever12: '/base/interlockBase/lever12',
         },
         expandedRowKeys:[],
         pidField:"pid",
@@ -94,11 +101,19 @@
        this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
+      getInterlockTwoTree(){
+        getAction(this.url.lever12).then(res => {
+          console.log(res)
+          this.interlockTwoTree = res
+        })
+      },
       add (obj) {
+        this.getInterlockTwoTree()
         this.modelDefault.pid=''
         this.edit(Object.assign(this.modelDefault , obj));
       },
       edit (record) {
+        this.getInterlockTwoTree()
         this.model = Object.assign({}, record);
         this.visible = true;
       },