|
@@ -289,12 +289,10 @@
|
|
|
<el-tree
|
|
|
:props="dialogProps"
|
|
|
show-checkbox
|
|
|
- :check-strictly='true'
|
|
|
:data="dialogData"
|
|
|
node-key="id"
|
|
|
accordion
|
|
|
ref="trees"
|
|
|
- @check-change="handleCheckChange"
|
|
|
class="filter-tree"
|
|
|
>
|
|
|
</el-tree>
|
|
@@ -727,19 +725,26 @@ export default {
|
|
|
})
|
|
|
this.pushfileTap = true
|
|
|
await this.saixuan(this.dialogData)
|
|
|
+ console.log(this.checkXuan);
|
|
|
this.$refs.trees.setCheckedKeys(this.checkXuan);
|
|
|
},
|
|
|
// 赛选
|
|
|
saixuan (da) {//赛选
|
|
|
if (da.length > 0) {
|
|
|
+ let tag = true
|
|
|
da.forEach(val => {
|
|
|
- if (val.isDisplayTree == 1) {
|
|
|
+ if (val.isDisplayTree == 1 && val.hasChildren) {
|
|
|
+ let ks = this.saixuan(val.children)
|
|
|
+ if (ks) {
|
|
|
+ this.checkXuan.push(val.id)
|
|
|
+ }
|
|
|
+ } else if (val.isDisplayTree == 1 && !val.hasChildren) {
|
|
|
this.checkXuan.push(val.id)
|
|
|
- }
|
|
|
- if (val.hasChildren) {
|
|
|
- this.saixuan(val.children)
|
|
|
+ } else {
|
|
|
+ tag = false
|
|
|
}
|
|
|
})
|
|
|
+ return tag
|
|
|
}
|
|
|
},
|
|
|
pushFileClose () {//弹框关闭事件
|
|
@@ -779,33 +784,24 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
saveFile () {//保存按钮
|
|
|
- let arr = this.$refs.trees.getCheckedKeys()
|
|
|
- console.log(arr);
|
|
|
+ let zi = this.$refs.trees.getCheckedKeys() //返回选中子节点的key
|
|
|
+ let fu = this.$refs.trees.getHalfCheckedKeys()//返回选中子节点的父节点的key
|
|
|
+ let arr = [...zi, ...fu]
|
|
|
if (arr.length > 0) {
|
|
|
- // this.$refs.trees.setCheckedKeys(this.checkXuan);
|
|
|
- // let ids = ''
|
|
|
- // arr.forEach((val, key) => {
|
|
|
- // ids += val
|
|
|
- // if (key != arr.length - 1) {
|
|
|
- // ids += ','
|
|
|
- // }
|
|
|
- // })
|
|
|
- // this.submitDisplayConfigTree(ids)
|
|
|
+ let ids = ''
|
|
|
+ arr.forEach((val, key) => {
|
|
|
+ ids += val
|
|
|
+ if (key != arr.length - 1) {
|
|
|
+ ids += ','
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.submitDisplayConfigTree(ids)
|
|
|
} else {
|
|
|
this.$message({
|
|
|
type: 'error',
|
|
|
message: '请先设置配置文件'
|
|
|
})
|
|
|
}
|
|
|
- },
|
|
|
- handleCheckChange (data, checked, indeterminate) {
|
|
|
- console.log(data, checked, indeterminate);
|
|
|
- if (checked) {
|
|
|
-
|
|
|
- }
|
|
|
- },
|
|
|
- checkXuanzhong () {
|
|
|
-
|
|
|
},
|
|
|
//#endregion
|
|
|
},
|