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 | 123 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 43 deletions(-)
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 221ebe2..09c9d13 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -46,6 +46,7 @@
height: calc(100% - 20px);
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
+ overflow-y: auto;
}
.thing .left .custom-tree-node span {
@@ -171,10 +172,11 @@
:data="towTree"
ref="tree"
:props="{ children: 'children', label: 'father' }"
- node-key="id"
+ node-key="name"
default-expand-all
@node-click="handleNodeClick"
:key="upIndex"
+ highlight-current
>
<div class="custom-tree-node" slot-scope="{ node, data }">
<span
@@ -185,7 +187,7 @@
: 'el-icon-tickets'
}`"
></i>
- {{ data.name }}{{ data.father }}</span
+ {{data.code}}{{ data.name }}</span
>
<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
@@ -221,6 +223,9 @@
</el-table>
</div>
</div>
+
+
+
<el-dialog title="缂栬緫璁板綍鍐呭" :visible.sync="upDia" width="500px">
<div class="body">
<el-row style="line-height: 46px">
@@ -232,6 +237,7 @@
<el-select
v-model="edit.type"
placeholder="璇烽�夋嫨"
+ disabled
style="width: 310px"
>
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
@@ -250,12 +256,14 @@
<el-select
v-model="edit.father"
style="width: 310px"
+ disabled
placeholder="璇烽�夋嫨"
>
<el-option
v-for="item in procedure"
:key="item"
:label="item"
+ disabled
:value="item"
>
</el-option>
@@ -268,8 +276,9 @@
>
<el-col :span="16" :offset="1">
<el-select
- v-model="AAA.id"
+ v-model="cell"
style="width: 310px"
+ disabled
multiple
placeholder="璇烽�夋嫨"
>
@@ -291,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>
@@ -320,6 +346,7 @@
v-model="form.type"
placeholder="璇烽�夋嫨"
style="width: 480px"
+ @change="edittype"
>
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
@@ -332,6 +359,8 @@
<template>
<el-select
v-model="form.father"
+ allow-create
+ filterable
placeholder="璇烽�夋嫨"
style="width: 480px"
>
@@ -368,12 +397,13 @@
<template>
<el-select
v-model="form.elementId"
+ multiple
placeholder="璇烽�夋嫨"
style="width: 200px"
>
<el-option
v-for="item in element"
- :key="item.value"
+ :key="item.id"
:label="item.name"
:value="item.id"
>
@@ -509,6 +539,7 @@
upDia: false,
element: [],
equipment: [0],
+ cell:[],
AAA: [
{
id: "",
@@ -516,11 +547,10 @@
],
edit: {
deviceGroup: "",
- elementId: "",
father: "",
name: "",
type: "",
- // children:[],
+ children:[],
},
upData: {
name: "",
@@ -567,11 +597,11 @@
Neworder() {
this.dialogVisible = false;
this.addTechTemp();
- // this.form = '';
+ this.form = {};
},
Deleteapi() {
this.dialogVisible = false;
- this.form = "";
+ this.form = {};
},
addTechTemp() {
// console.log(this.$api.url.addTechTemp);
@@ -581,7 +611,7 @@
{
deviceGroup: this.form.deviceGroup,
- elementId: this.form.elementId,
+ elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
father: this.form.father,
name: this.form.name,
type: this.form.type,
@@ -616,11 +646,19 @@
//宸ュ簭
chooseTech() {
- this.$axios.get(this.$api.url.chooseTech).then((res) => {
- this.procedure = res.data;
- console.log(this.procedure);
- });
+ this.$axios.get(this.$api.url.chooseTech,{
+ params:{
+ type:this.typeselect
+ }
+ }).then(res =>{
+ console.log(res);
+ this.procedure = res.data
+ })
},
+ edittype(val) {
+ this.typeselect = val
+ this.chooseTech()
+ },
//鎵归噺鍒犻櫎
delAllTech() {
console.log(this.delete);
@@ -637,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: {
@@ -660,21 +699,24 @@
}
)
.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 },
})
.then((res) => {
this.towTree = res.data;
- console.log(this.towTree);
+ console.log(this.towTree);
+ this.$nextTick(() => {
+ this.$refs.tree.setCurrentKey(this.towTree[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓�
+ })
let one=this.towTree.filter(item=>{
return item.children.length>0
})[0]
@@ -787,25 +829,20 @@
})
.then((res) => {
this.edit = res.data[0];
- this.AAA = res.data[0].children;
- console.log(this.edit);
- console.log(this.AAA);
- // this.edit.forEach(el => {
- // // el.children.forEach(ele =>{
- // // this.AAA.push(ele)
- // console.log(el);
- // })
- // console.log(this.AAA.id);
- // })
- // 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);
+
});
},
//缂栬緫鍐呭
upContent(ob) {
this.upData = ob;
- this.selecTechById();
- this.selecTechById();
- console.log(this.upData);
+ this.selecTechById()
this.upDia = true;
},
@@ -824,4 +861,4 @@
},
},
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3