|
|
@@ -15,8 +15,8 @@
|
|
|
<div class="custom-tree-node-list">{{data.pagename}}</div>
|
|
|
<div class="custom-tree-node-list">{{data.pagetype}}</div>
|
|
|
<div class="custom-tree-node-list">
|
|
|
- <el-tooltip class="item" effect="dark" :content="data.selectcolumnlist" placement="top">
|
|
|
- <div class="tmsg">{{ data.selectcolumnlist }}</div>
|
|
|
+ <el-tooltip class="item" effect="dark" :content="data.filterset" placement="top">
|
|
|
+ <div class="tmsg">{{ data.filterset }}</div>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
<div class="custom-tree-node-list">
|
|
|
@@ -172,7 +172,7 @@ export default {
|
|
|
updatecolumnlist,
|
|
|
filterset
|
|
|
}
|
|
|
- rowData.selectcolumnlist = JSON.stringify(dataRules)
|
|
|
+ rowData.filterset = JSON.stringify(dataRules)
|
|
|
if (type == 1) {
|
|
|
rowData.userid = id
|
|
|
this.queryId = 7
|
|
|
@@ -237,15 +237,16 @@ export default {
|
|
|
if (narrs.length) {
|
|
|
ndata.map(item => {
|
|
|
narrs.map(ci => {
|
|
|
- if (item.pageconfigurationid == ci.pageconfigurationid && ci.selectcolumnlist) {
|
|
|
+ if (item.pageconfigurationid == ci.pageconfigurationid && ci.filterset) {
|
|
|
const tableColumnArrs = ndata.filter(item => item['superiorid'] == ci.pageconfigurationid && item['pagetype'] == 'column')
|
|
|
- const htmls = this.formatRowAuth(ci.selectcolumnlist, tableColumnArrs)
|
|
|
- item.selectcolumnmsg = ci.selectcolumnlist
|
|
|
- item.selectcolumnlist = htmls.join('')
|
|
|
+ const htmls = this.formatRowAuth(ci.filterset, tableColumnArrs)
|
|
|
+ item.selectcolumnmsg = ci.filterset
|
|
|
+ item.filterset = htmls.join('')
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
}
|
|
|
+ console.log(narrs)
|
|
|
const alldata = this.disableTreeData(ndata)
|
|
|
const treeMenu = listToTree([...alldata], 'superiorid', 'pageconfigurationid')
|
|
|
this.data = treeMenu
|
