From 0818becbf021341ce369d4f92b2ade3a2648a953 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 13:45:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/technology.vue | 201 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 143 insertions(+), 58 deletions(-)
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index c0ad40a..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"
@@ -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>
@@ -210,6 +210,11 @@
<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">
<span class="table_do" @click="upContent(scope.row)"
@@ -223,6 +228,9 @@
</el-table>
</div>
</div>
+
+
+
<el-dialog title="缂栬緫璁板綍鍐呭" :visible.sync="upDia" width="500px">
<div class="body">
<el-row style="line-height: 46px">
@@ -272,8 +280,12 @@
>鍏冧欢:</el-col
>
<el-col :span="16" :offset="1">
- <el-select
- v-model="edit.children"
+ <el-input v-model="cell"
+ placeholder="璇疯緭鍏ュ厓浠跺悕绉�"
+ style="width: 200px">
+ </el-input>
+ <!-- <el-select
+ v-model="cell"
style="width: 310px"
disabled
multiple
@@ -283,10 +295,10 @@
v-for="item in element"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
>
</el-option>
- </el-select>
+ </el-select> -->
</el-col>
</el-row>
<el-row style="line-height: 46px">
@@ -297,18 +309,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>
@@ -341,6 +370,8 @@
v-model="form.father"
allow-create
filterable
+ @create=""
+
placeholder="璇烽�夋嫨"
style="width: 480px"
>
@@ -375,7 +406,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="璇烽�夋嫨"
@@ -388,7 +420,7 @@
:value="item.id"
>
</el-option>
- </el-select>
+ </el-select> -->
</template>
</el-form-item>
</el-col>
@@ -498,9 +530,9 @@
elementId: "",
deviceGroup: "",
},
- search: {
- type: "",
- },
+ // search: {
+ // type: "",
+ // },
delete: [],
treetrunk: [],
process: [],
@@ -519,6 +551,7 @@
upDia: false,
element: [],
equipment: [0],
+ cell:[],
AAA: [
{
id: "",
@@ -543,16 +576,16 @@
type: "",
},
upIndex: 0,
- treeList:[]
+ treeList:[],
+ elerow:{},
};
},
mounted() {
this.selectAllTechTem();
- this.chooseTech();
- this.chooseDevGroup();
- this.chooseElement();
+
this.selectAllTechNam();
console.log(this.treeList);
+
},
methods: {
selectDataList() {
@@ -583,14 +616,16 @@
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,
@@ -602,19 +637,20 @@
}
)
.then((res) => {
- this.$parent.removeAllTab()
- this.selectAllTechNam();
+ console.log(res);
+ /* this.selectAllTechNam(); */
this.form = {};
+ this.$parent.removeAllTab()
});
},
//鍏冧欢
- 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) => {
@@ -622,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,{
@@ -640,35 +678,41 @@
},
//鎵归噺鍒犻櫎
delAllTech() {
+ console.log(this.delete);
this.$axios.post(this.$api.url.delAllTech, {
- ids: this.delete
+ ids: this.delete,
+ }).then(res=>{
+ this.$parent.removeAllTab()
});
- this.$parent.removeAllTab()
},
//鍒犻櫎
delTechById() {
+ console.log(this.$api.url.delTechById, this.upData.id);
this.$axios.post(this.$api.url.delTechById, {
- id: this.upData.id
+ id: this.upData.id,
+ }).then(res=>{
+ this.$parent.removeAllTab()
});
- this.$parent.removeAllTab()
},
//缂栬緫
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,
+ 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,
- },
- // id:this.upData.id,
- },
+ type: this.edit.type
},
{
headers: {
@@ -677,14 +721,15 @@
}
)
.then((res) => {
- this.$parent.removeAllTab()
+ /* this.selectAllTechNam(), */
+ this.$parent.removeAllTab()
});
},
query(val) {
this.selectAllTechTem();
},
- selectAllTechTem() {
+ selectAllTechTem() {
this.$axios
.get(this.$api.url.selectAllTechTem, {
params: { type: this.typeselect, message: this.search.technology },
@@ -693,32 +738,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.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) {
@@ -732,6 +792,9 @@
},
addend() {
this.dialogVisible = true;
+ this.chooseTech();
+ this.chooseDevGroup();
+ // this.chooseElement();
},
modify() {
this.modifyevent = true;
@@ -789,6 +852,7 @@
return el.id;
});
this.delete = cc.join(",");
+ console.log(this.delete);
this.delAllTech();
this.$message.success("鍒犻櫎瀹屾垚");
},
@@ -806,7 +870,28 @@
})
.then((res) => {
this.edit = res.data[0];
- console.log(this.edit);
+ 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));
+
});
},
//缂栬緫鍐呭
@@ -831,4 +916,4 @@
},
},
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3