From 8e44ce5a0c75861e5fdca999e3dc5b6f61faa585 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期四, 16 二月 2023 09:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW
---
src/views/datamanage/metadataManage.vue | 43
src/assets/img/synthesis/images/3白底_52.png | 0
src/assets/img/synthesis/images/3白底_87.png | 0
src/views/maintenance/systemMonitoring.vue | 44
src/assets/img/synthesis/images/3白底_198.png | 0
src/views/maintenance/blackwhiteList.vue | 82 +
src/assets/img/synthesis/images/3白底_208.png | 0
src/components/navMenu.vue | 3
src/views/userManage/roleManage.vue | 50 +
src/assets/img/synthesis/images/3白底_46.png | 0
src/views/maintenance/logLog.vue | 8
src/assets/img/synthesis/images/3白底_03.png | 0
src/assets/img/synthesis/images/3白底_151.png | 0
src/views/exportMap/index.vue | 342 +++-----
src/store/index.js | 8
src/assets/img/synthesis/images/3白底_201.png | 0
src/assets/img/synthesis/images/3白底_67.png | 0
src/assets/img/synthesis/images/3白底_108-33.png | 0
src/views/datamanage/SpatialData.vue | 457 +++++-----
src/assets/img/synthesis/images/3白底_203.png | 0
src/assets/img/synthesis/images/3白底_135.png | 0
src/assets/img/synthesis/images/3白底_183.png | 0
src/assets/img/synthesis/images/3白底_122.png | 0
src/assets/img/synthesis/images/3白底_228.png | 0
src/assets/img/synthesis/images/3白底_05.png | 0
src/views/maintenance/tokentool.vue | 41
src/components/mapsdk.vue | 231 +++--
src/assets/img/synthesis/images/3白底_49.png | 0
src/assets/img/synthesis/images/3白底_238.png | 0
src/assets/img/synthesis/images/3白底_108.png | 0
src/assets/img/synthesis/images/3白底_125.png | 0
src/views/datamanage/dictionaryManage.vue | 131 ++
src/assets/img/synthesis/images/3白底_168.png | 0
src/assets/img/synthesis/images/3白底_159.png | 0
src/assets/img/synthesis/images/3白底_116.png | 0
src/assets/img/synthesis/images/3白底_55.png | 0
src/views/maintenance/downlog.vue | 8
src/views/maintenance/menuSettings.vue | 32
src/assets/img/synthesis/images/3白底_16.png | 0
src/assets/img/synthesis/images/3白底_133.png | 0
src/assets/img/synthesis/images/3白底_93.png | 0
src/views/userManage/templateManage.vue | 42
src/assets/img/synthesis/images/3白底_236.png | 0
src/assets/img/synthesis/images/3白底_157.png | 0
src/views/maintenance/parameterConfiguration.vue | 11
src/assets/img/synthesis/images/3白底_114.png | 0
src/components/MapView/mapMenuTop.vue | 5
src/assets/img/synthesis/images/3白底_61.png | 0
src/views/datamanage/versionManage.vue | 69 +
src/assets/img/synthesis/images/3白底_206.png | 0
src/views/datamanage/domainManage.vue | 37
src/assets/img/synthesis/images/3白底_31.png | 0
src/assets/img/synthesis/images/3白底_162.png | 0
src/assets/img/synthesis/images/3白底_154.png | 0
src/views/datamanage/projectManage.vue | 16
src/assets/img/synthesis/images/3白底_128.png | 0
src/views/maintenance/userManagement.vue | 82 -
src/assets/css/configure.css | 3
src/assets/img/synthesis/images/3白底_225.png | 0
src/assets/img/synthesis/images/3白底_19.png | 0
src/views/Tools/maplayer.vue | 5
src/assets/img/systemMonitoring/图层 39 - 副本.png | 0
src/views/AuthorizationManagement/menuRoleAuthorization.vue | 52 +
src/assets/img/synthesis/images/3白底_180.png | 0
src/assets/css/config.css | 22
src/assets/img/synthesis/images/3白底_111.png | 0
src/assets/img/synthesis/images/3白底_29.png | 0
src/assets/img/synthesis/images/3白底_217.png | 0
src/assets/img/synthesis/images/3白底_164.png | 0
src/views/AuthorizationManagement/userRoleAuthorization.vue | 2
src/assets/img/synthesis/images/3白底_231.png | 0
src/views/AuthorizationManagement/roleMenuAuthorization.vue | 2
src/assets/img/synthesis/images/3白底_84.png | 0
src/views/Tools/LayerTree.vue | 162 ++-
src/assets/img/synthesis/images/3白底_195.png | 0
src/assets/img/synthesis/images/3白底_166.png | 0
src/assets/img/synthesis/images/3白底_220.png | 0
src/assets/img/synthesis/images/3白底_23.png | 0
src/assets/img/synthesis/images/3白底_10.png | 0
src/assets/img/synthesis/images/3白底_233.png | 0
src/views/datamanage/catalogueManage.vue | 60
src/views/maintenance/operationLog.vue | 8
src/assets/img/synthesis/images/3白底_105.png | 0
src/assets/img/synthesis/images/3白底_96.png | 0
src/assets/img/synthesis/images/3白底_148.png | 0
src/assets/img/synthesis/images/3白底_192.png | 0
src/assets/img/synthesis/images/3白底_90.png | 0
src/components/mapol.vue | 4
src/views/Synthesis/LeftMenu.vue | 6
src/views/userManage/authorityManage.vue | 28
src/views/datamanage/styleManage.vue | 49
src/assets/img/synthesis/images/3白底_58.png | 0
src/views/maintenance/authorityManagement.vue | 2
src/assets/img/synthesis/images/3白底_21.png | 0
src/assets/img/synthesis/images/3白底_222.png | 0
src/assets/img/synthesis/images/3白底_64.png | 0
src/views/userManage/resourceManage.vue | 30
src/assets/img/synthesis/images/3白底_07.png | 0
src/assets/img/synthesis/images/3白底_81.png | 0
src/views/maintenance/eventlogManage.vue | 8
src/components/MapDiv.vue | 15
src/assets/img/systemMonitoring/图层 39.png | 0
src/views/AuthorizationManagement/roleResAuthorization.vue | 2
src/assets/img/synthesis/images/3白底_130.png | 0
src/components/ProjectOl.vue | 4
src/views/datamanage/dataUpdata.vue | 145 ++-
src/assets/img/compass.png | 0
src/assets/img/synthesis/images/3白底_186.png | 0
src/assets/img/synthesis/images/3白底_69.png | 0
src/assets/img/synthesis/images/3白底_13.png | 0
src/assets/img/synthesis/images/3白底_26.png | 0
src/views/userManage/orgManage.vue | 58
112 files changed, 1,377 insertions(+), 1,032 deletions(-)
diff --git a/src/assets/css/config.css b/src/assets/css/config.css
index dc45b29..b46b764 100644
--- a/src/assets/css/config.css
+++ b/src/assets/css/config.css
@@ -7,6 +7,10 @@
background: rgba(48, 48, 48, 0.85);
}
+.Black_theme .box_divm {
+ background: rgba(48, 48, 48, 0.85) !important;
+}
+
.Black_theme .box_div {
background: #303030;
}
@@ -271,9 +275,10 @@
color: #FFF;
}
-.Black_theme .el-icon-arrow-down{
+.Black_theme .el-icon-arrow-down {
color: #FFF;
}
+
.Black_theme .twoMenu_imge11 {
background: url("../../assets/img/synthesis/鍥惧眰 32.png") no-repeat center;
}
@@ -487,12 +492,15 @@
.Black_theme .twoMenu_imge88 {
background: url("../../assets/img/synthesis/鍥惧眰 32.png") no-repeat center;
}
-.Black_theme .menuPop .leftBox li{
- color: #FFF ;
-}
-.Black_theme .popupBox .popupContainer{
+
+.Black_theme .menuPop .leftBox li {
color: #FFF;
}
-.Black_theme .popupBox .popupContainer{
- color: #FFF !important;
+
+.Black_theme .popupBox .popupContainer {
+ color: #FFF;
+}
+
+.Black_theme .popupBox .popupContainer {
+ color: #FFF !important;
}
\ No newline at end of file
diff --git a/src/assets/css/configure.css b/src/assets/css/configure.css
index 7b22c59..af5c77c 100644
--- a/src/assets/css/configure.css
+++ b/src/assets/css/configure.css
@@ -28,6 +28,9 @@
background: #F4F8FF;
}
+.box_divm {
+ background-color: rgba(244, 248, 255, 0.85) !important;
+}
.subpage_Div {
border: 1px solid #dcdfe6;
}
diff --git a/src/assets/img/compass.png b/src/assets/img/compass.png
new file mode 100644
index 0000000..e9d43e3
--- /dev/null
+++ b/src/assets/img/compass.png
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_03.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_03.png"
new file mode 100644
index 0000000..500b845
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_03.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_05.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_05.png"
new file mode 100644
index 0000000..be27a9f
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_05.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_07.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_07.png"
new file mode 100644
index 0000000..7ce0422
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_07.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_10.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_10.png"
new file mode 100644
index 0000000..717732b
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_10.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_105.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_105.png"
new file mode 100644
index 0000000..cf12c14
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_105.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_108-33.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_108-33.png"
new file mode 100644
index 0000000..9100fc4
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_108-33.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_108.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_108.png"
new file mode 100644
index 0000000..edc0c1b
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_108.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_111.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_111.png"
new file mode 100644
index 0000000..a49e04b
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_111.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_114.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_114.png"
new file mode 100644
index 0000000..2309cdb
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_114.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_116.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_116.png"
new file mode 100644
index 0000000..cbb66ef
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_116.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_122.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_122.png"
new file mode 100644
index 0000000..55ff73d
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_122.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_125.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_125.png"
new file mode 100644
index 0000000..9418f5f
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_125.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_128.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_128.png"
new file mode 100644
index 0000000..94d6267
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_128.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_13.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_13.png"
new file mode 100644
index 0000000..bdbe4bc
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_13.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_130.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_130.png"
new file mode 100644
index 0000000..8f55499
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_130.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_133.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_133.png"
new file mode 100644
index 0000000..d9b2d3a
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_133.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_135.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_135.png"
new file mode 100644
index 0000000..310989a
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_135.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_148.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_148.png"
new file mode 100644
index 0000000..f1c5cca
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_148.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_151.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_151.png"
new file mode 100644
index 0000000..4f05590
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_151.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_154.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_154.png"
new file mode 100644
index 0000000..18ad8cb
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_154.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_157.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_157.png"
new file mode 100644
index 0000000..4fdc1f9
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_157.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_159.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_159.png"
new file mode 100644
index 0000000..52e250a
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_159.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_16.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_16.png"
new file mode 100644
index 0000000..03cdd28
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_16.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_162.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_162.png"
new file mode 100644
index 0000000..6559520
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_162.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_164.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_164.png"
new file mode 100644
index 0000000..e513aef
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_164.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_166.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_166.png"
new file mode 100644
index 0000000..77ed6b8
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_166.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_168.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_168.png"
new file mode 100644
index 0000000..3fb0483
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_168.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_180.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_180.png"
new file mode 100644
index 0000000..ab39122
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_180.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_183.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_183.png"
new file mode 100644
index 0000000..8ab203e
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_183.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_186.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_186.png"
new file mode 100644
index 0000000..2c286f8
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_186.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_19.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_19.png"
new file mode 100644
index 0000000..6109287
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_19.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_192.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_192.png"
new file mode 100644
index 0000000..4f695e2
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_192.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_195.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_195.png"
new file mode 100644
index 0000000..b692679
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_195.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_198.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_198.png"
new file mode 100644
index 0000000..10be19e
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_198.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_201.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_201.png"
new file mode 100644
index 0000000..f2ee803
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_201.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_203.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_203.png"
new file mode 100644
index 0000000..9023e9d
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_203.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_206.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_206.png"
new file mode 100644
index 0000000..5ed63c2
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_206.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_208.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_208.png"
new file mode 100644
index 0000000..d6bf445
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_208.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_21.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_21.png"
new file mode 100644
index 0000000..3ff8882
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_21.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_217.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_217.png"
new file mode 100644
index 0000000..0203ff1
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_217.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_220.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_220.png"
new file mode 100644
index 0000000..bde8100
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_220.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_222.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_222.png"
new file mode 100644
index 0000000..d2d3c22
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_222.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_225.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_225.png"
new file mode 100644
index 0000000..fcad4f1
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_225.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_228.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_228.png"
new file mode 100644
index 0000000..8ad4e79
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_228.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_23.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_23.png"
new file mode 100644
index 0000000..fd1b338
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_23.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_231.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_231.png"
new file mode 100644
index 0000000..7a66ef9
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_231.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_233.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_233.png"
new file mode 100644
index 0000000..df3e3c0
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_233.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_236.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_236.png"
new file mode 100644
index 0000000..8abd927
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_236.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_238.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_238.png"
new file mode 100644
index 0000000..3d9741d
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_238.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_26.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_26.png"
new file mode 100644
index 0000000..fb2122a
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_26.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_29.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_29.png"
new file mode 100644
index 0000000..80a8af0
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_29.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_31.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_31.png"
new file mode 100644
index 0000000..49f1231
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_31.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_46.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_46.png"
new file mode 100644
index 0000000..b271b7a
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_46.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_49.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_49.png"
new file mode 100644
index 0000000..d2b9983
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_49.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_52.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_52.png"
new file mode 100644
index 0000000..4e97c4c
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_52.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_55.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_55.png"
new file mode 100644
index 0000000..670d904
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_55.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_58.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_58.png"
new file mode 100644
index 0000000..40f779a
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_58.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_61.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_61.png"
new file mode 100644
index 0000000..d5eada0
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_61.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_64.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_64.png"
new file mode 100644
index 0000000..ea79208
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_64.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_67.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_67.png"
new file mode 100644
index 0000000..59d35b0
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_67.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_69.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_69.png"
new file mode 100644
index 0000000..0c28b4e
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_69.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_81.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_81.png"
new file mode 100644
index 0000000..94dcb59
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_81.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_84.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_84.png"
new file mode 100644
index 0000000..5488fec
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_84.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_87.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_87.png"
new file mode 100644
index 0000000..217fc26
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_87.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_90.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_90.png"
new file mode 100644
index 0000000..725182a
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_90.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_93.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_93.png"
new file mode 100644
index 0000000..e890d18
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_93.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/images/3\347\231\275\345\272\225_96.png" "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_96.png"
new file mode 100644
index 0000000..39655ab
--- /dev/null
+++ "b/src/assets/img/synthesis/images/3\347\231\275\345\272\225_96.png"
Binary files differ
diff --git "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39 - \345\211\257\346\234\254.png" "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39 - \345\211\257\346\234\254.png"
new file mode 100644
index 0000000..26ecbd1
--- /dev/null
+++ "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39 - \345\211\257\346\234\254.png"
Binary files differ
diff --git "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39.png" "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39.png"
index 26ecbd1..154a847 100644
--- "a/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39.png"
+++ "b/src/assets/img/systemMonitoring/\345\233\276\345\261\202 39.png"
Binary files differ
diff --git a/src/components/MapDiv.vue b/src/components/MapDiv.vue
index 8c76f52..f57f2e6 100644
--- a/src/components/MapDiv.vue
+++ b/src/components/MapDiv.vue
@@ -10,7 +10,10 @@
>
<mapsdk></mapsdk>
</div>
- <div id="ds" v-show="isShowDs"></div>
+ <div
+ id="ds"
+ v-show="isShowDs"
+ ></div>
<!--openLayers鏄剧ず鐣岄潰-->
<div
v-show="isOlMapFlag"
@@ -102,7 +105,9 @@
});
let mapZoomAndMove = function (event) {
var position = window.map.getView().getCenter();
- var pos = transform(position, 'EPSG:3857', 'EPSG:4326');
+
+ // var pos = transform(position, 'EPSG:3857', 'EPSG:4326');
+ var pos = position;
var level = that.getHeight(parseInt(window.map.getView().getZoom()));
window.Viewer.camera.setView({
destination: Cesium.Cartesian3.fromDegrees(pos[0], pos[1], level),
@@ -166,9 +171,13 @@
var lat = Cesium.Math.toDegrees(cartographic.latitude);
var lng = Cesium.Math.toDegrees(cartographic.longitude);
var level = this.getLevel(cartographic.height);
+ var value
+ // window.map
+ // .getView()
+ // .setCenter(transform([lng, lat], 'EPSG:4326', 'EPSG:3857'));
window.map
.getView()
- .setCenter(transform([lng, lat], 'EPSG:4326', 'EPSG:3857'));
+ .setCenter([lng, lat]);
window.map.getView().setZoom(level);
},
getLevel(height) {
diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index 5ba0202..a3832ca 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -364,10 +364,11 @@
setTurfCircle(position, radius) {
var options = {
steps: 10,
- units: 'miles',
+ units: 'meters',
properties: { foo: 'bar' },
};
var circle = turf.circle(position, radius, options);
+ debugger
this.setJonToWKT(circle);
},
setTurfPolyOrLine(res, type) {
@@ -379,7 +380,7 @@
}
if (type == 'polyline') {
var line = turf.lineString(std, { name: 'polyline' });
- restVal = turf.buffer(line, 10, { units: 'miles' });
+ restVal = turf.buffer(line, 10, { units: 'meters' });
} else if (type == 'rectangle') {
var ste = this.setCartesianToEightFour(res[0]);
std.push([ste.lng, ste.lat]);
diff --git a/src/components/ProjectOl.vue b/src/components/ProjectOl.vue
index 4261106..fe09cc0 100644
--- a/src/components/ProjectOl.vue
+++ b/src/components/ProjectOl.vue
@@ -1,6 +1,6 @@
<template>
<div id="mapView" class="projectBox">
- <div class="Tools">
+ <div class="Tools box_divm">
<el-button
type="success"
icon="el-icon-plus"
@@ -137,7 +137,7 @@
}
.Tools {
position: absolute;
- background: #303030;
+
opacity: 0.9;
z-index: 40;
padding: 10px;
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index 1a78887..a23bc3d 100644
--- a/src/components/mapol.vue
+++ b/src/components/mapol.vue
@@ -79,9 +79,9 @@
target: "mapol",
layers: [imageLayer, vectorLayer],
view: new View({
- center: transform([105.02, 34.9], "EPSG:4326", "EPSG:3857"),
+ center: [105.02, 34.9] ,
zoom: 4,
- projection: "EPSG:3857",
+ projection: "EPSG:4326",
}),
controls: defaultControls().extend([
new FullScreen(),
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 4646ed1..cf8375c 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -1,44 +1,85 @@
<template>
<div class="mapBox">
<div id="mapdiv">
- <div class="menu_Top" v-if="$store.state.mapMenuBoolean">
+ <div
+ class="menu_Top box_divm"
+ v-if="$store.state.mapMenuBoolean"
+ >
<map-menu-top v-if="$store.state.mapMenuBoxFlag == '1'" />
<map-space-top v-if="$store.state.mapMenuBoxFlag == '2'" />
</div>
- <div class="bufferBox" v-if="showBufferBoxDialog">
- <el-card class="box-card">
- <div slot="header" class="clearfix">
+ <div
+ class="bufferBox"
+ v-if="showBufferBoxDialog"
+ >
+ <el-card class="box-card box_divm">
+ <div
+ slot="header"
+ class="clearfix"
+ >
<span>缂撳啿鍖哄垎鏋�</span>
<div style="float: right; cursor: pointer">
- <i class="el-icon-close" @click="closeBufferBox(1)"></i>
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(1)"
+ ></i>
</div>
</div>
<div class="box-body">
- <el-form ref="form" :model="bufFrom" label-width="100px">
+ <el-form
+ ref="form"
+ :model="bufFrom"
+ label-width="100px"
+ >
<el-form-item label="缂撳啿鍗婂緞(绫�):">
<el-input v-model="bufFrom.val"></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="addBuffer(1)" type="info">鐐�</el-button>
- <el-button @click="addBuffer(2)" type="info">绾�</el-button>
- <el-button @click="addBuffer(3)" type="info">闈�</el-button>
- <el-button @click="clearBuffer" type="info">娓呴櫎</el-button>
+ <el-button
+ @click="addBuffer(1)"
+ type="info"
+ >鐐�</el-button>
+ <el-button
+ @click="addBuffer(2)"
+ type="info"
+ >绾�</el-button>
+ <el-button
+ @click="addBuffer(3)"
+ type="info"
+ >闈�</el-button>
+ <el-button
+ @click="clearBuffer"
+ type="info"
+ >娓呴櫎</el-button>
</el-form-item>
</el-form>
</div>
</el-card>
</div>
- <div class="coordLocalBox" v-if="showCoordLocalBoxDialog">
+ <div
+ class="coordLocalBox"
+ v-if="showCoordLocalBoxDialog"
+ >
<el-card class="box-card">
- <div slot="header" class="clearfix">
+ <div
+ slot="header"
+
+ >
<span>鍧愭爣瀹氫綅</span>
<div style="float: right; cursor: pointer">
- <i class="el-icon-close" @click="closeBufferBox(2)"></i>
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(2)"
+ ></i>
</div>
</div>
<div class="box-body">
- <el-form ref="form" :model="coordFrom" label-width="50px">
+ <el-form
+ ref="form"
+ :model="coordFrom"
+ label-width="50px"
+ >
<el-form-item label="缁忓害:">
<el-input v-model="coordFrom.lon"></el-input>
</el-form-item>
@@ -49,22 +90,38 @@
<el-input v-model="coordFrom.height"></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="setCoordLocal" type="info">瀹氫綅</el-button>
+ <el-button
+ @click="setCoordLocal"
+ type="info"
+ >瀹氫綅</el-button>
</el-form-item>
</el-form>
</div>
</el-card>
</div>
- <div class="toponymicLocalBox" v-if="showToponymicLocalBoxDialog">
+ <div
+ class="toponymicLocalBox"
+ v-if="showToponymicLocalBoxDialog"
+ >
<el-card class="box-card">
- <div slot="header" class="clearfix">
+ <div
+ slot="header"
+ class="clearfix"
+ >
<span>鍦板悕瀹氫綅</span>
<div style="float: right; cursor: pointer">
- <i class="el-icon-close" @click="closeBufferBox(3)"></i>
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(3)"
+ ></i>
</div>
</div>
<div class="box-body">
- <el-form :model="comprehensive" :inline="true" label-width="50px">
+ <el-form
+ :model="comprehensive"
+ :inline="true"
+ label-width="50px"
+ >
<el-form-item label="鍦板悕:">
<el-input
style="width: 200px"
@@ -72,17 +129,28 @@
></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="setQueryTable" type="info">鏌ヨ</el-button>
+ <el-button
+ @click="setQueryTable"
+ type="info"
+ >鏌ヨ</el-button>
</el-form-item>
</el-form>
- <el-table :data="tableData" height="200px" style="width: 100%">
+ <el-table
+ :data="tableData"
+ height="200px"
+ style="width: 100%"
+ >
<el-table-column
align="center"
type="index"
label="搴忓彿"
width="70px"
/>
- <el-table-column prop="name" align="center" label="瀹氫綅">
+ <el-table-column
+ prop="name"
+ align="center"
+ label="瀹氫綅"
+ >
<template slot-scope="scope">
<el-button
@click="handleLocation(scope.$index, scope.row)"
@@ -91,10 +159,17 @@
></el-button>
</template>
</el-table-column>
- <el-table-column prop="name" align="center" label="鍦板悕">
+ <el-table-column
+ prop="name"
+ align="center"
+ label="鍦板悕"
+ >
</el-table-column>
</el-table>
- <div style="margin-top: 10px" class="pagination_box">
+ <div
+ style="margin-top: 10px"
+ class="pagination_box"
+ >
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -109,12 +184,21 @@
</div>
</el-card>
</div>
- <div class="pathAnalysisBox" v-if="showPathAnalysisBoxDialog">
+ <div
+ class="pathAnalysisBox"
+ v-if="showPathAnalysisBoxDialog"
+ >
<el-card class="box-card">
- <div slot="header" class="clearfix">
+ <div
+ slot="header"
+ class="clearfix"
+ >
<span>璺緞鍒嗘瀽</span>
<div style="float: right; cursor: pointer">
- <i class="el-icon-close" @click="closeBufferBox(4)"></i>
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(4)"
+ ></i>
</div>
</div>
<div class="box-body">
@@ -124,7 +208,10 @@
:rules="rules"
label-width="55px"
>
- <el-form-item label="璧风偣:" prop="lon">
+ <el-form-item
+ label="璧风偣:"
+ prop="lon"
+ >
<el-input
style="width: 250px"
v-model="pathFrom.lon"
@@ -134,10 +221,15 @@
:underline="false"
@click="showMouseLeftClick(1)"
style="margin-left: 10px"
- ><i style="color: white" class="el-icon-plus"></i
- ></el-link>
+ ><i
+ style="color: white"
+ class="el-icon-plus"
+ ></i></el-link>
</el-form-item>
- <el-form-item label="缁堢偣:" prop="lat">
+ <el-form-item
+ label="缁堢偣:"
+ prop="lat"
+ >
<el-input
style="width: 250px"
v-model="pathFrom.lat"
@@ -147,13 +239,16 @@
:underline="false"
@click="showMouseLeftClick(2)"
style="margin-left: 10px"
- ><i style="color: white" class="el-icon-plus"></i
- ></el-link>
+ ><i
+ style="color: white"
+ class="el-icon-plus"
+ ></i></el-link>
</el-form-item>
<el-form-item>
- <el-button @click="showMouseLeftClick(3)" type="info"
- >鏌ヨ</el-button
- >
+ <el-button
+ @click="showMouseLeftClick(3)"
+ type="info"
+ >鏌ヨ</el-button>
</el-form-item>
</el-form>
</div>
@@ -302,7 +397,7 @@
// 100000
// ),
// })
- Viewer.camera.flyTo({
+ Viewer.camera.flyTo({
destination: Cesium.Cartesian3.fromDegrees(110, 33, 8000000),
});
@@ -570,9 +665,7 @@
return false
}
})
- if (this.linePath != null) {
- this.clearPathAll(3)
- }
+ this.clearPathAll(3)
var start = this.pathFrom.lon.split(",")
var end = this.pathFrom.lat.split(",")
var startData = {
@@ -581,7 +674,7 @@
x2: parseFloat(end[0]),
y2: parseFloat(end[1]),
}
-
+
const data = await comprehensive_selectRoute(startData)
if (data.code != 200) {
return this.$message.error("鏁版嵁璇锋眰澶辫触")
@@ -803,63 +896,15 @@
right: 1%;
bottom: 1%;
}
- .box-body {
- padding: 18px;
- /deep/ .el-form-item__label {
- color: white !important;
- }
- /deep/ .el-input__inner {
- background: rgba(255, 255, 255, 0.2) !important;
- color: white !important;
- }
-
- /deep/.el-table,
- .el-table__expanded-cell {
- background-color: transparent;
- color: white;
- }
-
- /deep/ .el-table tr {
- background-color: transparent !important;
- }
- /deep/ .el-table tbody tr:hover > td {
- background-color: rgba(255, 255, 255, 0.2) !important;
- }
- /deep/.el-table鈥揺nable-row-transition .el-table__body td,
- .el-table .cell {
- background-color: transparent !important;
- }
- /deep/ .el-table th.el-table__cell {
- background-color: transparent !important;
- color: white;
- }
- /deep/.el-pager li {
- background-color: transparent !important;
- color: white;
- }
- /deep/ .btn-prev {
- background-color: transparent !important;
- }
- /deep/ .btn-next {
- background-color: transparent !important;
- color: white !important;
- }
- /deep/ .el-pagination__total {
- color: white;
- }
- /deep/ .el-pagination__jump {
- color: white;
- }
- }
-
+
.box-card {
- background: #303030;
+
opacity: 0.85;
border: 1px solid rgba(32, 160, 255, 0.6);
- color: white;
+
}
.menu_Top {
- background: #303030;
+
opacity: 0.85;
width: 100%;
padding: 1%;
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 6b07d55..74fc41e 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -187,6 +187,9 @@
this.$router.push('/');
},
getTimeCookies() {
+ if(!localStorage.getItem('LFToken')){
+ return false
+ }
var time1 = new Date(JSON.parse(localStorage.getItem('LFToken')).time);
var time2 = new Date();
if (time2 > time1) {
diff --git a/src/store/index.js b/src/store/index.js
index 16e42f3..81a8183 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -52,9 +52,11 @@
pipelineEntity: [],
reporturl: null,
layerMnage: false,
- themeflag:false,
+ themeflag: false,
language: true,
- isNaviget:false,
+ isNaviget: false,
+ treeData: null,
+ checkedKeys: [],
},
mutations: {
//鑾峰彇鏉冮檺鍚堥泦
@@ -168,7 +170,7 @@
});
});
},
- setCookies(res) {
+ setCookies(res) {
var value = localStorage.getItem('LFToken');
if (value != null) {
this.rmCookies();
diff --git a/src/views/AuthorizationManagement/menuRoleAuthorization.vue b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
index b425c48..6f66b42 100644
--- a/src/views/AuthorizationManagement/menuRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
@@ -1,15 +1,41 @@
<template>
<div class="menuSettings_box">
- <My-bread
+ <!-- <My-bread
:list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.MenuRoleAuthorization')}`,
]"
></My-bread>
- <el-divider />
+ <el-divider /> -->
+ <div class="menuSettings_tree subpage_Div">
+ <My-bread :list="[
+ `${$t('operatManage.operatManage')}`,
+ `${$t('operatManage.UserRoleAuthorization')}`,
+ ]"></My-bread>
+
+ <el-divider />
+ <div class="menuTreeBox">
+
+ <div class="card_tree">
+ <el-tree
+ :data="depList"
+ :props="defaultProps"
+ :show-checkbox="false"
+ :check-on-click-node="true"
+ :check-strictly="true"
+ node-key="id"
+ @check="treeCheck"
+ :default-expanded-keys="[1]"
+ ref="treeForm"
+ >
+ </el-tree>
+ </div>
+
+ </div>
+ </div>
<div class="menuTreeBox ">
- <div class="left_tree subpage_Div">
+ <!-- <div class="left_tree subpage_Div">
<el-tree
:data="depList"
:props="defaultProps"
@@ -22,7 +48,7 @@
:default-expanded-keys="[1]"
>
</el-tree>
- </div>
+ </div> -->
<div class="right_menu subpage_Div">
<div
style="
@@ -45,7 +71,7 @@
<div class="btn" style="margin-left: auto">
<el-button
v-if="menuStatus.insert"
- type="primary"
+ type="success"
icon="el-icon-circle-plus-outline"
size="small"
:disabled="roleid == null ? true : false"
@@ -90,7 +116,6 @@
</el-table>
<div
- style="margin-top: 20px; text-align: center"
class="pagination_box"
>
<el-pagination
@@ -454,9 +479,13 @@
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.menuSettings_box {
- height: 98%;
+ height: 96%;
width: 98%;
padding: 1%;
+ border-radius: 10px;
+
+ display: flex;
+ justify-content: space-between;
.menuTreeBox {
width: 100%;
@@ -469,11 +498,13 @@
border-radius: 5px;
float: left;
overflow-y: auto;
+ border-radius: 10px;
}
.right_menu {
- width: 67%;
- height: 92%;
+ border-radius: 10px;
+ width: 97%;
+ height: 100%;
padding: 10px;
border-radius: 5px;
@@ -487,5 +518,8 @@
margin-top: 8px;
}
}
+.subpage_Div{
+ border-radius: 10px;
+}
</style>
\ No newline at end of file
diff --git a/src/views/AuthorizationManagement/roleMenuAuthorization.vue b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
index 2aa12d7..70cb1bf 100644
--- a/src/views/AuthorizationManagement/roleMenuAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
@@ -124,7 +124,7 @@
>
<el-button
v-if="menuStatus.insert"
- type="primary"
+ type="success"
icon="el-icon-circle-plus-outline"
size="small"
@click="adduser"
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index 700ecb7..787ecae 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -101,7 +101,7 @@
>
<el-button
v-if="menuStatus.insert"
- type="primary"
+ type="success"
icon="el-icon-circle-plus-outline"
size="small"
:disabled="roleid == null ? true : false"
diff --git a/src/views/AuthorizationManagement/userRoleAuthorization.vue b/src/views/AuthorizationManagement/userRoleAuthorization.vue
index 8a60bd4..6df114f 100644
--- a/src/views/AuthorizationManagement/userRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/userRoleAuthorization.vue
@@ -107,7 +107,7 @@
>
<el-button
v-if="menuStatus.insert"
- type="primary"
+ type="success"
icon="el-icon-circle-plus-outline"
size="small"
:disabled="roleid == null ? true : false"
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 7bf1a0a..a41aa50 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -377,7 +377,7 @@
isContrastFlag: false,
UndergroundMode: false,
scaleLine: null,
- Excavation:false,
+ Excavation: false,
};
},
methods: {
@@ -923,7 +923,7 @@
}
break
case "d13":
- if (this.Excavation ) {
+ if (this.Excavation) {
this.Excavation.destroy()
this.Excavation = null
} else {
@@ -1182,6 +1182,8 @@
this.$store.state.showAllLayers = true;
this.$store.state.layerMnage = false;
+ this.$store.state.treeData = null;
+ this.$store.state.checkedKeys = [];
this.setCoverage('a1');
},
};
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index 03592cc..6696753 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -15,7 +15,8 @@
@node-contextmenu="rightClick"
@check-change="handleCheckChange"
:default-checked-keys="handleTreeCheck"
- ref="tree" >
+ ref="tree"
+ >
<span
class="slot-t-node"
slot-scope="{ node, data }"
@@ -38,7 +39,7 @@
></el-input>
</span>
</span>
-
+
</el-tree>
<el-card
@@ -143,6 +144,14 @@
import { image_layer } from '../../assets/js/index.js';
import ImageWMS from 'ol/source/ImageWMS';
import Image from 'ol/layer/Image';
+import GeoJSON from 'ol/format/GeoJSON.js';
+import Map from 'ol/Map.js';
+
+import { Vector as VectorSource } from "ol/source";
+import { Vector as VectorLayer, } from "ol/layer";
+
+import View from 'ol/View.js';
+import { Fill, Stroke, Style } from 'ol/style.js';
import { perms_selectLayers } from '../../api/api.js'
export default {
name: 'tree',
@@ -297,6 +306,30 @@
deleteNode() {
this.foo();
+ var label = this.currentNode.data.label;
+ if (this.currentNode.data.layerType == 'WMS') {
+ for (var i in window.Viewer.imageryLayers_layers) {
+ if (window.Viewer.imageryLayers_layers[i].name === label) {
+ window.Viewer.imageryLayers.remove(window.Viewer.imageryLayers_layers[i])
+ }
+ }
+
+ } else if (this.currentNode.data.layerType == 'WFS') {
+ for (var i in window.Viewer.dataSources._dataSources) {
+ if (window.Viewer.dataSources._dataSources[i].name == label) {
+ window.Viewer.dataSources.remove(window.Viewer.dataSources._dataSources[i]);
+ std.push(data.label)
+ }
+ }
+ }
+ var layers_ol = window.map.getAllLayers();
+ for (var i in layers_ol) {
+ var layerOl = layers_ol[i];
+ if (layerOl.values_.name == label) {
+ window.map.removeLayer(layerOl); //鏄剧ず鍥惧眰
+ }
+ }
+
this.$refs.tree.remove(this.currentNode);
},
@@ -317,40 +350,41 @@
menuMoveF(type) {
- // 灏嗗彉鍔ㄤ箣鍓嶇殑node澶囦唤
- var node= this.currentNode;
- var data = this.currentData;
- let copyNode = this.currentNode
- // copyNode.previousSibling = {...node. }
- // copyNode.nextSibling = {...node.nextSibling}
- // window.sessionStorage.setItem('menuNode',CircularJSON.stringify(copyNode))
- let nodeData = {}
- if (type==='up') {
- // 涓婄Щ
- if (node.previousSibling) {
- // 鍒犻櫎鍘熷厛鐨刵ode
- this.$refs.tree.remove(node.data)
- // 鎷垮埌copy鐨刵ode
- // nodeData = CircularJSON.parse(window.sessionStorage.getItem('menuNode'))
- // // 澶嶅埗璇ode鍒版寚瀹氫綅缃�(鍙傛暟锛�1. 瑕佸鍔犵殑鑺傜偣鐨� data 2. 瑕佸鍔犵殑鑺傜偣鐨勫悗涓�涓妭鐐圭殑 data銆乲ey 鎴栬�� node)
- // this.$refs.tree.insertBefore(nodeData.data,nodeData.previousSibling.data)
- window.sessionStorage.removeItem('menuNode')
- } else {
- this.$message.warning('璇ヨ彍鍗曞凡缁忔槸褰撳墠灞傛渶涓婄骇')
- }
+ // 灏嗗彉鍔ㄤ箣鍓嶇殑node澶囦唤
+ var node = this.currentNode;
+ var data = this.currentData;
+ let copyNode = this.currentNode
+
+ // copyNode.previousSibling = {...node. }
+ // copyNode.nextSibling = {...node.nextSibling}
+ // window.sessionStorage.setItem('menuNode',CircularJSON.stringify(copyNode))
+ let nodeData = {}
+ if (type === 'up') {
+ // 涓婄Щ
+ if (node.previousSibling) {
+ // 鍒犻櫎鍘熷厛鐨刵ode
+ this.$refs.tree.remove(node.data)
+ // 鎷垮埌copy鐨刵ode
+ // nodeData = CircularJSON.parse(window.sessionStorage.getItem('menuNode'))
+ // // 澶嶅埗璇ode鍒版寚瀹氫綅缃�(鍙傛暟锛�1. 瑕佸鍔犵殑鑺傜偣鐨� data 2. 瑕佸鍔犵殑鑺傜偣鐨勫悗涓�涓妭鐐圭殑 data銆乲ey 鎴栬�� node)
+ // this.$refs.tree.insertBefore(nodeData.data,nodeData.previousSibling.data)
+ window.sessionStorage.removeItem('menuNode')
} else {
- // 涓嬬Щ
- if (node.nextSibling) {
- this.$refs.tree.remove(node.data)
- nodeData = CircularJSON.parse(window.sessionStorage.getItem('menuNode'))
- // 鍙傛暟锛�1. 瑕佸鍔犵殑鑺傜偣鐨� data 2. 瑕佸鍔犵殑鑺傜偣鐨勫墠涓�涓妭鐐圭殑 data銆乲ey 鎴栬�� node
- this.$refs.tree.insertAfter(nodeData.data,nodeData.nextSibling.data)
- window.sessionStorage.removeItem('menuNode')
- } else {
- this.$message.warning('璇ヨ彍鍗曞凡缁忔槸褰撳墠灞傛渶涓嬬骇')
- }
+ this.$message.warning('璇ヨ彍鍗曞凡缁忔槸褰撳墠灞傛渶涓婄骇')
}
- },
+ } else {
+ // 涓嬬Щ
+ if (node.nextSibling) {
+ this.$refs.tree.remove(node.data)
+ nodeData = CircularJSON.parse(window.sessionStorage.getItem('menuNode'))
+ // 鍙傛暟锛�1. 瑕佸鍔犵殑鑺傜偣鐨� data 2. 瑕佸鍔犵殑鑺傜偣鐨勫墠涓�涓妭鐐圭殑 data銆乲ey 鎴栬�� node
+ this.$refs.tree.insertAfter(nodeData.data, nodeData.nextSibling.data)
+ window.sessionStorage.removeItem('menuNode')
+ } else {
+ this.$message.warning('璇ヨ彍鍗曞凡缁忔槸褰撳墠灞傛渶涓嬬骇')
+ }
+ }
+ },
handleDragStart(node, ev) {
@@ -410,15 +444,23 @@
if (std.length == 0 && checked == true) {
this.setAddLayers(data)
}
-
+ var layers_ol = window.map.getAllLayers();
+ for (var i in layers_ol) {
+ var layerOl = layers_ol[i];
+ if (layerOl.values_.name == data.label) {
+ layerOl.setVisible(checked); //鏄剧ず鍥惧眰
+ }
+ }
},
setAddLayers(res) {
if (res.layerType == 'WMS') {
+
var url = geoServerURl;
if (res.url != null && res.url != undefined) {
url = res.url
}
+ var imageryLayers = window.Viewer.scene.imageryLayers;
let layerWMS = new Cesium.WebMapServiceImageryProvider({
url: url,
layers: res.resource,
@@ -428,7 +470,29 @@
},
});
layerWMS.name = res.label;
- window.Viewer.imageryLayers.addImageryProvider(layerWMS);
+ //閫忔槑搴�
+ var tdtAnnoLayer = imageryLayers.addImageryProvider(layerWMS);
+ if (res.opacity) {
+ tdtAnnoLayer.alpha = parseInt(res.opacity) / 100;
+ }
+ var layer2 = new Image({
+ name: res.label,
+ source: new ImageWMS({
+ crossOrigin: 'anonymous',
+ url: url,
+
+ params: {
+ FORMAT: 'image/png',
+ VERSION: '1.1.1',
+ LAYERS: res.resource,
+ },
+ }),
+ });
+ if (res.opacity) {
+ layer2.setOpacity(parseInt(res.opacity) / 100);
+ }
+ window.map.addLayer(layer2);
+
} else if (res.layerType == 'WFS') {
var url = res.url + "?service=WFS&version=1.0.0&request=GetFeature&typeName=" + res.resource + "&outputFormat=application%2Fjson"
@@ -439,7 +503,8 @@
success: function (data) {
var datasource = Cesium.GeoJsonDataSource.load(data, {
stroke: Cesium.Color.YELLOW,
- fill: Cesium.Color.YELLOW.withAlpha(0.5),
+ fill: Cesium.Color.YELLOW.withAlpha(0.1),
+ alpha: 0.1,
strokeWidth: 8,
clampToGround: true //鏄惁璐村湴
});
@@ -453,10 +518,17 @@
console.log("error");
}
});
+
+ var vectorLayer = new VectorLayer({
+ name: res.label,
+ source: new VectorSource({
+ url: url,
+ format: new GeoJSON(),
+ }),
+
+ });
+ window.map.addLayer(vectorLayer);
}
-
-
-
},
async layersStart() {
const data = await perms_selectLayers();
@@ -581,17 +653,21 @@
watch: {
filterText(val) {
this.$refs.tree.filter(val);
+
},
},
mounted() {
-
+ this.$bus.$on("treeDataCopy", (res) => {
+ this.$store.state.treeData = this.treeData;
+ this.$store.state.checkedKeys = this.$refs.tree.getCheckedKeys()
+ });
if (this.$store.state.showAllLayers == true) {
this.layersStart();
this.$store.state.showAllLayers = false;
} else {
- this.treelayersStart();
-
+ this.treeData = this.$store.state.treeData;
+ this.$refs.tree.setCheckedKeys(this.$store.state.checkedKeys);
}
},
diff --git a/src/views/Tools/maplayer.vue b/src/views/Tools/maplayer.vue
index 4053435..0ad9e0c 100644
--- a/src/views/Tools/maplayer.vue
+++ b/src/views/Tools/maplayer.vue
@@ -48,12 +48,15 @@
},
// 鍏抽棴寮圭獥
close(id) {
+ this.$bus.$emit("treeDataCopy","true");
let index = this.PopupData.findIndex((item) => {
return item.id === id;
});
let data = this.PopupData.splice(index, 1)[0];
data.close && data.close();
- this.$store.state.layerMnage = false;
+ this.$store.state.layerMnage = false;
+
+
},
// 鎵撳紑寮圭獥
open(title, value, style = {}) {
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 60ce304..72f2f10 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -7,7 +7,7 @@
<el-divider />
<div class="spatialContent ">
<div class="spatial_leftTree subpage_Div">
- <el-input v-model="filterText"></el-input>
+ <el-input v-model="filterText" style="width: 200px;"></el-input>
<div style="width:300px">
<el-tree
@@ -22,51 +22,27 @@
></el-tree>
</div>
</div>
- <div class="spatial_rightContent subpage_Div">
- <el-form
+ <div class="contentshuju">
+ <div class="contentshujutou">
+ <el-form
ref="ruleForm"
:model="ruleForm"
:inline="true"
>
<el-form-item>
+ <!-- type="textarea" -->
<el-input
- type="textarea"
v-model="ruleForm.fileName"
class="nm-skin-pretty"
show-word-limit
:rows="2"
resize='none'
disabled
- style="width: 545px;"
+ style="width: 200px;"
></el-input>
</el-form-item>
- <el-form-item>
- <el-button
- v-if="btnStatus.insert"
- @click="conditionVisible = true"
- size="small"
- icon="el-icon-plus"
- type="success"
- >{{$t('common.append')}}</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- @click="submitForm"
- type="primary"
- size="small"
- icon="el-icon-search"
- >{{$t('common.iquery')}}</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- @click="resetForm"
- size="small"
- icon="el-icon-refresh"
- type="info"
- >{{$t('common.reset')}}</el-button>
- </el-form-item>
- <el-form-item>
+ <el-form-item style="float: right">
<el-button
@click="getSpaceMapVisibale"
size="small"
@@ -75,17 +51,33 @@
$t('synthesis.rangequery')
}}</el-button>
</el-form-item>
+ <el-form-item style="float: right">
+ <el-button
+ @click="submitForm"
+ type="primary"
+ size="small"
+ icon="el-icon-search"
+ >{{$t('common.iquery')}}</el-button>
+ </el-form-item>
+ <el-form-item style="float: right">
+ <el-button
+ v-if="btnStatus.insert"
+ @click="conditionVisible = true"
+ size="small"
+ icon="el-icon-plus"
+ type="success"
+ >{{$t('common.append')}}</el-button>
+ </el-form-item>
</el-form>
- <el-divider class="eldivider" />
- <div>
+ </div>
+ <div class="contenttable">
<el-table
ref="filterTable"
:data="tableData"
- border
- style="width: 100% "
- @selection-change="handleSelectionChange"
+ style="width: 100%"
+ height="100%"
>
- <el-table-column
+ <el-table-column
type="selection"
width="55"
/>
@@ -121,16 +113,15 @@
</el-table-column>
</el-table>
<div
- style="margin-top: 20px"
+ style="margin-top: 20px; "
class="pagination_box"
>
<el-pagination
- v-if="changePag"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
- :current-page="this.listData.pageIndex"
+ :current-page="listData.pageIndex"
:page-sizes="[10, 20, 50, 100]"
- :page-size="this.listData.pageSize"
+ :page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
>
@@ -138,6 +129,7 @@
</div>
</div>
</div>
+
</div>
<div
class="infoBox box_div"
@@ -357,9 +349,9 @@
</template>
<script>
-import MapSdk from '../../components/mapsdk.vue'
-import $ from 'jquery';
-import { conditions } from '../Archive/Archive.js'
+import MapSdk from "../../components/mapsdk.vue";
+import $ from "jquery";
+import { conditions } from "../Archive/Archive.js";
import {
dataQuery_selectTabs,
dataQuery_selectDomains,
@@ -368,51 +360,61 @@
dataQuery_uploadFiles,
dataQuery_selectFiles,
dataQuery_deletes,
-} from '../../api/api';
+} from "../../api/api";
import { getToken } from "../../utils/auth.js";
-import catalogueTree from '../../components/catalogueTree.vue';
-import MyBread from '../../components/MyBread.vue';
+import catalogueTree from "../../components/catalogueTree.vue";
+import MyBread from "../../components/MyBread.vue";
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- name: 'dataSearch',
+ name: "dataSearch",
components: { MyBread, catalogueTree, MapSdk },
data() {
return {
- attachtable: ['b_pac_geologic_hazard', 'b_hydrogeology', 'b_pac_meteorological', 'b_pac_marine_meteorological', 'b_pac_frozensoil', 's_borehole', 'm_marker', 'm_hydraulic_protection', 'm_equipment_nameplate'],
+ attachtable: [
+ "b_pac_geologic_hazard",
+ "b_hydrogeology",
+ "b_pac_meteorological",
+ "b_pac_marine_meteorological",
+ "b_pac_frozensoil",
+ "s_borehole",
+ "m_marker",
+ "m_hydraulic_protection",
+ "m_equipment_nameplate",
+ ],
formInline: {
- file: '',
+ file: "",
},
formSql: {
- field: '',
- condition: '',
- value: '',
- type: '',
- date: '',
-
+ field: "",
+ condition: "",
+ value: "",
+ type: "",
+ date: "",
},
fromSqlflag: false,
tree: [
{
- tabDesc: '鍩虹鏁版嵁',
- label: '鍩虹鏁版嵁',
- value: 'BD',
- ns: 'bd',
+ tabDesc: "鍩虹鏁版嵁",
+ label: "鍩虹鏁版嵁",
+ value: "BD",
+ ns: "bd",
id: 1,
children: [],
},
{
id: 2,
- tabDesc: '涓氬姟鏁版嵁',
- label: '涓氬姟鏁版嵁',
- value: 'BS',
- ns: 'bs',
+ tabDesc: "涓氬姟鏁版嵁",
+ label: "涓氬姟鏁版嵁",
+ value: "BS",
+ ns: "bs",
children: [],
- }, {
+ },
+ {
id: 3,
- tabDesc: '鍏冩暟鎹�',
- label: '鍏冩暟鎹�',
- value: 'MD',
- ns: 'md',
+ tabDesc: "鍏冩暟鎹�",
+ label: "鍏冩暟鎹�",
+ value: "MD",
+ ns: "md",
children: [],
},
],
@@ -421,8 +423,8 @@
condOption: [],
defaultProps: {
- children: 'children',
- label: 'label',
+ children: "children",
+ label: "label",
},
btnStatus: {
select: false,
@@ -434,22 +436,22 @@
},
tableType: null,
ruleForm: {
- fileName: ''
+ fileName: "",
},
FBtest: false,
tableData: [],
- formLabelWidth: '120px',
+ formLabelWidth: "120px",
dialogFormVisible: false,
upform: {
- gid: '',
- pipename: '',
- sitename: '',
- type: '',
- seriesname: '',
- stationvalue: '',
- transportm: '',
- diameter: '',
- name: '',
+ gid: "",
+ pipename: "",
+ sitename: "",
+ type: "",
+ seriesname: "",
+ stationvalue: "",
+ transportm: "",
+ diameter: "",
+ name: "",
},
changePag: true,
@@ -458,7 +460,7 @@
attributeData: [],
currentPage: 1,
- searchName: '',
+ searchName: "",
multipleSelection: [],
filedsLayer: null,
count: 0,
@@ -478,8 +480,7 @@
tabName: null,
eventid: null,
},
- filterText: ''
-
+ filterText: "",
};
},
created() {
@@ -491,7 +492,7 @@
watch: {
filterText(val) {
this.$refs.tree.filter(val);
- }
+ },
},
methods: {
@@ -503,18 +504,17 @@
this.dialogMapVisible = true;
this.showMapVisible = true;
this.$store.state.mapMenuBoolean = true;
- this.$store.state.mapMenuBoxFlag = '1';
+ this.$store.state.mapMenuBoxFlag = "1";
this.$store.state.mapPopBoolean = false;
this.$store.state.mapPopBoxFlag = null;
this.$store.state.download = true;
-
},
handleMapClose() {
- this.$confirm('纭鍏抽棴锛�')
+ this.$confirm("纭鍏抽棴锛�")
.then((_) => {
this.closeMapDown();
})
- .catch((_) => { });
+ .catch((_) => {});
},
closeMapDown() {
this.dialogMapVisible = false;
@@ -532,7 +532,7 @@
}
const res = await dataQuery_deletes({ ids: std.toString() });
if (res.code != 200) {
- this.$message.error('鏂囦欢鍒犻櫎澶辫触');
+ this.$message.error("鏂囦欢鍒犻櫎澶辫触");
}
this.getAttacthFlieList();
},
@@ -540,69 +540,75 @@
var token = getToken();
var fs = document.getElementById("insertFile");
if (fs.files.length == 0) {
-
this.$message({
- message: '璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢锛�',
- type: 'warning'
+ message: "璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢锛�",
+ type: "warning",
});
return;
}
- const formData = new FormData()
+ const formData = new FormData();
for (var i = 0, c = fs.files.length; i < c; i++) {
-
- formData.append('file', fs.files[i]); // fs.files[i].name,file
+ formData.append("file", fs.files[i]); // fs.files[i].name,file
}
- $.ajax(BASE_URL + "/dataQuery/uploadFiles?token=" + token + "&tabName= " + this.upAttach.tabName + "&eventid=" + this.upAttach.eventid, {
- type: "post",
- data: formData,
- async: true,
- cache: false,
- processData: false,
- contentType: false,
- success: (rs) => {
- this.$message({
- message: '闄勪欢娣诲姞鎴愬姛',
- type: 'success'
- });
- document.getElementById("insertFile").value = "";
- this.formInline = {
- file: '',
- }
- this.getAttacthFlieList();
- },
- error: (e) => {
- document.getElementById("insertFile").value = "";
- this.$message.error('闄勪欢娣诲姞澶辫触');
+ $.ajax(
+ BASE_URL +
+ "/dataQuery/uploadFiles?token=" +
+ token +
+ "&tabName= " +
+ this.upAttach.tabName +
+ "&eventid=" +
+ this.upAttach.eventid,
+ {
+ type: "post",
+ data: formData,
+ async: true,
+ cache: false,
+ processData: false,
+ contentType: false,
+ success: (rs) => {
+ this.$message({
+ message: "闄勪欢娣诲姞鎴愬姛",
+ type: "success",
+ });
+ document.getElementById("insertFile").value = "";
+ this.formInline = {
+ file: "",
+ };
+ this.getAttacthFlieList();
+ },
+ error: (e) => {
+ document.getElementById("insertFile").value = "";
+ this.$message.error("闄勪欢娣诲姞澶辫触");
+ },
}
- });
+ );
},
async getAttacthFlieList() {
- var obj = this.upAttach
+ var obj = this.upAttach;
const res = await dataQuery_selectFiles(obj);
if (res.code != 200) {
- this.$message.error('鍒楄〃璋冪敤澶辫触');
- return
+ this.$message.error("鍒楄〃璋冪敤澶辫触");
+ return;
}
this.tableAttach = res.result;
},
-
getAttachTable(index, row) {
if (row.eventid != null) {
this.upAttach.eventid = row.eventid;
} else {
- this.upAttach.eventid = '';
+ this.upAttach.eventid = "";
}
this.getAttacthFlieList();
this.dialogFormVisible = true;
},
//闄勪欢=>鏂囦欢閫夋嫨
getInsertFile() {
- $('#insertFile').click();
+ $("#insertFile").click();
},
insertFile() {
- var val = document.getElementById('insertFile').files;
+ var val = document.getElementById("insertFile").files;
if (!val || !val.length) return;
this.formInline.file = val[0].name;
@@ -611,16 +617,16 @@
async getTreeDataAll() {
const data = await dataQuery_selectTabs();
if (data.code != 200) {
- this.$message.error('鍒楄〃璋冪敤澶辫触');
+ this.$message.error("鍒楄〃璋冪敤澶辫触");
}
var option = data.result;
for (var i in option) {
var val_Data = option[i];
- val_Data.id = '1' + i;
+ val_Data.id = "1" + i;
// val_Data.label = val_Data.tabDesc + "(" + val_Data.tab + ")"
- val_Data.label = val_Data.tabDesc
- option[i].id = parseInt(option[i].id)
+ val_Data.label = val_Data.tabDesc;
+ option[i].id = parseInt(option[i].id);
for (var j in this.tree) {
if (this.tree[j].ns == option[i].ns) {
this.tree[j].children.push(val_Data);
@@ -633,7 +639,7 @@
// this.tree[1].children.push(val_Data);
// }
}
- this.handleNodeClick(this.tree[0].children[0])
+ this.handleNodeClick(this.tree[0].children[0]);
},
//鎺堟潈绠＄悊
showPermsBtn() {
@@ -642,7 +648,6 @@
permsEntity
.filter((item) => item.perms == currentPerms)
.map((item) => {
-
this.btnStatus[item.tag.substr(1)] = true;
});
},
@@ -666,7 +671,7 @@
res.then((val) => {
this.attributeData = val;
});
- if (this.ruleForm.fileName != '') {
+ if (this.ruleForm.fileName != "") {
this.listData.filter = this.ruleForm.fileName;
} else {
this.listData.filter = null;
@@ -674,7 +679,7 @@
const data = await dataQuery_selectByPage(this.listData);
if (data.code != 200) {
- this.$message.error('璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!');
+ this.$message.error("璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!");
return;
}
var res_val = this.attributeData;
@@ -699,7 +704,7 @@
name: this.listData.name,
});
if (fileds.code != 200) {
- this.$message.error('璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!');
+ this.$message.error("璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!");
return;
}
@@ -708,15 +713,15 @@
name: this.listData.name,
});
if (domains.code != 200) {
- this.$message.error('璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!');
+ this.$message.error("璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!");
return;
}
var data1 = fileds.result;
var data2 = domains.result;
var std = [];
for (var i in data1) {
- if (data1[i].type != 'geomtry' && data1[i].type != 'null') {
- this.filedsOption.push(data1[i])
+ if (data1[i].type != "geomtry" && data1[i].type != "null") {
+ this.filedsOption.push(data1[i]);
}
if (data1[i].showtype == 1) {
if (data1[i].domainNa != null) {
@@ -735,55 +740,54 @@
this.formSql.date = new Date();
},
handleconditionClose() {
- this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
+ this.$confirm("纭鍏抽棴锛�")
+ .then((_) => {
this.startFiledAndcondition();
})
- .catch(_ => { });
+ .catch((_) => {});
},
fieldChange(value) {
- var obj = {}
+ var obj = {};
obj = this.filedsOption.find(function (item) {
return item.field === value;
- })
- this.conditionChange(obj)
-
+ });
+ this.conditionChange(obj);
},
conditionChange(res) {
this.formSql.field = res.field;
this.formSql.type = res.type;
if (res.type == "date" || res.type == "datetime") {
- this.fromSqlflag = true
+ this.fromSqlflag = true;
} else {
- this.fromSqlflag = false
+ this.fromSqlflag = false;
}
var std = [];
this.condOption = [];
- if (res.type == 'text' || res.type == 'blob') {
- std = conditions[0]
- } else if (res.type == 'date' || res.type == 'datetime') {
- std = conditions[2]
+ if (res.type == "text" || res.type == "blob") {
+ std = conditions[0];
+ } else if (res.type == "date" || res.type == "datetime") {
+ std = conditions[2];
} else {
- std = conditions[1]
+ std = conditions[1];
}
for (var i in std) {
this.condOption.push({
label: std[i],
value: std[i],
- })
+ });
}
- this.formSql.condition = this.condOption[0].value
+ this.formSql.condition = this.condOption[0].value;
},
appendQueryFilter() {
if (this.formSql.type == "date" || this.formSql.type == "datetime") {
if (this.formSql.date == null) {
- this.$message.error('璇疯緭鍏ヨ鏌ヨ鐨勪俊鎭�!');
+ this.$message.error("璇疯緭鍏ヨ鏌ヨ鐨勪俊鎭�!");
return;
}
} else {
if (this.formSql.value == "") {
- this.$message.error('璇疯緭鍏ヨ鏌ヨ鐨勪俊鎭�!');
+ this.$message.error("璇疯緭鍏ヨ鏌ヨ鐨勪俊鎭�!");
return;
}
}
@@ -795,32 +799,29 @@
if (this.formSql.type == "long" || this.formSql.type == "integer") {
val = parseInt(this.formSql.value);
- } else if (this.formSql.type == 'double') {
-
+ } else if (this.formSql.type == "double") {
if (this.formSql.value.indexOf(".") != -1) {
val = this.formSql.value;
} else {
- val = parseFloat(this.formSql.value).toFixed(1)
+ val = parseFloat(this.formSql.value).toFixed(1);
}
- } else if (this.formSql.type == "date" || this.formSql.type == "datetime") {
+ } else if (
+ this.formSql.type == "date" ||
+ this.formSql.type == "datetime"
+ ) {
var time = new Date(this.formSql.date);
var m = time.getMonth() + 1;
var d = time.getDate();
var y = time.getFullYear();
- val = "'" + y +
- '-' +
- this.add0(m) +
- '-' +
- this.add0(d) + "'";
+ val = "'" + y + "-" + this.add0(m) + "-" + this.add0(d) + "'";
} else {
val = "'" + this.formSql.value + "'";
}
- this.ruleForm.fileName += this.formSql.field + " " + this.formSql.condition + " " + val;
+ this.ruleForm.fileName +=
+ this.formSql.field + " " + this.formSql.condition + " " + val;
this.startFiledAndcondition();
},
-
-
//鍊煎煙瀛楁鍖归厤
getDomainNaFild(res, result) {
@@ -890,12 +891,11 @@
},
// 閲嶇疆鏌ヨ
resetForm() {
- this.ruleForm.fileName = '';
+ this.ruleForm.fileName = "";
this.listData.pageIndex = 1;
this.listData.pageSize = 10;
//鑾峰彇table淇℃伅
this.getCollapseTable(this.filedsLayer);
-
},
// 鍙戝竷鎸夐挳
@@ -909,9 +909,9 @@
// .then(() => {
const loading = this.$loading({
lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)',
+ text: "Loading",
+ spinner: "el-icon-loading",
+ background: "rgba(0, 0, 0, 0.7)",
});
setTimeout(() => {
loading.close();
@@ -950,15 +950,15 @@
// 鎻愪氦淇敼
updateForm() {
let params = {};
- this.$confirm('鏄惁纭畾缂栬緫?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
+ this.$confirm("鏄惁纭畾缂栬緫?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
})
.then(() => {
this.dialogFormVisible = false;
switch (this.tableType) {
- case '鍦虹珯鐐�':
+ case "鍦虹珯鐐�":
params = {
gid: this.upform.gid,
pipename: this.upform.pipename,
@@ -968,15 +968,15 @@
UpdateSitePoint(params).then((res) => {
if (res.data == 1) {
this.$message({
- message: '淇敼鎴愬姛',
- type: 'success',
+ message: "淇敼鎴愬姛",
+ type: "success",
});
}
- this.getSPData(10, 1, '');
- this.getSPCount('');
+ this.getSPData(10, 1, "");
+ this.getSPCount("");
});
break;
- case '绠￠亾涓績绾�':
+ case "绠￠亾涓績绾�":
params = {
gid: this.upform.gid,
pipename: this.upform.pipename,
@@ -988,15 +988,15 @@
UpdateStationSeries(params).then((res) => {
if (res.data == 1) {
this.$message({
- message: '淇敼鎴愬姛',
- type: 'success',
+ message: "淇敼鎴愬姛",
+ type: "success",
});
}
- this.getSSData(10, 1, '');
- this.getSSCount('');
+ this.getSSData(10, 1, "");
+ this.getSSCount("");
});
break;
- case '鏍囨々':
+ case "鏍囨々":
params = {
gid: this.upform.gid,
pipename: this.upform.pipename,
@@ -1006,12 +1006,12 @@
UpdatgeMarker(params).then((res) => {
if (res.data == 1) {
this.$message({
- message: '淇敼鎴愬姛',
- type: 'success',
+ message: "淇敼鎴愬姛",
+ type: "success",
});
}
- this.getMData(10, 1, '');
- this.getMCount('');
+ this.getMData(10, 1, "");
+ this.getMCount("");
});
break;
}
@@ -1026,7 +1026,7 @@
// this.getMetaCount("");
// });
})
- .catch(() => { });
+ .catch(() => {});
},
// 鑾峰彇澶氶�夐�変腑鐨勫璞�
handleSelectionChange(val) {
@@ -1041,47 +1041,47 @@
for (var i in this.multipleSelection) {
std.push(this.multipleSelection[i].gid);
}
- this.$confirm('纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
+ this.$confirm("纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
})
.then(() => {
switch (this.tableType) {
- case '鍦虹珯鐐�':
+ case "鍦虹珯鐐�":
dltSitePoint(std).then((res) => {
if (res.data !== 0) {
this.$message({
- message: '鍒犻櫎鎴愬姛',
- type: 'success',
+ message: "鍒犻櫎鎴愬姛",
+ type: "success",
});
}
- this.getSPData(10, 1, '');
- this.getSPCount('');
+ this.getSPData(10, 1, "");
+ this.getSPCount("");
});
break;
- case '绠￠亾涓績绾�':
+ case "绠￠亾涓績绾�":
dltStationSeries(std).then((res) => {
if (res.data !== 0) {
this.$message({
- message: '鍒犻櫎鎴愬姛',
- type: 'success',
+ message: "鍒犻櫎鎴愬姛",
+ type: "success",
});
}
- this.getSSData(10, 1, '');
- this.getSSCount('');
+ this.getSSData(10, 1, "");
+ this.getSSCount("");
});
break;
- case '鏍囨々':
+ case "鏍囨々":
dltMarker(std).then((res) => {
if (res.data !== 0) {
this.$message({
- message: '鍒犻櫎鎴愬姛',
- type: 'success',
+ message: "鍒犻櫎鎴愬姛",
+ type: "success",
});
}
- this.getMData(10, 1, '');
- this.getMCount('');
+ this.getMData(10, 1, "");
+ this.getMCount("");
});
break;
}
@@ -1094,7 +1094,7 @@
// });
// });
})
- .catch(() => { });
+ .catch(() => {});
},
},
};
@@ -1113,15 +1113,16 @@
justify-content: space-between;
.spatial_leftTree {
width: calc(15% - 0px);
- height: 91%;
+ height: 100%;
border-radius: 5px;
padding: 1%;
- overflow: auto;
+ max-height: 670px;
+ overflow-y: auto;
}
.spatial_rightContent {
- width: 80%;
- height: 91%;
+ // width: 80%;
+ // height: 91%;
border-radius: 5px;
padding: 1%;
@@ -1129,4 +1130,26 @@
}
}
}
+.contentshuju{
+ width: 80%;
+ height: 91%;
+ border-radius: 5px;
+ padding: 1%;
+ max-height: 670px;
+ border: 1px solid #dcdfe6;
+}
+.contentshujutou{
+ height: 50px;
+ padding: 1%;
+ border-radius: 5px;
+ border: 1px solid #dcdfe6;
+}
+.contenttable{
+ min-height: 520px;
+ height: 530px;
+ margin-top: 10px;
+}
+/deep/ .el-table__body{
+ min-height: 525px;
+}
</style>
diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue
index c0a887c..07980fc 100644
--- a/src/views/datamanage/catalogueManage.vue
+++ b/src/views/datamanage/catalogueManage.vue
@@ -23,13 +23,13 @@
</div>
</div>
<div class="cataLog_rightContent subpage_Div">
- <div style="display:flex;justify-content:space-between">
+ <div style="align-items: center;display:flex;justify-content:space-between">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/' }">{{
$t('dataManage.dictionaryManageObj.particulars')
}}</el-breadcrumb-item>
</el-breadcrumb>
- <div>
+ <div style="margin-right: -5px;">
<div class="menuTop">
<el-form
@@ -47,32 +47,12 @@
:file-list="fileList"
>
<el-button
- type="info"
+ type="success"
icon="el-icon-plus"
size="small"
>涓婁紶鏂囦欢</el-button>
</el-upload>
- </el-form-item>
- <el-form-item>
- <el-button
- v-if="menuStatus.update"
- :disabled="itemdetail.pid == null ? true : false"
- @click="setEditNode(1)"
- type="info"
- icon="el-icon-top"
- size="small"
- >鍚戜笂绉诲姩</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- v-if="menuStatus.update"
- :disabled="itemdetail.pid == null ? true : false"
- @click="setEditNode(2)"
- type="info"
- icon="el-icon-bottom"
- size="small"
- >鍚戜笅绉诲姩</el-button>
</el-form-item>
<el-form-item>
<el-button
@@ -104,6 +84,26 @@
size="small"
>鍒犻櫎</el-button>
</el-form-item>
+ <el-form-item>
+ <el-button
+ v-if="menuStatus.update"
+ :disabled="itemdetail.pid == null ? true : false"
+ @click="setEditNode(1)"
+ type="info"
+ icon="el-icon-top"
+ size="small"
+ >鍚戜笂绉诲姩</el-button>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ v-if="menuStatus.update"
+ :disabled="itemdetail.pid == null ? true : false"
+ @click="setEditNode(2)"
+ type="info"
+ icon="el-icon-bottom"
+ size="small"
+ >鍚戜笅绉诲姩</el-button>
+ </el-form-item>
</el-form>
</div>
@@ -121,7 +121,7 @@
:label="$t('dataManage.dataUpObj.directoryName')"
:label-width="formLabelWidth"
>
- <el-input v-model="itemdetail.name" />
+ <el-input v-model="itemdetail.name" style="max-width: 400px;"/>
</el-form-item>
<el-form-item
:label="$t('dataManage.dataUpObj.catalogDescription')"
@@ -131,7 +131,7 @@
v-model="itemdetail.descr"
type="textarea"
resize="none"
- style="height: 100%; overflow: auto"
+ style="height: 100%; overflow: auto;max-width: 400px;"
/>
</el-form-item>
<el-form-item
@@ -142,6 +142,7 @@
v-model="itemdetail.bak"
type="textarea"
resize="none"
+ style="max-width: 400px;"
/>
</el-form-item>
<div class="btnBox">
@@ -863,19 +864,22 @@
padding: 1%;
.cataLogContent {
width: 100%;
- height: 92%;
+ height: 100%;
+ max-height: 670px;
display: flex;
+ align-items: center;
justify-content: space-between;
.cataLog_leftTree {
width: 15%;
- height: 91%;
+ height: 100%;
border-radius: 5px;
padding: 1%;
overflow-y: auto;
}
.cataLog_rightContent {
width: 80%;
- height: 91%;
+ height: 100%;
+ max-height: 670px;
border-radius: 5px;
padding: 1%;
.menuTop {
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index e3e0e61..36ff6c5 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -25,7 +25,7 @@
class="demo-form-inline"
>
<!-- 鍏ュ簱绫诲瀷 -->
- <el-form-item :label="$t('dataManage.dataUpObj.UploadType')">
+ <el-form-item :label="$t('dataManage.dataUpObj.UploadType')" style="margin-right: 2%">
<el-select
:disabled="tableData.length == 0 ? false : true"
v-model="formInline.uploadType"
@@ -43,6 +43,7 @@
</el-form-item>
<!-- 瀛樺偍鐩綍 -->
<el-form-item
+ style="margin-right: 2%"
v-show="uploadFlag"
:label="$t('dataManage.dataUpObj.storageDirectory')"
>
@@ -76,6 +77,7 @@
</el-form-item>
<!-- 椤圭洰鍚嶇О -->
<el-form-item
+ style="margin-right: 2%"
v-show="!uploadFlag"
:label="$t('dataManage.dataUpObj.entryName')"
>
@@ -95,7 +97,7 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁鐗堟湰 -->
- <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')">
+ <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')" style="margin-right: 2%">
<el-select
:popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
@@ -112,7 +114,7 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁涓撲笟 -->
- <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')">
+ <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')" style="margin-right: 2%">
<el-select
:popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
@@ -129,7 +131,7 @@
</el-select>
</el-form-item>
<!-- 鍧愭爣绯� -->
- <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')">
+ <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')" style="margin-right: 3%">
<el-select
:popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
@@ -175,7 +177,7 @@
<el-input
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="formInline.specialtyData"
- style="width:350px;"
+ style="width:210px;"
disabled
>
</el-input>
@@ -205,11 +207,11 @@
@change="handleMetaFileChange"
></input>
</el-form-item>
- <el-form-item v-show="uploadFlag">
+ <el-form-item v-show="uploadFlag" style="margin-left: 0.7%;">
<el-input
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="formInline.metaData"
- style="width:350px;"
+ style="width:210px;"
disabled
>
</el-input>
@@ -244,12 +246,12 @@
<el-input
placeholder="璇烽�夋嫨WBS鏁版嵁"
v-model="formInline.wbsData"
- style="width:350px;"
+ style="width:210px;"
disabled
>
</el-input>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
<!-- 涓婁紶 -->
<el-button
v-if="menuStatus.upload"
@@ -270,16 +272,6 @@
@click="setFileDelete"
type="danger"
>{{ $t('common.delete') }}</el-button>
- <!-- 璐ㄦ -->
- <el-button
- v-if="menuStatus.insert"
- :disabled="multipleSelection.length == 0 ? true : false"
- type="info"
- size="small"
- icon="el-icon-folder-checked"
- @click="handleQuayTestClick()"
- >{{$t('common.quayTest')}}
- </el-button>
<!-- 鍏ュ簱 -->
<el-button
v-if="menuStatus.insert"
@@ -289,6 +281,17 @@
icon="el-icon-folder-add"
type="warning"
>{{ $t('common.Warehousin') }}</el-button>
+ <!-- 璐ㄦ -->
+ <el-button
+ style="margin-right:-9px"
+ v-if="menuStatus.insert"
+ :disabled="multipleSelection.length == 0 ? true : false"
+ type="info"
+ size="small"
+ icon="el-icon-folder-checked"
+ @click="handleQuayTestClick()"
+ >{{$t('common.quayTest')}}
+ </el-button>
</el-form-item>
</el-form>
@@ -297,6 +300,7 @@
<!-- 涓婁紶鏁版嵁鍒楄〃 -->
<div class="subpage_Content subpage_Div">
<el-table
+ style="min-height: 470px;"
:data="tableData"
@selection-change="handleSelectionChange"
>
@@ -363,13 +367,21 @@
:model="formWarehousing"
class="demo-form-inline"
>
- <el-form-item :label="$t('dataManage.dataUpObj.describe')">
+ <el-form-item :label="$t('dataManage.dataUpObj.describe')" >
<el-input
v-model="formWarehousing.name"
placeholder="璇疯緭鍏ュ唴瀹�"
+ style="width: 200px;"
></el-input>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
+ <el-button
+ v-if="menuStatus.delete"
+ @click="setWarehouseDel"
+ icon="el-icon-folder-delete"
+ type="danger"
+ size="small"
+ >{{ $t('common.delete') }}</el-button>
<el-button
@click="setWarehouseSearch"
icon="el-icon-upload"
@@ -384,39 +396,29 @@
size="small"
type="info"
>{{ $t('common.reset') }}</el-button>
- <el-button
- v-if="menuStatus.delete"
- @click="setWarehouseDel"
- icon="el-icon-folder-delete"
- type="danger"
- size="small"
- >{{ $t('common.delete') }}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
<el-button
v-if="menuStatus.upload"
:disabled="multipleDelete.length == 0 ? true : false"
@click="setEnclosure"
icon="el-icon-folder-opened"
- type="warning"
+ type="success"
size="small"
>{{ $t('common.enclosure') }}</el-button>
</el-form-item>
</el-form>
</div>
- <div
- class="subpage_Content subpage_Div"
- style="min-height:330px"
- >
- <div class="contentTable">
- <el-table
- ref="multipleTable"
- :data="waretableData"
- tooltip-effect="dark"
- style="width: 100%"
- @selection-change="handleDelteChange"
- >
- <el-table-column
+ <!-- 鍏ュ簱 -->
+ <div class="bottom">
+ <div class="rightTable subpage_Div">
+ <div class="table_box">
+ <el-table
+ ref="filterTable"
+ :data="waretableData"
+ style="width: 100%"
+ height="99%">
+ <el-table-column
type="selection"
width="55"
>
@@ -494,21 +496,24 @@
:formatter="changetimeFile"
width="100"
/>
- </el-table>
- </div>
- <div>
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count"
- >
- </el-pagination>
- </div>
+ </el-table>
</div>
+ <div
+ class="pagination_box"
+ >
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count"
+ >
+ </el-pagination>
+ </div>
+ </div>
+ </div>
</el-tab-pane>
</el-tabs>
<!-- 璐ㄦ寮圭獥 -->
@@ -2429,4 +2434,28 @@
}
};
</script>
-
\ No newline at end of file
+<style lang="less" scoped>
+ .bottom {
+ width: 100%;
+ margin-top: 1%;
+ // height: 74%;
+ height: 570px;
+ display: flex;
+ justify-content: space-between;
+
+ .rightTable {
+ width: 98%;
+ height: 92%;
+
+ border-radius: 5px;
+ padding: 1%;
+ .table_box {
+ width: 100%;
+ height: 93%;
+ margin: 0 auto;
+ overflow: auto;
+ }
+ }
+ }
+
+</style>
\ No newline at end of file
diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue
index b04a0bd..1a969c0 100644
--- a/src/views/datamanage/dictionaryManage.vue
+++ b/src/views/datamanage/dictionaryManage.vue
@@ -5,8 +5,23 @@
`${$t('dataManage.dictionaryManage')}`,
]"></My-bread>
<el-divider />
- <div>
- <el-form
+ <div class="mainBox">
+ <div class="dictionaryContent">
+ <div class="dictionary_leftTree subpage_Div">
+ <ul>
+ <li
+ @click="getTableDesc(item)"
+ v-for="item in optionCount"
+ :class="{ active: activeName == item.tab }"
+ >
+ {{ item.tabDesc }}
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="right subpage_Div">
+ <div class="inquire">
+ <el-form
:inline="true"
:model="formInline"
class="demo-form-inline"
@@ -15,21 +30,10 @@
<el-input
v-model="formInline.tab"
:placeholder="$t('common.pleaseInput')"
+ style="width:200px"
></el-input>
</el-form-item>
- <el-form-item>
- <el-button
- icon="el-icon-search"
- size="small"
- @click="getSelectDictTab"
- class="primary"
- >{{ $t('common.iquery') }}</el-button>
- <el-button
- icon="el-icon-refresh"
- size="small"
- @click="getRemoveForm"
- type="info"
- >{{ $t('common.reset') }}</el-button>
+ <el-form-item style="float:right">
<el-button
v-if="btnStatus.insert"
icon="el-icon-edit"
@@ -46,27 +50,27 @@
>{{
$t('common.delete')
}}</el-button>
+ <el-button
+ icon="el-icon-search"
+ size="small"
+ @click="getSelectDictTab"
+ class="primary"
+ >{{ $t('common.iquery') }}</el-button>
+ <el-button
+ icon="el-icon-refresh"
+ size="small"
+ @click="getRemoveForm"
+ type="info"
+ >{{ $t('common.reset') }}</el-button>
</el-form-item>
</el-form>
- </div>
- <div class="dictionaryContent">
- <div class="dictionary_leftTree subpage_Div">
- <ul>
- <li
- @click="getTableDesc(item)"
- v-for="item in optionCount"
- :class="{ active: activeName == item.tab }"
- >
- {{ item.tabDesc }}
- </li>
- </ul>
- </div>
- <div class="dictionary_rightContent subpage_Div">
- <el-table
+ </div>
+ <div class="table_box">
+ <el-table
:data="tableData"
style="width: 100%"
@selection-change="handleSelectionChange"
- height="93%"
+ height="100%"
>
<el-table-column
type="selection"
@@ -153,7 +157,7 @@
</el-table>
<div
class="pagination_box"
- style="margin-top: 10px"
+ style="margin-top: 20px"
>
<el-pagination
@size-change="handleSizeChange"
@@ -165,6 +169,7 @@
:total="count"
>
</el-pagination>
+ </div>
</div>
</div>
</div>
@@ -699,13 +704,14 @@
width: 98%;
padding: 1%;
.dictionaryContent {
- width: 100%;
+ width: 16.5%;
height: 92%;
- display: flex;
- justify-content: space-between;
+ // display: flex;
+ // justify-content: space-between;
.dictionary_leftTree {
- width: 15%;
+ width: 100%;
height: 80%;
+ min-height: 700px;
border-radius: 5px;
padding: 1%;
@@ -744,4 +750,57 @@
margin-bottom: 10px;
}
}
+.mainBox {
+ width: 100%;
+ height: 92%;
+ display: flex;
+ justify-content: space-between;
+ .leftTree {
+ width: 15%;
+ height: 91%;
+
+ border-radius: 5px;
+ padding: 1%;
+ max-height: 670px;
+ overflow-y: auto;
+ }
+ .right {
+ width: 80%;
+ height: 91%;
+
+ border-radius: 5px;
+ padding: 1%;
+ max-height: 670px;
+ // overflow-y: auto;
+ .inquire {
+ // margin-bottom: 10px;
+ padding: 1%;
+
+ border-radius: 5px;
+ border: 1px solid #dcdfe6;
+ .el-form-item {
+ margin: 5px;
+ }
+ }
+ .table_box {
+ width: 100%;
+ height: 80%;
+ margin: 0 auto;
+ // overflow: auto;
+ margin-top: 10px;
+
+ .el-table /deep/ th.el-table__cell > .cell {
+ padding: 15px !important;
+ }
+
+ .el-table--border::after,
+ .el-table--group::after {
+ width: 0;
+ }
+ .el-table::before {
+ height: 0;
+ }
+ }
+ }
+ }
</style>
diff --git a/src/views/datamanage/domainManage.vue b/src/views/datamanage/domainManage.vue
index 3175934..8d36517 100644
--- a/src/views/datamanage/domainManage.vue
+++ b/src/views/datamanage/domainManage.vue
@@ -7,7 +7,7 @@
<el-divider />
<div class="mainBox">
<div class="leftTree subpage_Div">
- <el-input v-model="filterInput"></el-input>
+ <el-input v-model="filterInput" style="width:200px"></el-input>
<div style="width:450px">
<el-tree
:data="domainData"
@@ -33,21 +33,10 @@
<el-input
v-model="queryForm.code"
:placeholder="$t('common.pleaseInput')"
+ style="width:200px"
/>
</el-form-item>
- <el-form-item>
- <el-button
- @click="queryInfo('queryForm')"
- icon="el-icon-search"
- size="small"
- class="primary"
- >{{ $t('common.iquery') }}</el-button>
- <el-button
- @click="resetInfo('queryForm')"
- icon="el-icon-delete"
- size="small"
- type="info"
- >{{ $t('common.empty') }}</el-button>
+ <el-form-item style="float: right;">
<el-button
v-if="btnStatus.insert"
@click="showAddDialog"
@@ -62,6 +51,18 @@
size="small"
icon="el-icon-delete"
>{{ $t('common.delete') }}</el-button>
+ <el-button
+ @click="queryInfo('queryForm')"
+ icon="el-icon-search"
+ size="small"
+ class="primary"
+ >{{ $t('common.iquery') }}</el-button>
+ <el-button
+ @click="resetInfo('queryForm')"
+ icon="el-icon-delete"
+ size="small"
+ type="info"
+ >{{ $t('common.empty') }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -752,12 +753,13 @@
border-radius: 5px;
padding: 1%;
max-height: 670px;
- overflow-y: auto;
+ // overflow-y: auto;
.inquire {
- margin-bottom: 10px;
+ // margin-bottom: 10px;
+ padding: 1%;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+ border: 1px solid #dcdfe6;
.el-form-item {
margin: 5px;
}
@@ -767,6 +769,7 @@
height: 80%;
margin: 0 auto;
overflow: auto;
+ margin-top: 10px;
.el-table /deep/ th.el-table__cell > .cell {
padding: 15px !important;
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 61050e9..dcb5d3e 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -97,9 +97,10 @@
<el-input
v-model="queryForm.name"
:placeholder="$t('common.pleaseInput')"
+ style="width:200px"
/>
</el-form-item>
- <el-form-item>
+ <!-- <el-form-item style="float:right">
<el-button
@click="queryInfo()"
icon="el-icon-search"
@@ -107,14 +108,14 @@
size="small"
>{{ $t('common.iquery') }}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
@click="resetInfo('queryForm')"
icon="el-icon-refresh"
type="info"
size="small"
>{{ $t('common.reset') }}</el-button>
- </el-form-item>
+ </el-form-item> -->
<!-- <el-form-item v-if="btnStatus.insert">
<el-button
@@ -125,7 +126,7 @@
>{{ $t('common.append') }}</el-button
>
</el-form-item> -->
- <el-form-item v-if="btnStatus.delete">
+ <!-- <el-form-item v-if="btnStatus.delete" style="float:right">
<el-button
type="danger"
size="small"
@@ -133,7 +134,39 @@
icon="el-icon-delete"
>{{ $t('common.delete') }}</el-button>
</el-form-item>
- <el-form-item v-if="btnStatus.download">
+ <el-form-item v-if="btnStatus.download" style="float:right">
+ <el-button
+ @click="downFormData"
+ icon="el-icon-download"
+ type="success"
+ size="small"
+ >{{ $t('common.download') }}</el-button>
+ </el-form-item> -->
+ <el-form-item style="float:right">
+ <el-button
+ @click="resetInfo('queryForm')"
+ icon="el-icon-refresh"
+ type="info"
+ size="small"
+ >{{ $t('common.reset') }}</el-button>
+ </el-form-item>
+ <el-form-item style="float:right">
+ <el-button
+ @click="queryInfo()"
+ icon="el-icon-search"
+ class="primary"
+ size="small"
+ >{{ $t('common.iquery') }}</el-button>
+ </el-form-item>
+ <el-form-item v-if="btnStatus.delete" style="float:right">
+ <el-button
+ type="danger"
+ size="small"
+ @click="deleteMetaInfo"
+ icon="el-icon-delete"
+ >{{ $t('common.delete') }}</el-button>
+ </el-form-item>
+ <el-form-item v-if="btnStatus.download" style="float:right">
<el-button
@click="downFormData"
icon="el-icon-download"
diff --git a/src/views/datamanage/projectManage.vue b/src/views/datamanage/projectManage.vue
index 7fd64db..f493dd3 100644
--- a/src/views/datamanage/projectManage.vue
+++ b/src/views/datamanage/projectManage.vue
@@ -21,6 +21,12 @@
</div>
<div class="verSion_rightContent subpage_Div">
<el-form
+ style=" height: 44px;
+ padding: 1%;
+ display: flex;
+ flex-direction: row-reverse;
+ border-radius: 5px;
+ border: 1px solid #dcdfe6;"
:inline="true"
class="demo-form-inline"
>
@@ -35,12 +41,12 @@
>{{ $t('common.append') }}</el-button>
</el-form-item>
</el-form>
- <el-divider class="eldivider" />
- <div style="height: 80%; padding: 1%; overflow: auto">
+ <!-- <el-divider class="eldivider" /> -->
+ <div style="height: 80%; margin-top: 10px;">
<el-table
ref="filterTable"
:data="dbTableData"
- height="90%"
+ height="100%"
border
style="width: 100%"
>
@@ -462,13 +468,13 @@
border-radius: 5px;
padding: 1%;
-
+ max-height: 670px;
overflow-y: auto;
}
.verSion_rightContent {
width: 80%;
height: 91%;
-
+ max-height: 670px;
border-radius: 5px;
padding: 1%;
overflow-y: auto;
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index d886d54..b4c1f9a 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -5,7 +5,7 @@
`${$t('dataManage.styleManage')}`,
]"></My-bread>
<el-divider />
- <div class="searchComp subpage_Div">
+ <div class="searchComp subpage_Div" style="padding: 1%;">
<el-form
ref="ruleForm"
:model="ruleForm"
@@ -18,21 +18,10 @@
<el-input
v-model="ruleForm.name"
:placeholder="$t('common.pleaseInput')"
+ style="width:200px"
/>
</el-form-item>
- <el-form-item>
- <el-button
- @click="submitForm('ruleForm')"
- icon="el-icon-search"
- type="primary"
- size="small"
- >{{ $t('common.iquery') }}</el-button>
- <el-button
- @click="resetForm('ruleForm')"
- icon="el-icon-refresh"
- type="info"
- size="small"
- >{{ $t('common.empty') }}</el-button>
+ <el-form-item style="float: right;">
<el-button
v-if="btnStatus.insert"
@click="setInsertShow()"
@@ -47,16 +36,28 @@
type="danger"
size="small"
>{{ $t('common.delete') }}</el-button>
+ <el-button
+ @click="submitForm('ruleForm')"
+ icon="el-icon-search"
+ type="primary"
+ size="small"
+ >{{ $t('common.iquery') }}</el-button>
+ <el-button
+ @click="resetForm('ruleForm')"
+ icon="el-icon-refresh"
+ type="info"
+ size="small"
+ >{{ $t('common.empty') }}</el-button>
</el-form-item>
</el-form>
</div>
<div class="bottom">
- <div class="rightTable">
+ <div class="rightTable subpage_Div">
<div class="table_box">
<el-table
:data="tableData"
style="width: 100%"
- height="100%"
+ height="95%"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -142,7 +143,6 @@
</el-table>
</div>
<div
- style="margin-top: 20px; margin-left: 400px"
class="pagination_box"
>
<el-pagination
@@ -1661,13 +1661,20 @@
}
.bottom {
width: 100%;
- height: 85%;
+ margin-top: 1%;
+ height: 74%;
+ display: flex;
+ justify-content: space-between;
+
.rightTable {
- height: 100%;
- width: 100%;
+ width: 98%;
+ height: 92%;
+
+ border-radius: 5px;
+ padding: 1%;
.table_box {
width: 100%;
- height: 80%;
+ height: 93%;
margin: 0 auto;
overflow: auto;
}
diff --git a/src/views/datamanage/versionManage.vue b/src/views/datamanage/versionManage.vue
index b193eea..1e63074 100644
--- a/src/views/datamanage/versionManage.vue
+++ b/src/views/datamanage/versionManage.vue
@@ -5,12 +5,8 @@
`${$t('dataManage.versionManage')}`,
]"></My-bread>
<el-divider />
- <div class="verSionContent">
- <!-- <div class="verSion_leftTree">
- <ver-dir-tree></ver-dir-tree>
- </div> -->
- <div class="verSion_rightContent subpage_Div">
- <el-form
+ <div class="inquire subpage_Div">
+ <el-form
ref="ruleForm"
:model="ruleForm"
:inline="true"
@@ -20,7 +16,7 @@
:popper-append-to-body="false"
v-model="ruleForm.dirid"
placeholder="璇烽�夋嫨"
- style="width:300px"
+ style="width:200px"
>
<el-option
:value="ruleForm.dirid"
@@ -56,13 +52,7 @@
:placeholder="$t('common.pleaseInput')"
/>
</el-form-item>
- <el-form-item>
- <el-button
- @click="onSubmit('ruleForm')"
- icon="el-icon-search"
- size="small"
- class="primary"
- >{{ $t('common.iquery') }}</el-button>
+ <el-form-item style="float: right;">
<el-button
type="success"
v-if="btnStatus.insert"
@@ -71,6 +61,12 @@
size="small"
>{{ $t('common.append') }}</el-button>
<el-button
+ @click="onSubmit('ruleForm')"
+ icon="el-icon-search"
+ size="small"
+ class="primary"
+ >{{ $t('common.iquery') }}</el-button>
+ <el-button
type="info"
@click="resetForm('ruleForm')"
icon="el-icon-delete"
@@ -78,12 +74,14 @@
>{{ $t('common.empty') }}</el-button>
</el-form-item>
</el-form>
- <el-divider class="eldivider" />
- <div style="height: 73%">
+ </div>
+ <div class="bottom">
+ <div class="rightTable subpage_Div">
+ <div class="table_box">
<el-table
:data="tableData"
style="width: 100%"
- height="99%"
+ height="95%"
>
<el-table-column
align="center"
@@ -156,8 +154,8 @@
</template>
</el-table-column>
</el-table>
+ </div>
<div
- style="margin-top: 20px; "
class="pagination_box"
>
<el-pagination
@@ -171,9 +169,8 @@
>
</el-pagination>
</div>
- </div>
</div>
- </div>
+ </div>
<el-dialog
:title="$t('dataManage.vmobj.editVersion')"
:visible.sync="dialogFormVisible"
@@ -750,4 +747,36 @@
}
}
}
+.inquire {
+ position: relative;
+
+ padding-bottom: 8px;
+
+ border-radius: 5px;
+ padding: 1%;
+ .el-form-item {
+ margin: 5px;
+ }
+ }
+ .bottom {
+ width: 100%;
+ margin-top: 1%;
+ height: 74%;
+ display: flex;
+ justify-content: space-between;
+
+ .rightTable {
+ width: 98%;
+ height: 92%;
+
+ border-radius: 5px;
+ padding: 1%;
+ .table_box {
+ width: 100%;
+ height: 93%;
+ margin: 0 auto;
+ overflow: auto;
+ }
+ }
+ }
</style>
diff --git a/src/views/exportMap/index.vue b/src/views/exportMap/index.vue
index 3847d1a..a66e89a 100644
--- a/src/views/exportMap/index.vue
+++ b/src/views/exportMap/index.vue
@@ -1,23 +1,29 @@
<template>
<div
id="mapView"
- class="MapBox"
+ class="MapBox "
v-loading="loading"
element-loading-background="rgba(0, 0, 0, 0.8)"
>
- <div class="topMenu">
- <el-form :inline="true" :model="formInline" class="demo-form-inline">
+ <div class="topMenu box_divm">
+ <el-form
+ :inline="true"
+ :model="formInline"
+ class="demo-form-inline"
+ >
<el-form-item>
<el-link
- style="color: white"
@click="showLeftMenu(1)"
:underline="false"
title="鍥惧眰鍒楄〃"
- ><i class="el-icon-s-operation"></i
- ></el-link>
+ ><i class="el-icon-s-operation"></i></el-link>
</el-form-item>
<el-form-item>
- <el-select v-model="value" placeholder="璇烽�夋嫨">
+ <el-select
+ :popper-append-to-body="false"
+ v-model="value"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in options"
:key="item.value"
@@ -30,55 +36,44 @@
<el-form-item>
<el-link
- style="color: white"
@click="setMapAddDraw()"
:underline="false"
- ><i class="el-icon-edit-outline"></i>缁樺埗</el-link
- >
+ ><i class="el-icon-edit-outline"></i>缁樺埗</el-link>
</el-form-item>
<el-form-item>
<el-link
:disabled="layerExtent == null"
- style="color: white"
@click="setMapRemoveDraw()"
:underline="false"
title="鍥惧眰鍒楄〃"
- ><i class="el-icon-delete"></i>娓呴櫎</el-link
- >
+ ><i class="el-icon-delete"></i>娓呴櫎</el-link>
</el-form-item>
<el-form-item>
<el-link
- style="color: white"
@click="showMapApply = true"
:underline="false"
:disabled="layerExtent == null"
- >鍑哄浘鐢宠
+ >鍑哄浘鐢宠
</el-link>
</el-form-item>
<el-form-item>
<el-link
- style="color: white"
@click="getShowMapList"
:underline="false"
- >鍑哄浘鍒楄〃</el-link
- >
+ >鍑哄浘鍒楄〃</el-link>
</el-form-item>
<el-form-item>
<el-link
- style="color: white"
@click="changeMenulayer"
:underline="false"
v-show="isActive"
- >褰卞儚</el-link
- >
+ >褰卞儚</el-link>
<el-link
- style="color: white"
v-show="!isActive"
@click="changeMenulayer"
:underline="false"
- >鐭㈤噺</el-link
- >
+ >鐭㈤噺</el-link>
</el-form-item>
<el-form-item label="鏃嬭浆瑙掑害">
<el-input
@@ -94,14 +89,20 @@
class="left_Menu"
:class="{ left_main_show: !leftMenuOpen }"
>
- <div class="menu_content">
- <div class="topHeader" v-show="lefMenuContent">
+ <div class="menu_content box_divm">
+ <div
+ class="topHeader"
+ v-show="lefMenuContent"
+ >
<div>鍥惧眰鍒楄〃</div>
<div @click="showLeftMenu(2)"><i class="el-icon-s-fold"></i></div>
</div>
<el-divider></el-divider>
<div class="bottomContent">
- <div style="width: 100%" v-show="lefMenuContent">
+ <div
+ style="width: 100%"
+ v-show="lefMenuContent"
+ >
<el-tree
:data="treeData"
show-checkbox
@@ -117,46 +118,58 @@
</div>
</div>
- <div class="mapApplay" v-if="showMapApply">
+ <div
+ class="mapApplay box_divm"
+ v-if="showMapApply"
+ >
<label>鍑哄浘鐢宠</label>
<el-divider />
- <el-form ref="form" :model="form" label-width="80px">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ >
<el-form-item label="鍑哄浘鍚嶇О">
<el-input v-model="form.name"></el-input>
</el-form-item>
<el-form-item>
- <div style="padding: 1%; border: 1px solid white">
+ <div style="padding: 1%; ">
<el-table
ref="singleTable"
:data="tableData"
style="width: 100%"
height="200"
>
- <el-table-column type="index" label="搴忓彿" width="50">
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="50"
+ >
</el-table-column>
- <el-table-column property="name" label="鍥惧眰鍚嶇О">
+ <el-table-column
+ property="name"
+ label="鍥惧眰鍚嶇О"
+ >
</el-table-column>
</el-table>
</div>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="setMapApply">绔嬪嵆鍒涘缓</el-button>
+ <el-button
+ type="primary"
+ @click="setMapApply"
+ >绔嬪嵆鍒涘缓</el-button>
<el-button @click="showMapApply = false">鍙栨秷</el-button>
</el-form-item>
</el-form>
</div>
- <div class="mapApplay" v-if="showMapList">
- <div>
- <label>鍑哄浘鍒楄〃</label>
- <div style="float: right">
- <el-link @click="showMapList = false" :underline="false"
- ><i style="color: white" class="el-icon-close"></i
- ></el-link>
- </div>
- </div>
- <el-divider />
+
+ <el-dialog
+ title="鍑哄浘鍒楄〃"
+ :visible.sync="showMapList"
+ >
<el-table
ref="singleTable"
:data="exportable"
@@ -164,11 +177,24 @@
height="200"
@selection-change="handleSelectionChange"
>
- <el-table-column type="index" width="50" label="搴忓彿">
+ <el-table-column
+ type="index"
+ width="50"
+ label="搴忓彿"
+ >
</el-table-column>
- <el-table-column property="descr" label="鏍囬"> </el-table-column>
- <el-table-column property="name" label="鏂囦欢鍚嶇О"> </el-table-column>
- <el-table-column property="createName" label="鍑哄浘浜�">
+ <el-table-column
+ property="descr"
+ label="鏍囬"
+ > </el-table-column>
+ <el-table-column
+ property="name"
+ label="鏂囦欢鍚嶇О"
+ > </el-table-column>
+ <el-table-column
+ property="createName"
+ label="鍑哄浘浜�"
+ >
</el-table-column>
<el-table-column
property="createTime"
@@ -177,14 +203,15 @@
>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="120">
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ >
<template slot-scope="scope">
<el-link
- style="color: white"
@click.native.prevent="downloadMap(scope.$index, scope.row)"
:underline="false"
- >涓嬭浇</el-link
- >
+ >涓嬭浇</el-link>
</template>
</el-table-column>
</el-table>
@@ -200,15 +227,18 @@
>
</el-pagination>
</div>
- </div>
-
+ </el-dialog>
<el-dialog
title="鎻愮ず"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose"
>
- <el-form ref="layerform" :model="layerform" label-width="80px">
+ <el-form
+ ref="layerform"
+ :model="layerform"
+ label-width="80px"
+ >
<el-form-item label="鏈嶅姟鍚嶇О">
<el-input v-model="layerform.name"></el-input>
</el-form-item>
@@ -218,12 +248,21 @@
</el-radio-group>
</el-form-item>
<el-form-item label="鏈嶅姟鍦板潃">
- <el-input type="textarea" v-model="layerform.resource"></el-input>
+ <el-input
+ type="textarea"
+ v-model="layerform.resource"
+ ></el-input>
</el-form-item>
</el-form>
- <span slot="footer" class="dialog-footer">
+ <span
+ slot="footer"
+ class="dialog-footer"
+ >
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="setAddMapLayer">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ @click="setAddMapLayer"
+ >纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -234,7 +273,7 @@
import Map from "ol/Map"
import XYZ from "ol/source/XYZ"
import View from "ol/View"
-import { OverviewMap, defaults as defaultControls, FullScreen, ScaleLine, Rotate} from "ol/control.js"
+import { OverviewMap, defaults as defaultControls, FullScreen, ScaleLine, Rotate } from "ol/control.js"
import Image from "ol/layer/Image"
import TileLayer from "ol/layer/Tile"
import { transform } from "ol/proj"
@@ -337,6 +376,9 @@
layer_list.push(layer_entity)
if (data.result[i].isShow == 1) {
std.push(data.result[i].id)
+ this.tableData.push({
+ name: layer_entity.label,
+ })
this.showMapLayer(layer_entity)
}
}
@@ -349,22 +391,31 @@
}
}
}
- this.treeData = layer_groups
- for (var i in data.result) {
- if (data.result[i].type == 2 && data.result[i].url != null) {
- for (var j = 0; j < window.Viewer.imageryLayers._layers.length; j++) {
- var val_id = window.Viewer.imageryLayers._layers[j]
- if (val_id.show == true) {
- if (val_id.imageryProvider.name == data.result[i].cnName) {
- std.push(data.result[i].id)
- }
- }
- }
+ layer_groups = layer_groups.filter((res) => {
+ if (res.children != null && res.children.length != 0) {
+ return res
}
- }
+ })
+ this.treeData = layer_groups;
+
+ // for (var i in data.result) {
+ // if (data.result[i].type == 2 && data.result[i].url != null) {
+ // for (var j = 0; j < window.mapView.imageryLayers._layers.length; j++) {
+ // var val_id = window.mapView.imageryLayers._layers[j]
+ // if (val_id.show == true) {
+ // if (val_id.imageryProvider.name == data.result[i].cnName) {
+ // std.push(data.result[i].id)
+ // }
+ // }
+ // }
+ // }
+ // }
+ debugger
this.$refs.tree.setCheckedKeys(std)
},
showMapLayer(val) {
+ debugger
+ if (val == undefined) return;
var layer2 = new Image({
name: val.label,
source: new ImageWMS({
@@ -461,7 +512,7 @@
data: JSON.stringify(data),
contentType: "application/json",
dataType: "json",
- error: function () {},
+ error: function () { },
success: rs => {
this.loading = false
var value = "code = " + rs.code + ", result = " + rs.result
@@ -559,7 +610,7 @@
this.showMapApply = false
this.form = {}
},
- handleClose() {},
+ handleClose() { },
handleTreeNodeClick(data, nodes) {
if (data.children != null) return
var layers = mapView.getAllLayers()
@@ -570,13 +621,13 @@
layer.setVisible(nodes) //鏄剧ず鍥惧眰
if (nodes == true) {
str++
- this.arrList.push({
+ this.tableData.push({
name: data.label,
})
} else {
- this.arrList.some((item, i) => {
+ this.tableData.some((item, i) => {
if (item.name === data.label) {
- this.arrList.splice(i, 1)
+ this.tableData.splice(i, 1)
}
})
}
@@ -585,12 +636,12 @@
if (str == 0 && nodes == true) {
this.showMapLayer(data)
- this.arrList.push({
+ this.tableData.push({
name: data.label,
})
}
- this.tableData = this.arrList
+ // this.tableData = this.arrList
},
setAddMapLayer() {
this.dialogVisible = false
@@ -670,7 +721,7 @@
.topMenu {
z-index: 40;
position: absolute;
- background: rgba(0, 0, 0, 0.5);
+
width: 100%;
height: 70px;
padding-left: 20px;
@@ -678,7 +729,7 @@
.left_Menu {
z-index: 40;
width: 300px;
- background: rgba(0, 0, 0, 0.5);
+
height: calc(100% - 220px);
position: fixed;
left: 0;
@@ -692,7 +743,6 @@
margin: 10px;
display: flex;
justify-content: space-between;
- color: white;
}
.bottomContent {
width: calc(100% - 40px);
@@ -738,140 +788,14 @@
.mapApplay {
width: 40%;
position: absolute;
- background: #303030;
+
z-index: 40;
top: 15%;
margin-left: 30%;
padding: 1%;
- label {
- color: white;
- }
}
- /deep/.el-form-item__label {
- color: white;
- line-height: 70px;
- }
- /deep/.el-form-item__content {
- line-height: 70px;
- }
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- /deep/ .el-divider--horizontal {
- margin: 5px 0px;
- }
- /*淇敼table 琛ㄤ綋鐨勮儗鏅鑹插拰鏂囧瓧棰滆壊*/
- /deep/ .el-table {
- background-color: transparent;
-
- th,
- td {
- background-color: transparent;
- }
- .el-table__expanded-cell {
- background-color: transparent !important;
- }
-
- // 琛ㄥご鑳屾櫙鑹�
- th.el-table__cell {
- background-color: #303030;
-
- color: #fff;
- }
- tr > td {
- background-color: #303030;
- color: #fff;
- }
-
- // hover鏁堟灉
- tr:hover > td {
- background-color: rgba(255, 255, 255, 0.3) !important;
- }
-
- tbody tr:hover {
- background-color: rgba(255, 255, 255, 0.3) !important;
- // text-align: center;
- }
-
- // 婊氬姩鏉″楂�
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- height: 5px;
- }
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- /*婊氬姩鏉″搴�*/
- height: 5px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .el-table__body-wrapper::-webkit-scrollbar-track {
- box-shadow: 0px 1px 3px #216fe6 inset;
- /*婊氬姩鏉＄殑鑳屾櫙鍖哄煙鐨勫唴闃村奖*/
- border-radius: 10px;
- }
-
- /*瀹氫箟婊戝潡 鍐呴槾褰�+鍦嗚*/
- .el-table__body-wrapper::-webkit-scrollbar-thumb {
- box-shadow: 0px 1px 3px #216fe6 inset;
- border-radius: 6px;
- 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;
- }
- }
- /deep/.el-loading-spinner i {
- color: #409eff !important;
- }
- /deep/.el-tree .el-tree-node__content:hover {
- background-color: transparent !important;
- }
- /deep/.el-tree {
- color: white !important;
- background: transparent !important;
- }
- /deep/.el-tree-node:focus > .el-tree-node__content {
- background: transparent !important;
+ /deep/.el-form-item {
+ margin-top: 10px;
}
}
</style>
diff --git a/src/views/maintenance/authorityManagement.vue b/src/views/maintenance/authorityManagement.vue
index 6c9c2ce..07f3d88 100644
--- a/src/views/maintenance/authorityManagement.vue
+++ b/src/views/maintenance/authorityManagement.vue
@@ -5,7 +5,7 @@
<div class="inquire">
<el-form ref="formData1" :model="form" :inline="true">
<el-form-item label="" prop="name">
- <el-input v-model="form.name" placeholder="鍏抽敭瀛�" />
+ <el-input v-model="form.name" placeholder="鍏抽敭瀛�" />
</el-form-item>
<el-form-item>
diff --git a/src/views/maintenance/blackwhiteList.vue b/src/views/maintenance/blackwhiteList.vue
index 51d286f..924b75f 100644
--- a/src/views/maintenance/blackwhiteList.vue
+++ b/src/views/maintenance/blackwhiteList.vue
@@ -25,6 +25,7 @@
prop="blackListIP"
>
<el-input
+ style="width:200px"
v-model="queryInfo.ip"
:placeholder="$t('operatManage.BWL.listIPInfo')"
/>
@@ -34,11 +35,20 @@
prop="visit"
>
<el-input
+ style="width:200px"
v-model="queryInfo.visit"
:placeholder="$t('operatManage.BWL.interceptionNumber')"
/>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
+ <el-button
+ type="info"
+ @click="resetInfo('queryInfo')"
+ icon="el-icon-refresh"
+ size="small"
+ >{{ $t("operatManage.BWL.reset") }}</el-button>
+ </el-form-item>
+ <el-form-item style="float:right">
<el-button
type="primary"
@click="queryBlackInfo()"
@@ -47,24 +57,7 @@
>{{ $t("operatManage.BWL.search") }}
</el-button>
</el-form-item>
- <el-form-item>
- <el-button
- type="info"
- @click="resetInfo('queryInfo')"
- icon="el-icon-refresh"
- size="small"
- >{{ $t("operatManage.BWL.reset") }}</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- icon="el-icon-edit"
- v-if="menuStatus.insert"
- type="success"
- size="small"
- @click="showInsertdialog(1)"
- >{{ $t("common.append") }}</el-button>
- </el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
icon="el-icon-delete"
v-if="menuStatus.delete"
@@ -72,6 +65,15 @@
size="small"
@click="delBWList"
>{{ $t("common.delete") }}</el-button>
+ </el-form-item>
+ <el-form-item style="float:right">
+ <el-button
+ icon="el-icon-edit"
+ v-if="menuStatus.insert"
+ type="success"
+ size="small"
+ @click="showInsertdialog(1)"
+ >{{ $t("common.append") }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -170,6 +172,7 @@
prop="ip"
>
<el-input
+ style="width:200px"
v-model="queryInfo.ip"
:placeholder="$t('operatManage.BWL.listIPInfo')"
/>
@@ -179,11 +182,20 @@
prop="visit"
>
<el-input
+ style="width:200px"
v-model="queryInfo.visit"
:placeholder="$t('operatManage.BWL.interceptionNumber')"
/>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
+ <el-button
+ @click="resetForm('queryInfo')"
+ type="info" size="small"
+ ><i class="el-icon-delete"></i> {{
+ $t('operatManage.BWL.reset')
+ }}</el-button>
+ </el-form-item>
+ <el-form-item style="float: right;">
<el-button
size="small"
type="primary"
@@ -192,25 +204,7 @@
$t('operatManage.BWL.search')
}}</el-button>
</el-form-item>
- <el-form-item>
- <el-button
- @click="resetForm('queryInfo')"
- type="info" size="small"
- ><i class="el-icon-delete"></i> {{
- $t('operatManage.BWL.reset')
- }}</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- type="success" size="small"
- icon="el-icon-edit"
- v-if="menuStatus.insert"
- @click="showInsertdialog(2)"
- >{{
- $t('common.append')
- }}</el-button>
- </el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
<el-button
type="danger" size="small"
icon="el-icon-delete"
@@ -220,6 +214,16 @@
$t('common.delete')
}}</el-button>
</el-form-item>
+ <el-form-item style="float: right;">
+ <el-button
+ type="success" size="small"
+ icon="el-icon-edit"
+ v-if="menuStatus.insert"
+ @click="showInsertdialog(2)"
+ >{{
+ $t('common.append')
+ }}</el-button>
+ </el-form-item>
</el-form>
</div>
<div class="table_box1 subpage_Div">
diff --git a/src/views/maintenance/downlog.vue b/src/views/maintenance/downlog.vue
index ad772f2..2ea71f3 100644
--- a/src/views/maintenance/downlog.vue
+++ b/src/views/maintenance/downlog.vue
@@ -16,6 +16,7 @@
:label="$t('operatManage.operationLogObj.username')"
>
<el-input
+ style="width:200px"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -25,6 +26,7 @@
:label="$t('operatManage.operationLogObj.operationType')"
>
<el-select
+ style="width:200px"
:popper-append-to-body="false"
v-model="sizeForm.type"
:placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
@@ -55,7 +57,7 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
- style="width: 100%"
+ style="width:200px"
type="datetime"
:popper-class="popperclass"
:placeholder="$t('operatManage.operationLogObj.optionDate')"
@@ -69,14 +71,14 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
- style="width: 100%"
+ style="width:200px"
type="datetime"
:placeholder="$t('operatManage.operationLogObj.optionDate')"
>
</el-date-picker>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
@click="onSubmit"
icon="el-icon-search"
diff --git a/src/views/maintenance/eventlogManage.vue b/src/views/maintenance/eventlogManage.vue
index e557216..3c05fb8 100644
--- a/src/views/maintenance/eventlogManage.vue
+++ b/src/views/maintenance/eventlogManage.vue
@@ -16,6 +16,7 @@
:label="$t('operatManage.operationLogObj.username')"
>
<el-input
+ style="width:200px"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -25,6 +26,7 @@
:label="$t('operatManage.operationLogObj.operationType')"
>
<el-select
+ style="width:200px"
:popper-append-to-body="false"
clearable
v-model="sizeForm.type"
@@ -64,7 +66,7 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
- style="width: 100%"
+ style="width:200px"
type="datetime"
:placeholder="$t('operatManage.operationLogObj.optionDate')"
></el-date-picker>
@@ -77,14 +79,14 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
- style="width: 100%"
+ style="width:200px"
type="datetime"
:placeholder="$t('operatManage.operationLogObj.optionDate')"
>
</el-date-picker>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right">
<el-button
@click="onSubmit"
icon="el-icon-search"
diff --git a/src/views/maintenance/logLog.vue b/src/views/maintenance/logLog.vue
index 229954e..0a6cd00 100644
--- a/src/views/maintenance/logLog.vue
+++ b/src/views/maintenance/logLog.vue
@@ -17,6 +17,7 @@
:label="$t('operatManage.operationLogObj.username')"
>
<el-input
+ style="width:200px"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -26,6 +27,7 @@
:label="$t('operatManage.operationLogObj.operationType')"
>
<el-select
+ style="width:200px"
:popper-append-to-body="false"
v-model="sizeForm.type"
:placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
@@ -52,7 +54,7 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
- style="width: 100%"
+ style="width:200px"
type="datetime"
:placeholder="$t('operatManage.operationLogObj.optionDate')"
></el-date-picker>
@@ -65,14 +67,14 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
- style="width: 100%"
+ style="width:200px"
type="datetime"
:placeholder="$t('operatManage.operationLogObj.optionDate')"
>
</el-date-picker>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
@click="onSubmit"
icon="el-icon-search"
diff --git a/src/views/maintenance/menuSettings.vue b/src/views/maintenance/menuSettings.vue
index 30cd4ce..762d9fd 100644
--- a/src/views/maintenance/menuSettings.vue
+++ b/src/views/maintenance/menuSettings.vue
@@ -35,22 +35,6 @@
<div>
<el-button
- v-if="menuStatus.update"
- :disabled="itemdetail.pid == null ? true : false"
- @click="setEditNode(1)"
- type="info"
- icon="el-icon-top"
- size="small"
- >鍚戜笂绉诲姩</el-button>
- <el-button
- v-if="menuStatus.update"
- :disabled="itemdetail.pid == null ? true : false"
- @click="setEditNode(2)"
- type="info"
- icon="el-icon-bottom"
- size="small"
- >鍚戜笅绉诲姩</el-button>
- <el-button
v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(1)"
@@ -74,6 +58,22 @@
icon="el-icon-delete"
size="small"
>鍒犻櫎</el-button>
+ <el-button
+ v-if="menuStatus.update"
+ :disabled="itemdetail.pid == null ? true : false"
+ @click="setEditNode(1)"
+ type="info"
+ icon="el-icon-top"
+ size="small"
+ >鍚戜笂绉诲姩</el-button>
+ <el-button
+ v-if="menuStatus.update"
+ :disabled="itemdetail.pid == null ? true : false"
+ @click="setEditNode(2)"
+ type="info"
+ icon="el-icon-bottom"
+ size="small"
+ >鍚戜笅绉诲姩</el-button>
</div>
</div>
diff --git a/src/views/maintenance/operationLog.vue b/src/views/maintenance/operationLog.vue
index c9ac236..04f9f75 100644
--- a/src/views/maintenance/operationLog.vue
+++ b/src/views/maintenance/operationLog.vue
@@ -17,6 +17,7 @@
:label="$t('operatManage.operationLogObj.username')"
>
<el-input
+ style="width:200px"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -26,6 +27,7 @@
:label="$t('operatManage.operationLogObj.operationType')"
>
<el-select
+ style="width:200px"
:popper-append-to-body="false"
clearable
v-model="sizeForm.type"
@@ -69,7 +71,7 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
- style="width: 100%"
+ style="width:200px"
type="datetime"
:placeholder="$t('operatManage.operationLogObj.optionDate')"
></el-date-picker>
@@ -82,14 +84,14 @@
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
- style="width: 100%"
+ style="width:200px"
type="datetime"
:placeholder="$t('operatManage.operationLogObj.optionDate')"
>
</el-date-picker>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
@click="onSubmit"
icon="el-icon-search"
diff --git a/src/views/maintenance/parameterConfiguration.vue b/src/views/maintenance/parameterConfiguration.vue
index a55cb62..ad93913 100644
--- a/src/views/maintenance/parameterConfiguration.vue
+++ b/src/views/maintenance/parameterConfiguration.vue
@@ -5,11 +5,12 @@
`${$t('operatManage.systemLayout')}`,
]"></My-bread>
<el-divider />
- <div class="parameterConfiguration">
- <el-table
- :data="tableData"
- style="width: 100%"
- >
+ <div style="height: 73%">
+ <el-table
+ ref="filterTable"
+ :data="tableData"
+ style="width: 100%"
+ height="99%">
<el-table-column
align="center"
type="index"
diff --git a/src/views/maintenance/systemMonitoring.vue b/src/views/maintenance/systemMonitoring.vue
index 5ae5d8f..0abf4a6 100644
--- a/src/views/maintenance/systemMonitoring.vue
+++ b/src/views/maintenance/systemMonitoring.vue
@@ -6,7 +6,7 @@
]"></My-bread>
<el-divider />
<div class="content_Box">
- <div class="cloumn_Box1">
+ <div class="cloumn_Box1">
<div class="flex_Box1 subpage_Div">
<el-tabs
v-model="activeName"
@@ -18,7 +18,7 @@
>
<el-table
:data="resInfo"
- style="width: 100%; height: 310px"
+ style="width: 100%; height: 100%"
>
<el-table-column
prop="id"
@@ -486,6 +486,7 @@
type: 'category',
boundaryGap: false,
data: ['', '', '', '', '', '', ''],
+
},
yAxis: [
{
@@ -507,6 +508,16 @@
type: 'line',
showSymbol: false,
data: valueList,
+ // itemStyle: {
+ // normal: {
+ // color: "#009cff", //鏀瑰彉鎶樼嚎鐐圭殑棰滆壊
+ // lineStyle: {
+ // color: "#009cff", //鏀瑰彉鎶樼嚎棰滆壊
+ // },
+ // },
+ // }
+
+
},
],
};
@@ -674,7 +685,7 @@
left: 'center',
textStyle: {
fontSize: 18, //瀛椾綋澶у皬
-
+
},
},
series: [
@@ -868,11 +879,11 @@
height: 98%;
width: 98%;
padding: 1%;
-
+
.content_Box {
width: 100%;
height: 90%;
-
+
display: flex;
flex-direction: column;
justify-content: space-around;
@@ -885,10 +896,9 @@
.flex_Box {
width: 30.5%;
height: 88%;
-
+
border-radius: 5px;
padding: 1%;
-
.image1 {
width: 46px;
@@ -916,8 +926,8 @@
}
}
.ycsBox {
- width: 200px;
- height: 200px;
+ width: 495px;
+ height: 182px;
background: url("../../assets/img/systemMonitoring/鍥惧眰 39.png")
no-repeat;
background-size: 100% 100%;
@@ -929,13 +939,14 @@
width: 100%;
padding: 1%;
height: 80%;
+
display: flex;
justify-content: center;
}
}
.imageTitle {
float: left;
-
+
margin-left: 10px;
}
.ycTltle {
@@ -953,7 +964,7 @@
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 300;
- color: #ffffff;
+
line-height: 49px;
// margin-top: 20px;
@@ -981,9 +992,8 @@
.height_title {
width: 100%;
height: 48%;
-
+
p {
-
margin-top: 3%;
font-size: 24px;
}
@@ -1006,21 +1016,17 @@
width: 64%;
height: 92%;
padding: 1%;
-
+
border-radius: 5px;
-
}
.flex_Box {
width: 30.5%;
height: 92%;
-
+
border-radius: 5px;
padding: 1%;
-
}
}
}
-
-
}
</style>
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index b1ab160..2ee3dc3 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -24,6 +24,7 @@
<el-form-item :label="$t('operatManage.tokentoolObj.tokenStatus')">
<el-select
+ style="width:200px"
:popper-append-to-body="false"
v-model="ruleForm.value"
:placeholder="$t('common.choose')"
@@ -40,19 +41,7 @@
</el-form-item>
<!-- 鏌ヨ 娓呯┖ -->
- <el-form-item>
- <el-button
- icon="el-icon-search"
- size="small"
- type="primary"
- @click="onSubmit"
- >{{ $t('common.iquery') }}</el-button>
- <el-button
- icon="el-icon-delete"
- type="info"
- size="small"
- @click="onEmpty('formData1')"
- >{{ $t('common.empty') }}</el-button>
+ <el-form-item style="float:right">
<el-button
v-if="menuStatus.insert"
@click="InsertFormdialog = true"
@@ -67,17 +56,27 @@
type="danger"
size="small"
>{{ $t('common.delete') }}</el-button>
+ <el-button
+ icon="el-icon-search"
+ size="small"
+ type="primary"
+ @click="onSubmit"
+ >{{ $t('common.iquery') }}</el-button>
+ <el-button
+ icon="el-icon-delete"
+ type="info"
+ size="small"
+ @click="onEmpty('formData1')"
+ >{{ $t('common.empty') }}</el-button>
</el-form-item>
</el-form>
</div>
- <div class="table_box subpage_Div">
- <div></div>
- <el-table
- :data="tableData"
-
- style="width: 100%"
- @selection-change="handleSelectionChange"
- >
+ <div style="height: 73%">
+ <el-table
+ ref="filterTable"
+ :data="tableData"
+ style="width: 100%"
+ height="94%">
<el-table-column
type="selection"
width="55"
diff --git a/src/views/maintenance/userManagement.vue b/src/views/maintenance/userManagement.vue
index 3aaa7c1..29aff91 100644
--- a/src/views/maintenance/userManagement.vue
+++ b/src/views/maintenance/userManagement.vue
@@ -15,7 +15,7 @@
prop="uname"
:label="$t('userManage.userInfoObj.uname')"
>
- <el-input v-model="queryForm.uname" />
+ <el-input v-model="queryForm.uname" style="width:200px"/>
</el-form-item>
<el-form-item
prop="depid"
@@ -25,6 +25,7 @@
:popper-append-to-body="false"
v-model="queryForm.depName"
placeholder="璇烽�夋嫨"
+ style="width:200px"
>
<el-option
:value="queryForm.depid"
@@ -40,34 +41,9 @@
/>
</el-option>
</el-select>
-
- <!-- <el-cascader
- v-model="queryForm.depid"
- :options="treeOptions"
- filterable
- ref="cascaderHandle"
- @change="handleChange"
- :show-all-levels="false"
- :props="{
- label: 'name',
- value: 'id',
- children: 'children',
- checkStrictly: true,
- emitPath: false,
- }"
- >
- </el-cascader> -->
</el-form-item>
- <el-form-item>
- <el-button
- size="small"
- @click="queryInfo()"
- icon="el-icon-search"
- type="primary"
- >{{ $t('operatManage.ELM.search') }}
- </el-button>
- </el-form-item>
- <el-form-item>
+
+ <el-form-item style="float:right">
<el-button
type="info"
size="small"
@@ -77,19 +53,17 @@
{{ $t('operatManage.ELM.reset') }}
</el-button>
</el-form-item>
-
- <el-form-item>
+ <el-form-item style="float:right" v-show="setbatchFlag">
<el-button
- v-if="menuStatus.insert"
- type="success"
+ v-if="menuStatus.update"
size="small"
- @click="showAddDialog"
- icon="el-icon-plus"
- >
- {{ $t('common.append') }}
+ @click="editPwd"
+ type="warning"
+ icon="el-icon-unlock"
+ >{{ $t('common.changepassWord') }}
</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
v-if="menuStatus.delete"
type="danger"
@@ -100,26 +74,27 @@
{{ $t('common.delete') }}
</el-button>
</el-form-item>
- <el-form-item v-show="setbatchFlag">
+ <el-form-item style="float:right">
<el-button
- v-if="menuStatus.update"
+ v-if="menuStatus.insert"
+ type="success"
size="small"
- @click="editPwd"
- type="warning"
- icon="el-icon-unlock"
- >{{ $t('common.changepassWord') }}
+ @click="showAddDialog"
+ icon="el-icon-plus"
+ >
+ {{ $t('common.append') }}
</el-button>
</el-form-item>
</el-form>
</div>
- <div class="table_box subpage_Div">
- <el-table
- :data="tableData"
- border
- style="width: 100%;overflow: auto;height: 900px;"
- @selection-change="handleSelectionChange"
- >
- <el-table-column
+ <div style="height: 73%">
+ <el-table
+ ref="filterTable"
+ :data="tableData"
+ style="width: 100%"
+ height="90%"
+ >
+ <el-table-column
type="selection"
width="55"
/>
@@ -128,7 +103,6 @@
type="index"
:label="$t('common.index')"
width="70px"
- fixed
/>
<el-table-column
@@ -136,7 +110,6 @@
prop="uname"
width="150px"
:label="$t('userManage.userInfoObj.uname')"
- fixed
/>
<el-table-column
align="center"
@@ -239,7 +212,6 @@
<el-table-column
:label="$t('common.operate')"
width="80px"
- fixed="right"
v-if="menuStatus.update"
>
<template slot-scope="scope">
@@ -249,7 +221,7 @@
plain
@click="editInfo(scope.row)"
size="small"
- >{{ $t('common.edit') }}</el-button>
+ >{{ $t('common.update') }}</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/userManage/authorityManage.vue b/src/views/userManage/authorityManage.vue
index e55e74d..e3c53dd 100644
--- a/src/views/userManage/authorityManage.vue
+++ b/src/views/userManage/authorityManage.vue
@@ -13,21 +13,9 @@
:inline="true"
>
<el-form-item >
- <el-input v-model="ruleForm.name"></el-input>
+ <el-input v-model="ruleForm.name" style="width:200px"></el-input>
</el-form-item>
- <el-form-item>
- <el-button
- @click="submitForm('ruleForm')"
- icon="el-icon-search" size="small"
- type="primary"
- >{{
- $t('common.iquery')
- }}</el-button>
- <el-button
- @click="resetForm('ruleForm')"
- icon="el-icon-refresh"
- type="info" size="small"
- >{{ $t('common.empty') }}</el-button>
+ <el-form-item style="float: right;">
<el-button
v-if="menuStatus.insert"
@click="InsertFormdialog = true"
@@ -40,6 +28,18 @@
icon="el-icon-delete"
type="danger" size="small"
>{{ $t('common.delete') }}</el-button>
+ <el-button
+ @click="submitForm('ruleForm')"
+ icon="el-icon-search" size="small"
+ type="primary"
+ >{{
+ $t('common.iquery')
+ }}</el-button>
+ <el-button
+ @click="resetForm('ruleForm')"
+ icon="el-icon-refresh"
+ type="info" size="small"
+ >{{ $t('common.empty') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/userManage/orgManage.vue b/src/views/userManage/orgManage.vue
index 2e60edf..a61d071 100644
--- a/src/views/userManage/orgManage.vue
+++ b/src/views/userManage/orgManage.vue
@@ -20,8 +20,12 @@
</el-tree>
</div>
</div>
- <div class="right_menu subpage_Div">
-
+ <div style="width: 80%;border: 1px solid #dcdfe6;
+ width: 80%;
+ height: 91%;
+ border-radius: 5px;
+ padding: 1%;
+ overflow: auto;">
<div style="display:flex;justify-content:space-between">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/' }">{{
@@ -30,22 +34,6 @@
</el-breadcrumb>
<div>
- <el-button
- v-if="menuStatus.update"
- :disabled="itemdetail.pid == null ? true : false"
- @click="setEditNode(1)"
- type="info"
- icon="el-icon-top"
- size="small"
- >鍚戜笂绉诲姩</el-button>
- <el-button
- v-if="menuStatus.update"
- :disabled="itemdetail.pid == null ? true : false"
- @click="setEditNode(2)"
- type="info"
- icon="el-icon-bottom"
- size="small"
- >鍚戜笅绉诲姩</el-button>
<el-button
v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@@ -62,7 +50,7 @@
icon="el-icon-plus"
size="small"
>鏂板瀛愮骇</el-button>
- <el-button
+ <el-button
v-if="menuStatus.delete"
@click="setDelNode()"
:disabled="itemdetail.pid == null ? true : false"
@@ -70,12 +58,28 @@
icon="el-icon-delete"
size="small"
>鍒犻櫎</el-button>
+ <el-button
+ v-if="menuStatus.update"
+ :disabled="itemdetail.pid == null ? true : false"
+ @click="setEditNode(1)"
+ type="info"
+ icon="el-icon-top"
+ size="small"
+ >鍚戜笂绉诲姩</el-button>
+ <el-button
+ v-if="menuStatus.update"
+ :disabled="itemdetail.pid == null ? true : false"
+ @click="setEditNode(2)"
+ type="info"
+ icon="el-icon-bottom"
+ size="small"
+ >鍚戜笅绉诲姩</el-button>
</div>
</div>
- <el-divider />
-
<div class="form_box">
+ <el-divider class="eldivider" />
<el-form
+ style="min-height: 600px;overflow-y: auto;height: 500px;margin-top: 25px;"
:model="itemdetail"
ref="itemdetail"
:rules="rules"
@@ -87,6 +91,7 @@
<el-input
v-model="itemdetail.name"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -96,6 +101,7 @@
<el-input
v-model="itemdetail.sname"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -105,6 +111,7 @@
<el-input
v-model="itemdetail.code"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -114,6 +121,7 @@
<el-input
v-model="itemdetail.uncode"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -123,6 +131,7 @@
<el-input
v-model="itemdetail.addr"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -132,6 +141,7 @@
<el-input
v-model="itemdetail.contact"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -141,6 +151,7 @@
<el-input
v-model="itemdetail.fax"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -150,6 +161,7 @@
<el-input
v-model="itemdetail.email"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -159,6 +171,7 @@
<el-input
v-model="itemdetail.post"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -168,6 +181,7 @@
<el-input
v-model="itemdetail.website"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<el-form-item
@@ -177,6 +191,7 @@
<el-input
v-model="itemdetail.bak"
autocomplete="off"
+ style="max-width: 400px;"
></el-input>
</el-form-item>
<div
@@ -197,7 +212,6 @@
</div>
</el-form>
</div>
-
</div>
</div>
diff --git a/src/views/userManage/resourceManage.vue b/src/views/userManage/resourceManage.vue
index 2ed2a84..6e666fb 100644
--- a/src/views/userManage/resourceManage.vue
+++ b/src/views/userManage/resourceManage.vue
@@ -12,22 +12,9 @@
:inline="true"
>
<el-form-item :label="$t('userManage.resManageObj.name')">
- <el-input v-model="ruleForm.name"></el-input>
+ <el-input v-model="ruleForm.name" style="width:200px"></el-input>
</el-form-item>
- <el-form-item>
- <el-button
- @click="submitForm('ruleForm')"
- icon="el-icon-search"
- size="small"
- type="primary"
- style="background: #1890ff"
- >{{ $t('common.iquery') }}</el-button>
- <el-button
- @click="resetForm('ruleForm')"
- icon="el-icon-refresh"
- type="info"
- size="small"
- >{{ $t('common.empty') }}</el-button>
+ <el-form-item style="float:right">
<el-button
v-if="menuStatus.insert"
@click="setInsertFormdialog"
@@ -42,6 +29,19 @@
type="danger"
size="small"
>{{ $t('common.delete') }}</el-button>
+ <el-button
+ @click="submitForm('ruleForm')"
+ icon="el-icon-search"
+ size="small"
+ type="primary"
+ style="background: #1890ff"
+ >{{ $t('common.iquery') }}</el-button>
+ <el-button
+ @click="resetForm('ruleForm')"
+ icon="el-icon-refresh"
+ type="info"
+ size="small"
+ >{{ $t('common.empty') }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index 29e97b6..f9046a4 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -15,7 +15,7 @@
:label="$t('userManage.RM.roleName')"
prop="username"
>
- <el-input v-model="roleForm.username" />
+ <el-input v-model="roleForm.username" style="width:200px"/>
</el-form-item>
<el-form-item
:label="$t('userManage.RM.ownedSystem')"
@@ -25,7 +25,7 @@
:popper-append-to-body="false"
v-model="roleForm.depValue"
placeholder="璇烽�夋嫨"
- style="width:93%"
+ style="width:200px"
>
<el-option
:value="roleForm.depid"
@@ -55,7 +55,7 @@
@click="showDepTree(1)"
>{{ $t('common.choose') }}</el-button>
</el-form-item> -->
- <el-form-item>
+ <!-- <el-form-item style="float:right">
<el-button
type="success"
size="small"
@@ -65,7 +65,7 @@
$t('userManage.RM.add')
}}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
size="small"
type="primary"
@@ -74,7 +74,7 @@
$t('userManage.RM.query')
}}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
type="info"
size="small"
@@ -83,7 +83,7 @@
$t('userManage.RM.reset')
}}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
type="danger"
size="small"
@@ -92,6 +92,44 @@
><i class="el-icon-delete"></i> {{
$t('common.delete')
}}</el-button>
+ </el-form-item> -->
+ <el-form-item style="float:right">
+ <el-button
+ type="info"
+ size="small"
+ @click="resetForm('ruleForm')"
+ ><i class="el-icon-delete"></i> {{
+ $t('userManage.RM.reset')
+ }}</el-button>
+ </el-form-item>
+ <el-form-item style="float:right">
+ <el-button
+ size="small"
+ type="primary"
+ @click="onSubmit('ruleForm')"
+ ><i class="el-icon-search"></i> {{
+ $t('userManage.RM.query')
+ }}</el-button>
+ </el-form-item>
+ <el-form-item style="float:right">
+ <el-button
+ type="danger"
+ size="small"
+ @click="handleDelete()"
+ v-if="menuStatus.delete"
+ ><i class="el-icon-delete"></i> {{
+ $t('common.delete')
+ }}</el-button>
+ </el-form-item>
+ <el-form-item style="float:right">
+ <el-button
+ type="success"
+ size="small"
+ @click="setInsertFormdialog "
+ v-if="menuStatus.insert"
+ ><i class="el-icon-circle-plus-outline"></i> {{
+ $t('userManage.RM.add')
+ }}</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index e74b231..a7ea54a 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -13,19 +13,12 @@
>
<el-form-item>
<el-input
+ style="width:200px"
v-model="ruleForm.name"
:placeholder="$t('common.pleaseInput')"
/>
</el-form-item>
- <el-form-item>
- <el-button
- icon="el-icon-search"
- @click="setRefreshTable"
- type="primary"
- size="small"
- >{{ $t('common.iquery') }}</el-button>
- </el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
icon="el-icon-refresh"
@click="restRefreshTable"
@@ -33,16 +26,15 @@
size="small"
>{{ $t('common.empty') }}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
- v-if="btnStatus.insert"
- @click="setTableInsert"
- icon="el-icon-edit"
- type="success"
+ icon="el-icon-search"
+ @click="setRefreshTable"
+ type="primary"
size="small"
- >{{ $t('common.append') }}</el-button>
+ >{{ $t('common.iquery') }}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float:right">
<el-button
v-if="btnStatus.delete"
icon="el-icon-delete"
@@ -51,7 +43,15 @@
size="small"
>{{ $t('common.delete') }}</el-button>
</el-form-item>
-
+ <el-form-item style="float:right">
+ <el-button
+ v-if="btnStatus.insert"
+ @click="setTableInsert"
+ icon="el-icon-edit"
+ type="success"
+ size="small"
+ >{{ $t('common.append') }}</el-button>
+ </el-form-item>
</el-form>
</div>
<div>
@@ -91,16 +91,16 @@
:label="$t('common.domCode')"
:formatter="codeData"
/>
- <el-table-column
+ <!-- <el-table-column
align="center"
prop="fname"
:label="$t('common.filePath')"
- />
- <el-table-column
+ /> -->
+ <!-- <el-table-column
align="center"
prop="bak"
:label="$t('common.bak')"
- />
+ /> -->
<el-table-column
align="center"
prop="createName"
--
Gitblit v1.9.3