From 96b73e0c5e4bef9fadbf7f08eb8a5a49d617b292 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 九月 2023 09:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/components/view/technology.vue |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 221ebe2..c4e5282 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -174,7 +174,9 @@
           node-key="id"
           default-expand-all
           @node-click="handleNodeClick"
+          style="height: 500px;overflow-y: auto;"
           :key="upIndex"
+          highlight-current
         >
           <div class="custom-tree-node" slot-scope="{ node, data }">
             <span
@@ -185,7 +187,7 @@
                     : 'el-icon-tickets'
                 }`"
               ></i>
-              {{ data.name }}{{ data.father }}</span
+              {{data.code}}{{ data.name }}</span
             >
             <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
 							<i class="el-icon-delete"></i>
@@ -332,6 +334,8 @@
             <template>
               <el-select
                 v-model="form.father"
+                allow-create
+                filterable
                 placeholder="璇烽�夋嫨"
                 style="width: 480px"
               >
@@ -368,6 +372,7 @@
                 <template>
                   <el-select
                     v-model="form.elementId"
+                    multiple
                     placeholder="璇烽�夋嫨"
                     style="width: 200px"
                   >
@@ -567,7 +572,7 @@
     Neworder() {
       this.dialogVisible = false;
       this.addTechTemp();
-      // this.form = '';
+      this.form = {};
     },
     Deleteapi() {
       this.dialogVisible = false;
@@ -581,7 +586,7 @@
 
           {
             deviceGroup: this.form.deviceGroup,
-            elementId: this.form.elementId,
+            elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
             father: this.form.father,
             name: this.form.name,
             type: this.form.type,

--
Gitblit v1.9.3