From 5c49d381710a03daf1b18b702e0dd99575d92c04 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 11 九月 2023 09:25:33 +0800
Subject: [PATCH] modified: src/components/view/standard-table/technology.vue modified: src/components/view/standard.vue
---
src/components/view/standard.vue | 47 ++++++++++++++++++++++++++++++++++++++---------
src/components/view/standard-table/technology.vue | 2 +-
2 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index 835a583..988fadd 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -37,7 +37,7 @@
<el-table-column prop="pq" label="鐢熶骇瀹氶">
</el-table-column>
<el-table-column prop="" label="鎿嶄綔">
- <el-butten style="color: rgb(137, 137, 229);">缂栬緫</el-butten>
+ <el-button style="color: rgb(137, 137, 229);">缂栬緫</el-button>
</el-table-column>
</el-table>
</div>
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 845bf37..c7bda2b 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -20,7 +20,7 @@
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 != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
- {{ 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>
@@ -124,8 +124,8 @@
// }
// },
mounted() {
+ this.tableType=0
this.selectMaterialTree()
- // this.selectAll()
this.selectVersion()
},
methods: {
@@ -168,8 +168,8 @@
console.log(val);
this.returntree = val
},
- selectVersion() {//鐗堟湰
- this.$axios.get(this.$api.url.selectVersion, {
+ async selectVersion() {//鐗堟湰
+ let v=await this.$axios.get(this.$api.url.selectVersion, {
params: {
specificationsId: this.returntree.id,
type: this.typeselect,
@@ -179,12 +179,16 @@
this.version = this.verdata.map(el => {
return el = `v${el}`
})
- console.log(this.verdata);
+ // console.log("鐗堟湰");
+ return this.verdata[0]
})
+ this.character=v
+ this.VER="v"+v
+ console.log(this.character);
+ this.selectAll()
},
//鍙充晶鏁版嵁
selectAll() {
- console.log(this.$axios.get(this.$api.url.selectAll));
this.$axios.get(this.$api.url.selectAll, {
params: {
specificationsId: this.returntree.id,//tree鐨勭偣鍑诲弽棣�
@@ -207,9 +211,10 @@
// console.log(newObj);
},
//浜旂骇鏍�
- selectMaterialTree() {
- this.$axios.get(this.$api.url.selectTreeByMaterial).then(res => {
- this.list = res.data
+ async selectMaterialTree() {
+ let _that=this
+ let res=await this.$axios.get(this.$api.url.selectTreeByMaterial).then( res => {
+ _that.list = res.data
this.list.forEach((el, idx, arr) => {
if (idx == 0) {
arr[idx].name = '鎴愬搧'
@@ -219,8 +224,32 @@
}
})
this.selectDataList()
+ return _that.list
})
+ let s= this.filterChildren(res)
+ console.log(s);
},
+ filterChildren(list){
+ let one=list.filter(item=>{
+ return item.children!=undefined
+ })[0]
+ let two=one.children.filter(item=>{
+ return item.children!=undefined
+ })[0]
+ let three=two.children.filter(item=>{
+ return item.children!=undefined
+ })[0]
+ let four=three.children.filter(item=>{
+ return item.children!=undefined
+ })[0]
+ return four.children[0]
+ },
+ isObject(param) {
+ return typeof param === 'object' && param !== null;
+ },
+ isArray(param) {
+ return Array.isArray(param);
+},
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
--
Gitblit v1.9.3