From ac687d46631445a2ad0efebe843c300535277dec Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 28 十一月 2022 22:02:54 +0800
Subject: [PATCH] 1
---
src/views/datamanage/metadataManage.vue | 111 +++-
src/assets/img/synthesis/椭圆 6.png | 0
src/assets/img/synthesis/椭圆 5 拷贝 3.png | 0
src/assets/img/synthesis/空间测距.png | 0
src/assets/img/synthesis/M 拷贝.png | 0
src/assets/img/synthesis/圆角矩形 5 拷贝 2.png | 0
src/assets/img/synthesis/矩形 14 拷贝 7.png | 0
src/assets/img/synthesis/图层 14 副本 拷贝.png | 0
src/assets/img/synthesis/矩形 9.png | 0
src/assets/img/synthesis/图层 5 拷贝 6.png | 0
src/assets/img/synthesis/图层 9 拷贝 4.png | 0
src/assets/img/synthesis/导入.png | 0
src/components/navMenu.vue | 41 -
src/assets/img/synthesis/空间查询.png | 0
src/assets/img/synthesis/图层 11 拷贝.png | 0
src/assets/img/synthesis/圆角矩形 12 拷贝 3.png | 0
src/assets/img/synthesis/图层 31.png | 0
src/assets/img/synthesis/导出.png | 0
src/assets/img/synthesis/图层 28.png | 0
src/assets/img/synthesis/图层 74 拷贝 2.png | 0
src/assets/lang/zh.js | 8
src/assets/img/synthesis/图层 32.png | 0
src/assets/img/synthesis/椭圆 3 拷贝 16.png | 0
src/assets/img/synthesis/图层 6 拷贝.png | 0
src/assets/lang/en.js | 10
src/assets/img/synthesis/图层 31 拷贝.png | 0
src/assets/img/synthesis/dxkw.png | 0
src/assets/img/synthesis/椭圆 3 拷贝 20.png | 0
src/assets/img/synthesis/图层 74 拷贝 3.png | 0
src/assets/img/synthesis/图层 27.png | 0
src/assets/img/synthesis/椭圆 8 拷贝 8.png | 0
src/assets/img/synthesis/圆角矩形 12 拷贝 5.png | 0
src/assets/img/synthesis/图层 20.png | 0
src/assets/img/synthesis/系统菜单.png | 0
src/assets/img/synthesis/图层 8 拷贝 2.png | 0
src/components/mapsdk.vue | 9
src/assets/img/synthesis/发布.png | 0
src/assets/img/synthesis/圆角矩形 10 副本 3.png | 0
src/assets/img/synthesis/圆角矩形 12 拷贝 6.png | 0
src/api/api.js | 13
src/assets/img/synthesis/图层 7 拷贝 5.png | 0
src/assets/img/synthesis/清除.png | 0
src/assets/img/synthesis/管道.png | 0
src/assets/img/synthesis/矩形 8 拷贝 2.png | 0
src/assets/img/synthesis/图层 14 拷贝 3.png | 0
src/assets/img/synthesis/椭圆 7 拷贝 4.png | 0
src/assets/img/synthesis/图层 23.png | 0
src/assets/img/synthesis/图层 10 拷贝.png | 0
src/assets/img/synthesis/椭圆 4.png | 0
src/views/datamanage/dataLoader.vue | 184 ++++++-
src/assets/img/synthesis/椭圆 3 拷贝 23.png | 0
src/assets/img/synthesis/矢量智能对象 拷贝 3.png | 0
src/assets/img/synthesis/图层 18 拷贝.png | 0
src/assets/img/synthesis/图层 18.png | 0
src/assets/img/synthesis/矩形 8 拷贝 11.png | 0
src/views/Synthesis/index.vue | 974 +++++++++++++++++++++++++++++++-----------
src/assets/img/synthesis/图层 35.png | 0
src/assets/img/synthesis/圆角矩形 5 拷贝 3.png | 0
src/assets/img/synthesis/椭圆 7 拷贝 2.png | 0
src/assets/img/synthesis/矩形 13 拷贝.png | 0
src/assets/img/synthesis/在线.png | 0
src/assets/img/synthesis/图层 12 拷贝 2.png | 0
62 files changed, 980 insertions(+), 370 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index 5b0ea7b..c69dfa3 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -427,7 +427,10 @@
export function deleteMeta(params) {
return request.get('/meta/deletes', { params: params });
}
-
+//鍏冩暟鎹鐞嗚姹備笅杞�
+export function meta_downloadReq(params) {
+ return request.post('/meta/downloadReq', params);
+}
//缁煎悎灞曠ず鑾峰彇
export function select_Comprehensive_ByPageAndCount(params) {
return request.get('/comprehensive/selectAddrByPage', { params: params });
@@ -561,6 +564,14 @@
export function dataLoader_deleteMetas(params) {
return request.get('/dataLoader/deleteMetas', { params: params });
}
+//鏁版嵁鍏ュ簱=>鏌ヨ瀛楁淇℃伅
+export function dataLoader_selectFields(params) {
+ return request.get('/dataLoader/selectFields', { params: params });
+}
+//鏁版嵁鍏ュ簱=>鏌ヨ琛ㄤ腑鏁版嵁
+export function dataLoader_selectDbData(params) {
+ return request.get('/dataLoader/selectDbData', { params: params });
+}
// //鏁版嵁鍏ュ簱=>鏌ヨ鏂囦欢
// export function dataLoader_selectDirAll(params) {
diff --git "a/src/assets/img/synthesis/M \346\213\267\350\264\235.png" "b/src/assets/img/synthesis/M \346\213\267\350\264\235.png"
new file mode 100644
index 0000000..c642c49
--- /dev/null
+++ "b/src/assets/img/synthesis/M \346\213\267\350\264\235.png"
Binary files differ
diff --git a/src/assets/img/synthesis/dxkw.png b/src/assets/img/synthesis/dxkw.png
new file mode 100644
index 0000000..40e872e
--- /dev/null
+++ b/src/assets/img/synthesis/dxkw.png
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\217\221\345\270\203.png" "b/src/assets/img/synthesis/\345\217\221\345\270\203.png"
new file mode 100644
index 0000000..72ade62
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\217\221\345\270\203.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 10 \346\213\267\350\264\235.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 10 \346\213\267\350\264\235.png"
index b7de1bd..80d26ef 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 10 \346\213\267\350\264\235.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 10 \346\213\267\350\264\235.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 11 \346\213\267\350\264\235.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 11 \346\213\267\350\264\235.png"
index 61dec9b..5129258 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 11 \346\213\267\350\264\235.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 11 \346\213\267\350\264\235.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 12 \346\213\267\350\264\235 2.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 12 \346\213\267\350\264\235 2.png"
index 58d3133..d192b7c 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 12 \346\213\267\350\264\235 2.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 12 \346\213\267\350\264\235 2.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 14 \345\211\257\346\234\254 \346\213\267\350\264\235.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 14 \345\211\257\346\234\254 \346\213\267\350\264\235.png"
index d5ef430..9e5a5ea 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 14 \345\211\257\346\234\254 \346\213\267\350\264\235.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 14 \345\211\257\346\234\254 \346\213\267\350\264\235.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 3.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 3.png"
index 348a4b4..e33623f 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 3.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 3.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 18 \346\213\267\350\264\235.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 18 \346\213\267\350\264\235.png"
index 8970e54..71565fd 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 18 \346\213\267\350\264\235.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 18 \346\213\267\350\264\235.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 18.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 18.png"
index d9d9368..42431cb 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 18.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 18.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 20.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 20.png"
index 044b93b..bfb1f42 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 20.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 20.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 23.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 23.png"
index 50693f7..a162b7f 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 23.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 23.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 27.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 27.png"
index 5430f0c..f70a133 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 27.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 27.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 28.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 28.png"
index 3518f92..8b5a282 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 28.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 28.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 31 \346\213\267\350\264\235.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 31 \346\213\267\350\264\235.png"
index f7aa18d..9af1c41 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 31 \346\213\267\350\264\235.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 31 \346\213\267\350\264\235.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 31.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 31.png"
index cf5d049..7a8114b 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 31.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 31.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 32.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 32.png"
index 7cf45ae..08692d2 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 32.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 32.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 35.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 35.png"
index 470bd8c..71b8f12 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 35.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 35.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 5 \346\213\267\350\264\235 6.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 5 \346\213\267\350\264\235 6.png"
index 7e5e65d..df50c23 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 5 \346\213\267\350\264\235 6.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 5 \346\213\267\350\264\235 6.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 6 \346\213\267\350\264\235.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 6 \346\213\267\350\264\235.png"
index 0e23435..2842fed 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 6 \346\213\267\350\264\235.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 6 \346\213\267\350\264\235.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 7 \346\213\267\350\264\235 5.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 7 \346\213\267\350\264\235 5.png"
index 6e86e8b..26eaf5b 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 7 \346\213\267\350\264\235 5.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 7 \346\213\267\350\264\235 5.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 74 \346\213\267\350\264\235 2.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 74 \346\213\267\350\264\235 2.png"
index 1b88360..19707cd 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 74 \346\213\267\350\264\235 2.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 74 \346\213\267\350\264\235 2.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 74 \346\213\267\350\264\235 3.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 74 \346\213\267\350\264\235 3.png"
index 9e0a4d2..976a644 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 74 \346\213\267\350\264\235 3.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 74 \346\213\267\350\264\235 3.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 8 \346\213\267\350\264\235 2.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 8 \346\213\267\350\264\235 2.png"
index 6dffc64..0868cb9 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 8 \346\213\267\350\264\235 2.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 8 \346\213\267\350\264\235 2.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 9 \346\213\267\350\264\235 4.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 9 \346\213\267\350\264\235 4.png"
index a96df53..fedfe89 100644
--- "a/src/assets/img/synthesis/\345\233\276\345\261\202 9 \346\213\267\350\264\235 4.png"
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 9 \346\213\267\350\264\235 4.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 10 \345\211\257\346\234\254 3.png" "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 10 \345\211\257\346\234\254 3.png"
index 9e7c841..1074bd2 100644
--- "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 10 \345\211\257\346\234\254 3.png"
+++ "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 10 \345\211\257\346\234\254 3.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 3.png" "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 3.png"
index 6e5d8c6..3f8b5db 100644
--- "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 3.png"
+++ "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 3.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 5.png" "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 5.png"
index a91b46e..9f4c0bd 100644
--- "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 5.png"
+++ "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 5.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 6.png" "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 6.png"
index 0db7ca3..993df8e 100644
--- "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 6.png"
+++ "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 12 \346\213\267\350\264\235 6.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 5 \346\213\267\350\264\235 2.png" "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 5 \346\213\267\350\264\235 2.png"
index 075f673..4f7bca1 100644
--- "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 5 \346\213\267\350\264\235 2.png"
+++ "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 5 \346\213\267\350\264\235 2.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 5 \346\213\267\350\264\235 3.png" "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 5 \346\213\267\350\264\235 3.png"
index adf3625..a9684ef 100644
--- "a/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 5 \346\213\267\350\264\235 3.png"
+++ "b/src/assets/img/synthesis/\345\234\206\350\247\222\347\237\251\345\275\242 5 \346\213\267\350\264\235 3.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\234\250\347\272\277.png" "b/src/assets/img/synthesis/\345\234\250\347\272\277.png"
new file mode 100644
index 0000000..daf411a
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\234\250\347\272\277.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\257\274\345\205\245.png" "b/src/assets/img/synthesis/\345\257\274\345\205\245.png"
new file mode 100644
index 0000000..fe278f6
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\257\274\345\205\245.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\257\274\345\207\272.png" "b/src/assets/img/synthesis/\345\257\274\345\207\272.png"
new file mode 100644
index 0000000..2afa4c4
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\257\274\345\207\272.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 16.png" "b/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 16.png"
index 9f95395..3123848 100644
--- "a/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 16.png"
+++ "b/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 16.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 20.png" "b/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 20.png"
index 79ec1ed..d5d9e96 100644
--- "a/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 20.png"
+++ "b/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 20.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 23.png" "b/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 23.png"
index 993f103..ca82993 100644
--- "a/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 23.png"
+++ "b/src/assets/img/synthesis/\346\244\255\345\234\206 3 \346\213\267\350\264\235 23.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\244\255\345\234\206 4.png" "b/src/assets/img/synthesis/\346\244\255\345\234\206 4.png"
index cd08c0a..3b49d10 100644
--- "a/src/assets/img/synthesis/\346\244\255\345\234\206 4.png"
+++ "b/src/assets/img/synthesis/\346\244\255\345\234\206 4.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\244\255\345\234\206 5 \346\213\267\350\264\235 3.png" "b/src/assets/img/synthesis/\346\244\255\345\234\206 5 \346\213\267\350\264\235 3.png"
index 6ff6890..f65a555 100644
--- "a/src/assets/img/synthesis/\346\244\255\345\234\206 5 \346\213\267\350\264\235 3.png"
+++ "b/src/assets/img/synthesis/\346\244\255\345\234\206 5 \346\213\267\350\264\235 3.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\244\255\345\234\206 6.png" "b/src/assets/img/synthesis/\346\244\255\345\234\206 6.png"
index 346121e..f14ed85 100644
--- "a/src/assets/img/synthesis/\346\244\255\345\234\206 6.png"
+++ "b/src/assets/img/synthesis/\346\244\255\345\234\206 6.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\244\255\345\234\206 7 \346\213\267\350\264\235 2.png" "b/src/assets/img/synthesis/\346\244\255\345\234\206 7 \346\213\267\350\264\235 2.png"
index aae32bc..8bf3472 100644
--- "a/src/assets/img/synthesis/\346\244\255\345\234\206 7 \346\213\267\350\264\235 2.png"
+++ "b/src/assets/img/synthesis/\346\244\255\345\234\206 7 \346\213\267\350\264\235 2.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\244\255\345\234\206 7 \346\213\267\350\264\235 4.png" "b/src/assets/img/synthesis/\346\244\255\345\234\206 7 \346\213\267\350\264\235 4.png"
index db53333..aaa865a 100644
--- "a/src/assets/img/synthesis/\346\244\255\345\234\206 7 \346\213\267\350\264\235 4.png"
+++ "b/src/assets/img/synthesis/\346\244\255\345\234\206 7 \346\213\267\350\264\235 4.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\244\255\345\234\206 8 \346\213\267\350\264\235 8.png" "b/src/assets/img/synthesis/\346\244\255\345\234\206 8 \346\213\267\350\264\235 8.png"
index 2223698..330716e 100644
--- "a/src/assets/img/synthesis/\346\244\255\345\234\206 8 \346\213\267\350\264\235 8.png"
+++ "b/src/assets/img/synthesis/\346\244\255\345\234\206 8 \346\213\267\350\264\235 8.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\346\270\205\351\231\244.png" "b/src/assets/img/synthesis/\346\270\205\351\231\244.png"
index 1c528a5..a4a42da 100644
--- "a/src/assets/img/synthesis/\346\270\205\351\231\244.png"
+++ "b/src/assets/img/synthesis/\346\270\205\351\231\244.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\237\242\351\207\217\346\231\272\350\203\275\345\257\271\350\261\241 \346\213\267\350\264\235 3.png" "b/src/assets/img/synthesis/\347\237\242\351\207\217\346\231\272\350\203\275\345\257\271\350\261\241 \346\213\267\350\264\235 3.png"
index 7898e16..2466e73 100644
--- "a/src/assets/img/synthesis/\347\237\242\351\207\217\346\231\272\350\203\275\345\257\271\350\261\241 \346\213\267\350\264\235 3.png"
+++ "b/src/assets/img/synthesis/\347\237\242\351\207\217\346\231\272\350\203\275\345\257\271\350\261\241 \346\213\267\350\264\235 3.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\237\251\345\275\242 13 \346\213\267\350\264\235.png" "b/src/assets/img/synthesis/\347\237\251\345\275\242 13 \346\213\267\350\264\235.png"
index d302697..6864a95 100644
--- "a/src/assets/img/synthesis/\347\237\251\345\275\242 13 \346\213\267\350\264\235.png"
+++ "b/src/assets/img/synthesis/\347\237\251\345\275\242 13 \346\213\267\350\264\235.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\237\251\345\275\242 14 \346\213\267\350\264\235 7.png" "b/src/assets/img/synthesis/\347\237\251\345\275\242 14 \346\213\267\350\264\235 7.png"
index 37c22c3..6710525 100644
--- "a/src/assets/img/synthesis/\347\237\251\345\275\242 14 \346\213\267\350\264\235 7.png"
+++ "b/src/assets/img/synthesis/\347\237\251\345\275\242 14 \346\213\267\350\264\235 7.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\237\251\345\275\242 8 \346\213\267\350\264\235 11.png" "b/src/assets/img/synthesis/\347\237\251\345\275\242 8 \346\213\267\350\264\235 11.png"
index 6d263e8..cf6c1c7 100644
--- "a/src/assets/img/synthesis/\347\237\251\345\275\242 8 \346\213\267\350\264\235 11.png"
+++ "b/src/assets/img/synthesis/\347\237\251\345\275\242 8 \346\213\267\350\264\235 11.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\237\251\345\275\242 8 \346\213\267\350\264\235 2.png" "b/src/assets/img/synthesis/\347\237\251\345\275\242 8 \346\213\267\350\264\235 2.png"
index 5f8caab..01e04f7 100644
--- "a/src/assets/img/synthesis/\347\237\251\345\275\242 8 \346\213\267\350\264\235 2.png"
+++ "b/src/assets/img/synthesis/\347\237\251\345\275\242 8 \346\213\267\350\264\235 2.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\237\251\345\275\242 9.png" "b/src/assets/img/synthesis/\347\237\251\345\275\242 9.png"
index 920bfac..1a26e80 100644
--- "a/src/assets/img/synthesis/\347\237\251\345\275\242 9.png"
+++ "b/src/assets/img/synthesis/\347\237\251\345\275\242 9.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\251\272\351\227\264\346\237\245\350\257\242.png" "b/src/assets/img/synthesis/\347\251\272\351\227\264\346\237\245\350\257\242.png"
new file mode 100644
index 0000000..c0271e9
--- /dev/null
+++ "b/src/assets/img/synthesis/\347\251\272\351\227\264\346\237\245\350\257\242.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\251\272\351\227\264\346\265\213\350\267\235.png" "b/src/assets/img/synthesis/\347\251\272\351\227\264\346\265\213\350\267\235.png"
new file mode 100644
index 0000000..869434c
--- /dev/null
+++ "b/src/assets/img/synthesis/\347\251\272\351\227\264\346\265\213\350\267\235.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\256\241\351\201\223.png" "b/src/assets/img/synthesis/\347\256\241\351\201\223.png"
new file mode 100644
index 0000000..5696468
--- /dev/null
+++ "b/src/assets/img/synthesis/\347\256\241\351\201\223.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\347\263\273\347\273\237\350\217\234\345\215\225.png" "b/src/assets/img/synthesis/\347\263\273\347\273\237\350\217\234\345\215\225.png"
new file mode 100644
index 0000000..ab20c39
--- /dev/null
+++ "b/src/assets/img/synthesis/\347\263\273\347\273\237\350\217\234\345\215\225.png"
Binary files differ
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 3c5208b..929d5ae 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -42,6 +42,8 @@
quayTest: 'Auality testing',
md5: 'MD5 Code',
lineNuber: 'line Nuber',
+ pleaseInputPassworld: 'Please input a password',
+ passworld: 'Passworld',
},
dataManage: {
@@ -382,6 +384,10 @@
},
},
synthesis: {
+ import: 'Import',
+ export: 'Export',
+ pipelineAnalysis: 'Pipeline analysis',
+ sceneExtraction: 'Scene extraction',
synthesis: 'Comprehensive Display',
themaic: 'Thematic Maps',
archive: 'Data Library',
@@ -423,7 +429,7 @@
gardenquery: 'Garden Query',
polygonquery: 'Polygon Query',
attributequery: 'Attribute Query',
- rangequery: 'Range Query',
+ rangequery: 'Spatial query',
gpsrtk: 'GPS-RTK',
placenamelocation: 'Placename Location',
distancemeasure: 'Distance Measure',
@@ -437,7 +443,7 @@
symboliclabel: 'Symbolic Label',
flatterrain: 'Flat Terrain',
terrainexcavation: 'Terrain Excavation',
- removepaint: 'Remove Paint',
+ removepaint: 'Clear',
openFile: 'open File',
saveFile: 'save File',
synthobj: {
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index f887b38..dc72b9c 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -42,6 +42,8 @@
quayTest: '璐ㄦ',
md5: 'MD5鐮�',
lineNuber: '琛屾暟',
+ pleaseInputPassworld: '璇疯緭鍏ュ瘑鐮�',
+ passworld: '瀵嗙爜',
},
dataManage: {
dataManage: '鏁版嵁绠＄悊',
@@ -380,7 +382,11 @@
},
},
synthesis: {
+ import: '瀵煎叆',
+ export: '瀵煎嚭',
+ pipelineAnalysis: '绠￠亾鍒嗘瀽',
synthesis: '缁煎悎灞曠ず',
+ sceneExtraction: '鍦烘櫙鎻愬彇',
themaic: '涓撻鍦板浘',
archive: '璧勬枡棣�',
coverage: '鍥惧眰',
@@ -421,7 +427,7 @@
gardenquery: '鍦嗘煡璇�',
polygonquery: '澶氳竟褰㈡煡璇�',
attributequery: '灞炴�ф煡璇�',
- rangequery: '鑼冨洿鏌ヨ',
+ rangequery: '绌洪棿鏌ヨ',
gpsrtk: '鍧愭爣瀹氫綅',
placenamelocation: '鍦板悕瀹氫綅',
distancemeasure: '璺濈娴嬮噺',
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 682e776..918cf57 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -734,18 +734,13 @@
.mapBox {
width: 100%;
height: 100%;
- overflow: hidden;
- margin: 0;
- padding: 0;
+ position: relative;
#mapdiv {
width: 100%;
height: 100%;
overflow: hidden;
- margin: 0;
- padding: 0;
- position: absolute;
-
+ position: relative;
.toponymicLocalBox {
width: 750px;
height: 450x;
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index a4db331..4a84824 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -124,41 +124,21 @@
mounted() {
this.getMenuTree();
},
- computed: {
- // 鎴戜滑浣跨敤璁＄畻灞炴�ф潵鑾峰彇鍒板綋鍓嶇偣鍑荤殑鑿滃崟鐨勮矾鐢辫矾寰勶紝鐒跺悗璁剧疆default-active涓殑鍊�
- // 浣垮緱鑿滃崟鍦ㄨ浇鍏ユ椂灏辫兘瀵瑰簲楂樹寒
- // activeIndex() {
- // const route = this.$route;
- // const { meta, path } = route;
- // // if set path, the sidebar will highlight the path you set
- // // 鍙互鍦ㄨ矾鐢遍厤缃枃浠朵腑璁剧疆鑷畾涔夌殑璺敱璺緞鍒癿eta.activeMenu灞炴�т腑锛屾潵鎺у埗鑿滃崟鑷畾涔夐珮浜樉绀�
- // if (meta.activeMenu) {
- // return meta.activeMenu;
- // }
- // return path;
- // },
- },
+ computed: {},
methods: {
//涓婚鍒囨崲
- setThemeColors() {
- // var value;
- // if (this.themeColor) {
- // value = '#303030';
- // } else {
- // value = '#409EFF';
- // }
- // localStorage.setItem('theme', value);
- // this.$store.commit('setSkin', value);
- },
+ setThemeColors() {},
//榧犳爣绉诲叆鑿滃崟浜嬩欢
setMenuMove(index, item) {
var that = this;
if (item.perms != null) {
this.$router.push(item.url);
- this.setShowFalseDiv(false);
- this.changeliSelect = '鍛靛懙';
- this.showFlag = null;
+ if (this.showFlag != null) {
+ this.setShowFalseDiv(false);
+ this.changeliSelect = '鍛靛懙';
+ this.showFlag = null;
+ }
} else {
if (this.showFlag != index) {
this.showFlag = index;
@@ -182,14 +162,9 @@
this.setShowFalseDiv(false);
this.changeliSelect = res.cnName;
this.$router.push(res.url);
+ this.$store.commit('currentPerms', res.perms);
},
async getMenuTree() {
- //鑾峰彇鐩綍鏍戞渶澶D锛屾柊寤鸿妭鐐逛娇鐢�
- // queryMaxId().then((res) => {
- // this.id = res.data;
- // });
- //
-
const data = await queryMenuTree();
var that = this;
if (data.code == 200) {
diff --git a/src/views/Synthesis/index.vue b/src/views/Synthesis/index.vue
index a0d6c7f..3884bba 100644
--- a/src/views/Synthesis/index.vue
+++ b/src/views/Synthesis/index.vue
@@ -1,232 +1,434 @@
<template>
<div class="synthesis">
- <map-div></map-div>
- <!-- <el-tabs type="border-card">
- <el-tab-pane v-if="menuStatus.menu1" :label="$t('synthesis.coverage')">
- <coverage />
- </el-tab-pane>
- <el-tab-pane v-if="menuStatus.menu2" :label="$t('synthesis.viewport')">
- <viewport />
- </el-tab-pane>
- <el-tab-pane v-if="menuStatus.menu3" :label="$t('synthesis.wander')">
- <wander />
- </el-tab-pane>
- <el-tab-pane v-if="menuStatus.menu4" :label="$t('synthesis.analyse')">
- <analyse />
- </el-tab-pane>
- <el-tab-pane v-if="menuStatus.menu5" :label="$t('synthesis.iqyery')">
- <iqyery />
- </el-tab-pane>
- <el-tab-pane v-if="menuStatus.menu6" :label="$t('synthesis.orientation')">
- <orientation />
- </el-tab-pane>
- <el-tab-pane v-if="menuStatus.menu7" :label="$t('synthesis.measurement')">
- <measurement />
- </el-tab-pane>
- <el-tab-pane v-if="menuStatus.menu8" :label="$t('synthesis.plotting')">
- <plotting @drawing="showBtn" />
- </el-tab-pane>
- </el-tabs>
- <el-card class="box-card">
-
- </el-card>
- <div class="plotBox">
- <el-collapse-transition>
- <div class="transition-box" v-show="showBtnBox">
- <ul>
- <li
- @click="changePlot(item)"
- v-for="item in itemsOne"
- :key="item.id"
- >
- <div class="divli">
- <div :class="item.class" class="backimge8"></div>
- </div>
- <div class="div_li">{{ $t(item.name) }}</div>
- </li>
- </ul>
+ <div class="lefIcon">
+ <ul>
+ <li v-for="item in showMenuList">
+ <div class="menuDiv" :title="item.name" @click="setMenuChange(item)">
+ <div class="menuImage" :class="item.class"></div>
+ </div>
+ </li>
+ </ul>
+ </div>
+ <div class="rightContent">
+ <div class="left_main" :class="{ left_main_show: !openStatus }">
+ <div class="leftMen_div" v-for="(item, index) in setListTwoMenu">
+ <div class="menuTwoImage" :class="item.css"></div>
+ <div>{{ $t(item.label) }}</div>
</div>
- </el-collapse-transition>
- </div> -->
+ </div>
+ <div id="mapdiv" class="right_main">
+ <div @click="changeBaseLayer" class="bottomChageLayer">
+ <div
+ id="cenBg"
+ v-bind:class="{ active: isActive, menuLayer: !isActive }"
+ ></div>
+ </div>
+ </div>
+ </div>
</div>
</template>
<script>
-import coverage from './coverage.vue'; //鍥惧眰
-import viewport from './viewport.vue'; //瑙嗗浘
-import wander from './wander.vue'; //婕父
-import analyse from './analyse.vue'; //鍒嗘瀽
-import iqyery from './inquire.vue'; //鏌ヨ
-import orientation from './orientation.vue'; //瀹氫綅
-import measurement from './measurement.vue'; //娴嬮噺
-import plotting from './plotting.vue'; //鏍囩粯
-import MapDiv from '../../components/MapDiv';
import { getPerms } from '../../api/api';
export default {
- components: {
- coverage,
- viewport,
- wander,
- analyse,
- iqyery,
- orientation,
- measurement,
- plotting,
- MapDiv,
- },
+ components: {},
data() {
return {
- showBtnBox: false,
- itemsOne: [
+ openStatus: false,
+ isActive: false,
+ showMenuList: [],
+ menuOption: [
{
- id: '1',
- name: 'synthesis.point',
- class: 'h1',
+ id: 1,
+ name: '鑿滃崟',
+ class: 'menu_img1',
+ show: true,
},
{
- id: '2',
- name: 'synthesis.line',
- class: 'h2',
+ id: 2,
+ name: '鍥惧眰',
+ class: 'menu_img2',
+ show: false,
},
- // {
- // id: "3",
- // name: "synthesis.rectangle",
- // class: "h3",
- // },
{
- id: '4',
- name: 'synthesis.polygon',
- class: 'h4',
+ id: 3,
+ name: '瑙嗗浘',
+ class: 'menu_img3',
+ show: false,
},
- // {
- // id: "7",
- // name: "synthesis.symboliclabel",
- // class: "h7",
- // },
- // {
- // id: "5",
- // name: "synthesis.flatterrain",
- // class: "h5",
- // },
- // {
- // id: "6",
- // name: "synthesis.terrainexcavation",
- // class: "h6",
- // },
{
- id: '8',
- name: 'synthesis.removepaint',
- class: 'h8',
+ id: 4,
+ name: '婕父',
+ class: 'menu_img4',
+ show: false,
},
- // {
- // id: "9",
- // name: "synthesis.openFile",
- // class: "h6",
- // },
- // {
- // id: "10",
- // name: "synthesis.saveFile",
- // class: "h8",
- // },
+ {
+ id: 5,
+ name: '鍒嗘瀽',
+ class: 'menu_img5',
+ show: false,
+ },
+ {
+ id: 6,
+ name: '鏌ヨ',
+ class: 'menu_img6',
+ show: false,
+ },
+ {
+ id: 7,
+ name: '瀹氫綅',
+ class: 'menu_img7',
+ show: false,
+ },
+ {
+ id: 8,
+ name: '娴嬮噺',
+ class: 'menu_img8',
+ show: false,
+ },
+ {
+ id: 9,
+ name: '鏍囩粯',
+ class: 'menu_img9',
+ show: false,
+ },
],
- iframeSrc: null,
- messageName: null,
- permsId: null,
- menuStatus: {
- menu1: false,
- menu2: false,
- menu3: false,
- menu4: false,
- menu5: false,
- menu6: false,
- menu7: false,
- menu8: false,
- },
+ setListTwoMenu: [],
+ setListTwoMenuAll: [
+ [
+ {
+ label: 'synthesis.layer',
+ name: '鍥惧眰绠＄悊',
+ css: 'twoMenu_imge11',
+ },
+ {
+ name: '鍦烘櫙鎻愬彇',
+ label: 'synthesis.sceneExtraction',
+ css: 'twoMenu_imge12',
+ },
+ {
+ label: 'synthesis.release',
+ name: '鍦烘櫙鍙戝竷',
+ css: 'twoMenu_imge13',
+ },
+ ],
+ [
+ {
+ label: 'synthesis.split',
+ name: '鍒嗗睆',
+ css: 'twoMenu_imge21',
+ },
+ {
+ label: 'synthesis.twod',
+ name: '浜岀淮',
+ css: 'twoMenu_imge22',
+ },
+ {
+ label: 'synthesis.threed',
+ name: '涓夌淮',
+ css: 'twoMenu_imge23',
+ },
+ {
+ label: 'synthesis.full',
+ name: '鍏ㄥ浘',
+ css: 'twoMenu_imge24',
+ },
+ {
+ label: 'synthesis.zommin',
+ name: '鏀惧ぇ',
+ css: 'twoMenu_imge25',
+ },
+ {
+ label: 'synthesis.zoomout',
+ name: '缂╁皬',
+ css: 'twoMenu_imge26',
+ },
+ {
+ label: 'synthesis.rule',
+ name: '姣斾緥灏�',
+ css: 'twoMenu_imge27',
+ },
+ {
+ label: 'synthesis.compass',
+ name: '鎸囧寳閽�',
+ css: 'twoMenu_imge28',
+ },
+ ],
+ [
+ {
+ label: 'synthesis.someroaming',
+ name: '鐐规极娓�',
+ css: 'twoMenu_imge31',
+ },
+ {
+ label: 'synthesis.lineroaming',
+ name: '绾胯矾婕父',
+ css: 'twoMenu_imge32',
+ },
+ {
+ label: 'synthesis.mouseroaming',
+ name: '榧犳爣婕父',
+ css: 'twoMenu_imge33',
+ },
+ {
+ label: 'synthesis.snapshot',
+ name: '鍦板浘蹇収',
+ css: 'twoMenu_imge34',
+ },
+ {
+ label: 'synthesis.tdisplay',
+ name: '涓夌淮婕旂ず',
+ css: 'twoMenu_imge35',
+ },
+ ],
+ [
+ {
+ label: 'synthesis.contouranalysis',
+ name: '绛夐珮绾�',
+ css: 'twoMenu_imge41',
+ },
+ {
+ label: 'synthesis.slopeanalysis',
+ name: '鍧″害鍒嗘瀽',
+ css: 'twoMenu_imge42',
+ },
+ {
+ label: 'synthesis.pathanalysis',
+ name: '璺緞鍒嗘瀽',
+ css: 'twoMenu_imge43',
+ },
+ {
+ label: 'synthesis.cuttinganalysis',
+ name: '鍦板舰鍓栧垏',
+ css: 'twoMenu_imge44',
+ },
+ {
+ label: 'synthesis.floodanalysis',
+ name: '娣规病鍒嗘瀽',
+ css: 'twoMenu_imge45',
+ },
+ {
+ label: 'synthesis.earthworkcalculation',
+ name: '鍦熸柟閲忚绠�',
+ css: 'twoMenu_imge46',
+ },
+ {
+ label: 'synthesis.crosssectionanalysis',
+ name: '涓夌淮鎴潰',
+ css: 'twoMenu_imge47',
+ },
+ {
+ label: 'synthesis.imagecontrast',
+ name: '褰卞儚瀵规瘮',
+ css: 'twoMenu_imge48',
+ },
+ {
+ label: 'synthesis.pipelineAnalysis',
+ name: '绠￠亾鍒嗘瀽',
+ css: 'twoMenu_imge49',
+ },
+ {
+ label: 'synthesis.flatterrain',
+ name: '鍦板舰骞虫暣',
+ css: 'twoMenu_imge410',
+ },
+ {
+ label: 'synthesis.terrainexcavation',
+ name: '鍦板舰寮�鎸�',
+ css: 'twoMenu_imge411',
+ },
+ ],
+ [
+ {
+ label: 'synthesis.attributequery',
+ name: '灞炴�ф煡璇�',
+ css: 'twoMenu_imge51',
+ },
+ {
+ label: 'synthesis.rangequery',
+ name: '绌洪棿鏌ヨ',
+ css: 'twoMenu_imge52',
+ },
+ ],
+ [
+ {
+ label: 'synthesis.gpsrtk',
+ name: '鍧愭爣瀹氫綅',
+ css: 'twoMenu_imge61',
+ },
+ {
+ label: 'synthesis.placenamelocation',
+ name: '鍦板悕瀹氫綅',
+ css: 'twoMenu_imge62',
+ },
+ ],
+ [
+ {
+ label: 'synthesis.synthobj.m1',
+ name: '姘村钩璺濈',
+ css: 'twoMenu_imge71',
+ },
+ {
+ label: 'synthesis.synthobj.m4',
+ name: '鍨傜洿楂樺害',
+ css: 'twoMenu_imge72',
+ },
+ {
+ label: 'synthesis.synthobj.m6',
+ name: '骞抽潰闈㈢Н',
+ css: 'twoMenu_imge73',
+ },
+ {
+ label: 'synthesis.synthobj.m7',
+ name: '浣撶Н',
+ css: 'twoMenu_imge74',
+ },
+ {
+ label: 'synthesis.synthobj.m5',
+ name: '琛ㄩ潰闈㈢Н',
+ css: 'twoMenu_imge75',
+ },
+ {
+ label: 'synthesis.synthobj.m2',
+ name: '绌洪棿璺濈',
+ css: 'twoMenu_imge76',
+ },
+ ],
+ [
+ {
+ label: 'synthesis.point',
+ name: '鐐�',
+ css: 'twoMenu_imge81',
+ },
+ {
+ label: 'synthesis.line',
+ name: '绾�',
+ css: 'twoMenu_imge82',
+ },
+ {
+ label: 'synthesis.rectangle',
+ name: '鐭╁舰',
+ css: 'twoMenu_imge83',
+ },
+ {
+ label: 'synthesis.polygon',
+ name: '澶氳竟褰�',
+ css: 'twoMenu_imge84',
+ },
+ {
+ label: 'synthesis.import',
+ name: '瀵煎叆',
+ css: 'twoMenu_imge85',
+ },
+ {
+ label: 'synthesis.export',
+ name: '瀵煎嚭',
+ css: 'twoMenu_imge86',
+ },
+ {
+ label: 'synthesis.removepaint',
+ name: '娓呴櫎',
+ css: 'twoMenu_imge87',
+ },
+ ],
+ ],
};
},
watch: {},
created() {},
methods: {
- showBtn() {
- this.showBtnBox = !this.showBtnBox;
- },
- changePlot(res) {
- sgworld.Creator.SimpleGraphic.edit(true, { editProp: true });
- switch (res.id) {
- case '1':
- sgworld.Creator.createSimpleGraphic(
- 'point',
- {},
- function (entity) {}
- );
- break;
- case '2':
- sgworld.Creator.createSimpleGraphic(
- 'polyline',
- {},
- function (entity) {}
- );
- break;
- case '3':
- sgworld.Creator.createSimpleGraphic(
- 'rectangle',
- {},
- function (entity) {}
- );
- break;
- case '4':
- sgworld.Creator.createSimpleGraphic(
- 'polygon',
- {},
- function (entity) {}
- );
- break;
- case '6':
- if (window.Excavation) {
- window.Excavation.clear();
- window.Excavation = null;
- } else {
- this.$refs.terrainDig.open();
- }
- break;
- case '5':
- if (window.TerrainFlattening) {
- window.TerrainFlattening.remove();
- window.TerrainFlattening = null;
- } else {
- this.$refs.modelPress.open();
- }
- break;
- case '7':
- sgworld.Creator.createModelLibrary();
- break;
- case '8':
- this.clearAll();
- break;
- case '10':
- break;
- }
- },
+ //鍦板浘鍒濆鍖�
+ initMap() {
+ //鍦板浘鍒濆鍖�
+ window.sgworld = new SmartEarth.SGWorld('mapdiv', {
+ licenseServer: window.sceneConfig.licenseServer,
+ });
+ window.Viewer = window.sgworld._Viewer;
+ //瀹氫綅
+ sgworld.Navigate.jumpTo({
+ //璺宠浆瑙嗚
+ destination: new Cesium.Cartesian3.fromDegrees(
+ 116.055913,
+ 39.937685,
+ 8000
+ ),
+ });
+ Viewer.imageryLayers.addImageryProvider(
+ new Cesium.WebMapTileServiceImageryProvider({
+ url: 'http://t0.tianditu.com/vec_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=94a34772eb88317fcbf8428e10448561',
+ layer: 'tdtVecBasicLayer',
+ style: 'default',
+ format: 'image/jpeg',
+ tileMatrixSetID: 'GoogleMapsCompatible',
+ show: false,
+ })
+ );
- clearAll() {
- sgworld.Creator.SimpleGraphic.clear();
- if (window.Excavation) {
- window.Excavation.clear();
- window.Excavation = null;
- }
- if (window.TerrainFlattening) {
- window.TerrainFlattening.remove();
- window.TerrainFlattening = null;
+ Viewer.imageryLayers.addImageryProvider(
+ new Cesium.WebMapTileServiceImageryProvider({
+ url: 'http://t0.tianditu.com/img_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=img&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=94a34772eb88317fcbf8428e10448561',
+ layer: 'tdtBasicLayer',
+ style: 'default',
+ format: 'image/jpeg',
+ tileMatrixSetID: 'GoogleMapsCompatible',
+ show: false,
+ })
+ );
+ Viewer.imageryLayers.addImageryProvider(
+ new Cesium.WebMapTileServiceImageryProvider({
+ url: 'http://t0.tianditu.com/cva_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=cva&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default.jpg&tk=94a34772eb88317fcbf8428e10448561',
+ layer: 'tdtAnnoLayer',
+ style: 'default',
+ format: 'image/jpeg',
+ tileMatrixSetID: 'GoogleMapsCompatible',
+ })
+ );
+ },
+ //搴曞浘鍒囨崲
+ changeBaseLayer() {
+ this.isActive = !this.isActive;
+ this.setLayerVisible();
+ },
+ setLayerVisible() {
+ if (this.isActive == true) {
+ Viewer.imageryLayers.get(1).show = true;
+ Viewer.imageryLayers.get(2).show = false;
+ } else {
+ Viewer.imageryLayers.get(1).show = false;
+ Viewer.imageryLayers.get(2).show = true;
}
},
- tepostmessage(res) {
- const msg = {
- message: 'changeTool',
- data: res,
- };
- document
- .getElementById('sunIframe')
- .contentWindow.postMessage(msg, this.iframeSrc);
+ //宸︿晶鑿滃崟婊戝姩鏄鹃殣
+ setMenuChange(res) {
+ switch (res.id) {
+ case 1:
+ this.openStatus = !this.openStatus;
+ break;
+ default: {
+ this.openStatus = true;
+ this.setListTwoMenu = this.setListTwoMenuAll[res.id - 2];
+ }
+ }
+ },
+ //鍒濆鍖栬彍鍗曟巿鏉�
+ getPermsMenu() {
+ var val = this.$store.state.currentPerms;
+ var permsEntity = this.$store.state.permsEntity;
+ for (var i = 0; i < permsEntity.length; i++) {
+ if (permsEntity[i].perms == val) {
+ this.showMenuChange(permsEntity[i], permsEntity);
+ }
+ }
+ for (var i in this.menuOption) {
+ if (this.menuOption[i].show != false) {
+ this.showMenuList.push(this.menuOption[i]);
+ }
+ }
+ //鍒濆鍖栦簩绾ц彍鍗�
+ if (this.showMenuList.length > 1) {
+ var index = this.showMenuList[1].id;
+ this.setListTwoMenu = this.setListTwoMenuAll[index - 2];
+ }
},
showMenuChange(res, result) {
var permsId = res.id;
@@ -238,77 +440,333 @@
}
},
showMenuStatus(res) {
- switch (res.cnName) {
- case '鍥惧眰':
- this.menuStatus.menu1 = true;
- break;
- case '瑙嗗浘':
- this.menuStatus.menu2 = true;
- break;
- case '婕父':
- this.menuStatus.menu3 = true;
- break;
- case '鍒嗘瀽':
- this.menuStatus.menu4 = true;
- break;
- case '鏌ヨ':
- this.menuStatus.menu5 = true;
- break;
- case '瀹氫綅':
- this.menuStatus.menu6 = true;
- break;
- case '娴嬮噺':
- this.menuStatus.menu7 = true;
- break;
- case '鏍囩粯':
- this.menuStatus.menu8 = true;
- break;
- }
- },
- getPermsMenu() {
- let val;
- if (this.$store.state.currentPerms) {
- val = this.$store.state.currentPerms;
- } else {
- val = '/comprehensive';
- }
- var permsEntity = this.$store.state.permsEntity;
-
- if (permsEntity.length == 0) {
- getPerms().then((res) => {
- if (res.code == 200) permsEntity = res.result;
- for (var i = 0; i < permsEntity.length; i++) {
- if (permsEntity[i].perms == val) {
- this.showMenuChange(permsEntity[i], permsEntity);
- }
- }
- });
- } else {
- for (var i = 0; i < permsEntity.length; i++) {
- if (permsEntity[i].perms == val) {
- this.showMenuChange(permsEntity[i], permsEntity);
- }
+ var std = [];
+ std.push(this.menuOption[0]);
+ for (var i = 1; i < this.menuOption.length; i++) {
+ if (this.menuOption[i].name == res.cnName) {
+ this.menuOption[i].show = true;
}
}
},
},
mounted() {
- //this.messageName = this.$store.state.teNmme;
- this.$bus.$on('changetool', (e) => {
- this.tepostmessage(e);
- });
+ this.initMap();
},
-
+ //鍒濆鍖栬彍鍗曟巿鏉�
created() {
this.getPermsMenu();
},
};
</script>
-<style>
+<style lang="less" scoped>
.synthesis {
width: 100%;
height: 100%;
- position: absolute;
+ position: relative;
+ .lefIcon {
+ width: 63px;
+ height: 100%;
+ background: #353535;
+ position: absolute;
+ z-index: 30;
+ .menuDiv {
+ width: 60px;
+ height: 60px;
+ border: 1px solid rgba(53, 53, 53, 0);
+
+ .menuImage {
+ width: 26px;
+ height: 26px;
+ margin-left: 17px;
+ margin-top: 17px;
+ }
+
+ .menu_img1 {
+ background: url('../../assets/img/synthesis/绯荤粺鑿滃崟.png') no-repeat
+ center;
+ }
+ .menu_img2 {
+ background: url('../../assets/img/synthesis/鐭╁舰 8 鎷疯礉 2.png')
+ no-repeat center;
+ }
+ .menu_img3 {
+ background: url('../../assets/img/synthesis/鍥惧眰 6 鎷疯礉.png') no-repeat
+ center;
+ }
+ .menu_img4 {
+ background: url('../../assets/img/synthesis/鍥惧眰 8 鎷疯礉 2.png')
+ no-repeat center;
+ }
+ .menu_img5 {
+ background: url('../../assets/img/synthesis/鐭㈤噺鏅鸿兘瀵硅薄 鎷疯礉 3.png')
+ no-repeat center;
+ }
+ .menu_img6 {
+ background: url('../../assets/img/synthesis/鍥惧眰 9 鎷疯礉 4.png')
+ no-repeat center;
+ }
+ .menu_img7 {
+ background: url('../../assets/img/synthesis/鍥惧眰 7 鎷疯礉 5.png')
+ no-repeat center;
+ }
+ .menu_img8 {
+ background: url('../../assets/img/synthesis/鍥惧眰 5 鎷疯礉 6.png')
+ no-repeat center;
+ }
+ .menu_img9 {
+ background: url('../../assets/img/synthesis/鐭╁舰 8 鎷疯礉 11.png')
+ no-repeat center;
+ }
+ }
+ li:hover {
+ background: linear-gradient(180deg, #002992, #080472);
+ }
+ }
+ .rightContent {
+ width: calc(100% - 63px);
+ height: 100%;
+ float: right;
+ display: flex;
+ .left_main {
+ margin: 0;
+ width: 300px;
+ height: auto;
+ text-align: center;
+ transition: width 2s;
+ display: flex;
+ flex-wrap: wrap;
+ align-content: flex-start;
+ }
+ .leftMen_div {
+ font-size: 16px;
+ font-family: Microsoft YaHei;
+ font-weight: 400;
+ color: #ffffff;
+ padding: 10px;
+ min-width: 100px;
+ margin-left: 10px;
+ margin-top: 10px;
+ border-radius: 5px;
+ }
+ .leftMen_div:hover {
+ background: linear-gradient(180deg, #002992, #080472);
+ border: 1px solid #000000;
+ box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.21);
+ }
+ .menuTwoImage {
+ width: 32px;
+ height: 32px;
+ display: inline-block;
+ }
+
+ .twoMenu_imge11 {
+ background: url('../../assets/img/synthesis/鍥惧眰 32.png') no-repeat center;
+ }
+ .twoMenu_imge12 {
+ background: url('../../assets/img/synthesis/鍥惧眰 35.png') no-repeat center;
+ }
+ .twoMenu_imge13 {
+ background: url('../../assets/img/synthesis/鍙戝竷.png') no-repeat center;
+ }
+ //瑙嗗浘
+ .twoMenu_imge21 {
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 12 鎷疯礉 3.png')
+ no-repeat center;
+ }
+ .twoMenu_imge22 {
+ background: url('../../assets/img/synthesis/鍥惧眰 10 鎷疯礉.png') no-repeat
+ center;
+ }
+ .twoMenu_imge23 {
+ background: url('../../assets/img/synthesis/鍥惧眰 11 鎷疯礉.png') no-repeat
+ center;
+ }
+ .twoMenu_imge24 {
+ background: url('../../assets/img/synthesis/鍥惧眰 12 鎷疯礉 2.png') no-repeat
+ center;
+ }
+ .twoMenu_imge25 {
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 5 鎷疯礉 2.png')
+ no-repeat center;
+ }
+ .twoMenu_imge26 {
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 5 鎷疯礉 3.png')
+ no-repeat center;
+ }
+ .twoMenu_imge27 {
+ background: url('../../assets/img/synthesis/鐭╁舰 9.png') no-repeat center;
+ }
+ .twoMenu_imge28 {
+ background: url('../../assets/img/synthesis/妞渾 4.png') no-repeat center;
+ }
+ //婕父
+ .twoMenu_imge31 {
+ background: url('../../assets/img/synthesis/妞渾 6.png') no-repeat center;
+ }
+ .twoMenu_imge32 {
+ background: url('../../assets/img/synthesis/妞渾 7 鎷疯礉 2.png') no-repeat
+ center;
+ }
+ .twoMenu_imge33 {
+ background: url('../../assets/img/synthesis/鍥惧眰 14 鍓湰 鎷疯礉.png')
+ no-repeat center;
+ }
+ .twoMenu_imge34 {
+ background: url('../../assets/img/synthesis/鍥惧眰 74 鎷疯礉 2.png') no-repeat
+ center;
+ }
+ .twoMenu_imge35 {
+ background: url('../../assets/img/synthesis/妞渾 7 鎷疯礉 4.png') no-repeat
+ center;
+ }
+ //鍒嗘瀽
+ .twoMenu_imge41 {
+ background: url('../../assets/img/synthesis/妞渾 8 鎷疯礉 8.png') no-repeat
+ center;
+ }
+ .twoMenu_imge42 {
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 12 鎷疯礉 5.png')
+ no-repeat center;
+ }
+ .twoMenu_imge43 {
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 10 鍓湰 3.png')
+ no-repeat center;
+ }
+ .twoMenu_imge44 {
+ background: url('../../assets/img/synthesis/鍥惧眰 74 鎷疯礉 3.png') no-repeat
+ center;
+ }
+ .twoMenu_imge45 {
+ background: url('../../assets/img/synthesis/鍥惧眰 20.png') no-repeat center;
+ }
+ .twoMenu_imge46 {
+ background: url('../../assets/img/synthesis/鍥惧眰 14 鎷疯礉 3.png') no-repeat
+ center;
+ }
+ .twoMenu_imge47 {
+ background: url('../../assets/img/synthesis/鍥惧眰 18.png') no-repeat center;
+ }
+ .twoMenu_imge48 {
+ background: url('../../assets/img/synthesis/鍦嗚鐭╁舰 12 鎷疯礉 6.png')
+ no-repeat center;
+ }
+ .twoMenu_imge49 {
+ background: url('../../assets/img/synthesis/绠￠亾.png') no-repeat center;
+ }
+ .twoMenu_imge410 {
+ background: url('../../assets/img/synthesis/dxkw.png') no-repeat center;
+ }
+ .twoMenu_imge411 {
+ background: url('../../assets/img/synthesis/鐭╁舰 14 鎷疯礉 7.png') no-repeat
+ center;
+ }
+ //鏌ヨ
+ .twoMenu_imge51 {
+ background: url('../../assets/img/synthesis/鍥惧眰 23.png') no-repeat center;
+ }
+ .twoMenu_imge52 {
+ background: url('../../assets/img/synthesis/绌洪棿鏌ヨ.png') no-repeat
+ center;
+ }
+ //瀹氫綅
+ .twoMenu_imge61 {
+ background: url('../../assets/img/synthesis/鍥惧眰 27.png') no-repeat center;
+ }
+ .twoMenu_imge62 {
+ background: url('../../assets/img/synthesis/鍥惧眰 28.png') no-repeat center;
+ }
+ //娴嬮噺
+ .twoMenu_imge71 {
+ background: url('../../assets/img/synthesis/鍥惧眰 31.png') no-repeat center;
+ }
+ .twoMenu_imge72 {
+ background: url('../../assets/img/synthesis/鍥惧眰 31 鎷疯礉.png') no-repeat
+ center;
+ }
+ .twoMenu_imge73 {
+ background: url('../../assets/img/synthesis/鐭╁舰 13 鎷疯礉.png') no-repeat
+ center;
+ }
+ .twoMenu_imge74 {
+ background: url('../../assets/img/synthesis/鍥惧眰 18 鎷疯礉.png') no-repeat
+ center;
+ }
+ .twoMenu_imge75 {
+ background: url('../../assets/img/synthesis/M 鎷疯礉.png') no-repeat center;
+ }
+ .twoMenu_imge76 {
+ background: url('../../assets/img/synthesis/绌洪棿娴嬭窛.png') no-repeat
+ center;
+ }
+ //鏍囩粯
+ .twoMenu_imge81 {
+ background: url('../../assets/img/synthesis/妞渾 5 鎷疯礉 3.png') no-repeat
+ center;
+ }
+ .twoMenu_imge82 {
+ background: url('../../assets/img/synthesis/妞渾 3 鎷疯礉 16.png') no-repeat
+ center;
+ }
+ .twoMenu_imge83 {
+ background: url('../../assets/img/synthesis/妞渾 3 鎷疯礉 20.png') no-repeat
+ center;
+ }
+ .twoMenu_imge84 {
+ background: url('../../assets/img/synthesis/妞渾 3 鎷疯礉 23.png') no-repeat
+ center;
+ }
+ .twoMenu_imge85 {
+ background: url('../../assets/img/synthesis/瀵煎叆.png') no-repeat center;
+ }
+ .twoMenu_imge86 {
+ background: url('../../assets/img/synthesis/瀵煎嚭.png') no-repeat center;
+ }
+ .twoMenu_imge87 {
+ background: url('../../assets/img/synthesis/娓呴櫎.png') no-repeat center;
+ }
+
+ .right_main {
+ flex: 1;
+ height: 100%;
+ position: relative;
+ }
+ .left_main_show {
+ width: 0px;
+ }
+ .bottomChageLayer {
+ height: 40px;
+ width: 60px;
+ z-index: 40;
+ position: absolute;
+ flex-direction: column;
+ justify-content: space-between;
+ box-shadow: 3px 3px 6px #666;
+ border: 1px solid rgba(204, 204, 204, 0.76);
+ border-radius: 5px;
+ cursor: pointer;
+ bottom: 1%;
+ left: 1%;
+ }
+ .bottomChageLayer:hover {
+ border: 1px solid #409eff;
+ }
+ .active {
+ width: 100%;
+ height: 100%;
+ background: url('../../assets/img/Layer/imgLayer2.png') no-repeat center;
+ position: absolute;
+ background-size: 100% 100%;
+ border-radius: 5px;
+ }
+ .menuLayer {
+ width: 100%;
+ height: 100%;
+ background: url('../../assets/img/Layer/imgLayer1.png') no-repeat center;
+ position: absolute;
+ background-size: 100% 100%;
+ border-radius: 5px;
+ }
+ }
}
</style>
diff --git a/src/views/datamanage/dataLoader.vue b/src/views/datamanage/dataLoader.vue
index 249237b..69a293f 100644
--- a/src/views/datamanage/dataLoader.vue
+++ b/src/views/datamanage/dataLoader.vue
@@ -204,33 +204,39 @@
/>
<el-table-column
align="center"
- prop="tab"
:label="$t('dataManage.dataUpObj.tableName')"
fixed
- />
+ >
+ <template slot-scope="scope">
+ <a @click="detail(scope.row)" >{{
+ scope.row.tab
+ }}</a>
+ </template>
+ </el-table-column>
+
<el-table-column
align="center"
prop="rows"
:label="$t('common.lineNuber')"
- fixed
+
/>
<el-table-column
align="center"
prop="desc"
:label="$t('dataManage.dataUpObj.describe')"
- fixed
+
/>
<el-table-column
align="center"
prop="uname"
:label="$t('dataManage.vmobj.createonuser')"
- fixed
+
/>
<el-table-column
align="center"
prop="createTime"
:label="$t('dataManage.vmobj.createontime')"
- fixed
+
:formatter="changetimeFile"
/>
</el-table>
@@ -293,6 +299,46 @@
<el-button class="primary" @click="setInsrtWareTable">纭� 瀹�</el-button>
</span>
</el-dialog>
+
+<el-dialog
+ :title="$t('common.details')"
+ :visible.sync="dialogVisible"
+ width="70%"
+ >
+ <div style="height:600px">
+ <el-table
+ ref="filterTable"
+ :data="dbTableData"
+ height="90%"
+ border
+ style="width: 100%"
+ >
+ <el-table-column width="60" type="index" :label="$t('common.index')" />
+ <el-table-column
+ v-for="(item, index) in attributeData"
+ :key="index"
+ :label="item.alias"
+ :prop="item.field"
+ show-overflow-tooltip
+ align="center"
+ ></el-table-column>
+ </el-table>
+ <div style="margin-top: 10px" class="pagination_box">
+ <el-pagination
+ @size-change="handleLoaderSizeChange"
+ @current-change="handleLoaderCurrentChange"
+ :current-page="listLoader.pageIndex"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="listLoader.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count1"
+ >
+ </el-pagination>
+ </div>
+ </div>
+
+</el-dialog>
+
</div>
</template>
@@ -311,7 +357,9 @@
dataLoader_selectMappers,
dataLoader_SelectTabs,
dataLoader_selectByPageForUpload,
-dataLoader_deleteMetas
+dataLoader_deleteMetas,
+dataLoader_selectFields,
+dataLoader_selectDbData
} from '../../api/api';
export default {
name: 'dataUpdata',
@@ -369,6 +417,15 @@
activeName3: '',
wareTableFlag: null,
multipleDelete:[],
+ dialogVisible:false,
+ attributeData:[],
+ listLoader:{
+ id:null,
+ pageSize:1,
+ pageSize:10,
+ },
+ count1:0,
+ dbTableData:[],
};
},
@@ -406,10 +463,50 @@
},
deep: true,
immediate: true,
+
},
},
methods: {
+ async detail(res){
+ var val = res.tab.split(".");
+ const data = await dataLoader_selectFields({
+ ns:val[0],
+ tab:val[1]
+ })
+ if(data.code != 200){
+ this.$message.error('瀛楁鍒楄〃璋冪敤澶辫触');
+ return
+ }
+ this.dialogVisible = true;
+ this.attributeData =data.result;
+ this.listLoader={
+ id:res.id,
+ pageIndex:1,
+ pageSize:10,
+ }
+ this.getDataLoaderSelectDbData();
+ },
+ async getDataLoaderSelectDbData (){
+ const data1 = await dataLoader_selectDbData(this.listLoader);
+ if(data1.code != 200){
+ this.$message.error('瀛楁鍒楄〃璋冪敤澶辫触');
+ return
+ }
+ this.dbTableData =data1.result;
+ },
+ handleLoaderSizeChange(val){
+ this.listLoader.pageIndex= 1;
+ this.listLoader.pageSize =val;
+ this.getDataLoaderSelectDbData();
+ },
+handleLoaderCurrentChange(val){
+ this.listLoader.pageIndex= val;
+ this.getDataLoaderSelectDbData();
+},
+
+
+
changetimeFile(res){
//shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲
@@ -979,42 +1076,7 @@
background-color: #216fe6;
}
}
- .pagination_box {
- margin-top: 20px;
- /deep/.el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/.el-pagination__total {
- color: white;
- }
- /deep/.el-pagination__jump {
- color: white;
- }
- /deep/.el-pager li.active {
- color: #409eff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- /deep/.btn-next i {
- color: white;
- }
- /deep/.btn-prev i {
- color: white;
- }
- }
+
}
.primary {
background: #409eff;
@@ -1174,5 +1236,41 @@
/deep/ .el-tabs__item {
color: #409eff;
}
+ .pagination_box {
+ margin-top: 20px;
+ /deep/.el-input__inner {
+ background-color: transparent !important;
+ border: 1px solid;
+ color: white;
+ }
+ /deep/.el-pagination__total {
+ color: white;
+ }
+ /deep/.el-pagination__jump {
+ color: white;
+ }
+ /deep/.el-pager li.active {
+ color: #409eff;
+ }
+ /deep/.el-pager li {
+ color: white;
+ background: transparent;
+ }
+ /deep/.el-pager li {
+ color: white;
+ }
+ /deep/.btn-prev {
+ background: transparent;
+ }
+ /deep/.btn-next {
+ background: transparent;
+ }
+ /deep/.btn-next i {
+ color: white;
+ }
+ /deep/.btn-prev i {
+ color: white;
+ }
+ }
}
</style>
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 2ad33c1..2f4d408 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -52,7 +52,7 @@
>{{ $t('common.delete') }}</el-button
>
</el-form-item>
- <!-- <el-form-item v-if="btnStatus.download">
+ <el-form-item v-if="btnStatus.download">
<el-button
@click="downFormData"
icon="el-icon-download"
@@ -60,7 +60,7 @@
size="small"
>{{ $t('common.download') }}</el-button
>
- </el-form-item> -->
+ </el-form-item>
</el-form>
</div>
<div class="bottom">
@@ -308,7 +308,7 @@
</div>
</el-dialog>
<div class="downloadBox" v-if="showCodeBox">
- <h4 style="padding: 20px">璇疯緭鍏ヤ笅杞藉寘瀵嗙爜</h4>
+ <h4 style="padding: 20px">{{$t('common.passworld')}}</h4>
<el-form
:model="codeForm"
:rules="rules"
@@ -316,18 +316,18 @@
label-width="100px"
class="codeForm"
>
- <el-form-item label="瀵嗙爜" prop="password">
+ <el-form-item :label="$t('common.passworld')" prop="password">
<el-input type="password" v-model="codeForm.password"></el-input>
</el-form-item>
- <el-form-item label="纭瀵嗙爜" prop="repassword">
+ <el-form-item :label="$t('common.SPassword')" prop="repassword">
<el-input type="password" v-model="codeForm.repassword"></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" size="small" @click="download('codeForm')"
- >纭畾</el-button
+ <el-button class="primary" size="small" @click="download('codeForm')"
+ >{{$t('common.confirm')}}</el-button
>
<el-button type="info" size="small" @click="closeDown('codeForm')"
- >鍙栨秷</el-button
+ >{{$t('common.cancel')}}</el-button
>
</el-form-item>
</el-form>
@@ -336,6 +336,9 @@
</template>
<script>
+var encrypt = new JSEncrypt();
+import $ from 'jquery'
+import { getToken } from '@/utils/auth';
import {
select_meta_ByPageAndCount,
// queryDataCount,
@@ -345,8 +348,9 @@
selectDictTab,
selectdirTab,
queryDepTree,
-
+ meta_downloadReq,
} from '../../api/api';
+
import MyBread from '../../components/MyBread.vue';
export default {
name: 'metadataManage',
@@ -361,12 +365,23 @@
callback();
}
};
+ var passwordValidator = (rule, value, callback) => {
+ var passwordreg =
+ /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![a-z0-9]+$)(?![a-z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![0-9\W!@#$%^&*`~()\\-_+=,.?;<>]+$)[a-zA-Z0-9\W!@#$%^&*`~()\\-_+=,.?;<>]{12,20}$/;
+ if (!passwordreg.test(value)) {
+ callback(
+ new Error('瀵嗙爜蹇呴』鐢辨暟瀛椼�佸瓧姣嶃�佺壒娈婂瓧绗︾粍鍚�,璇疯緭鍏�13-20浣�')
+ );
+ } else {
+ callback();
+ }
+ };
return {
- defaultProps: {
+ defaultProps: {
children: 'children',
label: 'name',
},
-dirComPanyOption:[],
+ dirComPanyOption: [],
companyOption: [],
activeName: '',
optionCount: [],
@@ -389,7 +404,7 @@
repassword: '',
},
rules: {
- password: [{ required: true, message: '璇疯緭鍏ュ瘑鐮�', trigger: 'blur' }],
+ password: [{ required: true, message: '璇疯緭鍏ュ瘑鐮�', trigger: 'blur' }, { validator: passwordValidator, trigger: 'blur' }],
repassword: [
{ required: true, message: '璇疯緭鍏ョ‘璁ゅ瘑鐮�', trigger: 'blur' },
{ validator: repasswordValidator, trigger: 'blur' },
@@ -412,7 +427,7 @@
pageSize: 10,
pageIndex: 1,
name: null,
- dirid:null,
+ dirid: null,
},
cascader: {
label: 'name',
@@ -504,16 +519,16 @@
if (res.code != 200) {
this.$message.error('鍒楄〃璋冪敤澶辫触');
}
- this.optionCount =this.treeData(res.result);
- this.dirComPanyOption= this.treeData(res.result);
- this.listData.dirid=this.optionCount[0].id;
- this.getMetaData();
+ this.optionCount = this.treeData(res.result);
+ this.dirComPanyOption = this.treeData(res.result);
+ this.listData.dirid = this.optionCount[0].id;
+ this.getMetaData();
},
handleNodeClick(data) {
- this.listData.pageSize=10;
+ this.listData.pageSize = 10;
this.listData.pageIndex = 1;
this.listData.dirid = data.id;
- this.getMetaData();
+ this.getMetaData();
},
getTableDesc(res) {
this.activeName = res.tab;
@@ -689,7 +704,7 @@
this.editForm = {};
done();
})
- .catch((_) => {});
+ .catch((_) => { });
},
// 鎻愪氦淇敼
@@ -728,7 +743,52 @@
this.editForm = JSON.parse(this.initialForm);
});
},
- download() {},
+ async download() {
+ var std = [];
+ for (var i in this.multipleSelection) {
+ std.push(this.multipleSelection[i].id)
+ }
+ var obj = {
+ pwd: encrypt.encrypt("Test!321&456"),
+ ids: std
+ };
+ var token = getToken();
+ $.ajax({
+ url:BASE_URL+"/meta/downloadReq?token="+token,
+ type: 'post',
+ dataType: null,
+ data: JSON.stringify(obj),
+ success: function (res) {
+ debugger
+ },
+ error: function () {
+
+ }
+ })
+
+ //
+ // $.ajax( BASE_URL+"/meta/downloadReq?token="+token, "POST", JSON.stringify(obj), null, null, function (rs) {
+ // console.log(rs);
+ // alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+ // });
+ // const res = await meta_downloadReq(JSON.stringify(obj))
+ // debugger
+ //
+ // $.ajax(BASE_URL + '/meta/downloadReq"?token=' + token, {
+ // type: 'post',
+ // data: JSON.stringify(obj),
+ // async: true,
+ // cache: false,
+ // processData: false,
+ // contentType: false,
+ // success: (rs) => {
+ // debugger
+ // },
+ // error: (e) => {
+ // console.log(e);
+ // },
+ // });
+ },
closeDown() {
this.showCodeBox = false;
this.codeForm.password = '';
@@ -864,12 +924,13 @@
.downloadBox {
position: absolute;
top: 20%;
- left: 50%;
+ left: 40%;
padding: 20px;
-
- width: 20%;
- border: 1px solid #000;
+ background: #303030;
+ width: 30%;
+ border: 1px solid gray;
border-radius: 10px;
+ color: white;
}
/*淇敼table 琛ㄤ綋鐨勮儗鏅鑹插拰鏂囧瓧棰滆壊*/
/deep/ .el-table {
--
Gitblit v1.9.3