From 49bd2c4b798bd57ec09c5d731e2bc78345c6fb25 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 14 九月 2023 10:42:10 +0800 Subject: [PATCH] update --- src/components/view/technology.vue | 76 ++++++++++++++++++++++++++++---------- 1 files changed, 56 insertions(+), 20 deletions(-) diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue index 1693634..51225fc 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: "", @@ -603,8 +624,9 @@ ) .then((res) => { console.log(res); - this.selectAllTechNam(); + /* this.selectAllTechNam(); */ this.form = {}; + this.$parent.removeAllTab() }); }, @@ -643,6 +665,8 @@ console.log(this.delete); this.$axios.post(this.$api.url.delAllTech, { ids: this.delete, + }).then(res=>{ + this.$parent.removeAllTab() }); }, //鍒犻櫎 @@ -650,25 +674,28 @@ console.log(this.$api.url.delTechById, this.upData.id); this.$axios.post(this.$api.url.delTechById, { id: this.upData.id, + }).then(res=>{ + 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, + 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 +704,15 @@ } ) .then((res) => { - console.log(res); + /* 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 }, @@ -698,7 +726,8 @@ let one=this.towTree.filter(item=>{ return item.children.length>0 })[0] - let name=one.children[0].name + let name=one.children[0].name + this.checkTreeNode.name=name this.selectAllTechNamStart(name) this.selectDataList(); }); @@ -807,7 +836,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 +868,4 @@ }, }, }; -</script> \ No newline at end of file +</script> -- Gitblit v1.9.3