diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 9d5cde35c..f742ddb6f 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -450,11 +450,62 @@ export default { } this.addModel = true }, - getTree3() { - this.$http.get('sarResource/ts-resource', {}, {}, res => { - if (res.ok) { - this.treeData3 = res.data - } + // getTree3() { + // this.$http.get('sarResource/ts-resource', {}, {}, res => { + // if (res.ok) { + // this.treeData3 = res.data + // } + // }) + // }, + async getTreeAsync(){ + let tsResource = await this.getTree3() + let sarMenuStandard = await this.getTree4() + + let list1 = [] + let list2 = [] + if(tsResource && tsResource.ok && tsResource.data){ + list1 = tsResource.data + } + + if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){ + list2 = sarMenuStandard.data + } + + if(list2.length > 0){ + list1 = list1.concat(list2) + } + + if(list1.length > 0){ + this.treeData3 = this.sortByKey(list1,"displaySeq") + } + + + }, + sortByKey(ary, key) { + return ary.sort(function (a, b) { + let x = a[key] + let y = b[key] + return ((x < y) ? -1 : (x > y) ? 1 : 0) + }) + }, + getTree3(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sarResource/ts-resource/getListStand', {}, { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, + getTree4(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('lawss/sarMenuStandard/getListStand', {dicId:'9m4qqqaansxmox5e82zm'}, { + _this: this + }, res => { + const history = res; + resolve(history) + }) }) }, confirmDialogData() { @@ -627,7 +678,7 @@ export default { }, mounted() { this.getTree() - this.getTree3() + this.getTreeAsync() } } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 775c6512a..2804dfc07 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3783,6 +3783,59 @@ export default { } }) }, + async getTreeAsync(){ + + let tsResource = await this.selectMenu1() + let sarMenuStandard = await this.selectMenu2() + + let list1 = [] + let list2 = [] + if(tsResource && tsResource.ok && tsResource.data){ + list1 = tsResource.data + } + + if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){ + list2 = sarMenuStandard.data + } + + if(list2.length > 0){ + list1 = list1.concat(list2) + } + + if(list1.length > 0){ + this.treeList = this.sortByKey(list1,"displaySeq") + } + }, + sortByKey(ary, key) { + return ary.sort(function (a, b) { + let x = a[key] + let y = b[key] + return ((x < y) ? -1 : (x > y) ? 1 : 0) + }) + }, + selectMenu1() { + return new Promise((resolve, reject) => { + this.$http.get('sarResource/ts-resource/getListStand', { + sorDivide: 'INLAND_STAND', + userId: this.$store.getters.userInfo.userId + }, { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, + selectMenu2(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('lawss/sarMenuStandard/getListStand', {dicId:'9m4qqqaansxmox5e82zm'}, { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, // 查询二级菜单 selectMenu() { this.$http.get('sarResource/ts-resource/getListStand', { @@ -5792,7 +5845,7 @@ export default { }, async mounted() { // 进入页面后查询树形结构目录 - await this.selectMenu() + await this.getTreeAsync() this.dragControllerLR() // 进入页面后查询标准体系树形结构目录 引用 数据字典配置 // await this.selectStandardMenu()