From 40f0147e880d83e8ffb341994ab37e9e712fccf9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 12 九月 2023 17:51:59 +0800
Subject: [PATCH] 	modified:   src/assets/api/controller.js 	modified:   src/components/view/standard-table/product.vue 	modified:   src/components/view/standard-table/target.vue 	modified:   src/components/view/standard-table/technology.vue 	modified:   src/components/view/standard.vue

---
 src/components/view/laboratoryManagement.vue |   55 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/components/view/laboratoryManagement.vue b/src/components/view/laboratoryManagement.vue
index 55d2727..34b1576 100644
--- a/src/components/view/laboratoryManagement.vue
+++ b/src/components/view/laboratoryManagement.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="12" class="top_left_name">瀹為獙瀹ょ鐞�</el-col>
+      <el-col :span="12" class="top_left_name">璁惧缁存姢</el-col>
       <el-col :span="12" style="text-align: right;">
         <el-button
           @click="testItem()"
@@ -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
@@ -224,9 +227,9 @@
               ></i>
               {{ data.father }}</span
             >
-            <el-button type="text" size="mini" @click.stop="remove(node, data)">
+           <!--  <el-button type="text" size="mini" @click.stop="remove(node, data)">
               <i class="el-icon-delete"></i>
-            </el-button>
+            </el-button> -->
           </div>
         </el-tree>
       </div>
@@ -409,7 +412,7 @@
       // BOM鏍戞暟鎹粨鏋�
       towTree: [],
       equipment: '',
-      equip:'',
+      equaip:'',
       ruleForm: {
         // 鏂板浠櫒琛ㄥ崟
         code: "",
@@ -424,10 +427,10 @@
         treedata:{
             father:'璁惧缁�1',
         },
-        equr:1,
+        equr:'',
       },
       delete:{},
-      equip:[],
+      equip:1,
       rules: {
         name: [
           { required: true, message: "璇疯緭鍏ヤ华鍣ㄨ澶囩紪鍙�", trigger: "blur" },
@@ -465,12 +468,20 @@
       }
     };
   },
+  mounted() {
+    // 鍒濆鍖栬皟鐢ㄤ簩绾ф爲
+    this.twoTreeApi();
+    // 鍒濆鍖栬皟鐢ㄨ〃鏍兼暟鎹�
+    // this.tableDataApi();
+    this.selectDevice()//鍙宠竟
+  },
   methods: {
     selectDevice() {//鍙宠竟鏁版嵁
-      console.log(this.$api.url.selectDevice);
+      console.log(this.ruleForm.treedata.father);
+      console.log(this.equip);
       this.$axios.get(this.$api.url.selectDevice,{
         params:{
-          father:this.treedata.father,
+          father:this.ruleForm.treedata.father,
           type:this.equip,
         }
       }).then(res =>{
@@ -524,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){
@@ -567,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 => {
@@ -582,7 +599,7 @@
     },
     handleNodeClick(data) {
       console.log(data);
-        this.treedata = data
+        // this.treedata = data
         this.selectDevice()
     },
     handlerDeptList() {
@@ -720,13 +737,7 @@
         });
     }
   },
-  mounted() {
-    // 鍒濆鍖栬皟鐢ㄤ簩绾ф爲
-    this.twoTreeApi();
-    // 鍒濆鍖栬皟鐢ㄨ〃鏍兼暟鎹�
-    this.tableDataApi();
-    this.selectDevice()//鍙宠竟
-  },
+ 
   watch: {
     "ruleForm.rawInsProductId": {
       //鐩戝惉ruleForm.rawInsProductId

--
Gitblit v1.9.3