Merge branch 'develop' into 'FOTON'

Develop See merge request LAWS/laws-system-front-FOTON!319
2022-02-21 09:01:23 +08:00
parent 6db9e1c2f9 25bb05b4b5
commit cd881ab58b
21 changed files with 3269 additions and 7069 deletions
@@ -3794,6 +3794,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', {
@@ -5803,7 +5856,7 @@ export default {
  },
  async mounted() {
    // 进入页面后查询树形结构目录
-    await this.selectMenu()
+    await this.getTreeAsync()
    this.dragControllerLR()
    // 进入页面后查询标准体系树形结构目录 引用 数据字典配置
    // await this.selectStandardMenu()