From 87579d3017141b6c183a8c31eed34772ac5551b4 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 17:40:37 +0800
Subject: [PATCH] 改bug

---
 src/components/view/technology.vue |   80 ++++++++++++++++++++++++++-------------
 1 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 93e60ed..79a2d1b 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -187,7 +187,7 @@
                     : 'el-icon-tickets'
                 }`"
               ></i>
-              {{data.code}}{{ data.name }}</span
+              {{ data.father }}</span
             >
             <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
 							<i class="el-icon-delete"></i>
@@ -209,6 +209,11 @@
           </el-table-column>
           <el-table-column prop="name" label="宸ヨ壓鍚嶇О"> </el-table-column>
           <el-table-column prop="device_group" label="璁惧缁�">
+          </el-table-column>
+          <el-table-column label="鍏冧欢">
+            <template slot-scope="scope">
+              <el-tag type="info" style="margin-right: 10px;" v-for="(a, index) in JSON.parse(scope.row.element)" :key="index">{{ a }}</el-tag>
+            </template>
           </el-table-column>
           <el-table-column label="鎿嶄綔" width="130">
             <template slot-scope="scope">
@@ -396,7 +401,8 @@
             <el-col :span="10">
               <el-form-item label="鍏冧欢">
                 <template>
-                  <el-select
+                  <el-input v-model="form.elementId" placeholder="璇疯緭鍏ュ厓浠跺悕绉�" style="width: 200px"></el-input>
+                  <!-- <el-select
                     v-model="form.elementId"
                     multiple
                     placeholder="璇烽�夋嫨"
@@ -409,7 +415,7 @@
                       :value="item.id"
                     >
                     </el-option>
-                  </el-select>
+                  </el-select> -->
                 </template>
               </el-form-item>
             </el-col>
@@ -565,16 +571,16 @@
         type: "",
       },
       upIndex: 0,
-	  treeList:[]
+	  treeList:[],
+    elerow:{},
     };
   },
   mounted() {
     this.selectAllTechTem();
-    this.chooseTech();
-    this.chooseDevGroup();
-    this.chooseElement();
+    
     this.selectAllTechNam();
 	console.log(this.treeList);
+  
   },
   methods: {
     selectDataList() {
@@ -605,14 +611,17 @@
       this.form = {};
     },
     addTechTemp() {
-      // console.log(this.$api.url.addTechTemp);
+      console.log(this.form.elementId.split(','));
+ 
       this.$axios
         .post(
           this.$api.url.addTechTemp,
 
           {
             deviceGroup: this.form.deviceGroup,
-            elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
+            // elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
+            // element:this.form.elementId.split(','),
+            element:JSON.stringify(this.form.elementId.split(',')),
             father: this.form.father,
             name: this.form.name,
             type: this.form.type,
@@ -632,12 +641,12 @@
     },
 
     //鍏冧欢
-    chooseElement() {
-      this.$axios.get(this.$api.url.chooseElement).then((res) => {
-        this.element = res.data;
-        console.log(this.element);
-      });
-    },
+    // chooseElement() {
+    //   this.$axios.get(this.$api.url.chooseElement).then((res) => {
+    //     this.element = res.data;
+    //     console.log(this.element);
+    //   });
+    // },
     //璁惧
     chooseDevGroup() {
       this.$axios.get(this.$api.url.chooseDevGroup).then((res) => {
@@ -722,33 +731,47 @@
           this.towTree = res.data;
           console.log(this.towTree);
           this.$nextTick(() => {
-				this.$refs.tree.setCurrentKey(this.towTree[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓�
+				this.$refs.tree.setCurrentKey(this.towTree[0].father) // 榛樿閫変腑鑺傜偣绗竴涓�
 			})
-		  let one=this.towTree.filter(item=>{
-			return item.children.length>0
-		  })[0]
-		  let name=one.children[0].name 
-      this.checkTreeNode.name=name
-		  this.selectAllTechNamStart(name)
-          this.selectDataList();
+		  // let one=this.towTree.filter(item=>{
+			// return item.children.length>0
+		  // })[0]
+		  // let name=one.children[0].name 
+      // this.checkTreeNode.name=name
+		  // this.selectAllTechNamStart(name)
+      //     this.selectDataList();
+      let one=this.towTree[0]
+        let name =one.father
+        this.checkTreeNode.father = name
+			  console.log(name);
+        this.selectAllTechNamStart(name)
         });
     },
     handleNodeClick(data, node) {
 		console.log(data);
       this.checkTreeNode = data;
-      this.treetrunk = node;
-      console.log(this.treetrunk);
-      console.log(this.checkTreeNode);
+      // this.treetrunk = node;
+      // console.log(this.treetrunk);
+      // console.log(this.checkTreeNode);
       this.selectAllTechNam();
 
     },
     selectAllTechNam() {
       this.$axios
         .get(this.$api.url.selectAllTechNam, {
-          params: { father: this.checkTreeNode.name },
+          params: { father: this.checkTreeNode.father },
         })
         .then((res) => {
           this.tableData = res.data;
+
+          let kk =this.tableData.map(el =>{
+            console.log(el);
+            return el.element
+		        })[0]
+            // console.log(kk.replace('[','').replace(']','') ); 
+            // console.log(kk.split(','));
+            this.elerow = kk
+
         });
     },
 	selectAllTechNamStart(name) {
@@ -762,6 +785,9 @@
     },
     addend() {
       this.dialogVisible = true;
+      this.chooseTech();
+      this.chooseDevGroup();
+      // this.chooseElement();
     },
     modify() {
       this.modifyevent = true;

--
Gitblit v1.9.3