From e31a294cd6ce4cdc41a2df4a5d3994b0f14f1eb2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 13 九月 2023 14:31:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/components/view/laboratoryManagement.vue |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index 9cbf45d..5fb48be 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -55,7 +55,7 @@
                     placeholder="璇烽�夋嫨璁惧缁�"
                   >
                     <el-option
-                      v-for="list in equip"
+                      v-for="list in equaip"
                       :key="list"
                       :label="list"
                       :value="list"
@@ -190,7 +190,7 @@
         <el-radio-button  label="1">鐢熶骇璁惧</el-radio-button>
         <el-radio-button  label="2">妫�楠岃澶�</el-radio-button>
         </el-radio-group>
-        <el-input
+        <!-- <el-input
           class="frame_input"
           v-model="search_class"
           placeholder="璇疯緭鍏ュ垎绫诲悕绉�"
@@ -202,14 +202,17 @@
             style="font-size: 23px; padding: 5px 0;cursor:pointer;"
             @click="handlerDeptList"
           ></i>
-        </el-input>
+        </el-input> -->
         <el-tree
           :data="towTree"
           ref="tree"
           :props="{ children: 'children', label: 'father' }"
           node-key="id"
           default-expand-all
+          highlight-current
+          style="margin-top: 20px;"
           @node-click="handleNodeClick"
+          
         >
           <div class="custom-tree-node" slot-scope="{ node, data }">
             <span
@@ -409,7 +412,7 @@
       // BOM鏍戞暟鎹粨鏋�
       towTree: [],
       equipment: '',
-      equip:'',
+      equaip:'',
       ruleForm: {
         // 鏂板浠櫒琛ㄥ崟
         code: "",
@@ -424,7 +427,7 @@
         treedata:{
             father:'璁惧缁�1',
         },
-        equr:1,
+        equr:'',
       },
       delete:{},
       equip:1,
@@ -532,15 +535,16 @@
         .catch(_ => {});
     },
     testItem() {
+      this.listgroup()
       this.dialogVisible = true;
       this.$axios.get(this.$api.url.addDeviceKeeper).then(res => {
         this.keeperList = res.data;
       });
-      this.listgroup()
     },
     listgroup() {
         this.$axios.get(this.$api.url.listgroup).then(res =>{
-            this.equip = res.data
+            this.equaip = res.data
+            console.log(this.equip);
         })
     },
     RadioChange(val){
@@ -551,7 +555,7 @@
     twoTreeApi() {
       this.$axios.get(this.$api.url.towTree,{
         params:{
-            type:this.equip
+            type:this.equip,
         }
       }).then(res => {
         // let list = res.data;
@@ -575,7 +579,12 @@
         keeper:this.ruleForm.keeper,
         name:this.ruleForm.name,
         type:this.ruleForm.type,
-      }, {headers: {"Content-Type": "application/json"}})
+      }, {headers: {"Content-Type": "application/json"}
+    }).then(res =>{
+      this.selectDevice()
+      this.$message.success('鏂板鎴愬姛')
+      this.ruleForm = {}
+    })
     },
     // tableDataApi() {
     //   this.$axios.get(this.$api.url.tableDeviceList).then(res => {

--
Gitblit v1.9.3