Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane

WX

2023-08-15 ec86ce630c3bf6ef4abe5f52ecde21eeda03c5e7

 src/views/datamanage/bankController.vue

@@ -21,7 +21,7 @@
        ⋮
      </div>
      <div class="mid box_div">
        <data-updata v-if="setMenuFlag == 'dataUpdata'"></data-updata>
        <!-- <data-updata v-if="setMenuFlag == 'dataUpdata'"></data-updata>

        <spatial-data v-if="setMenuFlag == 'SpatialData'"></spatial-data>

@@ -31,9 +31,25 @@
        <style-manage v-if="setMenuFlag == 'styleManage'"></style-manage>
        <data-loader v-if="setMenuFlag == 'dataLoader'"></data-loader>
        <down-loader v-if="setMenuFlag == 'downLoader'"></down-loader>
        <data-statistics v-if="setMenuFlag == 'dataStatistics'"></data-statistics>
        <data-statistics v-if="setMenuFlag == 'dataStatistics'"></data-statistics>-->
        <uploadmanage v-if="setMenuFlag == 'uploadmanage'"></uploadmanage>
        <layer-management v-if="setMenuFlag == 'layerManagement'"></layer-management>
        <resourceManagement v-if="setMenuFlag == 'resourceManagement'"></resourceManagement>
        <data-updata v-if="setMenuFlag == 'dataUpdata'"></data-updata>
        <catalogue-manage v-if="setMenuFlag == 'catalogueManage'"></catalogue-manage>
        <version-manage v-if="setMenuFlag == 'versionManage'"></version-manage>
        <project-manage v-if="setMenuFlag == 'projectManage'"></project-manage>

        <spatial-data v-if="setMenuFlag == 'SpatialData'"></spatial-data>

        <domain-manage v-if="setMenuFlag == 'domainManage'"></domain-manage>
        <dictionary-manage v-if="setMenuFlag == 'dictionaryManage'"></dictionary-manage>
        <metadata-manage v-if="setMenuFlag == 'metadataManage'"></metadata-manage>
        <style-manage v-if="setMenuFlag == 'styleManage'"></style-manage>
        <data-loader v-if="setMenuFlag == 'dataLoader'"></data-loader>
        <down-loader v-if="setMenuFlag == 'downLoader'"></down-loader>

        <data-statistics v-if="setMenuFlag == 'dataStatistics'"></data-statistics>
      </div>
    </div>

@@ -57,8 +73,8 @@
import projectManage from '@/views/datamanage/projectManage.vue'; //项目管理
import dataStatistics from '@/views/datamanage/dataStatistics.vue'; //数据统计
import uploadmanage from '@/views/datamanage/uploadmanage.vue'; //发布管理
import resourceManagement from '@/views/datamanage/resourceManagement.vue'; //数据管理-图层管理
import layerManagement from '@/views/datamanage/layerManagement.vue'; //数据管理-图层管理

export default {
  components: {
    customElMenu,
@@ -75,8 +91,8 @@
    projectManage,
    dataStatistics,
    uploadmanage,
    layerManagement,

    resourceManagement,
    layerManagement
  },
  data() {
    return {
@@ -159,16 +175,17 @@

        return value.url == '/bankController';
      });

      if (menuLists.length <= 0) return
     

      const res = await selectMenuRecursive({ id: menuLists[0].id });

      if (res.code == 200) {
        if (res.result.length != 0) {
          let menuList = res.result.filter((value) => {
            return value.type == 1;
          });

          // let menuList = res.result.filter((value) => {
          //   return value.type == 1;
          // });
          let menuList = res.result;
          this.menuList = this.treeData(menuList);
          this.m1 = this.menuList[0].cnName;
          this.setViewController(this.menuList[0]);
@@ -217,7 +234,7 @@
          branchArr.length > 0 ? (father.children = branchArr) : ''; // 给父级添加一个children属性，并赋值
          // 属于同一对象问题，例如：令 a=b、c=1 ，然后再令 b.c=c ， 那么 a.c=b.c=c=1 ；同理，后续令 c.d=2 ,那么 a.c.d 也是=2；
          // 由此循环多次后，就能形成相应的树形数据结构
          return father.pid == 86; // 返回一级菜单
          return father.pid == 14; // 返回一级菜单
        });
      } else {