From ff54cb77e4fe63d5c85669cc3bd116d015c17c2d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 11:22:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/technology.vue | 39 +++++++++++++++++++++++++++++----------
src/components/view/record-content.vue | 5 +++--
2 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index 255077c..e727526 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -140,12 +140,13 @@
</span>
</el-dialog>
<!-- 鏂板寮圭獥 -->
- <el-dialog title="鐢熶骇璁板綍鏂板" :visible.sync="dialogVisible" ref="ruleForm" width="35%">
+ <el-dialog title="鐢熶骇璁板綍鏂板" :visible.sync="dialogVisible" :rules="Rules"
+ ref="ruleForm" width="35%">
<div>
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="绫诲瀷">
<template>
- <el-select v-model="form.type" :rules="Rules"
+ <el-select v-model="form.type"
@change="edittype" placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 1cf57b1..1026936 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -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">
@@ -702,7 +706,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 +868,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