From 0c409fb4381a7be9dd96a3e8cb0161f77bc7ef8c Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 09:06:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/technology.vue |   65 +++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 1693634..09c9d13 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -223,6 +223,9 @@
         </el-table>
       </div>
     </div>
+
+
+
     <el-dialog title="缂栬緫璁板綍鍐呭" :visible.sync="upDia" width="500px">
       <div class="body">
         <el-row style="line-height: 46px">
@@ -273,7 +276,7 @@
           >
           <el-col :span="16" :offset="1">
             <el-select
-              v-model="edit.children"
+              v-model="cell"
               style="width: 310px"
               disabled
               multiple
@@ -283,7 +286,7 @@
                 v-for="item in element"
                 :key="item.id"
                 :label="item.name"
-                :value="item.name"
+                :value="item.id"
               >
               </el-option>
             </el-select>
@@ -297,18 +300,35 @@
             <el-input v-model="edit.name" size="small" clearable></el-input>
           </el-col>
         </el-row>
+
         <el-row style="line-height: 46px">
           <el-col :span="4" style="font-size: 14px; text-align: right"
             >璁惧缁�:</el-col
           >
           <el-col :span="16" :offset="1">
-            <el-input
+            <!-- <el-input
               v-model="upData.device_group"
               size="small"
               clearable
-            ></el-input>
+            ></el-input> -->
+            <template>
+              <el-select
+                v-model="upData.device_group"
+                placeholder="璇烽�夋嫨"
+                style="width: 306px"
+              >
+                <el-option
+                  v-for="item in equipment"
+                  :key="item.index"
+                  :label="item.father"
+                  :value="item.father"
+                >
+                </el-option>
+              </el-select>
+            </template>
           </el-col>
         </el-row>
+
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitUpData">纭� 瀹�</el-button>
@@ -519,6 +539,7 @@
       upDia: false,
       element: [],
       equipment: [0],
+      cell:[],
       AAA: [
         {
           id: "",
@@ -654,21 +675,22 @@
     },
     //缂栬緫
     writeTechById() {
+      // console.log(JSON.stringify(this.edit.children));
+      // console.log(JSON.stringify(this.edit.children));
+      // var str = ''
+      // this.edit.children.forEach((a,ai)=>{
+      //   str += a.id
+      //   if(ai!=this.edit.children.length-1) str+=','
+      // })
       this.$axios
         .post(
-          this.$api.url.writeTechById,
-          {
-            params: {
-              id: this.upData.id,
-              technologyTemplateDto: {
+          this.$api.url.writeTechById + `?id=${this.upData.id}`,
+            {
                 deviceGroup: this.upData.device_group,
-                elementId: this.edit.elementId,
+                elementId:this.cell.join(','),
                 father: this.edit.father,
                 name: this.edit.name,
-                type: this.edit.type,
-              },
-              // id:this.upData.id,
-            },
+                type: this.edit.type
           },
           {
             headers: {
@@ -677,14 +699,14 @@
           }
         )
         .then((res) => {
-          console.log(res);
+          this.selectAllTechNam()
         });
     },
 
     query(val) {
       this.selectAllTechTem();
     },
-     selectAllTechTem() { 
+     selectAllTechTem() {
        this.$axios
         .get(this.$api.url.selectAllTechTem, {
           params: { type: this.typeselect, message: this.search.technology },
@@ -807,7 +829,14 @@
         })
         .then((res) => {
           this.edit = res.data[0];
-          console.log(this.edit);
+          console.log(this.edit.children);
+          this.cell = this.edit.children.map(el => {
+					return el.id
+				})
+          // this.cell = this.cell.join(',')
+          // this.cell = nn
+          // console.log(this.cell);
+
         });
     },
     //缂栬緫鍐呭
@@ -832,4 +861,4 @@
     },
   },
 };
-</script>
\ No newline at end of file
+</script>

--
Gitblit v1.9.3