From c7ccbc6510a9350e0a0a5a39a84f46c382d080b3 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 15:00:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/technology.vue | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 79a2d1b..f7870aa 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -172,7 +172,7 @@
:data="towTree"
ref="tree"
:props="{ children: 'children', label: 'father' }"
- node-key="name"
+ node-key="father"
default-expand-all
@node-click="handleNodeClick"
:key="upIndex"
@@ -280,7 +280,11 @@
>鍏冧欢:</el-col
>
<el-col :span="16" :offset="1">
- <el-select
+ <el-input v-model="cell"
+ placeholder="璇疯緭鍏ュ厓浠跺悕绉�"
+ style="width: 200px">
+ </el-input>
+ <!-- <el-select
v-model="cell"
style="width: 310px"
disabled
@@ -294,7 +298,7 @@
:value="item.id"
>
</el-option>
- </el-select>
+ </el-select> -->
</el-col>
</el-row>
<el-row style="line-height: 46px">
@@ -367,6 +371,7 @@
allow-create
filterable
@create=""
+
placeholder="璇烽�夋嫨"
style="width: 480px"
>
@@ -616,7 +621,6 @@
this.$axios
.post(
this.$api.url.addTechTemp,
-
{
deviceGroup: this.form.deviceGroup,
// elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
@@ -654,7 +658,9 @@
// console.log(this.equipment);
});
},
-
+ // onTypeBlur(e) {
+ // if (e.target.value) {
+ // this.type = e.target.value;}},
//宸ュ簭
chooseTech() {
this.$axios.get(this.$api.url.chooseTech,{
@@ -702,7 +708,8 @@
this.$api.url.writeTechById + `?id=${this.upData.id}`,
{
deviceGroup: this.upData.device_group,
- elementId:this.cell.join(','),
+ element:JSON.stringify(this.cell.split(',')),
+ // element:JSON.stringify(this.form.elementId.split(','))
father: this.edit.father,
name: this.edit.name,
type: this.edit.type
@@ -863,13 +870,27 @@
})
.then((res) => {
this.edit = res.data[0];
- 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);
+ this.cell = this.edit.element
+ console.log(this.cell);
+ let cc = JSON.parse(this.cell).join(",")
+ console.log(cc);
+ this.cell = cc
+ console.log(this.cell);
+ // this.cell = this.edit.children.map(el => {
+ // return el.id
+ // })
+ // this.cell = this.cell.join(',')
+ // this.cell = nn
+ // console.log(this.cell);
+
+
+
+ // let cc = this.edit.element.join(", ")
+ // let str = cc.join(", ");
+ // let cc = JSON.parse(this.edit.element)
+ // console.log(cc);
+ // console.log(gg);
+ // console.log(json.parse(gg));
});
},
--
Gitblit v1.9.3