From 83f8bc7010db6a1aacca3f1038e15e340685ec9b Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 17:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/standard.vue | 47 +++++++++++++++++++++++++++++------------------
src/components/view/technology.vue | 2 +-
src/components/view/Technicalindex.vue | 2 +-
3 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/components/view/Technicalindex.vue b/src/components/view/Technicalindex.vue
index 6aa8d70..ad0c54b 100644
--- a/src/components/view/Technicalindex.vue
+++ b/src/components/view/Technicalindex.vue
@@ -193,7 +193,7 @@
>
<div class="custom-tree-node" slot-scope="{ node, data }">
<span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
- {{data.father}} {{ data.name }}</span>
+ {{data.code}} {{ data.name }}</span>
<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
</el-button> -->
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 0d1f689..845bf37 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -16,10 +16,10 @@
<div class="left">
<el-input v-model="search" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable></el-input>
- <el-tree :data="list" ref="tree" :default-expand-all="false" :props="{ children: 'children', label: 'name' }"
+ <el-tree :data="list" ref="tree" :default-expand-all="true" :props="{ children: 'children', label: 'name' }"
node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current>
<div class="custom-tree-node" slot-scope="{ node, data }">
- <span><i :class="`node_i ${data.code != '[4]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
+ <span><i :class="`node_i ${data.code != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
{{ data.name }}</span>
<el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
@@ -125,10 +125,35 @@
// },
mounted() {
this.selectMaterialTree()
- this.selectAll()
+ // this.selectAll()
this.selectVersion()
},
methods: {
+ selectDataList() {
+ this.list.forEach(a => {
+ a.code = '[1]'
+ if (a.children != undefined) {
+ a.children.forEach(b => {
+ b.code = '[2]'
+ if (b.children != undefined) {
+ b.children.forEach(c => {
+ c.code = '[3]'
+ if (c.children != undefined) {
+ c.children.forEach(d => {
+ d.code = '[4]'
+ if (d.children != undefined) {
+ d.children.forEach(e => {
+ e.code = '[5]'
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ },
handleSelectionChange() {
},
@@ -192,22 +217,8 @@
if (idx == 1) {
arr[idx].name = '鍗婃垚鍝�'
}
- el.children.forEach((newEl, newIdx, newArr) => {
- if (newIdx == 0) {
- newArr[newIdx].name = '姗¤兌杩炴帴鍣�'
- }
- if (newIdx == 1) {
- newArr[newIdx].name = '閲戝睘杩炴帴鍣�'
- }
- if (newIdx == 2) {
- newArr[newIdx].name = '婀挎彃鎷旂數杩炴帴鍣�'
- }
- if (newIdx == 3) {
- newArr[newIdx].name = '鍒嗘敮缁勪欢'
- }
- })
})
- console.log(this.list);
+ this.selectDataList()
})
},
filterNode(value, data) {
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 221ebe2..c5669d6 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -185,7 +185,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>
--
Gitblit v1.9.3