From 4c5c20a7c03539104df74072b1b8a81b51c19ab8 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 14 九月 2023 10:42:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/view/self-inspection.vue | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/components/view/self-inspection.vue b/src/components/view/self-inspection.vue index 9b35529..55b8cbc 100644 --- a/src/components/view/self-inspection.vue +++ b/src/components/view/self-inspection.vue @@ -141,7 +141,7 @@ <div class="thing"> <div class="left"> <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable @input="(val)=>$refs.tree.filter(val)"></el-input> - <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all + <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode" :key="upIndex"> <div class="custom-tree-node" slot-scope="{ node, data }"> @@ -216,7 +216,7 @@ <el-form ref="form" :model="form" label-width="80px"> <el-form-item label="绫诲瀷"> <template> - <el-select v-model="form.value" placeholder="璇烽�夋嫨" style="width: 480px;"> + <el-select v-model="form.value" placeholder="璇烽�夋嫨" @change="edittype" style="width: 480px;"> <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option> <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option> <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option> @@ -382,7 +382,7 @@ product: [], list: [], checkTreeNode: { - id:1, + id:'', }, tableData: [], upIndex: 0, @@ -442,9 +442,10 @@ ids:this.delete }) }, + //缂栬緫 + writeRecordById() { - - + }, //鏂板 add() { this.dialogVisible = false @@ -489,6 +490,11 @@ console.log(this.typeselect); this.selectAllleft() }, + edittype(val) { + // this.typeselect = '' + this.typeselect = val + this.chooseTechFath() + }, //涓讳綋宸� selectAllleft() { this.$axios.get(this.$api.url.selectAllleft,{ @@ -497,9 +503,32 @@ this.list = res.data; console.log(this.list); this.selectDataList() + this.$nextTick(() => { + this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓� + }) + console.log("==========="); + console.log(this.list); + let one=this.list.filter(item=>{ + return item.children.length>0 + })[0] + console.log(one); + let id =one.children[0].id + console.log(id); + this.selectAllSelfStart(id) + this.selectDataList(); + console.log("==========="); }) }, - //selectAllSelf checkTreeNode + //榛樿 + selectAllSelfStart(id) { + this.$axios.get(this.$api.url.selectAllSelf,{ + params:{id:id} + }).then(res => { + this.tableData = res.data; + console.log(this.tableData); + }) + }, + //鍙� selectAllSelf() { this.$axios.get(this.$api.url.selectAllSelf,{ params:{id:this.checkTreeNode.id} -- Gitblit v1.9.3