From ec86ce630c3bf6ef4abe5f52ecde21eeda03c5e7 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期二, 15 八月 2023 10:59:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane
---
src/views/datamanage/bankController.vue | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/views/datamanage/bankController.vue b/src/views/datamanage/bankController.vue
index 81c14df..c5ac5f3 100644
--- a/src/views/datamanage/bankController.vue
+++ b/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) : ''; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
// 灞炰簬鍚屼竴瀵硅薄闂锛屼緥濡傦細浠� a=b銆乧=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 {
--
Gitblit v1.9.3