From 4e3d77dcbe421a4d6611ebcdd1ac3165cb36ad4b Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 06 二月 2023 14:59:33 +0800
Subject: [PATCH] 系统界面翻新，回车登录，综合展示菜单重复
---
src/views/datamanage/metadataManage.vue | 232 -
src/components/catalogueTree copy.vue | 27
src/views/datamanage/projectManage.vue | 232 -
src/views/maintenance/userManagement.vue | 148 -
src/assets/css/configure.css | 47
src/assets/css/content.css | 189 +
src/views/maintenance/systemMonitoring.vue | 109
src/components/MapView/mapSpaceTop.vue | 24
src/components/catalogueTree.vue | 31
src/views/AuthorizationManagement/menuRoleAuthorization.vue | 174 -
src/views/maintenance/blackwhiteList.vue | 139 -
src/views/datamanage/dataController.vue | 166
src/views/Thematic/index.vue | 94
src/components/navMenu.vue | 210 -
src/views/userManage/roleManage.vue | 197 -
src/views/maintenance/logLog.vue | 111
src/views/exportMap/index.vue | 155
src/store/index.js | 15
src/views/AuthorizationManagement/userRoleAuthorization.vue | 230 -
src/views/AuthorizationManagement/roleMenuAuthorization.vue | 270 -
src/views/Tools/Popup.vue | 8
src/views/datamanage/SpatialData.vue | 215 -
src/views/Thematic/index copy 2.vue | 2
src/assets/lang/zh.js | 1
src/views/Tools/LayerTree.vue | 197 +
src/main.js | 4
src/views/datamanage/catalogueManage.vue | 132
src/views/maintenance/operationLog.vue | 145
src/assets/lang/en.js | 15
src/views/Home.vue | 25
public/LfSKyline/index.html | 2
src/views/Archive/index.vue | 411 +--
src/views/maintenance/tokentool.vue | 170 -
src/assets/css/index.css | 267 ++
src/views/Synthesis/LeftMenu.vue | 39
src/views/datamanage/styleDepTree.vue | 9
src/views/userManage/authorityManage.vue | 207 -
src/components/mapsdk.vue | 18
src/views/maintenance/mochaitmo.vue | 167
src/assets/js/index.js | 63
src/views/datamanage/styleManage.vue | 217 -
src/api/api.js | 17
src/views/datamanage/dictionaryManage.vue | 299 -
public/config/config.js | 24
src/components/customElMenu.vue | 12
src/views/Archive/dataApplication.vue | 230 -
src/views/maintenance/downlog.vue | 111
src/views/maintenance/menuSettings.vue | 104
src/views/userManage/resourceManage.vue | 226 -
src/views/maintenance/eventlogManage.vue | 107
src/views/AuthorizationManagement/roleResAuthorization.vue | 183 -
src/components/login.vue | 24
src/components/MapView/mapMenuPop.vue | 24
src/views/datamanage/dataLoader.vue | 16
src/views/Tools/queryinfo.vue | 2
src/views/datamanage/dataUpdata.vue | 293 --
src/utils/request.js | 12
src/views/maintenance/databaseMonitoring.vue | 2
src/views/Synthesis/index.vue | 13
src/views/maintenance/parameterConfiguration.vue | 117
public/LfSKyline/css/index.css | 3
src/views/userManage/orgManage.vue | 190 -
src/components/MapView/mapMenuTop.vue | 9
src/views/datamanage/versionManage.vue | 145 -
src/views/datamanage/domainManage.vue | 187 -
src/views/userManage/roleDepTree.vue | 20
66 files changed, 1,803 insertions(+), 5,681 deletions(-)
diff --git a/public/LfSKyline/css/index.css b/public/LfSKyline/css/index.css
index d138a8e..d64419c 100644
--- a/public/LfSKyline/css/index.css
+++ b/public/LfSKyline/css/index.css
@@ -106,7 +106,8 @@
}
.fieldset {
- margin: 10px 5px;
+ padding: 10px 5px;
+ height: calc(100% - 20px);
}
#layers {
diff --git a/public/LfSKyline/index.html b/public/LfSKyline/index.html
index da80981..26a5731 100644
--- a/public/LfSKyline/index.html
+++ b/public/LfSKyline/index.html
@@ -97,7 +97,7 @@
<legend>鏁版嵁鐩綍</legend>
<!-- <div id="layers"></div> -->
<div>
- <object id="TerraExplorerInformationWindowEx" classid="CLSID:3A4F919B-65A8-11D5-85C1-0001023952C1" width="300" height="400"></object>
+ <object id="TerraExplorerInformationWindowEx" classid="CLSID:3A4F919B-65A8-11D5-85C1-0001023952C1"></object>
</div>
diff --git a/public/config/config.js b/public/config/config.js
index f62e2a5..5031c5f 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -1,5 +1,5 @@
var isWeb = location.hostname.indexOf("103.85.165.") > -1;
-
+
var webHost = isWeb ? location.hostname + ":8052" : '192.168.20.106' + ":12316";
var fmeHost = isWeb ? location.hostname + ":8051" : '192.168.20.205' + ":88";
@@ -26,20 +26,20 @@
var modelUrl = LFData + '/tileset/SN/tileset.json';
// DEM
-var demLayer = LFData + '/dem';
+var demLayer = 'http://192.168.20.55/LFData/dem';
// 缁煎悎灞曠ず
window.sceneConfig = {
- // Sdk璁稿彲
- licenseServer: 'http://' + iisHost + '/LFServer',
- // MPT鍚嶇О
- mptName: "china_5m.Ei.397334",
- // SG鍦板潃
- SGUrl: "http://" + iisHost + "/SG/Elevation",
- // Fly鍦板潃
- fly: 'http://' + iisHost + '/LFData/fly/' + (isWeb ? "lfy_web.fly" : "lf_127.fly"),
- //
- positionBtn: [],
+ // Sdk璁稿彲
+ licenseServer: 'http://' + iisHost + '/LFServer',
+ // MPT鍚嶇О
+ mptName: "china_5m.Ei.397334",
+ // SG鍦板潃
+ SGUrl: "http://" + iisHost + "/SG/Elevation",
+ // Fly鍦板潃
+ fly: 'http://' + iisHost + '/LFData/fly/' + (isWeb ? "lfy_web.fly" : "lf_127.fly"),
+ //
+ positionBtn: [],
};
var gaoDeBaseUrl = [{
diff --git a/src/api/api.js b/src/api/api.js
index fadb478..297e775 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -707,7 +707,10 @@
export function apply_insertApply(params) {
return request.post('/apply/insertApply', params);
}
-
+//璧勬枡棣�=>鏍规嵁鍗曚綅ID闆嗗悎鏌ヨ鍗曚綅
+export function dataLib_selectDepsByIds(params) {
+ return request.get('/dataLib/selectDepsByIds?' + params);
+}
//璧勬枡棣�=>璇锋眰涓嬭浇
export function dataLib_downloadReq(params) {
@@ -729,7 +732,10 @@
export function dataLib_selectBusinessType(params) {
return request.get('/dataLib/selectBusinessType', { params: params });
}
-
+//璧勬枡棣�=>鍒嗛〉鏌ヨ涓嬭浇鏂囦欢
+export function dataLib_selectPageCountForDownload(params) {
+ return request.get('/dataLib/selectPageCountForDownload', { params: params });
+}
//涓嬭浇鏃ュ織=銆嬪垎椤垫煡璇㈠苟杩斿洖璁板綍鏁�
export function downlog_selectByPageAndCount(params) {
@@ -924,4 +930,9 @@
//椤圭洰绠＄悊=>鍒犻櫎
export function project_selectLocation(params) {
return request.get('/project/selectLocation?x=' + params.x + '&y=' + params.y)
-}
\ No newline at end of file
+}
+//鏌ヨ鎵�鏈夊浘灞�
+export function perms_selectLayers(params) {
+ return request.get('/perms/selectLayers', { params: params });
+}
+
diff --git a/src/assets/css/configure.css b/src/assets/css/configure.css
new file mode 100644
index 0000000..8a8bb3e
--- /dev/null
+++ b/src/assets/css/configure.css
@@ -0,0 +1,47 @@
+/* 婊氬姩鏉℃牱寮� */
+
+::-webkit-scrollbar{
+ width:8px;
+ height:8px;
+ background-color: #409eff;
+}
+::-webkit-scrollbar-track{
+ background: #eee;
+}
+::-webkit-scrollbar-thumb{
+ background: #409eff;
+ border-radius:100px;
+}
+::-webkit-scrollbar-thumb:hover{
+ background: #409eff;
+}
+::-webkit-scrollbar-corner{
+ background: #409eff;
+}
+
+
+.box_div {
+ background: #F4F8FF;
+}
+
+.subpage_Div {
+ border: 1px solid #dcdfe6;
+}
+
+.el-scrollbar .el-scrollbar__bar .is-vertical {
+ width: 0;
+}
+
+.el-tree {
+ background: transparent;
+}
+
+.el-tree-node.is-current>.el-tree-node__content {
+
+ color: #409eff !important;
+}
+
+.el-tree-node__content :hover {
+
+ background-color: transparent !important;
+}
\ No newline at end of file
diff --git a/src/assets/css/content.css b/src/assets/css/content.css
new file mode 100644
index 0000000..6f087f8
--- /dev/null
+++ b/src/assets/css/content.css
@@ -0,0 +1,189 @@
+.contentBox {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+}
+
+
+.box {
+ width: calc(100% - 20px);
+ height: calc(100% - 20px);
+ margin: 10px;
+ overflow: hidden;
+
+}
+
+/*宸︿晶div鏍峰紡*/
+.left {
+ width: calc(17% - 10px);
+ /*宸︿晶鍒濆鍖栧搴�*/
+ height: 100%;
+ overflow: auto;
+ border-radius: 10px;
+ float: left;
+}
+
+/*鎷栨嫿鍖篸iv鏍峰紡*/
+.resize {
+ cursor: col-resize;
+ float: left;
+ position: relative;
+ top: 45%;
+ background-color: #d6d6d6;
+ border-radius: 5px;
+ margin-top: -10px;
+ width: 10px;
+ height: 50px;
+ background-size: cover;
+ background-position: center;
+ /*z-index: 99999;*/
+ font-size: 32px;
+ color: white;
+}
+
+/*鎷栨嫿鍖洪紶鏍囨偓鍋滄牱寮�*/
+.resize:hover {
+ color: #444444;
+}
+
+/*鍙充晶div'鏍峰紡*/
+.mid {
+ float: left;
+ width: 83%;
+ /*鍙充晶鍒濆鍖栧搴�*/
+ height: 100%;
+
+ border-radius: 10px;
+}
+
+
+
+.subpage_Box {
+ width: 98%;
+ height: 98%;
+ padding: 1%;
+ overflow: auto;
+}
+
+.subpage_Iquery {
+ width: calc(98% - 2px);
+ height: auto;
+
+ padding-left: 1%;
+ padding-right: 1%;
+ padding-top: 1%;
+ border-radius: 5px;
+}
+
+.subpage_Content {
+ width: calc(98% - 2px);
+ height: auto;
+
+ margin-top: 1%;
+ margin-bottom: 1%;
+ padding: 1%;
+ border-radius: 5px;
+}
+
+.tarnsbtton {
+ width: 6%;
+ height: 100%;
+ /*flex 甯冨眬*/
+ display: flex;
+ /*瀹炵幇鍨傜洿灞呬腑*/
+ align-items: center;
+ /*瀹炵幇姘村钩灞呬腑*/
+ justify-content: center;
+}
+
+.dialogBox {
+ width: 100%;
+ height: 500px;
+ display: flex;
+ justify-content: space-between;
+}
+
+.transFarBox {
+ width: 30%;
+ height: 100%;
+
+ border-radius: 5px;
+ max-height: 500px;
+ overflow-y: auto;
+}
+
+.transFarBox li {
+ line-height: 30px;
+ text-align: center;
+}
+
+.transFarBox li:hover {
+ background: rgba(0, 0, 0, 0.2);
+}
+
+.transFarBox .active {
+ color: #409eff;
+}
+
+.dialogContent {
+ width: calc(100% - 20px);
+ max-height: 370px;
+ float: left;
+ overflow: auto;
+ padding: 10px;
+
+}
+
+.dialogContent .ContBox {
+ width: 44%;
+ padding: 10px;
+ margin-left: 2%;
+ float: left;
+
+}
+
+.dialogContent .ContDiv {
+ display: flex;
+ justify-content: space-around;
+ margin: 5px 0px;
+
+}
+
+.dialogContent .contLable {
+ width: 175px;
+
+}
+
+.infoBox {
+ width: 500px;
+ position: absolute;
+ z-index: 100;
+ top: 15%;
+ right: 15%;
+ border: 1px solid white;
+
+ height: 600px;
+ padding: 10px;
+ overflow: auto;
+ border-radius: 5px;
+
+}
+
+.infoBox .el-card {
+ background-color: transparent;
+
+}
+
+.infoBox span {
+ font-size: 16px;
+ font-weight: 600;
+}
+
+.infoBox .contentBox {
+ margin: 0 aotu 10px;
+
+}
+
+.infoBox p {
+ font-size: 14px;
+}
\ No newline at end of file
diff --git a/src/assets/css/index.css b/src/assets/css/index.css
new file mode 100644
index 0000000..d560169
--- /dev/null
+++ b/src/assets/css/index.css
@@ -0,0 +1,267 @@
+html {}
+
+/* Home椤甸潰 */
+.home {
+ height: 100vh;
+ position: relative;
+}
+
+.el-container {
+ height: 100%;
+}
+
+.el-header {
+ padding: 0;
+ height: 90px !important;
+}
+
+.el-main {
+ margin: 0px;
+ padding: 0px !important;
+ background: #3B4D6E;
+}
+
+/* 瀵艰埅鏍忛〉闈� */
+.NavBox {
+ width: 100%;
+ height: 100%;
+ background-image: linear-gradient(rgb(34, 33, 33), rgb(27, 31, 78));
+}
+
+.topBox {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+}
+
+.topTitle {
+ width: 415px;
+ height: 70px;
+ background: url("../img/LOGO.png") no-repeat center;
+}
+
+.topMenu {
+ width: auto;
+ flex: 1;
+ height: 100px;
+}
+
+.menuContent {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+}
+
+.contentDiv {
+ margin-left: 1%;
+}
+
+.ImgMenu {
+ width: 100%;
+ height: auto;
+ display: flex;
+ justify-content: center;
+}
+
+.menuImage {
+ width: 40px;
+ height: 40px;
+}
+
+.menulabel {
+ font-size: 14px;
+ font-family: Source Han Sans CN;
+ font-weight: 500;
+ text-align: center;
+ width: 120px;
+ color: #fff
+}
+
+.changeStyle {
+ color: #fec801;
+}
+
+.m1 {
+ background: url("../img/menu/menu11.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m2 {
+ background: url("../img/menu/menu21.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m3 {
+ background: url("../img/menu/menu31.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m4 {
+ background: url("../img/menu/menu41.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m5 {
+ background: url("../img/menu/menu51.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m6 {
+ background: url("../img/menu/menu61.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m7 {
+ background: url("../img/menu/qwyzt.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m11 {
+ background: url("../img/menu/menu12.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m21 {
+ background: url("../img/menu/menu22.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m31 {
+ background: url("../img/menu/menu32.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m41 {
+ background: url("../img/menu/menu42.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m51 {
+ background: url("../img/menu/menu52.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m61 {
+ background: url("../img/menu/menu62.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.m71 {
+ background: url("../img/menu/qwyzt-h.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.topUser {
+ color: white;
+ height: 70px;
+}
+
+.userName {
+ margin: 10px 10px;
+ display: flex;
+ justify-content: space-between;
+ height: 30px;
+}
+
+.userLanguage {
+ margin: 0px 10px;
+ margin-top: 10px;
+ display: flex;
+ height: 30px;
+}
+
+.userImage {
+ width: 20px;
+ height: 20px;
+ float: left;
+ margin-right: 10px;
+}
+
+.user1 {
+ background: url("../img/user.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.user2 {
+ background: url("../img/EN.png") no-repeat;
+ background-size: 100% 100%;
+}
+
+.userText {
+ font-size: 15px;
+ line-height: 15px;
+ font-family: Microsoft YaHei;
+ font-weight: 400;
+
+ text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.35);
+}
+
+.TextLanguage {
+ font-size: 15px;
+ line-height: 15px;
+ font-family: Microsoft YaHei;
+ font-weight: 400;
+
+ text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.35);
+}
+
+.elLink {
+ margin-left: 5px;
+ font-size: 15px;
+ margin-bottom: 4px;
+ color: white;
+}
+
+.secondMenuDiv {
+ position: absolute;
+ z-index: 1024;
+ margin-top: 10px;
+ border: 1px solid gray;
+ border-radius: 5px;
+}
+
+.topUser .el-link--default:hover {
+ color: #409eff !important;
+}
+
+.topUser .el-link--default {
+ color: white !important;
+}
+
+.el-menu {
+ border: transparent;
+}
+
+.secondMenuDiv {
+ position: absolute;
+ z-index: 1024;
+ margin-top: 15px;
+background: rgba(244,248,255, 0.85);
+ border-radius: 5px;
+
+}
+
+.secondMenuDiv div {
+ line-height: 30px;
+
+ padding: 10px;
+ font-size: 18px;
+ font-family: Microsoft YaHei;
+ font-weight: 400;
+
+ line-height: 49px;
+ min-width: 120px;
+}
+
+.secondMenuDiv .changeLiStyle {
+ color: #409eff ;
+ box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.1);
+ border:1px solid #409eff;
+ /* background: #182E45 */
+ /*
+ */
+
+}
\ No newline at end of file
diff --git a/src/views/Thematic/index.js b/src/assets/js/index.js
similarity index 65%
rename from src/views/Thematic/index.js
rename to src/assets/js/index.js
index 0a005c4..2557cea 100644
--- a/src/views/Thematic/index.js
+++ b/src/assets/js/index.js
@@ -48,6 +48,37 @@
isEdit: false,
children: [
{
+ id: 13,
+ label: '椤圭洰',
+ resource: 'LF:bs_project',
+ isEdit: false,
+ },
+ {
+ id: 14,
+ label: '绔欏満',
+ resource: 'LF:m_sitepoint',
+ isEdit: false,
+ },
+ {
+ id: 15,
+ label: '鍏磋叮鐐�',
+ resource: 'LF:m_poi',
+ isEdit: false,
+ },
+ {
+ id: 16,
+ label: '1:100涓囪嚜鐒跺湴鍚嶇偣',
+ resource: 'LF:dlg_100w_aanp',
+ isEdit: false,
+ },
+ {
+ id: 18,
+ label: '1:100涓囧眳姘戝湴鍦板悕鐐�',
+ resource: 'LF:dlg_100w_agnp',
+ isEdit: false,
+ },
+
+ {
id: 11,
label: '绠￠亾涓績绾�',
resource: 'LF:m_pipeline',
@@ -60,15 +91,35 @@
isEdit: false,
},
{
- id: 13,
- label: '椤圭洰',
- resource: 'LF:bs_project',
+ id: 19,
+ label: '1:100涓囧叕璺�',
+ resource: 'LF:dlg_100w_lrdl',
+ isEdit: false,
+ }, {
+ id: 20,
+ label: ' 1:100涓囬搧璺�',
+ resource: 'LF:dlg_100w_lrrl',
isEdit: false,
},
{
- id: 14,
- label: '绔欏満',
- resource: 'LF:m_sitepoint',
+ id: 21,
+ label: '1:100涓囨按绯荤嚎',
+ resource: 'LF:dlg_100w_lrrl',
+ isEdit: false,
+ }, {
+ id: 22,
+ label: '1:100涓囪鏀垮鐣岀嚎',
+ resource: 'LF:dlg_100w_boul',
+ isEdit: false,
+ },{
+ id: 23,
+ label: '1:100涓囪鏀垮鐣岄潰',
+ resource: 'LF:dlg_100w_boua',
+ isEdit: false,
+ },{
+ id: 24,
+ label: '1:100涓囨按绯婚潰',
+ resource: 'LF:dlg_100w_hyda',
isEdit: false,
},
],
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 7671e0a..631a328 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -44,7 +44,7 @@
lineNuber: 'line Nuber',
pleaseInputPassworld: 'Please input a password',
passworld: 'Passworld',
- language:"涓枃"
+ language: "涓枃"
},
dataManage: {
@@ -94,8 +94,8 @@
selectMetadata: 'Select Metadata',
entryName: 'Entry Name',
selectWBSData: 'Select WBS Data',
-
- coordinateSystem:'Coordinate System'
+
+ coordinateSystem: 'Coordinate System'
},
metadataManage: 'metadataManage',
@@ -126,8 +126,8 @@
gather: 'Acquisition time',
depName: 'Company',
versionNumber: 'Version Number',
- tab:'Table',
- row:'rows'
+ tab: 'Table',
+ row: 'rows'
},
dictionaryManage: 'dictionaryManage',
dictionaryManageObj: {
@@ -422,6 +422,7 @@
},
},
synthesis: {
+ DownloadList: 'Download List',
import: 'Import',
export: 'Export',
pipelineAnalysis: 'Pipeline analysis',
@@ -496,8 +497,8 @@
},
more: 'More',
Multiplechoice: 'Multiple choice',
- Singlechoice:'Single choice',
- undergroundMode:'Underground mode'
+ Singlechoice: 'Single choice',
+ undergroundMode: 'Underground mode'
},
downlog: {
type1: 'Shp file',
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 223687b..a3ad659 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -422,6 +422,7 @@
export: '瀵煎嚭',
pipelineAnalysis: '绠￠亾鍒嗘瀽',
synthesis: '缁煎悎灞曠ず',
+ DownloadList:'涓嬭浇鍒楄〃',
dataApplication: '鏁版嵁鐢宠',
sceneExtraction: '鍦烘櫙鎻愬彇',
themaic: '涓撻鍦板浘',
diff --git a/src/components/MapView/mapMenuPop.vue b/src/components/MapView/mapMenuPop.vue
index 028259b..fbc8fa8 100644
--- a/src/components/MapView/mapMenuPop.vue
+++ b/src/components/MapView/mapMenuPop.vue
@@ -140,7 +140,7 @@
<el-form-item label="瀹℃牳鍗曚綅">
<div>
<ul>
- <li v-for="item in ruleForm.depname">
+ <li v-for="item in ruleForm.depid">
{{item.name}}
</li>
</ul>
@@ -208,6 +208,7 @@
dataQuery_selectDbOverflowDep,
apply_insertApply,
decr, encr,
+ dataLib_selectDepsByIds,
} from "../../api/api.js";
import { getToken } from "@/utils/auth";
import $ from "jquery";
@@ -339,11 +340,21 @@
this.insertFlag = 2;
var std = [];
this.insertOption.ids = data.result;
+ var val = "";
for (var i in data.result) {
+ if (val == "") {
+ val += "ids=" + data.result[i]
+ } else {
+ val += "&ids=" + data.result[i]
+ }
+
std.push({
name: data.result[i]
})
}
+ const data1 = await dataLib_selectDepsByIds(val);
+
+ this.ruleForm.depid = data1.result;
this.ruleForm.depname = std;
this.ruleForm.wkt = decr(this.listdata.wkt)
this.ruleForm.tabs = this.option;
@@ -410,7 +421,7 @@
message: '鏁版嵁鐢宠鎴愬姛',
type: 'success'
});
-
+
this.closeDown();
}
@@ -890,14 +901,9 @@
}
}
li {
- color: white;
line-height: 20px;
- border-bottom: 1px solid white;
+ border-bottom: 1px solid gray;
padding: 5px;
}
-/deep/.el-textarea .el-input__count {
- background: transparent;
-}
</style>
-<style lang="less"></style>
-<style scoped lang="less"></style>
+
diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index 28038e8..7c76f40 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -410,12 +410,5 @@
padding: 4px 20px;
font-weight: 400;
}
-/deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
-}
-/deep/ .el-select .el-input__inner {
- border-color: #fff !important;
-}
+
</style>
diff --git a/src/components/MapView/mapSpaceTop.vue b/src/components/MapView/mapSpaceTop.vue
index de07c8f..c4f97a7 100644
--- a/src/components/MapView/mapSpaceTop.vue
+++ b/src/components/MapView/mapSpaceTop.vue
@@ -146,27 +146,5 @@
}
</style>
<style lang="less" scoped>
-.el-tree .el-tree-node .is-leaf + .el-checkbox .el-checkbox__inner {
- display: inline-block;
-}
-.el-tree .el-tree-node .el-checkbox .el-checkbox__inner {
- display: none;
-}
-
-/deep/.el-form-item__label {
- color: white;
-}
-/deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff !important;
- border: 1px solid;
-}
-
-/deep/ .el-input__inner {
- border-color: #fff !important;
-}
-/deep/.el-select-dropdown {
- border-color: white;
- opacity: 0.85;
-}
+
</style>
diff --git a/src/components/catalogueTree copy.vue b/src/components/catalogueTree copy.vue
index 5c6b0a1..cbf6095 100644
--- a/src/components/catalogueTree copy.vue
+++ b/src/components/catalogueTree copy.vue
@@ -247,32 +247,7 @@
width: 100%;
height: 94%;
overflow: auto;
- .el-tree {
- background: transparent;
- font-size: 15px;
- font-family: Microsoft YaHei;
- font-weight: 400;
- color: #000000;
- // /deep/ .el-tree-node__label {
- // font-size: 18px;
- // }
- /deep/ .el-tree-node {
- padding-top: 10px;
- // padding-bottom: 10px;
- }
- /deep/ .el-tree-node:focus > .el-tree-node__content {
- background-color: #b9b9b9;
- }
- /deep/ .el-tree-node__content:hover {
- background-color: rgb(153, 153, 153);
- }
- .btnBox {
- margin-left: 5px;
- .el-button + .el-button {
- margin-left: 5px;
- }
- }
- }
+
}
}
</style>
diff --git a/src/components/catalogueTree.vue b/src/components/catalogueTree.vue
index 15d3ddb..00df9d2 100644
--- a/src/components/catalogueTree.vue
+++ b/src/components/catalogueTree.vue
@@ -266,36 +266,7 @@
height: 94%;
overflow: auto;
- .el-tree {
- background: transparent;
- font-size: 15px;
- font-family: Microsoft YaHei;
- font-weight: 400;
- color: #000000;
-
- // /deep/ .el-tree-node__label {
- // font-size: 18px;
- // }
- /deep/ .el-tree-node {
- padding-top: 10px;
- // padding-bottom: 10px;
- }
-
- /deep/ .el-tree-node:focus > .el-tree-node__content {
- background-color: #b9b9b9;
- }
-
- /deep/ .el-tree-node__content:hover {
- background-color: rgb(153, 153, 153);
- }
-
- .btnBox {
- margin: 0 10px 0 5px;
- .el-button + .el-button {
- margin-left: 5px;
- }
- }
- }
+
}
}
</style>
diff --git a/src/components/customElMenu.vue b/src/components/customElMenu.vue
index bf0ece4..e47425e 100644
--- a/src/components/customElMenu.vue
+++ b/src/components/customElMenu.vue
@@ -36,14 +36,4 @@
},
};
</script>
-<style lang="less" scoped>
-.faSub {
- /deep/ .el-submenu__title i {
- background-color: transparent !important;
- color: #fff;
- }
- /deep/.el-menu {
- border: transparent !important;
- }
-}
-</style>
+
diff --git a/src/components/login.vue b/src/components/login.vue
index b299878..b34fffa 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -224,7 +224,7 @@
// 鑾峰彇vuex涓瑼ctions閲岀殑鏂规硶
...mapActions(['login', 'getpublickey']),
getCode(data) {
-
+
this.validCode = data; //鍦╠ata涓畾涔変竴涓� validCode:'',鐢ㄦ潵璁板綍楠岃瘉鐮併��
},
@@ -244,6 +244,7 @@
return
}
this.setCookies(response);
+
getPerms().then((res) => {
if (res.code == 200) {
this.$store.commit('getPermsEntity', res.result);
@@ -275,17 +276,36 @@
});
},
setCookies(res) {
+
var timeData = moment(res.result.expire).format('YYYY-MM-DD HH:mm:ss');
var LfPrems = {
token: res.result.token,
uname: res.result.uname,
time: timeData,
+ userid: res.result.createUser,
+ expire: res.result.expire
};
LfPrems = JSON.stringify(LfPrems);
localStorage.setItem('LFToken', LfPrems);
},
+ enterLogin() {
+ document.onkeydown = (e) => {
+ e = window.event || e;
+
+
+ if (this.$route.path == '/login' && (e.code == 'Enter' || e.code == 'enter' || e.code == 'NumpadEnter')) {
+
+ //鏈�閲嶈鏈�鍚庤皟鐢�1.鐧诲綍鏍￠獙鏂规硶
+ //this.login();
+ this.submitForm('loginForm')
+ }
+ };
+
+ }
},
- created() { },
+ created() {
+ this.enterLogin();
+ },
};
</script>
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 0134978..2378eac 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -410,15 +410,15 @@
// );
// openStreetMap.item.show = false;
- // Viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
- // url:demLayer
- // });
- var option = {
- url: window.sceneConfig.SGUrl,
- layerName: window.sceneConfig.mptName,
- requestVertexNormals: true
- }
- sgworld.Creator.sfsterrainprovider("", option, "", true, "");
+ Viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
+ url:demLayer
+ });
+ // var option = {
+ // url: window.sceneConfig.SGUrl,
+ // layerName: window.sceneConfig.mptName,
+ // requestVertexNormals: true
+ // }
+ // sgworld.Creator.sfsterrainprovider("", option, "", true, "");
window.elevationTool = new SmartEarth.ElevationTool(window.sgworld);
elevationTool.setContourColor('#F1D487');
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 458c344..1c83a75 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -24,7 +24,7 @@
</div>
</div>
<div
- class="secondMenuDiv"
+ class="secondMenuDiv subpage_Div"
v-show="index == showFlag ? true :false"
>
<div
@@ -128,9 +128,13 @@
const data = await getPerms();
this.$store.state.permsEntity = data.result;
}
+
this.$store.state.uname = JSON.parse(
localStorage.getItem('LFToken')
).uname;
+ this.$store.state.unid = JSON.parse(
+ localStorage.getItem('LFToken')
+ ).userid;
this.$router.push('/');
},
getTimeCookies() {
@@ -353,209 +357,5 @@
};
</script>
<style lang="less" scoped>
-//@import url(); 寮曞叆鍏叡css绫�
-.NavBox {
- width: 100%;
- height: 100%;
- background-image: linear-gradient(rgb(34, 33, 33), rgb(27, 31, 78));
- .topBox {
- width: 100%;
- height: 100%;
- display: flex;
- justify-content: space-around;
- align-items: center;
- .topTitle {
- width: 435px;
- height: 70px;
- background: url("../assets/img/LOGO.png") no-repeat center;
- }
- .topMenu {
- width: auto;
- flex: 1;
- height: 100px;
- .menuContent {
- width: 100%;
- height: 100%;
- display: flex;
- .contentDiv {
- margin-left: 1%;
- }
- }
- .ImgMenu {
- width: 100%;
- height: auto;
- display: flex;
- justify-content: center;
- }
- .menuImage {
- width: 70px;
- height: 70px;
- }
- .menulabel {
- font-size: 14px;
- font-family: Source Han Sans CN;
- font-weight: 500;
- color: #ffffff;
- text-align: center;
- width: 120px;
- }
- .changeStyle {
- color: #fec801;
- }
- .m1 {
- background: url("../assets/img/menu/menu11.png") no-repeat;
- background-size: 100% 100%;
- }
- .m2 {
- background: url("../assets/img/menu/menu21.png") no-repeat;
- background-size: 100% 100%;
- }
- .m3 {
- background: url("../assets/img/menu/menu31.png") no-repeat;
- background-size: 100% 100%;
- }
- .m4 {
- background: url("../assets/img/menu/menu41.png") no-repeat;
- background-size: 100% 100%;
- }
- .m5 {
- background: url("../assets/img/menu/menu51.png") no-repeat;
- background-size: 100% 100%;
- }
- .m6 {
- background: url("../assets/img/menu/menu61.png") no-repeat;
- background-size: 100% 100%;
- }
- .m7 {
- background: url("../assets/img/menu/qwyzt.png") no-repeat;
- background-size: 100% 100%;
- }
- .m11 {
- background: url("../assets/img/menu/menu12.png") no-repeat;
- background-size: 100% 100%;
- }
- .m21 {
- background: url("../assets/img/menu/menu22.png") no-repeat;
- background-size: 100% 100%;
- }
- .m31 {
- background: url("../assets/img/menu/menu32.png") no-repeat;
- background-size: 100% 100%;
- }
- .m41 {
- background: url("../assets/img/menu/menu42.png") no-repeat;
- background-size: 100% 100%;
- }
- .m51 {
- background: url("../assets/img/menu/menu52.png") no-repeat;
- background-size: 100% 100%;
- }
- .m61 {
- background: url("../assets/img/menu/menu62.png") no-repeat;
- background-size: 100% 100%;
- }
- .m71 {
- background: url("../assets/img/menu/qwyzt-h.png") no-repeat;
- background-size: 100% 100%;
- }
- }
-
- .topUser {
- height: 70px;
-
- .userName {
- margin: 0px 10px;
-
- display: flex;
- justify-content: space-between;
- height: 30px;
- }
- .userLanguage {
- margin: 0px 10px;
- margin-top: 10px;
-
- display: flex;
-
- height: 30px;
- }
- .userImage {
- width: 30px;
- height: 30px;
- float: left;
- margin-right: 10px;
- }
- .user1 {
- background: url("../assets/img/user.png") no-repeat;
- background-size: 100% 100%;
- }
- .user2 {
- background: url("../assets/img/EN.png") no-repeat;
- background-size: 100% 100%;
- }
- .userText {
- font-size: 15px;
-
- line-height: 30px;
- font-family: Microsoft YaHei;
- font-weight: 400;
- color: #ffffff;
- text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.35);
- }
- .TextLanguage {
- font-size: 15px;
-
- line-height: 30px;
- font-family: Microsoft YaHei;
- font-weight: 400;
- color: #ffffff;
- text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.35);
- }
- }
- .elLink {
- margin-left: 5px;
- font-size: 15px;
- margin-bottom: 4px;
- }
- }
-
- .secondMenuDiv {
- position: absolute;
- z-index: 1024;
- margin-top: 10px;
- border: 1px solid white;
- border-radius: 5px;
- div {
- line-height: 30px;
- background: #303030;
- padding: 10px;
- font-size: 18px;
- font-family: Microsoft YaHei;
- font-weight: 400;
- color: #ffffff;
- line-height: 49px;
- min-width: 120px;
- }
- .changeLiStyle {
- color: #fec801;
- background: linear-gradient(180deg, #002992, #080472);
- }
- }
-
- /deep/.el-link.el-link--default:hover {
- color: #409eff !important;
- }
- /deep/ .el-link.el-link--default {
- color: white !important;
- }
- /deep/ ul.el-menu-vertical-demo.el-menu {
- // 娣诲姞鑳屾櫙棰滆壊
- background-image: rgba(255, 255, 255, 0.1) !important;
- }
-
- /deep/ li.el-menu-item.is-active {
- // 娣诲姞鏍峰紡锛屽彧閽堝瀵艰埅鏍忛鑿滃崟
- background-color: transparent;
- }
-}
</style>
diff --git a/src/main.js b/src/main.js
index f0d0502..f6f7305 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,9 @@
// import locale from 'element-ui/lib/locale/lang/zh-CN'
// import 'element-ui/lib/theme-chalk/index.css';
import '@/assets/element-variables.scss';
-
+import '@/assets/css/index.css'
+import '@/assets/css/content.css'
+import '@/assets/css/configure.css'
Vue.prototype.$echarts = echarts;
import * as echarts from 'echarts';
Vue.use(ElementUI, { locale });
diff --git a/src/store/index.js b/src/store/index.js
index 66f50f9..1a9853d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -42,15 +42,16 @@
theme: variables.theme,
//鐧诲綍鐢ㄦ埛鍚�
uname: null,
+ unid: null,
//椤圭洰绠＄悊
projeOl: null,
download: false,
showAllLayers: true,
- primitLayer:null,
- loading:false,
- pipelineEntity:[],
- reporturl:null,
- layerMnage:false,
+ primitLayer: null,
+ loading: false,
+ pipelineEntity: [],
+ reporturl: null,
+ layerMnage: false,
},
mutations: {
//鑾峰彇鏉冮檺鍚堥泦
@@ -143,7 +144,7 @@
login(data)
.then((response) => {
const data = response;
-
+
if (data.code !== 200) {
resolve(data);
return
@@ -164,7 +165,7 @@
});
});
},
- setCookies(res) {
+ setCookies(res) {
var value = localStorage.getItem('LFToken');
if (value != null) {
this.rmCookies();
diff --git a/src/utils/request.js b/src/utils/request.js
index 5e76368..685670d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -28,6 +28,16 @@
if (token) {
config.headers["token"] = token;
}
+
+ if (config.url.indexOf("logout") != -1 && config.url.indexOf("login") != -1) {
+ var expire = JSON.parse(window.localStorage.getItem("LFToken")).expire;
+ var timeire = new Date().getTime();
+ if (timeire >= expire) {
+
+ this.$router.push("logout")
+ }
+ }
+
//鍔犺浇loading
store.commit("UPDATE_API_COUNT", "add");
return config;
@@ -77,7 +87,7 @@
{
let str = this.result.toString();
let res = JSON.parse(str);
-
+
Message({
message: res.message,
type: "error",
diff --git a/src/views/Archive/dataApplication.vue b/src/views/Archive/dataApplication.vue
index 60ce609..67d19b5 100644
--- a/src/views/Archive/dataApplication.vue
+++ b/src/views/Archive/dataApplication.vue
@@ -1,11 +1,11 @@
<template>
- <div class="logLog_box">
+ <div class="logLog_box box_div">
<My-bread :list="[
`${$t('synthesis.synthesis')}`,
`${$t('synthesis.dataApplication')}`,
]"></My-bread>
<el-divider />
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
:inline="true"
ref="sizeForm"
@@ -88,11 +88,10 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box subpage_Div">
<el-table
:data="tableData"
style="width: 100%"
-
>
<el-table-column
@@ -216,7 +215,7 @@
<el-table-column
align="center"
prop="uname"
- label="鐢宠浜�"
+ label="瀹℃牳浜�"
/>
<el-table-column
align="center"
@@ -239,30 +238,32 @@
align="center"
prop="status"
label="鐘舵��"
+ :formatter="formatStatus1"
/>
<el-table-column
min-width="150"
:label="$t('common.operate')"
>
<template slot-scope="scope">
+ <div v-if="matchState3(scope,/[]/)">
+ <el-button
+ type="danger"
+ size="mini"
+ @click="handleApplyRepulse(scope.$index, scope.row)"
+ plain
+ >鎵撳洖</el-button>
- <el-button
- v-if="scope.row.status == 0"
- type="danger"
- size="mini"
- @click="handleApplyRepulse(scope.$index, scope.row)"
- plain
- >鎵撳洖</el-button>
-
- <el-button
- v-if="scope.row.status == 0"
- @click="handleApplyAdopt(scope.$index, scope.row)"
- type="success"
- size="mini"
- plain
- >閫氳繃</el-button>
+ <el-button
+ @click="handleApplyAdopt(scope.$index, scope.row)"
+ type="success"
+ size="mini"
+ plain
+ >閫氳繃</el-button>
+ </div>
+ <div v-if="!matchState3(scope,/[]/)">- -</div>
</template>
+
</el-table-column>
</el-table>
</div>
@@ -289,7 +290,9 @@
data() {
return {
- detailsFrom: {},
+ detailsFrom: {
+ tableData:[],
+ },
dialogDetailsVisible: false,
sizeForm: {
start: null,
@@ -316,6 +319,7 @@
if (data.code != 200) {
return this.$message.error("鍒楄〃璋冪敤澶辫触");
}
+
this.showRestData();
},
async handleApplyAdopt(index, row) {
@@ -334,7 +338,7 @@
if (data1.code != 200) {
return this.$message.error("鍒楄〃璋冪敤澶辫触");
}
- this.detailsFrom.tableData = data.result;
+ this.detailsFrom.tableData = data1.result;
},
async handleReApply(index, row) {
const data = await apply_updateForResubmit({ applyid: row.id });
@@ -366,20 +370,35 @@
this.detailsFrom.uname = row.uname;
this.detailsFrom.time = this.format(row.createTime);
this.detailsFrom.status = this.statusFormat(row.status);
- console.log(data.result)
+ this.detailsFrom.statued = row.status;
this.dialogDetailsVisible = true;
},
matchState(state = '', reg) {
var row = state.row;
- if (row.status >= -1 && row.status <= 9 && this.$store.state.uname == row.uname) {
+ if (row.status >= -1 && row.status <= 9 && this.$store.state.unid == row.userid) {
return true
}
return false
},
matchState1(state = '', reg) {
+
var row = state.row;
- if (row.status == -1 && this.$store.state.uname == row.uname) {
+ if (row.status == -1 && this.$store.state.unid == row.userid) {
+ return true
+ }
+ return false
+ },
+ matchState2(state = '', reg) {
+ var row = state.row;
+ if (row.status != -10 && this.$store.state.unid == row.userid) {
+ return true
+ }
+ return false
+ },
+ matchState3(state = '', reg) {
+ var row = state.row;
+ if (row.status == 0 && (this.detailsFrom.statued > -10 && this.detailsFrom.statued < 10) && this.$store.state.unid == row.userid) {
return true
}
return false
@@ -423,14 +442,30 @@
return this.statusFormat(data);
},
statusFormat(res) {
+
if (res >= 0 && res <= 9) {
return "瀹℃牳涓�"
} else if (res == -10) {
- return "閫�鍥�"
+ return "浣滃簾"
} else if (res == -1) {
return "鎵撳洖"
+ }else if (res == 10) {
+ return "閫氳繃"
+ }
+ },
+ formatStatus1(row, column) {
+ let data = row[column.property];
+ if (data == null) {
+ return data;
+ }
+ return this.statusFormat1(data);
+ }, statusFormat1(res) {
+ if (res == 1) {
+ return "閫氳繃"
+ } else if (res == 0) {
+ return "寰呭鏍�"
} else if (res == -1) {
- return "閫�鍥�"
+ return "鎵撳洖"
}
},
resAllTable() {
@@ -485,11 +520,11 @@
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.logLog_box {
- width: 100%;
- padding: 10px;
- height: 100%;
+ width: 98%;
- box-sizing: border-box;
+ height: 95%;
+ padding: 1%;
+
.el-input {
width: 300px;
}
@@ -499,22 +534,13 @@
margin-top: 20px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 20px;
.el-form-item {
margin: 7px;
}
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
}
.statusLabel {
- color: white;
padding: 0px 5px;
font-size: 14px;
}
@@ -524,131 +550,9 @@
padding: 10px;
height: auto;
border-radius: 5px;
-
-
- /*淇敼table 琛ㄤ綋鐨勮儗鏅鑹插拰鏂囧瓧棰滆壊*/
-
- .pagination_box {
- /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: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- }
}
.text-center {
text-align: center;
}
-}
-/deep/ .el-select .el-input__inner {
- border-color: #fff !important;
-}
-
-/deep/.el-form-item__label {
- color: white;
-}
-// 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
-/deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
-}
-/deep/ .el-dialog {
- background: #303030;
-}
-/deep/.el-range-editor.is-active,
-.el-range-editor.is-active:hover,
-.el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
-}
-/deep/.el-dialog__title {
- color: white;
-}
-/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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
-}
-/deep/.el-textarea__inner {
- background: transparent !important;
- border-color: #fff !important;
- color: white;
-}
-/deep/.el-textarea .el-input__count {
- background: transparent;
}
</style>
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index e8ca548..618ca6b 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -1,12 +1,12 @@
<template>
- <div class="archive">
+ <div class="archive box_div">
<div class="top_header">
<div class="top_left">
<My-bread :list="[`${$t('synthesis.synthesis')}`, `${$t('synthesis.archive')}`]"></My-bread>
</div>
</div>
- <div class="box_item">
+ <div class="box_item ">
<div class="box_left">璧勬枡绫诲埆</div>
<div class="box_cont">
@@ -22,16 +22,12 @@
</div>
<div
v-if="!isShowFirstCheck"
- class="box_div"
+ class="menu_div"
v-for="(item, index) in showList"
:key="index"
@click="changeListDataType(item)"
>
- <!-- <el-checkbox
- v-if="isShowFirstCheck"
- v-model="item.isCheckedFlag"
- :checked="item.isCheckedFlag"
- ></el-checkbox> -->
+
<div
:class="{menuActive:dataTypeName == item.name}"
style="margin-left: 5px"
@@ -40,13 +36,13 @@
</div>
<div class="box_right">
<div
- class="box_div box_menu"
+ class="menu_div subpage_Div"
@click="moreEvent(1)"
>
{{ $t('synthesis.more') }}
</div>
<div
- class="box_div box_menu"
+ class="menu_div subpage_Div "
@click="checkEvent(1)"
>
<i class="el-icon-plus"></i>
@@ -55,7 +51,7 @@
</div>
</div>
</div>
- <div class="box_item">
+ <div class="box_item ">
<div class="box_left">椤圭洰鍚嶇О</div>
<div class="box_cont">
<div v-if=" isShowSecondCheck">
@@ -70,7 +66,7 @@
</div>
<div
v-if="!isShowSecondCheck"
- class="box_div"
+ class="menu_div"
v-for="(item, index) in showList1"
:key="index"
@click="changeListEntryName(item)"
@@ -83,13 +79,13 @@
</div>
<div class="box_right">
<div
- class="box_div box_menu"
+ class="menu_div subpage_Div"
@click="moreEvent(2)"
>
{{ $t('synthesis.more') }}
</div>
<div
- class="box_div box_menu"
+ class="menu_div subpage_Div"
@click="checkEvent(2)"
>
<i class="el-icon-plus"></i>
@@ -100,8 +96,8 @@
</div>
<div class="bottom_content">
- <div class="bottom_left">
- <!-- <div class="box_div">褰撳墠鎼滅储鍏抽敭璇�:</div> -->
+ <div class="bottom_left ">
+ <!-- <div class="menu_div">褰撳墠鎼滅储鍏抽敭璇�:</div> -->
<div>
<ul>
<li>鎼滅储绫诲瀷</li>
@@ -114,7 +110,7 @@
<li
@click="getMenuChange(2)"
:class="{ menuActive: !isMenuActive }"
- style="border-bottom: 1px solid white"
+ style="border-bottom: 1px solid #dcdfe6"
>
鏂囦欢鏁版嵁婧�
</li>
@@ -191,6 +187,14 @@
$t('synthesis.rangequery')
}}</el-button>
</el-form-item>
+ <el-form-item>
+ <el-button
+ @click="getdownloadList"
+ size="mini"
+ >{{
+ $t('synthesis.DownloadList')
+ }}</el-button>
+ </el-form-item>
</el-form>
</div>
<div v-if="isMenuActive">
@@ -200,7 +204,7 @@
:key="index"
>
<div
- class="box_div"
+ class="menu_div"
@click="getShowTable(item)"
>
{{ item.tabDesc }}
@@ -550,7 +554,7 @@
</div>
</el-dialog>
<div
- class="downloadBox"
+ class="downloadBox box_div subpage_Div"
v-if="showCodeBox"
>
<h4 style="padding: 20px">{{$t('common.passworld')}}</h4>
@@ -652,10 +656,7 @@
<div
style="float:right;margin-right:10px"
@click="downBatchFormData()"
- ><i
- style="color:#FFF"
- class="el-icon-download"
- ></i></div>
+ ><i class="el-icon-download"></i></div>
<div style="height:580px">
<el-table
@@ -742,9 +743,69 @@
:title=" $t('synthesis.rangequery')"
:visible.sync="dialogMapVisible"
width="90%"
+ top="10vh"
>
<div style="height:700px">
<map-sdk v-if='showMapVisible'></map-sdk>
+ </div>
+ </el-dialog>
+ <el-dialog
+ :visible.sync="downloadListVisible"
+ width="90%"
+ top="10vh"
+ >
+ <div style="height:700px">
+ <el-table
+ :data="downloadTableData"
+ style="width: 100%"
+ >
+ <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>
+ <el-table-column
+ property="createTime"
+ :formatter="formatData"
+ label="鏃ユ湡"
+ >
+ </el-table-column>
+
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <el-link
+ @click.native.prevent="downloadMap(scope.$index, scope.row)"
+ :underline="false"
+ >涓嬭浇</el-link>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-pagination
+ @size-change="downloadSizeChange"
+ @current-change="downloadCurrentChange"
+ :current-page="downloadPage.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="downloadPage.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="downloadPage.count"
+ >
+ </el-pagination>
</div>
</el-dialog>
<iframe
@@ -776,7 +837,8 @@
deleteMeta,
dataLib_selectProject,
dataLib_selectBaseType,
- dataLib_selectBusinessType
+ dataLib_selectBusinessType,
+ dataLib_selectPageCountForDownload,
} from '../../api/api';
import $ from 'jquery'
import { getToken } from '@/utils/auth';
@@ -810,6 +872,7 @@
}
};
return {
+ downloadListVisible: false,
data_type: [],
project_name: [],
checkedDataType: [],
@@ -903,6 +966,13 @@
pageIndex: 1,
pageSize: 10,
count: 0
+ },
+ downloadTableData: [],
+ downloadPage: {
+ pageIndex: 1,
+ pageSize: 10,
+ count: 0,
+ name: null,
}
};
},
@@ -953,6 +1023,46 @@
},
},
methods: {
+ downloadMap(index, rows) {
+ // var token = '?token=' + getToken();
+ // debugger
+ // var url = BASE_URL + '/dataLib/downloadFile' + token + '&guid=' + rows.guid+ '&pwd='+ rows.pwd
+ var token = getToken()
+
+ var url = BASE_URL + "/dataLib/downloadFile?token=" + token + "&guid=" + rows.guid + "&pwd=" + rows.pwd;
+ $("#downFrame").attr("src", url).click();
+ },
+ downloadSizeChange(val) {
+
+ this.downloadPage.pageIndex = 1;
+ this.downloadPage.pageSize = val;
+ this.getdownloadListData();
+ },
+ downloadCurrentChange(val) {
+ this.downloadPage.pageIndex = val;
+ this.getdownloadListData();
+ },
+ getdownloadList() {
+ this.downloadPage = {
+ pageIndex: 1,
+ pageSize: 10,
+ count: 0,
+ name: null,
+ }
+ this.downloadListVisible = true;
+ this.getdownloadListData();
+ },
+ async getdownloadListData() {
+ const data = await dataLib_selectPageCountForDownload(this.downloadPage);
+ if (data.code != 200) {
+ this.downloadListVisible = false;
+ return this.$message.error('涓嬭浇鍒楄〃鑾峰彇澶辫触');
+ }
+
+ this.downloadTableData = data.result;
+ console.log(this.downloadTableData, data.result.length, this.downloadPage)
+ this.downloadPage.count = data.count;
+ },
handleCheckedEntryNameChange(res) {
if (this.checkedEntryName.indexOf(res.name) != -1) {
if (res.name == "涓嶉檺") {
@@ -1783,8 +1893,8 @@
name: res.result[i].value
})
}
- for(var i in rest.result){
- str.push({
+ for (var i in rest.result) {
+ str.push({
id: rest.result[i].key,
name: rest.result[i].value
})
@@ -1803,18 +1913,18 @@
<style lang="less" scoped>
.archive {
- width: 100%;
- height: 100%;
- margin: 0;
- overflow-y: auto;
- background: #353539;
+ width: 98%;
+ height: 95%;
+ padding: 1%;
+ position: relative;
+ overflow: auto;
.top_header {
width: calc(100% -20px);
height: 60px;
display: flex;
padding: 0 10px;
justify-content: space-between;
- border-bottom: 1px solid white;
+
.top_left {
display: flex;
align-items: center;
@@ -1827,19 +1937,11 @@
line-height: 70px;
}
span {
- color: gray;
margin: 0 5px;
- }
- /deep/.el-form--inline .el-form-item__content {
- line-height: 70px;
- }
- /deep/.el-form--inline .el-form-item__label {
- line-height: 70px;
}
}
.box_item {
width: calc(100% - 60px);
- border-bottom: 1px solid white;
height: auto;
padding: 10px 30px;
@@ -1847,24 +1949,22 @@
display: flex;
float: left;
.box_left {
- color: white;
height: 100%;
line-height: 100%;
width: 100px;
text-align: center;
- color: white;
+
font-size: 14px;
font-weight: 400;
}
.box_cont {
- color: white;
height: 100%;
width: 80%;
display: flex;
flex-wrap: wrap;
/* 璁剧疆澶氳瀵归綈 */
align-content: flex-start;
- color: white;
+
font-size: 14px;
font-weight: 400;
}
@@ -1872,13 +1972,11 @@
display: flex;
justify-content: space-between;
margin-left: 10px;
- color: white;
+
font-size: 14px;
align-self: flex-start;
font-weight: 400;
- .box_menu {
- border: 1px solid white;
- }
+
.box_menu:hover {
border: 1px solid #009cff;
color: #009cff;
@@ -1898,15 +1996,15 @@
font-size: 14px;
font-weight: 400;
align-self: flex-start;
- color: white;
+
ul {
margin-left: 10px;
}
li {
height: 42px;
- border-top: 1px solid white;
- border-left: 1px solid white;
- border-right: 1px solid white;
+ border-top: 1px solid #dcdfe6;
+ border-left: 1px solid #dcdfe6;
+ border-right: 1px solid #dcdfe6;
font-size: 14px;
line-height: 42px;
padding: 5px 15px;
@@ -1919,19 +2017,16 @@
width: 100%;
padding: 0px 20px;
height: auto;
- color: white;
+
.boxCard {
margin: 1%;
- /deep/.el-card {
- background: #303030 !important;
- color: #fff !important;
- }
+
.cardItem {
margin-bottom: 10px;
}
}
li {
- border-bottom: 1px solid white;
+ border-bottom: 1px solid #dcdfe6;
padding: 10px 0px;
}
li:hover {
@@ -1945,51 +2040,15 @@
display: flex;
justify-content: center;
}
- .box_div {
+ .menu_div {
padding: 5px 15px;
margin-left: 10px;
display: flex;
align-items: center;
display: flex;
+
.menuActive {
color: #409eff;
- }
- }
- .primaries {
- background: linear-gradient(180deg, #002992, #080472);
- border: 1px solid #000000;
- box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.21);
- color: white;
- }
- .elLink {
- color: white;
- }
- .infoBox {
- width: 500px;
- position: absolute;
- z-index: 100;
- top: 25%;
- right: 25%;
- background: #303030;
- color: #fff;
- .el-card {
- background-color: transparent;
- color: #fff;
- span {
- color: #fff;
- font-size: 16px;
- font-weight: 600;
- }
- }
- .contentBox {
- margin: 0 aotu 10px;
- height: 500px;
- overflow: auto;
- p {
- // background-color: #bfa;
- // margin-bottom: 10px;
- font-size: 14px;
- }
}
}
@@ -1998,169 +2057,19 @@
top: 20%;
left: 40%;
padding: 20px;
- background: #303030;
- width: 30%;
- border: 1px solid gray;
- border-radius: 10px;
- color: white;
- }
- .pagination_box {
- /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-select .el-input__inner {
- border-color: #fff !important;
- }
- /deep/.el-checkbox {
- color: #ffff;
- line-height: 25px;
- }
-}
-.elLink {
- color: white !important;
-}
-.el-icon-folder-opened {
- color: white;
+ width: 30%;
+
+ border-radius: 10px;
+ }
}
.contentBox {
height: 60vh;
overflow: auto;
- color: white;
}
-/deep/ .el-dialog {
- background: #303030;
- z-index: 99;
-}
+
.downloadBox {
z-index: 999;
-}
-/deep/.el-range-editor.is-active,
-.el-range-editor.is-active:hover,
-.el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
-}
-/deep/.el-dialog__title {
- color: white;
-}
-/deep/ .el-dialog__body {
- padding: 10px;
-}
-/*淇敼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;
- }
-}
-// 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
-/deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid white !important;
-}
-/deep/.el-form-item__label {
- color: white;
-}
-/deep/.el-dialog__wrapper {
- overflow: hidden;
-}
-/deep/.el-textarea__inner {
- background: transparent;
- border-color: #fff !important;
- color: white;
- height: 70px !important;
-}
-/deep/.el-form-item {
- margin-bottom: 0px;
-}
-/deep/.el-form-item__content {
- line-height: 70px;
-}
-/deep/.el-textarea.is-disabled .el-textarea__inner {
- background: transparent;
}
</style>
diff --git a/src/views/AuthorizationManagement/menuRoleAuthorization.vue b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
index 2ec87fe..1ca038b 100644
--- a/src/views/AuthorizationManagement/menuRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
@@ -8,8 +8,8 @@
]"
></My-bread>
<el-divider />
- <div class="menuTreeBox">
- <div class="left_tree">
+ <div class="menuTreeBox ">
+ <div class="left_tree subpage_Div">
<el-tree
:data="depList"
:props="defaultProps"
@@ -23,7 +23,7 @@
>
</el-tree>
</div>
- <div class="right_menu">
+ <div class="right_menu subpage_Div">
<div
style="
font-size: 14px;
@@ -432,183 +432,35 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.menuTreeBox {
width: 100%;
height: 91%;
.left_tree {
- width: 30%;
+ width: 29%;
height: 92%;
padding: 10px;
- border: 1px solid rgb(202, 201, 204);
+
border-radius: 5px;
float: left;
overflow-y: auto;
- // 鏇存敼鎸囨爣鏍戝浘鏍囬鑹�
- /deep/ .el-tree .el-icon-caret-right:before {
- color: white; /** 杩欓噷鏄淇敼鍥炬爣鐨勯鑹� **/
- }
- /deep/ .el-tree {
- color: white; /** 杩欓噷鏄淇敼鍥炬爣鐨勯鑹� **/
- background: transparent;
- }
- /deep/.el-tree-node__content {
- &:hover {
- background-color: rgba(255, 255, 255, 0.3) !important;
- }
- }
- /deep/.el-tree-node.is-current > .el-tree-node__content {
- background-color: rgba(255, 255, 255, 0.3) !important;
- color: #409eff;
- }
+
}
.right_menu {
- width: 65%;
+ width: 67%;
height: 92%;
padding: 10px;
- border: 1px solid rgb(202, 201, 204);
+
border-radius: 5px;
float: right;
}
}
- /*閲岄潰鐨勪唬鐮佸彲浠ユ牴鎹嚜宸遍渶姹傚幓杩涜鏇存敼*/
- /* 璁剧疆婊氬姩鏉＄殑鏍峰紡 */
- ::-webkit-scrollbar {
- width: 4px;
- }
- /* 婊氬姩妲� */
- ::-webkit-scrollbar-track {
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
- border-radius: 10px;
- }
- /* 婊氬姩鏉℃粦鍧� */
- ::-webkit-scrollbar-thumb {
- border-radius: 10px;
- background: #8b8b8b;
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
- }
- ::-webkit-scrollbar-thumb:window-inactive {
- background: #8b8b8b;
- height: 289px;
- }
- .pagination_box {
- /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: #1890ff;
- }
- /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/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
- }
+
+
+
.divider {
margin-top: 8px;
}
}
</style>
-<style>
-.el-select-dropdown {
- background: #303030 !important;
- border-color: 1px solid !important;
-}
-
-.el-scrollbar__wrap {
- margin-bottom: -20px !important;
- margin-right: -20px !important;
-}
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
- background: rgba(255, 255, 255, 0.3) !important;
-}
-.el-select-dropdown__item {
- color: white !important;
-}
-</style>
+
\ No newline at end of file
diff --git a/src/views/AuthorizationManagement/roleMenuAuthorization.vue b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
index d6a69d6..cc0d6ff 100644
--- a/src/views/AuthorizationManagement/roleMenuAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
@@ -2,7 +2,7 @@
<div class="menuSettings_box">
<!-- 瑙掕壊锛屽崟浣� -->
<div class="menuSettings_tree">
- <div class="content_box">
+ <div class="content_box subpage_Div">
<My-bread :list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.RoleMenuAuthorization')}`,
@@ -15,14 +15,14 @@
<el-form-item label="鍗曚綅">
<el-select
ref="multiSelect"
- style="width: 300px; "
+ style="width: 300px;"
v-model="selFrom.name"
placeholder="璇烽�夋嫨鍗曚綅鍚嶇О..."
@change="chooseCustom('multiSelect')"
>
<el-option
:value="selectTree"
- style="overflow: auto; backgrond: transparent; height: 100%;"
+ style=" backgrond: transparent; height: 100%;"
disabled
>
<el-tree
@@ -45,7 +45,7 @@
style="width: 100%"
@row-click="singleElection"
highlight-current-row
- height="78%"
+
>
<el-table-column
align="center"
@@ -71,7 +71,7 @@
</el-table-column>
</el-table>
</div>
- <div class="content_box">
+ <div class="content_box subpage_Div">
<div style="
font-size: 14px;
color: #216fe6;
@@ -87,22 +87,22 @@
{{ $t('operatManage.UserRoleAuthorizationObj.menuTable') }}</span>
</div>
<el-divider />
- <div class="menuContent">
- <el-tree
- :data="menuList"
- :props="defaultMenuProps"
- :show-checkbox="false"
- :check-on-click-node="true"
- :check-strictly="true"
- node-key="id"
- @check="menuTreeCheck"
- ref="treeForm"
- :default-expanded-keys="[1]"
- >
- </el-tree>
- </div>
+
+ <el-tree
+ :data="menuList"
+ :props="defaultMenuProps"
+ :show-checkbox="false"
+ :check-on-click-node="true"
+ :check-strictly="true"
+ node-key="id"
+ @check="menuTreeCheck"
+ ref="treeForm"
+ :default-expanded-keys="[1]"
+ >
+ </el-tree>
+
</div>
- <div class="content_box">
+ <div class="content_box subpage_Div">
<div style="
font-size: 14px;
color: #216fe6;
@@ -523,7 +523,7 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.menuSettings_tree {
display: flex;
justify-content: space-around;
@@ -531,239 +531,17 @@
height: 100%;
.content_box {
padding: 10px;
- width: 31%;
+ width: 30%;
height: 94%;
- border: 1px solid rgb(202, 201, 204);
+ overflow-y: auto;
+ overflow-x: hidden;
border-radius: 5px;
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- /*淇敼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.1) !important;
- }
-
- tbody tr:hover {
- background-color: rgba(255, 255, 255, 0.1) !important;
- // text-align: center;
- }
-
- // 婊氬姩鏉″楂�
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- height: 5px;
- }
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- /*婊氬姩鏉″搴�*/
- height: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
- }
- }
- .menuContent {
- height: 90%;
- overflow: auto;
}
}
- /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.1) !important;
- }
-
- tbody tr:hover {
- background-color: rgba(255, 255, 255, 0.1) !important;
- // text-align: center;
- }
-
- // 婊氬姩鏉″楂�
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- height: 5px;
- }
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- /*婊氬姩鏉″搴�*/
- height: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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 {
- /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: #1890ff;
- }
- /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/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
-/* //鍙充晶鍜屼笅鏂圭殑鐧借竟 */
- /deep/.el-scrollbar__wrap{
- height: 1000px !important;
- }
.divider {
margin-top: 8px;
}
}
</style>
-<style>
-.el-tree .el-icon-caret-right:before {
- color: white !important; /** 杩欓噷鏄淇敼鍥炬爣鐨勯鑹� **/
-}
-.el-tree {
- color: white !important; /** 杩欓噷鏄淇敼鍥炬爣鐨勯鑹� **/
- background: transparent !important;
-}
-.el-tree-node__content {
- background: transparent !important;
-}
-.el-tree-node.is-current > .el-tree-node__content {
- background-color: rgba(255, 255, 255, 0.1) !important;
- color: #409eff;
-}
-/*閲岄潰鐨勪唬鐮佸彲浠ユ牴鎹嚜宸遍渶姹傚幓杩涜鏇存敼*/
-/* 璁剧疆婊氬姩鏉＄殑鏍峰紡 */
-::-webkit-scrollbar {
- width: 4px;
-}
-/* 婊氬姩妲� */
-::-webkit-scrollbar-track {
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
- border-radius: 10px;
-}
-/* 婊氬姩鏉℃粦鍧� */
-::-webkit-scrollbar-thumb {
- border-radius: 10px;
- background: #8b8b8b;
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
-}
-::-webkit-scrollbar-thumb:window-inactive {
- background: #8b8b8b;
- height: 289px;
-}
-.el-select-dropdown {
- background: #303030;
- border-color: white;
-}
-/* //鍙充晶鍜屼笅鏂圭殑鐧借竟 */
-.el-scrollbar__wrap {
- margin-bottom: -20px !important;
- margin-right: -20px !important;
-
-}
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
- background: rgba(0, 0, 0, 0.1) !important;
-}
-.el-select-dropdown__item {
- color: white;
-}
-</style>
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index 6dfd1ba..a0cac35 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -1,7 +1,7 @@
<template>
<div class="menuSettings_box">
<div class="menuSettings_tree">
- <div class="content_box">
+ <div class="content_box subpage_Div">
<My-bread :list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.RoleResAuthorization')}`,
@@ -22,7 +22,7 @@
</el-tree>
</div>
</div>
- <div class="content_box">
+ <div class="content_box subpage_Div">
<div style="
font-size: 14px;
color: #216fe6;
@@ -81,7 +81,7 @@
</el-pagination>
</div>
</div>
- <div class="content_box">
+ <div class="content_box subpage_Div">
<div style="
font-size: 14px;
color: #216fe6;
@@ -113,7 +113,7 @@
v-if="menuStatus.delete"
type="danger"
icon="el-icon-delete"
- size="small"
+ size="small"
@click="deletesUser"
:disabled="roleid == null ? true : false"
>{{
@@ -385,11 +385,15 @@
slot="footer"
class="dialog-footer"
>
- <el-button size="small" @click="dialogTableVisible = false">{{
+ <el-button
+ size="small"
+ @click="dialogTableVisible = false"
+ >{{
$t('dataManage.dictionaryManageObj.cancel')
}}</el-button>
<el-button
- size="small" type="primary"
+ size="small"
+ type="primary"
@click="addConfirm"
>{{ $t('dataManage.dictionaryManageObj.confirm') }}</el-button>
</div>
@@ -655,7 +659,7 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.menuSettings_tree {
width: 100%;
height: 100%;
@@ -665,175 +669,12 @@
padding: 10px;
width: 31%;
height: 94%;
- border: 1px solid rgb(202, 201, 204);
+
border-radius: 5px;
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- /*淇敼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.1) !important;
- }
-
- tbody tr:hover {
- background-color: rgba(255, 255, 255, 0.1) !important;
- // text-align: center;
- }
-
- // 婊氬姩鏉″楂�
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- height: 5px;
- }
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- /*婊氬姩鏉″搴�*/
- height: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
- }
}
.divider {
margin-top: 8px;
}
- }
- /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.1) !important;
- }
-
- tbody tr:hover {
- background-color: rgba(255, 255, 255, 0.1) !important;
- // text-align: center;
- }
-
- // 婊氬姩鏉″楂�
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- height: 5px;
- }
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- /*婊氬姩鏉″搴�*/
- height: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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 {
- /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: #1890ff;
- }
- /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/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
}
}
</style>
diff --git a/src/views/AuthorizationManagement/userRoleAuthorization.vue b/src/views/AuthorizationManagement/userRoleAuthorization.vue
index 07cd281..70e0224 100644
--- a/src/views/AuthorizationManagement/userRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/userRoleAuthorization.vue
@@ -1,6 +1,6 @@
<template>
<div class="menuSettings_box">
- <div class="menuSettings_tree">
+ <div class="menuSettings_tree subpage_Div">
<My-bread :list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.UserRoleAuthorization')}`,
@@ -26,7 +26,7 @@
</div>
</div>
- <div class="menuSettings_tree">
+ <div class="menuSettings_tree subpage_Div">
<div style="
font-size: 14px;
color: #409eff;
@@ -86,10 +86,8 @@
</el-pagination>
</div>
</div>
- <div class="menuSettings_tree">
- <!-- <div class="title_box">
- <h4>璇︾粏淇℃伅</h4>
- </div> -->
+ <div class="menuSettings_tree subpage_Div">
+
<div style="
font-size: 14px;
color: #409eff;
@@ -114,7 +112,6 @@
size="small"
:disabled="roleid == null ? true : false"
@click="adduser"
-
>{{ $t('operatManage.UserRoleAuthorizationObj.Added') }}</el-button>
<el-button
v-if="menuStatus.delete"
@@ -209,11 +206,15 @@
slot="footer"
class="dialog-footer"
>
- <el-button size="small" @click="dialogTableVisible = false">{{
+ <el-button
+ size="small"
+ @click="dialogTableVisible = false"
+ >{{
$t('dataManage.dictionaryManageObj.cancel')
}}</el-button>
<el-button
- size="small" type="primary"
+ size="small"
+ type="primary"
@click="addConfirm"
>{{ $t('dataManage.dictionaryManageObj.confirm') }}</el-button>
</div>
@@ -473,16 +474,11 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
display: flex;
justify-content: space-between;
- .el-card-define {
- height: 630px;
- background: #303030;
- border: transparent;
- }
+
.menuSettings_tree {
- border: 1px solid gray;
width: 33%;
height: 98%;
position: relative;
@@ -499,209 +495,13 @@
.menuTreeBox {
height: 90%;
overflow: auto;
- .card_tree {
- display: block;
-
- // 鏇存敼鎸囨爣鏍戝浘鏍囬鑹�
- /deep/ .el-tree .el-icon-caret-right:before {
- color: white; /** 杩欓噷鏄淇敼鍥炬爣鐨勯鑹� **/
- }
- /deep/ .el-tree {
- color: white; /** 杩欓噷鏄淇敼鍥炬爣鐨勯鑹� **/
- background: transparent;
- }
- /deep/.el-tree-node__content {
- &:hover {
- background-color: rgba(255, 255, 255, 0.3) !important;
- }
- }
- /deep/.el-tree-node.is-current > .el-tree-node__content {
- background-color: rgba(255, 255, 255, 0.3) !important;
- color: #409eff;
- }
-
- .btnBox {
- margin-left: 5px;
- .el-button + .el-button {
- margin-left: 5px;
- }
- }
- }
}
}
- .menuSettings {
- border-radius: 10px;
- border: 1px solid gray;
- width: 33%;
- height: 98%;
- padding: 10px;
- box-sizing: border-box;
- .title_box {
- background: #fff;
- padding: 10px;
- margin-bottom: 24px;
- display: flex;
- border-radius: 10px;
- border: 1px solid rgb(202, 201, 204);
- box-sizing: border-box;
- }
- }
- .table_box {
- padding: 10px;
- background: #fff;
- border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
- overflow: auto;
- height: 85%;
- }
+
+
.divider {
margin-top: 8px;
}
}
-
-.pagination_box {
- /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: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
-}
-.el-table,
-.el-table /deep/ .el-table__expanded-cell {
- background-color: transparent;
-}
-
-.el-table /deep/ th,
-.el-table /deep/ tr {
- background-color: transparent;
-}
-/*閲岄潰鐨勪唬鐮佸彲浠ユ牴鎹嚜宸遍渶姹傚幓杩涜鏇存敼*/
-/* 璁剧疆婊氬姩鏉＄殑鏍峰紡 */
-::-webkit-scrollbar {
- width: 4px;
-}
-/* 婊氬姩妲� */
-::-webkit-scrollbar-track {
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
- border-radius: 10px;
-}
-/* 婊氬姩鏉℃粦鍧� */
-::-webkit-scrollbar-thumb {
- border-radius: 10px;
- background: #8b8b8b;
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
-}
-::-webkit-scrollbar-thumb:window-inactive {
- background: #8b8b8b;
- height: 289px;
-}
-/deep/ .el-dialog {
- background: #303030;
-}
-/deep/.el-range-editor.is-active,
-.el-range-editor.is-active:hover,
-.el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
-}
-/deep/.el-dialog__title {
- color: white;
-}
-/*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
-}
</style>
-<style>
-.el-select-dropdown {
- background: #303030;
- border-color: 1px solid;
-}
-
-.el-scrollbar__wrap {
- margin-bottom: -20px !important;
- margin-right: -20px !important;
-}
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
- background: rgba(255, 255, 255, 0.3);
-}
-.el-select-dropdown__item {
- color: white !important;
-}
-</style>
+
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 8054b55..743eb01 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -5,7 +5,9 @@
<nav-menu></nav-menu>
</el-header>
<el-main>
+
<router-view />
+
</el-main>
</el-container>
</div>
@@ -22,28 +24,11 @@
},
data() {
return {
- // shwomMapview: true,
+
};
},
methods: {},
};
</script>
-<style lang="less">
-.home {
- height: 100vh;
- position: relative;
- .el-container {
- height: 100%;
- .el-header {
- padding: 0;
- height: 140px !important;
- }
- .el-main {
- margin: 0px;
- padding: 0px !important;
-
- background-color: rgb(53, 53, 57);
- }
- }
-}
-</style>
+
+
\ No newline at end of file
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 12aa838..f27149d 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -1,5 +1,5 @@
<template>
- <div class="menu_Box">
+ <div class="menu_Box box_div">
<div
class="leftMen_div"
@click="setChangeTwoMenu(item)"
@@ -555,14 +555,14 @@
// this.openMeasureResultInfo('娴锋嫈楂樺害', data);
// }
// );
- var measure = window.sgworld.Command.execute(0, 3, this.colorAll, (data) => {
- data.id = window.sgworld.Core.getuid();
- this.measureData.set(data.id, measure);
- this.openMeasureResultInfo('骞抽潰闈㈢Н', data);
+ var measure = window.sgworld.Command.execute(0, 3, this.colorAll, (data) => {
+ data.id = window.sgworld.Core.getuid();
+ this.measureData.set(data.id, measure);
+ this.openMeasureResultInfo('骞抽潰闈㈢Н', data);
-
- });
-
+
+ });
+
break;
case 'j2':
var measure = window.sgworld.Command.execute(
@@ -1021,10 +1021,11 @@
switch (res) {
case 'a1':
if (this.$store.state.layerMnage == false) {
+ this.$refs && this.$refs.maplayer && this.$refs.maplayer.closeAll();
this.$refs && this.$refs.maplayer && this.$refs.maplayer.open();
this.$store.state.layerMnage = true;
} else if (this.$store.state.layerMnage == true) {
- this.$refs && this.$refs.maplayer && this.$refs.maplayer.close();
+ this.$refs && this.$refs.maplayer && this.$refs.maplayer.closeAll();
this.$store.state.layerMnage = false;
}
@@ -1049,12 +1050,10 @@
}
});
- this.$bus.$on('showLeftMenu', (res) => {
- this.$store.state.showAllLayers = true;
- this.setCoverage('a1');
-
- });
+ this.$store.state.showAllLayers = true;
+ this.$store.state.layerMnage = false;
+ this.setCoverage('a1');
},
};
</script>
@@ -1075,7 +1074,7 @@
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
- color: #ffffff;
+
padding: 10px;
min-width: 100px;
margin-left: 10px;
@@ -1083,12 +1082,14 @@
border-radius: 5px;
}
.leftMen_div:hover {
- background: linear-gradient(180deg, #002992, #080472);
- border: 1px solid #000000;
- box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.21);
+ background: rgba(64, 158, 255, 0.4);
+ border: 1px solid #409eff;
+ box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.1);
+ border-radius: 5px;
}
.lefMenuDivActive {
- background: linear-gradient(180deg, #002992, #080472);
+ background: rgba(64, 158, 255, 0.4);
+ border: 1px solid #409eff;
}
.menuTwoImage {
width: 32px;
diff --git a/src/views/Synthesis/index.vue b/src/views/Synthesis/index.vue
index 1571328..e293829 100644
--- a/src/views/Synthesis/index.vue
+++ b/src/views/Synthesis/index.vue
@@ -145,8 +145,16 @@
//宸︿晶鑿滃崟婊戝姩鏄鹃殣
setMenuChange(res) {
switch (res.id) {
+
case 1:
+ if (this.showMenuFlag == null) return;
this.openStatus = !this.openStatus;
+ break;
+ case 10:
+ if (this.showMenuFlag == null) {
+ this.openStatus = false;
+ }
+ this.$bus.$emit('setChangeTwoMenu', res.id - 2);
break;
default: {
this.openStatus = true;
@@ -207,8 +215,7 @@
},
},
mounted() {
- this.$store.state.layerMnage = false
- this.$bus.$emit('showLeftMenu', true);
+ // this.$bus.$emit('showLeftMenu', true);
this.$store.state.mapMenuBoolean = false;
this.$store.state.mapMenuBoxFlag = null;
this.$store.state.mapPopBoolean = false;
@@ -230,7 +237,7 @@
width: 63px;
height: 100%;
overflow-y: auto;
- background: #353535;
+ background: #3b4d6e;
position: absolute;
z-index: 30;
.MenuIcon {
diff --git a/src/views/Thematic/index copy 2.vue b/src/views/Thematic/index copy 2.vue
index d98e9ad..c320fbc 100644
--- a/src/views/Thematic/index copy 2.vue
+++ b/src/views/Thematic/index copy 2.vue
@@ -100,7 +100,7 @@
<script>
import mapsdk from '../../components/mapsdk.vue';
-import { right_menu, right_list, image_layer } from './index.js';
+import { right_menu, right_list, image_layer } from '../../assets/js/index.js';
import echart11 from '../../components/echart11.vue';
import echart12 from '../../components/echart12.vue';
import echart13 from '../../components/echart13.vue';
diff --git a/src/views/Thematic/index.vue b/src/views/Thematic/index.vue
index 1636091..9501c3e 100644
--- a/src/views/Thematic/index.vue
+++ b/src/views/Thematic/index.vue
@@ -287,7 +287,8 @@
var Viewer = null;
import mapsdk from '../../components/mapsdk.vue';
-import { right_menu, right_list, image_layer } from './index.js';
+import { right_menu, right_list, image_layer } from '../../assets/js/index.js';
+import { perms_selectLayers } from '../../api/api.js';
import echart11 from '../../components/echart11.vue';
import echart12 from '../../components/echart12.vue';
import echart13 from '../../components/echart13.vue';
@@ -362,15 +363,19 @@
};
},
mounted() {
- this.treeData = image_layer;
+
this.rightList = right_list[0];
this.rightMenu = right_menu;
this.changeSelectli = this.rightList[0].id;
this.changeSelectStyle = this.rightMenu[0].id;
this.initMapView();
this.addImageLayer();
+
+
},
- created() { },
+ created() {
+
+ },
methods: {
setTopReturn() {
this.$router.push('/Synthesis');
@@ -558,24 +563,67 @@
Viewer.imageryLayers._layers[3].show = true;
}
},
- addImageLayer() {
- var val_layer = this.treeData[0].children;
+ async addImageLayer() {
+ const data = await perms_selectLayers();
+ // var val_layer = this.treeData[0].children;
+ // var std = [];
+ // for (var i = 0; i < val_layer.length; i++) {
+ // if (val_layer[i].id != 13 && val_layer[i].id != 14) {
+ // let layerWMS = new Cesium.WebMapServiceImageryProvider({
+ // url: geoServerURl,
+ // layers: val_layer[i].resource,
+ // parameters: {
+ // transparent: true,
+ // format: 'image/png',
+ // },
+ // });
+ // layerWMS.name = val_layer[i].label;
+ // Viewer.imageryLayers.addImageryProvider(layerWMS);
+ // std.push(val_layer[i].id);
+ // }
+ // }
+ if (data.code != 200) {
+ return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
+ }
var std = [];
- for (var i = 0; i < val_layer.length; i++) {
- if (val_layer[i].id != 13 && val_layer[i].id != 14) {
- let layerWMS = new Cesium.WebMapServiceImageryProvider({
- url: geoServerURl,
- layers: val_layer[i].resource,
- parameters: {
- transparent: true,
- format: 'image/png',
- },
- });
- layerWMS.name = val_layer[i].label;
- Viewer.imageryLayers.addImageryProvider(layerWMS);
- std.push(val_layer[i].id);
+ var layer_list = [];
+ var layer_groups = [];
+ for (var i in data.result) {
+ if (data.result[i].type == 1) {
+ layer_groups.push({
+ id: data.result[i].id,
+ label: data.result[i].cnName,
+ type: data.result[i].type,
+ isEdit: false,
+ children: [],
+ })
+ } else if (data.result[i].type == 2) {
+ if (data.result[i].url != null) {
+ var layer_entity = {
+ id: data.result[i].id,
+ pid: data.result[i].pid,
+ label: data.result[i].cnName,
+ resource: data.result[i].url,
+ type: data.result[i].type,
+ isEdit: false,
+ }
+ layer_list.push(layer_entity)
+ if (data.result[i].isShow == 1) {
+ std.push(data.result[i].id);
+ this.setAddImageLayer(layer_entity);
+ }
+ }
}
}
+ for (var i in layer_list) {
+ for (var j in layer_groups) {
+ if (layer_list[i].pid === layer_groups[j].id) {
+ layer_groups[j].children.push(layer_list[i])
+ }
+ }
+ }
+ this.treeData = layer_groups;
+
this.$refs.tree.setCheckedKeys(std);
},
handleCheckChange(data, checked, indeterminate) {
@@ -914,5 +962,15 @@
}
}
}
+ /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;
+ }
}
</style>
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index e5ad2fd..f73c16e 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -116,8 +116,10 @@
</template>
<script>
+import { image_layer } from '../../assets/js/index.js';
import ImageWMS from 'ol/source/ImageWMS';
import Image from 'ol/layer/Image';
+import { perms_selectLayers } from '../../api/api.js'
export default {
name: 'tree',
data() {
@@ -142,37 +144,7 @@
'm_sitepoint',
],
treeData: [
- {
- id: 1,
- label: 'LF',
- isEdit: false,
- children: [
- {
- id: 11,
- label: '绠￠亾涓績绾�',
- resource: 'LF:m_pipeline',
- isEdit: false,
- },
- {
- id: 12,
- label: '鎴樼暐閫氶亾',
- resource: 'LF:th_strategic_channel',
- isEdit: false,
- },
- {
- id: 13,
- label: '椤圭洰',
- resource: 'LF:bs_project',
- isEdit: false,
- },
- {
- id: 14,
- label: '绔欏満',
- resource: 'LF:m_sitepoint',
- isEdit: false,
- },
- ],
- },
+
],
defaultProps: {
children: 'children',
@@ -317,7 +289,8 @@
console.log('tree drop: ', dropNode.label, dropType);
},
handleCheckChange(data, checked, indeterminate) {
- if (data.children != null) return;
+
+ if (data.type != 2) return;
var std = [];
var layers_ol = window.map.getAllLayers();
for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
@@ -330,6 +303,7 @@
img_layer.show = checked;
}
}
+
if (std.length == 0 && checked == true) {
this.setAddLayers(data)
}
@@ -343,7 +317,7 @@
}
},
setAddLayers(res) {
-
+
let layerWMS = new Cesium.WebMapServiceImageryProvider({
url: geoServerURl,
layers: res.resource,
@@ -355,21 +329,113 @@
layerWMS.name = res.label;
window.Viewer.imageryLayers.addImageryProvider(layerWMS);
- var layer2 = new Image({
- name: res.label,
- source: new ImageWMS({
- crossOrigin: 'anonymous',
- url: geoServerURl,
- params: {
- FORMAT: 'image/png',
- VERSION: '1.1.1',
- LAYERS: res.resource,
- },
- }),
- });
- window.map.addLayer(layer2);
},
+ async layersStart() {
+ const data = await perms_selectLayers();
+ if (data.code != 200) {
+ return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
+
+ }
+ var std = [];
+ var layer_list = [];
+ var layer_groups = [];
+ for (var i in data.result) {
+ if (data.result[i].type == 1) {
+ layer_groups.push({
+ id: data.result[i].id,
+ label: data.result[i].cnName,
+ type: data.result[i].type,
+ isEdit: false,
+ children: [],
+ })
+ } else if (data.result[i].type == 2) {
+ if (data.result[i].url != null) {
+ var layer_entity = {
+ id: data.result[i].id,
+ pid: data.result[i].pid,
+ label: data.result[i].cnName,
+ resource: data.result[i].url,
+ type: data.result[i].type,
+ isEdit: false,
+ }
+ layer_list.push(layer_entity)
+
+ if (data.result[i].isShow == 1) {
+ std.push(data.result[i].id);
+ this.setAddLayers(layer_entity);
+ }
+
+ }
+ }
+ }
+
+ for (var i in layer_list) {
+ for (var j in layer_groups) {
+ if (layer_list[i].pid === layer_groups[j].id) {
+ layer_groups[j].children.push(layer_list[i])
+ }
+ }
+ }
+ this.treeData = layer_groups;
+ this.$refs.tree.setCheckedKeys(std);
+ },
+ async treelayersStart() {
+ const data = await perms_selectLayers();
+ if (data.code != 200) {
+ return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
+ }
+ var std = [];
+ var layer_list = [];
+ var layer_groups = [];
+ for (var i in data.result) {
+ if (data.result[i].type == 1) {
+ layer_groups.push({
+ id: data.result[i].id,
+ label: data.result[i].cnName,
+ type: data.result[i].type,
+ isEdit: false,
+ children: [],
+ })
+ } else if (data.result[i].type == 2) {
+ if (data.result[i].url != null) {
+ var layer_entity = {
+ id: data.result[i].id,
+ pid: data.result[i].pid,
+ label: data.result[i].cnName,
+ resource: data.result[i].url,
+ type: data.result[i].type,
+ isEdit: false,
+ }
+ layer_list.push(layer_entity)
+ }
+ }
+ }
+ for (var i in layer_list) {
+ for (var j in layer_groups) {
+ if (layer_list[i].pid === layer_groups[j].id) {
+ layer_groups[j].children.push(layer_list[i])
+ }
+ }
+ }
+ 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);
+ }
+ }
+ }
+ }
+ }
+ this.$refs.tree.setCheckedKeys(std);
+
+ }
},
watch: {
filterText(val) {
@@ -377,34 +443,16 @@
},
},
mounted() {
- var std = [];
- var val = this.treeData[0].children;
+
if (this.$store.state.showAllLayers == true) {
- for (var j = 0; j < val.length; j++) {
- if (val[j].id != 13 && val[j].id != 14) {
- std.push(val[j].id);
- this.setAddLayers(val[j]);
- }
-
- }
+ this.layersStart();
this.$store.state.showAllLayers = false;
-
-
} else {
- for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
- var val_id = window.Viewer.imageryLayers._layers[i];
- if (val_id.show == true) {
- for (var j = 0; j < val.length; j++) {
- if (val_id.imageryProvider.name == val[j].label) {
- std.push(val[j].id);
- }
- }
- }
- }
- }
+ this.treelayersStart();
- this.$refs.tree.setCheckedKeys(std);
+ }
+
},
};
</script>
@@ -605,7 +653,6 @@
display: block;
z-index: 10000;
- background-color: #fff;
padding: 10px 0;
border: 1px solid #ebeef5;
border-radius: 4px;
@@ -634,4 +681,14 @@
color: #fff !important;
border: 1px solid !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;
+}
</style>
diff --git a/src/views/Tools/Popup.vue b/src/views/Tools/Popup.vue
index b91bcc3..2611db9 100644
--- a/src/views/Tools/Popup.vue
+++ b/src/views/Tools/Popup.vue
@@ -238,10 +238,10 @@
width: 100%;
}
- /deep/ .el-form-item__label {
- color: #fff;
- font-size: 18px;
- }
+ // /deep/ .el-form-item__label {
+ // color: #fff;
+ // font-size: 18px;
+ // }
}
/deep/ .scrollbar {
diff --git a/src/views/Tools/queryinfo.vue b/src/views/Tools/queryinfo.vue
index d29ea88..c88d807 100644
--- a/src/views/Tools/queryinfo.vue
+++ b/src/views/Tools/queryinfo.vue
@@ -94,4 +94,4 @@
};
</script>
-<style scoped lang="less">
+
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index b720b5c..92a9dc0 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -5,8 +5,8 @@
`${$t('dataManage.dataRetrieval')}`,
]"></My-bread>
<el-divider />
- <div class="spatialContent">
- <div class="spatial_leftTree">
+ <div class="spatialContent ">
+ <div class="spatial_leftTree subpage_Div">
<el-input v-model="filterText"></el-input>
<div style="width:300px">
@@ -22,7 +22,7 @@
></el-tree>
</div>
</div>
- <div class="spatial_rightContent">
+ <div class="spatial_rightContent subpage_Div">
<el-form
ref="ruleForm"
:model="ruleForm"
@@ -42,7 +42,8 @@
></el-input>
</el-form-item>
<el-form-item>
- <el-button v-if="btnStatus.insert"
+ <el-button
+ v-if="btnStatus.insert"
@click="conditionVisible = true"
size="small"
icon="el-icon-plus"
@@ -139,7 +140,7 @@
</div>
</div>
<div
- class="infoBox"
+ class="infoBox box_div"
v-show="showinfoBox"
>
@@ -194,7 +195,7 @@
style="display: none"
@change="insertFile( )"
/>
- <el-link
+ <el-link
@click="getInsertFile( )"
:underline="false"
><i class="el-icon-folder-opened"></i></el-link>
@@ -202,14 +203,16 @@
<el-form-item>
<el-row>
<el-col :span="3">
- <el-link v-if="btnStatus.insert"
+ <el-link
+ v-if="btnStatus.insert"
class="elLink"
:underline="false"
@click="setAttachInsert"
>{{$t('common.append')}}</i></el-link>
</el-col>
<el-col :span="3">
- <el-link v-if="btnStatus.delete"
+ <el-link
+ v-if="btnStatus.delete"
class="elLink"
:underline="false"
@click="setAttachDel"
@@ -1094,7 +1097,7 @@
.spatial_leftTree {
width: calc(15% - 0px);
height: 91%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
overflow: auto;
@@ -1102,202 +1105,12 @@
.spatial_rightContent {
width: 80%;
height: 91%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
overflow-y: auto;
}
}
- .primary {
- background: #409eff;
- border: #409eff;
- color: white;
- }
- .eldivider {
- margin-top: 0px;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- // 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
- /*淇敼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: 10px;
- }
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- /*婊氬姩鏉″搴�*/
- height: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
- }
- .infoBox {
- width: 500px;
- position: absolute;
- z-index: 100;
- top: 15%;
- right: 15%;
- background-color: #303030;
- color: white;
- border: 1px solid gray;
- height: 600px;
- padding: 10px;
- overflow: auto;
- border-radius: 5px;
- .el-card {
- background-color: transparent;
- color: white;
- span {
- font-size: 16px;
- font-weight: 600;
- color: white;
- }
- }
- .contentBox {
- margin: 0 aotu 10px;
- p {
- color: white;
- font-size: 14px;
- }
- }
- }
-
- .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;
- }
- }
-
- .elLink {
- color: white !important;
- }
- .el-icon-folder-opened {
- color: white;
- }
-
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/.el-textarea__inner {
- background: transparent !important;
- border-color: #fff !important;
- color: white;
- }
-}
-/deep/ .el-dialog {
- background: #303030;
-}
-/deep/.el-range-editor.is-active,
-.el-range-editor.is-active:hover,
-.el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
-}
-/deep/.el-dialog__title {
- color: white;
-}
-/deep/ .el-dialog__body {
- padding: 10px;
-}
-/deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid white !important;
-}
-/deep/.el-dialog__wrapper {
- overflow: hidden !important;
+
}
</style>
diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue
index a3856d5..2dc5485 100644
--- a/src/views/datamanage/catalogueManage.vue
+++ b/src/views/datamanage/catalogueManage.vue
@@ -1,12 +1,12 @@
<template>
- <div class="cataLogBox">
+ <div class="subpage_Box">
<My-bread :list="[
`${$t('dataManage.dataManage')}`,
`${$t('dataManage.catalogueManage')}`,
]"></My-bread>
<el-divider />
<div class="cataLogContent">
- <div class="cataLog_leftTree">
+ <div class="cataLog_leftTree subpage_Div">
<div style="min-width:450px">
<el-tree
ref="tree"
@@ -15,14 +15,14 @@
:data="dirList"
:highlight-current="true"
:expand-on-click-node="false"
- :default-expand-all="true"
+ :default-expanded-keys="expandData"
@node-click="handleNodeClick"
>
</el-tree>
</div>
</div>
- <div class="cataLog_rightContent">
+ <div class="cataLog_rightContent subpage_Div">
<div style="display:flex;justify-content:space-between">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/' }">{{
@@ -254,6 +254,7 @@
name: [{ required: true, validator: validName, trigger: 'blur' }],
},
newNode: null,
+ expandData: [],
};
},
methods: {
@@ -273,7 +274,10 @@
if (this.itemdetail.id != null) {
this.$nextTick(() => {
- this.$refs.tree.setCurrentKey(this.itemdetail.id);
+
+ // this.expandData=[1]
+ // this.$refs.tree.setCurrentKey(this.itemdetail.id);
+ // document.getElementById(this.itemdetail.id).click();
});
}
@@ -429,6 +433,7 @@
message: '娣诲姞鎴愬姛',
type: 'success',
});
+
this.itemdetail = {};
this.ruleForm = {};
this.dialogFormVisible = false;
@@ -673,7 +678,7 @@
</script>
<style lang="less" scoped>
-.cataLogBox {
+.subpage_Box {
height: 98%;
width: 98%;
padding: 1%;
@@ -685,7 +690,6 @@
.cataLog_leftTree {
width: 15%;
height: 91%;
- border: 1px solid white;
border-radius: 5px;
padding: 1%;
overflow-y: auto;
@@ -693,123 +697,9 @@
.cataLog_rightContent {
width: 80%;
height: 91%;
- border: 1px solid white;
border-radius: 5px;
padding: 1%;
}
- }
- // .cataSettings_tree {
- // position: relative;
- // width: 344px;
- // height: 100%;
- // background: rgb(240, 242, 245);
- // padding: 20px;
- // border-radius: 10px;
- // box-sizing: border-box;
- // overflow: auto;
- // .saveBtn {
- // position: absolute;
- // left: 250px;
- // top: 23px;
- // }
- // .cataTreeBox {
- // height: 88%;
- // width: 100%;
- // overflow: auto;
- // .el-tree {
- // background: transparent;
- // font-size: 15px;
- // font-family: Microsoft YaHei;
- // font-weight: 400;
- // color: #000000;
- // /deep/ .el-tree-node {
- // padding-top: 10px;
- // // padding-bottom: 10px;
- // }
- // /deep/ .el-tree-node:focus > .el-tree-node__content {
- // background-color: #b9b9b9;
- // }
- // /deep/ .el-tree-node__content:hover {
- // background-color: rgb(153, 153, 153);
- // }
- // .btnBox {
- // margin: 0 10px 0 5px;
- // .el-button + .el-button {
- // margin-left: 5px;
- // }
- // }
- // }
- // }
- // }
- // .itemSettings {
- // width: calc(100% - 344px);
- // border-radius: 10px;
- // background: rgb(240, 242, 245);
- // margin-left: 10px;
- // height: 100%;
- // padding: 10px;
- // box-sizing: border-box;
- // .title_box {
- // background: #fff;
- // padding: 10px;
- // margin-bottom: 24px;
- // display: flex;
- // border-radius: 10px;
- // border: 1px solid rgb(202, 201, 204);
- // box-sizing: border-box;
- // }
- // .form_box {
- // border: 1px solid rgb(202, 201, 204);
- // border-radius: 10px;
- // background: #fff;
- // padding-top: 30px;
- // box-sizing: border-box;
- // width: 100%;
- // .el-input,
- // /deep/ .el-textarea {
- // width: 400px;
- // }
- // .btnBox {
- // margin: 0 270px 20px;
- // width: 200px;
- // display: flex;
- // justify-content: space-between;
- // }
- // }
- // }
- // /deep/ .el-dialog__body {
- // padding: 0 30px 0 0;
- // }
- .el-icon-delete-solid {
- color: gray;
- }
- .el-icon-circle-plus {
- color: gray;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- // 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- .primary {
- background: #409eff;
- border: #409eff;
- color: white;
}
}
</style>
diff --git a/src/views/datamanage/dataController.vue b/src/views/datamanage/dataController.vue
index adf01f7..1ddb659 100644
--- a/src/views/datamanage/dataController.vue
+++ b/src/views/datamanage/dataController.vue
@@ -1,23 +1,26 @@
<template>
- <div class="mochaitmo_Box">
- <div class="left_tree">
- <el-card class="el-card-define">
- <div class="card_tree">
- <el-menu
- active-text-color="#ffd04b"
- class="el-menu-vertical-demo"
- :default-active="activeIndex"
- background-color="transparent"
- text-color="#fff"
- @select="handleselect"
- >
- <customElMenu :menuData="menuList"></customElMenu>
- </el-menu>
- </div>
- </el-card>
- </div>
- <div class="right_page">
- <el-card class="el-card-define">
+ <div class="contentBox">
+
+ <div
+ class="box"
+ ref="box"
+ >
+ <div class="left box_div">
+ <el-menu
+ :default-active="activeIndex"
+ background-color="transparent"
+ @select="handleselect"
+ >
+ <customElMenu :menuData="menuList"></customElMenu>
+ </el-menu>
+ </div>
+ <div
+ class="resize"
+ title="鏀剁缉渚ц竟鏍�"
+ >
+ 鈰�
+ </div>
+ <div class="mid box_div">
<data-updata v-if="setMenuFlag == 'dataUpdata'"></data-updata>
<catalogue-manage v-if="setMenuFlag == 'catalogueManage'"></catalogue-manage>
@@ -30,9 +33,11 @@
<data-loader v-if="setMenuFlag == 'dataLoader'"></data-loader>
<down-loader v-if="setMenuFlag == 'downLoader'"></down-loader>
<project-manage v-if="setMenuFlag == 'projectManage'"></project-manage>
- </el-card>
+ </div>
</div>
+
</div>
+
</template>
<script>
@@ -88,8 +93,55 @@
created() { },
mounted() {
this.getTreeData();
+ //宸﹀彸鎷栧嫊
+ this.dragControllerDiv();
},
methods: {
+ //宸﹀彸鎷栧嫊
+ dragControllerDiv: function () {
+ var resize = document.getElementsByClassName('resize');
+ var left = document.getElementsByClassName('left');
+ var mid = document.getElementsByClassName('mid');
+ var box = document.getElementsByClassName('box');
+ for (let i = 0; i < resize.length; i++) {
+ // 榧犳爣鎸変笅浜嬩欢
+ resize[i].onmousedown = function (e) {
+ //棰滆壊鏀瑰彉鎻愰啋
+ resize[i].style.background = '#818181';
+ var startX = e.clientX;
+ resize[i].left = resize[i].offsetLeft;
+ // 榧犳爣鎷栧姩浜嬩欢
+ document.onmousemove = function (e) {
+ var endX = e.clientX;
+ var moveLen = resize[i].left + (endX - startX); // 锛坋ndx-startx锛�=绉诲姩鐨勮窛绂汇�俽esize[i].left+绉诲姩鐨勮窛绂�=宸﹁竟鍖哄煙鏈�鍚庣殑瀹藉害
+ var maxT = box[i].clientWidth - resize[i].offsetWidth; // 瀹瑰櫒瀹藉害 - 宸﹁竟鍖哄煙鐨勫搴� = 鍙宠竟鍖哄煙鐨勫搴�
+
+ if (moveLen < 205) moveLen = 205; // 宸﹁竟鍖哄煙鐨勬渶灏忓搴︿负32px
+ if (moveLen > maxT - 300) moveLen = maxT - 300; //鍙宠竟鍖哄煙鏈�灏忓搴︿负150px
+
+ resize[i].style.left = moveLen; // 璁剧疆宸︿晶鍖哄煙鐨勫搴�
+
+ for (let j = 0; j < left.length; j++) {
+ left[j].style.width = moveLen + 'px';
+ mid[j].style.width = (box[i].clientWidth - moveLen - 10) + 'px';
+ }
+ };
+ // 榧犳爣鏉惧紑浜嬩欢
+ document.onmouseup = function (evt) {
+ //棰滆壊鎭㈠
+ resize[i].style.background = '#d6d6d6';
+ document.onmousemove = null;
+ document.onmouseup = null;
+ resize[i].releaseCapture && resize[i].releaseCapture(); //褰撲綘涓嶅湪闇�瑕佺户缁幏寰楅紶鏍囨秷鎭氨瑕佸簲璇ヨ皟鐢≧eleaseCapture()閲婃斁鎺�
+ };
+ resize[i].setCapture && resize[i].setCapture(); //璇ュ嚱鏁板湪灞炰簬褰撳墠绾跨▼鐨勬寚瀹氱獥鍙ｉ噷璁剧疆榧犳爣鎹曡幏
+ return false;
+ };
+ }
+ },
+
+
+
//鑾峰彇鏍�
async getTreeData() {
const data = await queryMenuTree();
@@ -106,14 +158,14 @@
return value.type == 1;
});
this.menuList = this.treeData(menuList);
-
+
this.setViewController(this.menuList[0]);
} else {
-
+
this.$message.error('鏆傛棤鑿滃崟鏍忔暟鎹�');
}
} else {
- this.$message.error('鎺ュ彛鎶ラ敊');
+ this.$message.error('鎺ュ彛鎶ラ敊');
}
// this.treeList = this.treeData(data.result);
@@ -140,8 +192,8 @@
return father.pid == 1; // 杩斿洖涓�绾ц彍鍗�
});
} else {
-
- this.$message.error('鏆傛棤鑿滃崟鏍忔暟鎹�');
+
+ this.$message.error('鏆傛棤鑿滃崟鏍忔暟鎹�');
}
},
@@ -162,66 +214,4 @@
};
</script>
-<style lang="less" scoped>
-.mochaitmo_Box {
- width: calc(100% - 20px);
- height: calc(100% - 20px);
- margin: 0;
- padding: 10px;
-
- .left_tree {
- width: 270px;
- height: 100%;
- position: relative;
- float: left;
- border-radius: 5px;
- }
- .el-card-define {
- height: 100%;
- background: #303030;
- border: 1px solid gray;
- padding: 1px !important;
- }
- .el-tree {
- background-color: transparent;
- }
- .card_tree {
- height: 100%;
- overflow-y: auto;
- }
- .el-card__body,
- .el-main {
- padding: 0px !important;
- height: 100%;
- }
- .right_page {
- width: calc(100% - 280px);
- height: 100%;
- background: #303030;
- position: relative;
- float: right;
- }
- /deep/.el-menu {
- border: transparent !important;
- }
- /deep/.el-submenu__title:hover {
- background: rgba(255, 255, 255, 0.3) !important;
- }
- /deep/ .el-submenu .el-menu-item:hover {
- background: rgba(255, 255, 255, 0.3) !important;
- }
- /deep/.el-textarea__inner {
- background: transparent;
- border-color: #fff !important;
- color: white;
- }
- /deep/.el-textarea .el-input__count {
- background: transparent;
- color: #fff !important;
- }
- /deep/ .el-card__body {
- padding: 0px !important;
- height: 100%;
- }
-}
-</style>
+
\ No newline at end of file
diff --git a/src/views/datamanage/dataLoader.vue b/src/views/datamanage/dataLoader.vue
index ad5e1dd..49fd0da 100644
--- a/src/views/datamanage/dataLoader.vue
+++ b/src/views/datamanage/dataLoader.vue
@@ -1218,15 +1218,7 @@
justify-content: center;
}
}
- .el-icon-d-arrow-right {
- color: white;
- }
- .el-icon-d-arrow-left {
- color: #fff;
- }
- .el-icon-plus {
- color: white;
- }
+
/*淇敼table 琛ㄤ綋鐨勮儗鏅鑹插拰鏂囧瓧棰滆壊*/
/deep/ .el-table {
background-color: transparent;
@@ -1329,8 +1321,4 @@
}
}
</style>
-<style>
-.el-loading-spinner i {
- color: #1890ff !important;
-}
-</style>
+
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index da0faa2..0e95bb7 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -1,6 +1,6 @@
<template>
<div
- class="authorityManagement_box"
+ class="subpage_Box"
v-loading="loading"
element-loading-background="rgba(0, 0, 0, 0.8)"
>
@@ -18,7 +18,7 @@
:label="$t('dataManage.dataUpObj.uploaddata')"
name="first"
>
- <div class="contentIquery">
+ <div class="subpage_Iquery subpage_Div">
<el-form
:inline="true"
:model="formInline"
@@ -271,7 +271,7 @@
</el-form>
</div>
<!-- 涓婁紶鏁版嵁鍒楄〃 -->
- <div class="contentBox">
+ <div class="subpage_Content subpage_Div">
<el-table
:data="tableData"
@selection-change="handleSelectionChange"
@@ -333,7 +333,7 @@
:label="$t('dataManage.dataUpObj.receiptdata')"
name="second"
>
- <div class="contentIquery">
+ <div class="subpage_Iquery subpage_Div">
<el-form
:inline="true"
:model="formWarehousing"
@@ -371,7 +371,7 @@
</el-form>
</div>
<div
- class="contentBox"
+ class="subpage_Content subpage_Div"
style="min-height:330px"
>
<div class="contentTable">
@@ -459,7 +459,7 @@
/>
</el-table>
</div>
- <div class="pagination_box">
+ <div>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -830,27 +830,24 @@
width="70%"
>
<div class="dialogBox">
- <div class="transFarBox">
+ <div class="transFarBox subpage_Div">
<ul>
<li
@click="singleElection(item)"
v-for="(item, i) in tableWareOne"
- :class="{ active: activeName == item.tab }"
+ :class="{ active: activeName == item.eventid }"
>{{item.tab}} ({{item.type}})</li>
</ul>
</div>
<div class="tarnsbtton">
<div>
<div style="padding:2%">
- <el-link><i
- style="color:white"
- class="el-icon-plus"
- ></i></el-link>
+ <el-link><i class="el-icon-plus"></i></el-link>
</div>
</div>
</div>
- <div class="transFarBox">
+ <div class="transFarBox subpage_Div">
<ul>
<li
@click="singleElection2(item)"
@@ -862,21 +859,17 @@
<div class="tarnsbtton">
<div>
<div style="padding:2%">
- <el-link @click="setWareTableChangeLeft"><i
- style="color:white"
- class="el-icon-d-arrow-left"
- ></i></el-link>
+ <el-link @click="setWareTableChangeLeft"><i class="el-icon-d-arrow-left"></i></el-link>
</div><br />
<div style="padding:2%">
<el-link><i
@click="setWareTableChangeRight"
- style="color:white"
class="el-icon-d-arrow-right"
></i></el-link>
</div>
</div>
</div>
- <div class="transFarBox">
+ <div class="transFarBox subpage_Div">
<ul>
<li
@click="singleElection3(i)"
@@ -893,13 +886,16 @@
<el-button
size="small"
@click="autoMatchWare"
+ type="primary"
>鑷姩鍖归厤</el-button>
<el-button
size="small"
+ type="info"
@click="setInsrtWareTableClose "
>鍙� 娑�</el-button>
<el-button
size="small"
+ type="primary"
@click="setInsrtWareTable"
>纭� 瀹�</el-button>
</span>
@@ -1272,6 +1268,7 @@
}
}
}
+
this.loading = true;
const res = await dataUpload_insertFiles(JSON.stringify(this.insertWareList));
this.loading = false
@@ -1364,7 +1361,7 @@
//鏁版嵁鍖归厤宸︿晶鐐瑰嚮浜嬩欢
singleElection(row) {
this.wareSelectOne = row;
- this.activeName = row.tab
+ this.activeName = row.eventid
},
//鏁版嵁鍖归厤宸︿晶涓棿鐐瑰嚮浜嬩欢
singleElection2(row) {
@@ -2205,259 +2202,3 @@
}
};
</script>
-<style lang="less" scoped>
-//@import url(); 寮曞叆鍏叡css绫�
-.authorityManagement_box {
- width: 98%;
- height: 98%;
- padding: 1%;
- overflow: auto;
- .contentIquery {
- width: calc(98% - 2px);
- height: auto;
- border: 1px solid white;
- padding-left: 1%;
- padding-right: 1%;
- padding-top: 1%;
- border-radius: 5px;
- }
- .contentBox {
- width: calc(98% - 2px);
- height: auto;
- border: 1px solid white;
- margin-top: 1%;
- margin-bottom: 1%;
- padding: 1%;
- border-radius: 5px;
- }
- .elDivider {
- margin: 0;
- }
- .dialogBox {
- width: 100%;
- height: 500px;
- display: flex;
- justify-content: space-between;
- .transFarBox {
- width: 30%;
- height: 100%;
- border: 1px solid white;
- border-radius: 5px;
- max-height: 500px;
- overflow-y: auto;
- li {
- color: white;
- border-bottom: 1px solid white;
- line-height: 30px;
- text-align: center;
- }
- li:hover {
- background: rgba(255, 255, 255, 0.3);
- }
- .active {
- color: #409eff;
- }
- }
- .tarnsbtton {
- width: 6%;
- height: 100%;
-
- /*flex 甯冨眬*/
- display: flex;
- /*瀹炵幇鍨傜洿灞呬腑*/
- align-items: center;
- /*瀹炵幇姘村钩灞呬腑*/
- justify-content: center;
- }
- }
- .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;
- }
- }
- /*淇敼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: 10px;
- }
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- /*婊氬姩鏉″搴�*/
- height: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
- }
- /deep/.el-dialog__headerbtn {
- display: none;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- // 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
- /deep/ .popper__arrow::after {
- border-top-color: rgba(43, 45, 55, 0.8);
- }
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- /deep/.el-cascader .el-input__inner {
- border-color: #fff !important;
- }
- /deep/.el-textarea__inner {
- background: transparent;
- border-color: #fff !important;
- color: white;
- }
- /deep/.el-textarea .el-input__count {
- background: transparent;
- color: #fff !important;
- }
- /deep/.el-loading-spinner i {
- color: #1890ff !important;
- }
- /deep/.el-tabs__active-bar {
- background: #409eff;
- }
- /deep/ .el-tabs__item {
- color: #409eff;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- .dialogDiv {
- /deep/.el-form-item {
- margin-bottom: 0px;
- }
- /deep/.el-checkbox {
- color: white;
- }
- /deep/.el-checkbox__input.is-checked + .el-checkbox__label {
- color: white !important;
- }
- /deep/.el-checkbox__input.is-disabled + span.el-checkbox__label {
- color: white !important;
- }
- .dialogContent {
- width: calc(100% - 20px);
- max-height: 370px;
- float: left;
- overflow: auto;
- padding: 10px;
- .ContBox {
- width: 44%;
- padding: 10px;
- margin-left: 2%;
- float: left;
- .ContDiv {
- display: flex;
- justify-content: space-around;
- margin: 5px 0px;
- .contLable {
- width: 175px;
- color: white;
- }
- }
- }
- }
- }
- .elBotton {
- background: transparent !important;
- border: 1px solid white !important;
- color: white !important;
- }
- /deep/.el-dialog__wrapper {
- overflow: hidden;
- }
-}
-</style>
-
diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue
index faab855..c763a32 100644
--- a/src/views/datamanage/dictionaryManage.vue
+++ b/src/views/datamanage/dictionaryManage.vue
@@ -30,13 +30,15 @@
@click="getRemoveForm"
type="info"
>{{ $t('common.reset') }}</el-button>
- <el-button v-if="btnStatus.insert"
+ <el-button
+ v-if="btnStatus.insert"
icon="el-icon-edit"
size="small"
@click="InsertFormdialog = true"
type="success"
>{{ $t('common.append') }}</el-button>
- <el-button v-if="btnStatus.delete"
+ <el-button
+ v-if="btnStatus.delete"
icon="el-icon-delete"
size="small"
@click="DelFormData"
@@ -48,18 +50,18 @@
</el-form>
</div>
<div class="dictionaryContent">
- <div class="dictionary_leftTree">
+ <div class="dictionary_leftTree subpage_Div">
<ul>
<li
@click="getTableDesc(item)"
v-for="item in optionCount"
:class="{ active: activeName == item.tab }"
>
- {{ item.tabDesc }}
+ {{ item.tabDesc }}
</li>
</ul>
</div>
- <div class="dictionary_rightContent">
+ <div class="dictionary_rightContent subpage_Div">
<el-table
:data="tableData"
style="width: 100%"
@@ -139,13 +141,12 @@
<template slot-scope="scope">
<el-link
v-if="btnStatus.select"
- style="color: white"
@click="showDetail(scope.$index, scope.row)"
>{{ $t('dataManage.dictionaryManageObj.lookOver') }}</el-link>
<el-link
v-if="btnStatus.update"
@click="handleEdit(scope.$index, scope.row)"
- style="margin-left: 10px; color: white"
+ style="margin-left: 10px; "
>{{ $t('dataManage.dictionaryManageObj.revamp') }}</el-link>
</template>
</el-table-column>
@@ -168,98 +169,99 @@
</div>
</div>
<div
- class="infoBox"
+ class="infoBox box_div "
v-show="showinfoBox"
>
- <el-card class="box-card">
+
+ <div
+ slot="header"
+ class="clearfix"
+ >
+ <span>{{ $t('dataManage.dictionaryManageObj.particulars') }}</span>
<div
- slot="header"
- class="clearfix"
+ style="float: right; cursor: pointer"
+ @click="closeDetial"
>
- <span>{{ $t('dataManage.dictionaryManageObj.particulars') }}</span>
- <div
- style="float: right; cursor: pointer"
- @click="closeDetial"
- >
- <i class="el-icon-close"></i>
- </div>
+ <i class="el-icon-close"></i>
</div>
- <div class="contentBox">
- <p>
- {{ $t('dataManage.dictionaryManageObj.tableName') }}锛歿{
+ </div>
+ <el-divider></el-divider>
+ <div class="contentBox">
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.tableName') }}锛歿{
itemdetail.tab
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.tableAliasName') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.tableAliasName') }}锛歿{
itemdetail.tabDesc
}}
- </p>
- <el-divider></el-divider>
+ </p>
+ <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.fieldName') }}锛歿{
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.fieldName') }}锛歿{
itemdetail.field
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.fieldAliasName') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.fieldAliasName') }}锛歿{
itemdetail.alias
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.fieldType') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.fieldType') }}锛歿{
itemdetail.type
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.fieldLength') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.fieldLength') }}锛歿{
itemdetail.len
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.FieldPrecision') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.FieldPrecision') }}锛歿{
itemdetail.precision
}}
- </p>
- <el-divider></el-divider>
+ </p>
+ <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.remark') }}锛歿{
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.remark') }}锛歿{
itemdetail.bak
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.creationTime') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.creationTime') }}锛歿{
itemdetail.createTime
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.createPersonnel') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.createPersonnel') }}锛歿{
itemdetail.createUser
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.updateTime') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.updateTime') }}锛歿{
itemdetail.updateTime
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.dictionaryManageObj.updatePersonnel') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.dictionaryManageObj.updatePersonnel') }}锛歿{
itemdetail.updateUser
}}
- </p>
- </div>
- </el-card>
+ </p>
+ </div>
+
</div>
<el-dialog
top="3vh"
@@ -690,14 +692,13 @@
.dictionary_leftTree {
width: 15%;
height: 80%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
max-height: 670px;
overflow-y: auto;
li {
- color: white;
- border-bottom: 1px solid white;
+ border-bottom: 1px solid #dcdfe6;
line-height: 30px;
text-align: center;
}
@@ -711,7 +712,7 @@
.dictionary_rightContent {
width: 80%;
height: 80%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
overflow-y: auto;
@@ -719,7 +720,7 @@
}
.infinite-list-item {
background: rgba(255, 255, 255, 0.3);
- color: white;
+
margin-top: 5%;
padding: 1%;
text-align: center;
@@ -727,158 +728,6 @@
.eldivider {
margin-top: 0px;
margin-bottom: 10px;
- }
- .primary {
- background: #409eff;
- border: #409eff;
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- // 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
- /*淇敼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;
- }
- }
- .infoBox {
- width: 500px;
-
- position: absolute;
- z-index: 100;
- background: #303030;
- top: 15%;
- right: 25%;
-
- .el-card {
- color: white;
- background-color: transparent;
- span {
- font-size: 16px;
- font-weight: 600;
- }
- }
- .contentBox {
- margin: 0 aotu 10px;
- height: 500px;
- overflow: auto;
- p {
- font-size: 14px;
- }
- }
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
-
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- /deep/.el-cascader .el-input__inner {
- border-color: #fff !important;
}
}
</style>
diff --git a/src/views/datamanage/domainManage.vue b/src/views/datamanage/domainManage.vue
index dce92b8..e7da7d5 100644
--- a/src/views/datamanage/domainManage.vue
+++ b/src/views/datamanage/domainManage.vue
@@ -6,7 +6,7 @@
]"></My-bread>
<el-divider />
<div class="mainBox">
- <div class="leftTree">
+ <div class="leftTree subpage_Div">
<el-input v-model="filterInput"></el-input>
<div style="width:450px">
<el-tree
@@ -19,7 +19,7 @@
></el-tree>
</div>
</div>
- <div class="right">
+ <div class="right subpage_Div">
<div class="inquire">
<el-form
ref="queryForm"
@@ -160,10 +160,10 @@
</div>
</div>
<div
- class="infoBox"
+ class="infoBox subpage_Div box_div"
v-show="showinfoBox"
>
- <el-card class="box-card">
+
<div
slot="header"
class="clearfix"
@@ -176,6 +176,7 @@
<i class="el-icon-close"></i>
</div>
</div>
+ <el-divider></el-divider>
<div class="contentBox">
<p>
{{ $t('dataManage.domainManage.domName') }}锛歿{
@@ -215,7 +216,7 @@
<el-divider></el-divider>
<p>{{ $t('dataManage.domainManage.bak') }}锛歿{ itemdetail.bak }}</p>
</div>
- </el-card>
+
</div>
<el-dialog
width="510px"
@@ -723,7 +724,7 @@
};
</script>
<style lang="less" scoped>
-//@import url(); 寮曞叆鍏叡css绫�
+// @import url(); 寮曞叆鍏叡css绫�
.domainBox {
height: 98%;
width: 98%;
@@ -736,7 +737,7 @@
.leftTree {
width: 15%;
height: 91%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
max-height: 670px;
@@ -745,7 +746,7 @@
.right {
width: 80%;
height: 91%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
max-height: 670px;
@@ -780,174 +781,6 @@
}
}
- .infoBox {
- width: 500px;
-
- position: absolute;
- z-index: 100;
- top: 15%;
- right: 25%;
- color: white;
- background-color: #303030;
- .el-card {
- background-color: transparent;
- color: white;
- span {
- font-size: 16px;
- font-weight: 600;
- color: white;
- }
- }
- .contentBox {
- margin: 0 aotu 10px;
- height: 500px;
- overflow: auto;
- color: white;
- overflow-y: auto;
- p {
- color: white;
- font-size: 14px;
- }
- }
- }
- .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-form-item__label {
- color: white;
- }
- // 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
- /*淇敼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;
- }
- }
- /deep/ .el-dialog {
- width: 620px !important;
- margin-top: 10vh !important;
- }
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- /deep/.el-dialog .el-input__inner {
- width: 300px;
- }
- /deep/ .el-dialog__body {
- padding: 0px 30px;
- }
- /deep/ .el-dialog__footer {
- padding-top: 0 !important;
- width: 600px;
- display: flex;
- margin: 0 auto;
- justify-content: center;
- }
- .primary {
- background: #409eff;
- border: #409eff;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
+
}
</style>
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 1c6f4d5..9ad7539 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -5,7 +5,7 @@
`${$t('dataManage.metadataManage')}`,
]"></My-bread>
<el-divider />
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
ref="queryForm"
:model="queryForm"
@@ -92,25 +92,8 @@
</el-form>
</div>
<div class="bottom">
- <!-- <div class="leftTree">
- <el-tree
- ref="tree"
- :props="defaultProps"
- node-key="id"
- :data="optionCount"
- :default-expanded-keys="[1]"
- :current-node-key="1"
- :expand-on-click-node="false"
- :default-expand-all="false"
- draggable
- @node-click="handleNodeClick"
- >
- </span>
- </el-tree>
-
- </div> -->
- <div class="rightTable">
+ <div class="rightTable subpage_Div">
<div class="table_box">
<el-table
:data="tableData"
@@ -191,7 +174,8 @@
>{{
$t('common.details')
}}</el-link>
- <el-link v-if="btnStatus.update"
+ <el-link
+ v-if="btnStatus.update"
@click="editInfo(scope.row)"
style="margin-left: 10px; color: white"
>{{ $t('common.edit') }}</el-link>
@@ -375,13 +359,13 @@
class="dialog-footer"
>
<el-button
- size="small"
+ size="small"
@click="cancelEdit()"
>{{
$t('common.reset')
}}</el-button>
<el-button
- size="small"
+ size="small"
type="primary"
@click="sendEdit('editForm')"
v-loading.fullscreen.lock="fullscreenLoading"
@@ -393,13 +377,13 @@
class="dialog-footer"
>
<el-button
- size="small"
+ size="small"
@click="cancelAdd('editForm')"
>{{
$t('common.reset')
}}</el-button>
<el-button
- size="small"
+ size="small"
type="primary"
@click="sendAdd('editForm')"
v-loading.fullscreen.lock="fullscreenLoading"
@@ -712,8 +696,8 @@
}
this.companyOption1 = this.treeData(res.result);
this.queryForm.depid = this.companyOption1[0].id
- this.getQueryDirTree();
-
+ this.getQueryDirTree();
+
},
async getQueryDirTree() {
const res = await selectdirTab();
@@ -723,7 +707,7 @@
}
this.companyOption = this.treeData(res.result);
this.queryForm.dirid = this.companyOption[0].id
- this.getMetaData();
+ this.getMetaData();
},
handleChange(value) {
this.listData.pageSize = 10;
@@ -804,7 +788,7 @@
this.optionCount = this.treeData(res.result);
this.dirComPanyOption = this.treeData(res.result);
this.listData.dirid = this.optionCount[0].id;
-
+
},
handleNodeClick(data) {
this.listData.pageSize = 10;
@@ -860,9 +844,9 @@
this.listData.depid = this.queryForm.depid;
this.listData.dirid = this.queryForm.dirid;
// this.listData.dirid = 57
-
+
select_meta_ByPageAndCount(this.listData).then((res) => {
-
+
this.tableData = res.result;
this.count = res.count;
});
@@ -1109,7 +1093,7 @@
position: relative;
overflow: auto;
padding-bottom: 8px;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
.el-form-item {
@@ -1122,31 +1106,10 @@
height: 74%;
display: flex;
justify-content: space-between;
- .leftTree {
- width: 15%;
- height: 100%;
- border: 1px solid white;
- border-radius: 5px;
- padding: 1%;
- max-height: 670px;
- overflow-y: auto;
- li {
- color: white;
- border-bottom: 1px solid white;
- line-height: 30px;
- text-align: center;
- }
- li:hover {
- background: rgba(255, 255, 255, 0.3);
- }
- .active {
- color: #409eff;
- }
- }
+
.rightTable {
width: 98%;
height: 92%;
- border: 1px solid white;
border-radius: 5px;
padding: 1%;
@@ -1155,34 +1118,6 @@
height: 93%;
margin: 0 auto;
overflow: auto;
- }
- }
- }
- .infoBox {
- width: 500px;
- position: absolute;
- z-index: 100;
- top: 10%;
- right: 25%;
- background: #303030;
- color: #fff;
- .el-card {
- background-color: transparent;
- color: #fff;
- span {
- color: #fff;
- font-size: 16px;
- font-weight: 600;
- }
- }
- .contentBox {
- margin: 0 aotu 10px;
- height: 500px;
- overflow: auto;
- p {
- // background-color: #bfa;
- // margin-bottom: 10px;
- font-size: 14px;
}
}
}
@@ -1199,141 +1134,10 @@
top: 20%;
left: 40%;
padding: 20px;
- background: #303030;
+
width: 30%;
- border: 1px solid gray;
+
border-radius: 10px;
- color: white;
}
- /*淇敼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;
- }
- }
- /deep/.el-form-item__label {
- color: white;
- }
- // 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- .pagination_box {
- margin-top: 20px;
- /deep/.el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/.el-pagination__total {
- color: white;
- }
- /deep/.el-pagination__jump {
- color: white;
- }
- /deep/.el-pager li.active {
- color: #409eff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- /deep/.btn-next i {
- color: white;
- }
- /deep/.btn-prev i {
- color: white;
- }
- }
- .primary {
- background: #409eff;
- border: #409eff;
- color: white;
- }
-}
-/deep/ .el-select .el-input__inner {
- border-color: #fff !important;
-}
-/deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid white !important;
}
</style>
diff --git a/src/views/datamanage/projectManage.vue b/src/views/datamanage/projectManage.vue
index fb3bc4c..8ba403e 100644
--- a/src/views/datamanage/projectManage.vue
+++ b/src/views/datamanage/projectManage.vue
@@ -6,7 +6,7 @@
]"></My-bread>
<el-divider />
<div class="verSionContent">
- <div class="verSion_leftTree">
+ <div class="verSion_leftTree subpage_Div">
<el-tree
ref="tree"
:props="defaultProps"
@@ -19,7 +19,7 @@
>
</el-tree>
</div>
- <div class="verSion_rightContent">
+ <div class="verSion_rightContent subpage_Div">
<el-form
:inline="true"
class="demo-form-inline"
@@ -124,90 +124,9 @@
style="margin-top: 10px"
class="pagination_box"
>
- <!-- <el-pagination
- @size-change="handleLoaderSizeChange"
- @current-change="handleLoaderCurrentChange"
- :current-page="listLoader.pageIndex"
- :page-sizes="[10, 20, 30, 40]"
- :page-size="listLoader.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count1"
- >
- </el-pagination> -->
+
</div>
- <!-- <el-form
- class="projFrom"
- ref="form"
- :model="projectFrom"
- label-width="200px"
- >
- <el-form-item :label="$t('dataManage.projectObj.projname')">
- <el-input
- :disabled="true"
- v-model="projectFrom.projname"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.projtype')">
- <el-input
- :disabled="true"
- v-model="projectFrom.projtype"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.location')">
- <el-input
- :disabled="true"
- v-model="projectFrom.location"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.province')">
- <el-input
- :disabled="true"
- v-model="projectFrom.province"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.country')">
- <el-input
- :disabled="true"
- v-model="projectFrom.country"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.corpname')">
- <el-input
- :disabled="true"
- v-model="projectFrom.corpname"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.department')">
- <el-input
- :disabled="true"
- v-model="projectFrom.department"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.conperiod')">
- <el-input
- :disabled="true"
- v-model="projectFrom.conperiod"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.contents')">
- <el-input
- :disabled="true"
- v-model="projectFrom.contents"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.projstate')">
- <el-input
- :disabled="true"
- v-model="projectFrom.projstate"
- ></el-input>
- </el-form-item>
- <el-form-item :label="$t('dataManage.projectObj.remarks')">
- <el-input
- :disabled="true"
- v-model="projectFrom.remarks"
- ></el-input>
- </el-form-item>
- </el-form> -->
+
</div>
</div>
</div>
@@ -251,7 +170,7 @@
></el-input>
<el-link
@click="ShowInner"
- style="color: white; margin-left: 20px"
+ style=" margin-left: 20px"
icon="el-icon-plus"
>
</el-link>
@@ -522,7 +441,7 @@
.verSion_leftTree {
width: 15%;
height: 91%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
@@ -531,7 +450,7 @@
.verSion_rightContent {
width: 80%;
height: 91%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
overflow-y: auto;
@@ -540,7 +459,7 @@
height: 46px;
padding: 12px 12px;
font-size: 14px;
- color: white;
+
border-bottom: 1px solid white;
line-height: 46px;
}
@@ -558,135 +477,12 @@
width: 600px;
}
}
- .primary {
- background: #409eff;
- border: #409eff;
- color: white;
- }
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- .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-form-item__label {
- color: white;
- }
- // 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
- /*淇敼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: 10px;
- }
-
- .el-table__body-wrapper::-webkit-scrollbar {
- width: 5px;
- /*婊氬姩鏉″搴�*/
- height: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
- }
+
+
}
-/deep/ .el-dialog {
- background: #303030;
-}
-/deep/.el-range-editor.is-active,
-.el-range-editor.is-active:hover,
-.el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
-}
-/deep/.el-dialog__title {
- color: white;
-}
-/deep/ .el-select .el-input__inner {
- border-color: #fff !important;
-}
-/deep/.el-cascader .el-input__inner {
- border-color: #fff !important;
-}
+
</style>
-<style scoped></style>
+ >
diff --git a/src/views/datamanage/styleDepTree.vue b/src/views/datamanage/styleDepTree.vue
index 423cdd8..52e4912 100644
--- a/src/views/datamanage/styleDepTree.vue
+++ b/src/views/datamanage/styleDepTree.vue
@@ -333,13 +333,8 @@
// padding-bottom: 10px;
}
- /deep/ .el-tree-node:focus > .el-tree-node__content {
- background-color: #b9b9b9;
- }
-
- /deep/ .el-tree-node__content:hover {
- background-color: rgb(153, 153, 153);
- }
+
+
.btnBox {
margin-left: 5px;
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index fa3d636..fe540dc 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">
+ <div class="searchComp subpage_Div">
<el-form
ref="ruleForm"
:model="ruleForm"
@@ -24,7 +24,7 @@
<el-button
@click="submitForm('ruleForm')"
icon="el-icon-search"
- type="primary"
+ type="primary"
size="small"
>{{ $t('common.iquery') }}</el-button>
<el-button
@@ -452,12 +452,14 @@
class="dialog-footer"
>
<el-button
- type="info" size="small"
+ type="info"
+ size="small"
@click="removeUpdate"
>{{$t('common.close')}}</el-button>
<el-button
- type="primary"
- @click="updateForm" size="small"
+ type="primary"
+ @click="updateForm"
+ size="small"
>{{$t('common.confirm')}}</el-button>
</div>
</el-dialog>
@@ -653,11 +655,13 @@
class="dialog-footer"
>
<el-button
- type="info" size="small"
+ type="info"
+ size="small"
@click="insertFromDataClose"
>{{$t('common.close')}}</el-button>
<el-button
- type="primary" size="small"
+ type="primary"
+ size="small"
@click="insertFromData"
>{{$t('common.confirm')}}</el-button>
</div>
@@ -671,7 +675,7 @@
</div>
<div class="btnBox">
<el-button
- type="primary"
+ type="primary"
size="small"
@click="selectDirCataName"
>{{
@@ -687,7 +691,7 @@
</div>
</div>
<div
- class="leftTree"
+ class="leftTree subpage_Div"
v-if="showDepCata"
>
<div class="treeBox">
@@ -1376,7 +1380,7 @@
margin: 10px auto;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
.el-form-item {
margin: 5px;
}
@@ -1392,19 +1396,14 @@
left: 800px;
width: 400px;
height: 600px;
- background: #303030;
- border: 1px solid #000;
+
.treeBox {
height: 550px;
overflow: auto;
- /deep/ .el-tree-node__content:hover {
- background-color: rgb(153, 153, 153);
- }
}
.btnBox {
width: 160px;
margin: 10px auto 0;
- // background-color: red;
}
}
.bottom {
@@ -1418,194 +1417,8 @@
height: 80%;
margin: 0 auto;
overflow: auto;
- /*淇敼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;
- }
- }
}
}
- }
- .infoBox {
- width: 500px;
-
- position: absolute;
- z-index: 100;
- top: 15%;
- right: 25%;
- background-color: #303030;
- .el-card {
- color: white;
- background-color: transparent;
- span {
- font-size: 16px;
- font-weight: 600;
- }
- }
- .contentBox {
- margin: 0 aotu 10px;
- height: 500px;
- overflow: auto;
- p {
- // background-color: #bfa;
- // margin-bottom: 10px;
- font-size: 14px;
- }
- .boxlabel {
- margin-left: 10px;
- }
- }
- /* 鏁翠綋鏍峰紡 */
- .contentBox::-webkit-scrollbar {
- width: 6px;
- height: 6px;
- }
-
- /* 婊氬姩鏉� */
- .contentBox::-webkit-scrollbar-thumb {
- background-color: #b3d8ff;
- border-radius: 6px;
- }
-
- /* 婊氬姩鏉￠紶鏍囩粡杩囨牱寮� */
- .contentBox::-webkit-scrollbar-thumb:hover {
- background-color: #b3d8ff;
- border-radius: 6px;
- }
-
- /* 婊氬姩鏉¤建閬� */
- .contentBox::-webkit-scrollbar-track-piece {
- -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
- border-radius: 10px;
- background: #ededed;
- }
- }
- .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-form-item__label {
- color: white;
- }
- // 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
-
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- /deep/.el-cascader .el-input__inner {
- border-color: #fff !important;
- }
- .primary {
- background: #409eff;
- border: #409eff;
- color: white;
- }
- .el-icon-plus {
- color: white;
- }
- .el-icon-upload2 {
- color: white;
}
}
</style>
diff --git a/src/views/datamanage/versionManage.vue b/src/views/datamanage/versionManage.vue
index 8691a84..cfe510f 100644
--- a/src/views/datamanage/versionManage.vue
+++ b/src/views/datamanage/versionManage.vue
@@ -9,7 +9,7 @@
<!-- <div class="verSion_leftTree">
<ver-dir-tree></ver-dir-tree>
</div> -->
- <div class="verSion_rightContent">
+ <div class="verSion_rightContent subpage_Div">
<el-form
ref="ruleForm"
:model="ruleForm"
@@ -641,155 +641,14 @@
height: 92%;
display: flex;
justify-content: space-between;
- .verSion_leftTree {
- width: 15%;
- height: 91%;
- border: 1px solid white;
- border-radius: 5px;
- padding: 1%;
- max-height: 670px;
- overflow-y: auto;
- }
+
.verSion_rightContent {
width: 98%;
height: 91%;
- border: 1px solid white;
border-radius: 5px;
padding: 1%;
overflow-y: auto;
}
- }
- .eldivider {
- margin-top: 0px;
- }
- .primary {
- background: #409eff;
- border: #409eff;
- color: white;
- }
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- .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-form-item__label {
- color: white;
- }
- // 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
- /deep/.el-input__inner {
- background-color: transparent !important ;
- color: #fff;
- border: 1px solid;
- }
- /*淇敼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;
- }
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/ .el-select .el-input__inner {
- border-color: #fff !important;
- }
- /deep/.el-cascader .el-input__inner {
- border-color: #fff !important;
}
}
</style>
diff --git a/src/views/exportMap/index.vue b/src/views/exportMap/index.vue
index bb7f266..5074b30 100644
--- a/src/views/exportMap/index.vue
+++ b/src/views/exportMap/index.vue
@@ -3,7 +3,6 @@
id="mapView"
class="MapBox"
v-loading="loading"
-
element-loading-background="rgba(0, 0, 0, 0.8)"
>
<div class="topMenu">
@@ -111,7 +110,7 @@
v-show="lefMenuContent"
>
<el-tree
- :data="data"
+ :data="treeData"
show-checkbox
node-key="id"
:props="defaultProps"
@@ -307,8 +306,9 @@
import mapviewVue from '../../components/mapview.vue';
import { removeToken, getToken } from '@/utils/auth';
import $ from 'jquery';
-import { exportSelectByPage } from '../../api/api.js';
+import { exportSelectByPage, perms_selectLayers } from '../../api/api.js';
import moment from 'moment';
+import { image_layer } from '../../assets/js/index.js';
export default {
data() {
return {
@@ -339,41 +339,8 @@
{ label: 'A6', value: 'A6' },
],
value: 'A4',
- data: [
- {
- id: 1,
- label: '鍥惧眰',
- children: [
- {
- id: 11,
- label: '椤圭洰',
- value: '椤圭洰',
- layer: 'LF:bs_project',
- isEdit: false,
- },
- {
- id: 12,
- label: '绔欏満',
- value: '绔欏満',
- layer: 'LF:m_sitepoint',
- isEdit: false,
- },
- {
- id: 13,
- label: '绠￠亾涓績绾�',
- value: '绠￠亾涓績绾�',
- layer: 'LF:m_pipeline',
- isEdit: false,
- },
- {
- id: 14,
- label: '鎴樼暐閫氶亾',
- value: '鎴樼暐閫氶亾',
- layer: 'LF:th_strategic_channel',
- isEdit: false,
- },
- ],
- },
+ treeData: [
+
],
arrList: [],
defaultProps: {
@@ -392,32 +359,86 @@
count: 0,
};
},
+
mounted() {
+ this.LayerStart();
this.initMap();
this.showMapLayer();
},
methods: {
- showMapLayer() {
- var val = this.data[0].children;
+ async LayerStart() {
+ const data = await perms_selectLayers();
+ if (data.code != 200) {
+ return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
+ }
var std = [];
- for (var i = 0; i < val.length; i++) {
- var layer2 = new Image({
- name: val[i].label,
- source: new ImageWMS({
- crossOrigin: 'anonymous',
- url: geoServerURl,
+ var layer_list = [];
+ var layer_groups = [];
+ for (var i in data.result) {
+ if (data.result[i].type == 1) {
+ layer_groups.push({
+ id: data.result[i].id,
+ label: data.result[i].cnName,
+ type: data.result[i].type,
+ isEdit: false,
+ children: [],
+ })
+ } else if (data.result[i].type == 2) {
+ if (data.result[i].url != null) {
+ var layer_entity = {
+ id: data.result[i].id,
+ pid: data.result[i].pid,
+ label: data.result[i].cnName,
+ resource: data.result[i].url,
+ type: data.result[i].type,
+ isEdit: false,
+ }
+ layer_list.push(layer_entity)
+ if (data.result[i].isShow == 1) {
+ std.push(data.result[i].id);
+ this.showMapLayer(layer_entity);
+ }
+ }
+ }
+ }
+ for (var i in layer_list) {
+ for (var j in layer_groups) {
+ if (layer_list[i].pid === layer_groups[j].id) {
+ layer_groups[j].children.push(layer_list[i])
+ }
+ }
+ }
+ 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) {
- params: {
- FORMAT: 'image/png',
- VERSION: '1.1.1',
- LAYERS: val[i].layer,
- },
- }),
- });
- mapView.addLayer(layer2);
- std.push(val[i].id);
+ if (val_id.imageryProvider.name == data.result[i].cnName) {
+ std.push(data.result[i].id);
+ }
+ }
+ }
+ }
}
this.$refs.tree.setCheckedKeys(std);
+ },
+ showMapLayer(val) {
+ var layer2 = new Image({
+ name: val.label,
+ source: new ImageWMS({
+ crossOrigin: 'anonymous',
+ url: geoServerURl,
+
+ params: {
+ FORMAT: 'image/png',
+ VERSION: '1.1.1',
+ LAYERS: val.resource,
+ },
+ }),
+ });
+ mapView.addLayer(layer2);
},
showLeftMenu(res) {
switch (res) {
@@ -604,9 +625,12 @@
var layers = mapView.getAllLayers();
for (var i in layers) {
var layer = layers[i];
+ var str = 0;
if (layer.values_.name == data.label) {
+
layer.setVisible(nodes); //鏄剧ず鍥惧眰
if (nodes == true) {
+ str++;
this.arrList.push({
name: data.label,
});
@@ -619,6 +643,16 @@
}
}
}
+
+ if (str == 0 && nodes == true) {
+
+ this.showMapLayer(data)
+ this.arrList.push({
+ name: data.label,
+ });
+ }
+
+
this.tableData = this.arrList;
},
setAddMapLayer() {
@@ -728,6 +762,7 @@
padding: 20px;
display: flex;
justify-content: space-between;
+ overflow: auto;
}
.CenDiv {
height: 40px;
@@ -890,5 +925,15 @@
/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;
+ }
}
</style>
diff --git a/src/views/maintenance/blackwhiteList.vue b/src/views/maintenance/blackwhiteList.vue
index d878bfa..a2cf534 100644
--- a/src/views/maintenance/blackwhiteList.vue
+++ b/src/views/maintenance/blackwhiteList.vue
@@ -14,7 +14,7 @@
name="first"
>
<div>
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
ref="queryInfo"
:model="queryInfo"
@@ -75,7 +75,7 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box subpage_Div">
<el-table
:data="BTableData"
@selection-change="blackSelectionChange"
@@ -159,7 +159,7 @@
:label="$t('operatManage.BWL.whiteList')"
name="second"
>
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
ref="queryInfo"
:model="queryInfo"
@@ -222,7 +222,7 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box1">
+ <div class="table_box1 subpage_Div">
<el-table
:data="WTableData"
@selection-change="blackSelectionChange"
@@ -702,8 +702,8 @@
.logLog_box {
height: 98%;
width: 98%;
- padding: 1%;
- position: absolute;
+ padding: 1%;
+ overflow: auto;
.el-input {
width: 300px;
}
@@ -711,137 +711,26 @@
padding: 10px;
margin-top: 20px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 20px;
}
.table_box {
padding: 10px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
- overflow: auto;
- height: 322px;
+
+
+
}
.table_box1 {
padding: 10px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
- overflow: auto;
- height: 322px;
+
+
+
}
.text-center {
text-align: center;
}
- .pagination_box {
- /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: #1890ff;
- }
- /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/ .el-tabs__item {
- color: #409eff;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/.el-tabs__active-bar {
- background: #409eff;
- }
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
- }
+
}
</style>
diff --git a/src/views/maintenance/databaseMonitoring.vue b/src/views/maintenance/databaseMonitoring.vue
index 6f68d07..cd8e022 100644
--- a/src/views/maintenance/databaseMonitoring.vue
+++ b/src/views/maintenance/databaseMonitoring.vue
@@ -54,6 +54,6 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
}
</style>
diff --git a/src/views/maintenance/downlog.vue b/src/views/maintenance/downlog.vue
index 0d94d81..94e5bf5 100644
--- a/src/views/maintenance/downlog.vue
+++ b/src/views/maintenance/downlog.vue
@@ -5,7 +5,7 @@
`${$t('operatManage.DownloadLog')}`,
]"></My-bread>
<el-divider />
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
:inline="true"
ref="sizeForm"
@@ -78,7 +78,8 @@
<el-button
@click="onSubmit"
icon="el-icon-search"
- size="small" type="primary"
+ size="small"
+ type="primary"
>{{ $t("operatManage.operationLogObj.inquire") }}</el-button>
<el-button
@click="resAllTable"
@@ -89,7 +90,7 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box subpage_Div">
<el-table
:data="tableData"
style="width: 100%"
@@ -308,7 +309,7 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.el-input {
width: 300px;
}
@@ -318,18 +319,10 @@
margin-top: 20px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 20px;
.el-form-item {
margin: 7px;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
}
}
.table_box {
@@ -337,101 +330,9 @@
height: 57%;
padding: 10px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
-
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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 {
- /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: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- }
}
.text-center {
text-align: center;
}
-}
-/deep/ .el-select .el-input__inner {
- border-color: #fff !important;
}
</style>
diff --git a/src/views/maintenance/eventlogManage.vue b/src/views/maintenance/eventlogManage.vue
index 549efc2..18cbc8e 100644
--- a/src/views/maintenance/eventlogManage.vue
+++ b/src/views/maintenance/eventlogManage.vue
@@ -5,7 +5,7 @@
`${$t('operatManage.ResourceLog')}`,
]"></My-bread>
<el-divider />
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
:inline="true"
ref="sizeForm"
@@ -99,7 +99,7 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box subpage_Div">
<el-table
:data="tableData"
style="width: 100%"
@@ -284,7 +284,7 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.el-input {
width: 300px;
}
@@ -294,113 +294,22 @@
margin-top: 20px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 20px;
.el-form-item {
margin: 7px;
}
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
+
}
.table_box {
overflow: auto;
padding: 10px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
height: 57%;
/*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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 {
- /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: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- }
+
+
}
.text-center {
text-align: center;
diff --git a/src/views/maintenance/logLog.vue b/src/views/maintenance/logLog.vue
index 86a40bc..0ecd8c4 100644
--- a/src/views/maintenance/logLog.vue
+++ b/src/views/maintenance/logLog.vue
@@ -5,7 +5,7 @@
`${$t('operatManage.logLog')}`,
]"></My-bread>
<el-divider />
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
:inline="true"
@@ -88,7 +88,7 @@
</el-form>
</div>
<!-- 琛ㄦ牸鏄剧ず -->
- <div class="table_box">
+ <div class="table_box subpage_Div">
<el-table
:data="tableData"
style="width: 100%"
@@ -298,126 +298,23 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.inquire {
padding: 10px;
margin-top: 10px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 10px;
/deep/.el-form-item {
margin-bottom: 10px;
}
- .herder_box {
- padding: 10px;
- border-bottom: 1px solid #ccc;
- margin-bottom: 20px;
- font-size: 14px;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
}
.table_box {
padding: 10px;
-
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
overflow: auto;
height: 60%;
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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 {
- /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: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- }
}
.text-center {
text-align: center;
diff --git a/src/views/maintenance/menuSettings.vue b/src/views/maintenance/menuSettings.vue
index df5b1e4..8a477e2 100644
--- a/src/views/maintenance/menuSettings.vue
+++ b/src/views/maintenance/menuSettings.vue
@@ -8,7 +8,7 @@
<el-divider />
</div>
<div class="cataLogContent">
- <div class="left_Tree">
+ <div class="left_Tree subpage_Div">
<div style="width:auto">
<el-tree
ref="tree"
@@ -24,7 +24,7 @@
</div>
</div>
- <div class="right_menu">
+ <div class="right_menu subpage_Div">
<div style="display:flex;justify-content:space-between">
<el-breadcrumb separator="/">
@@ -35,7 +35,7 @@
<div>
<el-button
- v-if="menuStatus.update"
+ v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@click="setEditNode(1)"
type="info"
@@ -43,7 +43,7 @@
size="small"
>鍚戜笂绉诲姩</el-button>
<el-button
- v-if="menuStatus.update"
+ v-if="menuStatus.update"
:disabled="itemdetail.pid == null ? true : false"
@click="setEditNode(2)"
type="info"
@@ -51,7 +51,7 @@
size="small"
>鍚戜笅绉诲姩</el-button>
<el-button
- v-if="menuStatus.insert"
+ v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(1)"
type="success"
@@ -59,7 +59,7 @@
size="small"
>鏂板鍚岀骇</el-button>
<el-button
- v-if="menuStatus.insert"
+ v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(2)"
type="success"
@@ -67,7 +67,7 @@
size="small"
>鏂板瀛愮骇</el-button>
<el-button
- v-if="menuStatus.delete"
+ v-if="menuStatus.delete"
@click="setDelNode()"
:disabled="itemdetail.pid == null ? true : false"
type="danger"
@@ -339,7 +339,7 @@
},
data() {
return {
- menuStatus: {
+ menuStatus: {
delete: false,
insert: false,
update: false,
@@ -754,11 +754,11 @@
this.getMenuTree();
return;
} else {
- this.$message.error('璋冩暣澶辫触锛岃閲嶈瘯锛�');
+ this.$message.error('璋冩暣澶辫触锛岃閲嶈瘯锛�');
}
})
.catch(() => {
- this.$message.error('璋冩暣澶辫触锛岃閲嶈瘯锛�');
+ this.$message.error('璋冩暣澶辫触锛岃閲嶈瘯锛�');
});
},
handleNodeClick(data, node) {
@@ -800,7 +800,7 @@
}
},
showPermsMenu(res) {
-
+
switch (res.tag) {
case '/delete':
this.menuStatus.delete = true;
@@ -816,7 +816,7 @@
getPerms() {
var val = this.$store.state.currentPerms;
var permsEntity = this.$store.state.permsEntity;
-
+
if (permsEntity.length == 0) {
getPerms().then((res) => {
if (res.code == 200) {
@@ -843,7 +843,7 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.cataLogContent {
width: 100%;
height: 92%;
@@ -852,21 +852,13 @@
.left_Tree {
width: 15%;
height: 91%;
- border: 1px solid white;
border-radius: 5px;
padding: 1%;
overflow-y: auto;
- .el-icon-circle-plus {
- color: gray;
- }
- .el-icon-delete-solid {
- color: gray;
- }
}
.right_menu {
width: 80%;
height: 91%;
- border: 1px solid white;
border-radius: 5px;
padding: 1%;
overflow: auto;
@@ -876,77 +868,9 @@
.el-input {
width: 400px;
}
-
- /deep/.el-form-item__label {
- color: white;
- }
}
}
}
-
- .el-card-define {
- height: 100%;
- background: #303030;
- border: 1px solid gray;
- padding: 1px;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
- }
-
- /*閲岄潰鐨勪唬鐮佸彲浠ユ牴鎹嚜宸遍渶姹傚幓杩涜鏇存敼*/
- /* 璁剧疆婊氬姩鏉＄殑鏍峰紡 */
- ::-webkit-scrollbar {
- width: 4px;
- }
- /* 婊氬姩妲� */
- ::-webkit-scrollbar-track {
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
- border-radius: 10px;
- }
- /* 婊氬姩鏉℃粦鍧� */
- ::-webkit-scrollbar-thumb {
- border-radius: 10px;
- background: #8b8b8b;
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
- }
- ::-webkit-scrollbar-thumb:window-inactive {
- background: #8b8b8b;
- height: 289px;
- }
}
</style>
-<style lang="less">
-.el-select-dropdown {
- background: #303030;
- border-color: white;
-}
-//鍙充晶鍜屼笅鏂圭殑鐧借竟
-.el-scrollbar__wrap {
- margin-bottom: -20px !important;
- margin-right: -20px !important;
-}
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
- background: rgba(255, 255, 255, 0.3);
-}
-.el-select-dropdown__item {
- color: white;
-}
-</style>
+
\ No newline at end of file
diff --git a/src/views/maintenance/mochaitmo.vue b/src/views/maintenance/mochaitmo.vue
index e9c6e68..a393c28 100644
--- a/src/views/maintenance/mochaitmo.vue
+++ b/src/views/maintenance/mochaitmo.vue
@@ -1,48 +1,51 @@
<template>
- <div class="mochaitmo_Box">
- <div class="left_tree">
- <el-card class="el-card-define">
- <div class="card_tree">
- <el-menu
- active-text-color="#ffd04b"
- class="el-menu-vertical-demo"
- :default-active="activeIndex"
- background-color="transparent"
- text-color="#fff"
- @select="handleselect"
- >
- <customElMenu :menuData="menuList"></customElMenu>
- </el-menu>
- </div>
- </el-card>
+ <div class="contentBox">
+
+ <div
+ class="box"
+ ref="box"
+ >
+ <div class="left box_div">
+ <el-menu
+ :default-active="activeIndex"
+ background-color="transparent"
+ @select="handleselect"
+ >
+ <customElMenu :menuData="menuList"></customElMenu>
+ </el-menu>
+ </div>
+ <div
+ class="resize"
+ title="鏀剁缉渚ц竟鏍�"
+ >
+ 鈰�
+ </div>
+ <div class="mid box_div">
+ <menu-settings v-if="setMenuFlag == 'menuSettings'"></menu-settings>
+ <user-management v-if="setMenuFlag == 'userInfoManage'"></user-management>
+ <org-manage v-if="setMenuFlag == 'orgManage'"></org-manage>
+ <resource-manage v-if="setMenuFlag == 'resourceManage'"></resource-manage>
+ <role-manage v-if="setMenuFlag == 'roleManage'"></role-manage>
+ <authority-manage v-if="setMenuFlag == 'authorityManage'"></authority-manage>
+ <user-role-authorization v-if="setMenuFlag == 'userRoleAuthorization'"></user-role-authorization>
+ <menu-role-authorization v-if="setMenuFlag == 'menuRoleAuthorization'"></menu-role-authorization>
+ <role-menu-authorization v-if="setMenuFlag == 'roleMenuAuthorization'">
+ </role-menu-authorization>
+ <role-res-authorization v-if="setMenuFlag == 'roleResAuthorization'"></role-res-authorization>
+ <log-log v-if="setMenuFlag == 'logLog'"> </log-log>
+ <operation-log v-if="setMenuFlag == 'operationLog'"></operation-log>
+ <eventlog-manage v-if="setMenuFlag == 'eventlogManage'"></eventlog-manage>
+ <tokentool v-if="setMenuFlag == 'tokentool'"></tokentool>
+ <blackwhite-list v-if="setMenuFlag == 'blackwhiteList'"></blackwhite-list>
+ <database-monitoring v-if="setMenuFlag == 'dataIfream'"></database-monitoring>
+ <system-monitoring v-if="setMenuFlag == 'systemMonitoring'"></system-monitoring>
+ <parameter-configuration v-if="setMenuFlag == 'parameterConfiguration'"></parameter-configuration>
+ <downlog v-if="setMenuFlag == 'downlog'"></downlog>
+ </div>
</div>
- <div class="right_page">
- <el-card class="el-card-define">
- <div>
- <menu-settings v-if="setMenuFlag == 'menuSettings'"></menu-settings>
- <user-management v-if="setMenuFlag == 'userInfoManage'"></user-management>
- <org-manage v-if="setMenuFlag == 'orgManage'"></org-manage>
- <resource-manage v-if="setMenuFlag == 'resourceManage'"></resource-manage>
- <role-manage v-if="setMenuFlag == 'roleManage'"></role-manage>
- <authority-manage v-if="setMenuFlag == 'authorityManage'"></authority-manage>
- <user-role-authorization v-if="setMenuFlag == 'userRoleAuthorization'"></user-role-authorization>
- <menu-role-authorization v-if="setMenuFlag == 'menuRoleAuthorization'"></menu-role-authorization>
- <role-menu-authorization v-if="setMenuFlag == 'roleMenuAuthorization'">
- </role-menu-authorization>
- <role-res-authorization v-if="setMenuFlag == 'roleResAuthorization'"></role-res-authorization>
- <log-log v-if="setMenuFlag == 'logLog'"> </log-log>
- <operation-log v-if="setMenuFlag == 'operationLog'"></operation-log>
- <eventlog-manage v-if="setMenuFlag == 'eventlogManage'"></eventlog-manage>
- <tokentool v-if="setMenuFlag == 'tokentool'"></tokentool>
- <blackwhite-list v-if="setMenuFlag == 'blackwhiteList'"></blackwhite-list>
- <database-monitoring v-if="setMenuFlag == 'dataIfream'"></database-monitoring>
- <system-monitoring v-if="setMenuFlag == 'systemMonitoring'"></system-monitoring>
- <parameter-configuration v-if="setMenuFlag == 'parameterConfiguration'"></parameter-configuration>
- <downlog v-if="setMenuFlag == 'downlog'"></downlog>
- </div>
- </el-card>
- </div>
+
</div>
+
</template>
<script>
@@ -64,12 +67,12 @@
import databaseMonitoring from '@/views/maintenance/databaseMonitoring.vue'; //鏁版嵁搴撶洃鎺�
import systemMonitoring from '@/views/maintenance/systemMonitoring.vue'; //绯荤粺鐩戞帶
import parameterConfiguration from '@/views/maintenance/parameterConfiguration.vue'; //绯荤粺閰嶇疆
-import downlog from '@/views/maintenance/downlog.vue'; //涓嬭浇鏃ュ織
+import downlog from '@/views/maintenance/downlog.vue'; //涓嬭浇鏃ュ織
import { selectMenuRecursive, queryMenuTree, getPerms } from '../../api/api';
import customElMenu from '../../components/customElMenu.vue';
export default {
components: {
- menuSettings,
+ menuSettings,
userManagement,
orgManage,
resourceManage,
@@ -92,7 +95,7 @@
},
data() {
return {
- setMenuFlag: ' ',
+ setMenuFlag: ' ',
activeIndex: ' ',
oriData: [], //鍘熷鏍戞暟鎹�
dirData: [], //el鏍戞暟鎹�
@@ -113,10 +116,10 @@
},
created() { },
mounted() {
- this.getTreeData();
+ this.getTreeData();
},
methods: {
- async getCookies() {
+ async getCookies() {
var boolean = this.getTimeCookies();
if (boolean != true) {
this.$router.push('/login');
@@ -145,9 +148,9 @@
let menuLists = data.result.filter((value) => {
return value.url == '/mochaitmo';
});
-
- const res = await selectMenuRecursive({ id: menuLists[0].id});
-
+
+ const res = await selectMenuRecursive({ id: menuLists[0].id });
+
if (res.code == 200) {
if (res.result.length != 0) {
let menuList = res.result.filter((value) => {
@@ -212,66 +215,4 @@
};
</script>
-<style lang="less" scoped>
-.mochaitmo_Box {
- width: calc(100% - 20px);
- height: calc(100% - 20px);
- margin: 0;
- padding: 10px;
- overflow-y: hidden;
- .left_tree {
- width: 270px;
- height: 100%;
- position: relative;
- float: left;
- border-radius: 5px;
- }
- .el-card-define {
- height: 100%;
- background: #303030;
- border: 1px solid gray;
- padding: 1px !important;
- }
- .el-tree {
- background-color: transparent;
- }
- .card_tree {
- height: 100%;
- overflow-y: auto;
- }
- .el-card__body,
- .el-main {
- padding: 0px !important;
- height: 100%;
- }
- .right_page {
- width: calc(100% - 280px);
- height: 100%;
- background: #303030;
- position: relative;
- float: right;
- }
- /deep/.el-menu {
- border: transparent !important;
- }
- /deep/.el-submenu__title:hover {
- background: rgba(255, 255, 255, 0.3) !important;
- }
- /deep/ .el-submenu .el-menu-item:hover {
- background: rgba(255, 255, 255, 0.3) !important;
- }
- /deep/.el-textarea__inner {
- background: transparent;
- border-color: #fff !important;
- color: white;
- }
- /deep/.el-textarea .el-input__count {
- background: transparent;
- color: #fff !important;
- }
- /deep/ .el-card__body {
- padding: 0px !important;
- height: 100%;
- }
-}
-</style>
+
\ No newline at end of file
diff --git a/src/views/maintenance/operationLog.vue b/src/views/maintenance/operationLog.vue
index ca698d8..6bde5ba 100644
--- a/src/views/maintenance/operationLog.vue
+++ b/src/views/maintenance/operationLog.vue
@@ -1,15 +1,17 @@
<template>
<div class="operationLog_box">
- <My-bread
- :list="[
+ <My-bread :list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.operationLog')}`,
- ]"
- ></My-bread>
+ ]"></My-bread>
<el-divider />
- <div class="inquire">
-
- <el-form :inline="true" ref="sizeForm" :model="sizeForm">
+ <div class="inquire subpage_Div">
+
+ <el-form
+ :inline="true"
+ ref="sizeForm"
+ :model="sizeForm"
+ >
<el-form-item
prop="uname"
:label="$t('operatManage.operationLogObj.username')"
@@ -90,20 +92,24 @@
<el-button
@click="onSubmit"
icon="el-icon-search"
- size="small" type="primary"
- >{{ $t("operatManage.operationLogObj.inquire") }}</el-button
- >
+ size="small"
+ type="primary"
+ >{{ $t("operatManage.operationLogObj.inquire") }}</el-button>
<el-button
@click="onEmpty('sizeForm')"
icon="el-icon-delete"
- type="info" size="small"
- >{{ $t("operatManage.operationLogObj.empty") }}</el-button
- >
+ type="info"
+ size="small"
+ >{{ $t("operatManage.operationLogObj.empty") }}</el-button>
</el-form-item>
</el-form>
</div>
- <div class="table_box">
- <el-table :data="tableData" style="width: 100%" height="79%">
+ <div class="table_box subpage_Div">
+ <el-table
+ :data="tableData"
+ style="width: 100%"
+ height="79%"
+ >
<!-- <el-table-column type="selection" width="55" /> -->
<el-table-column
:label="$t('operatManage.operationLogObj.num')"
@@ -161,7 +167,10 @@
</template>
</el-table-column> -->
</el-table>
- <div style="margin-top: 40px" class="pagination_box">
+ <div
+ style="margin-top: 40px"
+ class="pagination_box"
+ >
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -302,121 +311,19 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
.inquire {
padding: 10px;
margin-top: 20px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 20px;
- .herder_box {
- padding: 10px;
- border-bottom: 1px solid #ccc;
- margin-bottom: 20px;
- font-size: 14px;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
}
.table_box {
padding: 10px;
border-radius: 5px;
overflow: auto;
height: 60%;
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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 {
- /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: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- }
}
.text-center {
text-align: center;
diff --git a/src/views/maintenance/parameterConfiguration.vue b/src/views/maintenance/parameterConfiguration.vue
index 9f8cd83..965bd1a 100644
--- a/src/views/maintenance/parameterConfiguration.vue
+++ b/src/views/maintenance/parameterConfiguration.vue
@@ -262,14 +262,14 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.parameterConfiguration {
padding-top: 10px;
padding-bottom: 10px;
height: 88%;
overflow: auto;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
box-sizing: border-box;
.el-select {
width: 100%;
@@ -278,119 +278,12 @@
display: flex;
justify-content: center;
}
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
+ margin-top: 10px;
}
- .pagination_box {
- /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: #1890ff;
- }
- /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/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- .boxlabel {
- color: white;
- }
+
}
</style>
diff --git a/src/views/maintenance/systemMonitoring.vue b/src/views/maintenance/systemMonitoring.vue
index 5be51ea..456cc7f 100644
--- a/src/views/maintenance/systemMonitoring.vue
+++ b/src/views/maintenance/systemMonitoring.vue
@@ -6,8 +6,8 @@
]"></My-bread>
<el-divider />
<div class="content_Box">
- <div class="cloumn_Box1">
- <div class="flex_Box1">
+ <div class="cloumn_Box1">
+ <div class="flex_Box1 subpage_Div">
<el-tabs
v-model="activeName"
@tab-click="handleClick"
@@ -78,7 +78,7 @@
</el-tab-pane>
</el-tabs>
</div>
- <div class="flex_Box">
+ <div class="flex_Box subpage_Div">
<div>
<div
style="line-height: 32px"
@@ -118,7 +118,7 @@
</div>
</div>
<div class="cloumn_Box">
- <div class="flex_Box">
+ <div class="flex_Box subpage_Div">
<div style="width: 100%; height: 20px">
<div class="image1"></div>
<div class="imageTitle">
@@ -168,7 +168,7 @@
</div>
</div>
</div>
- <div class="flex_Box">
+ <div class="flex_Box subpage_Div">
<div>
<div class="image2"></div>
<div
@@ -183,7 +183,7 @@
style="width: 100%; height: 86%; margin-top: 8%"
></div>
</div>
- <div class="flex_Box">
+ <div class="flex_Box subpage_Div">
<div style="width: 100%; height: 34px">
<div class="image3"></div>
<div
@@ -666,7 +666,6 @@
toolbox: {
show: true,
feature: {
-
saveAsImage: { show: true }
}
},
@@ -675,7 +674,7 @@
left: 'center',
textStyle: {
fontSize: 18, //瀛椾綋澶у皬
- color: '#ffffff', //瀛椾綋棰滆壊
+
},
},
series: [
@@ -869,11 +868,11 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.content_Box {
- width: 97%;
- height: 85%;
- position: absolute;
+ width: 100%;
+ height: 90%;
+
display: flex;
flex-direction: column;
justify-content: space-around;
@@ -886,10 +885,10 @@
.flex_Box {
width: 30.5%;
height: 88%;
- border: 1px solid rgb(202, 201, 204);
+
border-radius: 5px;
padding: 1%;
- background: rgb(21, 20, 20);
+
.image1 {
width: 46px;
@@ -936,7 +935,7 @@
}
.imageTitle {
float: left;
- color: white;
+
margin-left: 10px;
}
.ycTltle {
@@ -982,11 +981,9 @@
.height_title {
width: 100%;
height: 48%;
- label {
- color: white;
- }
+
p {
- color: white;
+
margin-top: 3%;
font-size: 24px;
}
@@ -1009,83 +1006,21 @@
width: 64%;
height: 92%;
padding: 1%;
- border: 1px solid rgb(202, 201, 204);
+
border-radius: 5px;
- background: rgb(21, 20, 20);
+
}
.flex_Box {
width: 30.5%;
height: 92%;
- border: 1px solid rgb(202, 201, 204);
+
border-radius: 5px;
padding: 1%;
- background: rgb(21, 20, 20);
+
}
}
}
- /deep/.el-tabs__item {
- color: white;
- }
- /deep/.el-tabs__item.is-active {
- color: #009cff;
- }
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
- }
+
+
}
</style>
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index a33fa4b..37c96be 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -5,7 +5,7 @@
`${$t('operatManage.tokentool')}`,
]"></My-bread>
<el-divider />
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
ref="formData"
:model="ruleForm"
@@ -69,10 +69,11 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box subpage_Div">
+ <div></div>
<el-table
:data="tableData"
- height="102.1%"
+
style="width: 100%"
@selection-change="handleSelectionChange"
>
@@ -168,19 +169,20 @@
</template>
</el-table-column>
</el-table>
+ <div style="margin-top:10px">
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count"
+ >
+ </el-pagination>
+ </div>
</div>
- <div class="pagination_box">
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="[10, 20, 30, 40]"
- :page-size="listData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count"
- >
- </el-pagination>
- </div>
+
<!-- 鏂板寮圭獥 -->
<el-dialog
:title="$t('operatManage.tokentoolObj.addToken')"
@@ -599,11 +601,7 @@
},
};
</script>
-<style scoped>
-/deep/ .el-table__fixed-right {
- height: 100% !important;
-}
-</style>
+
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
@@ -611,150 +609,28 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+overflow: auto;
.el-input {
width: 745px;
}
- .el-select {
- width: 745px;
- }
+
.inquire {
padding: 10px;
margin-top: 20px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 10px;
- .herder_box {
- padding: 10px;
- border-bottom: 1px solid #ccc;
- margin-bottom: 20px;
- font-size: 14px;
- }
+
.el-select {
width: 200px;
- }
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
}
}
.table_box {
padding: 10px;
- height: 63%;
+
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
margin-bottom: 10px;
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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 {
- /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: #1890ff;
- }
- /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/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
}
}
</style>
diff --git a/src/views/maintenance/userManagement.vue b/src/views/maintenance/userManagement.vue
index ad15aa1..01c873f 100644
--- a/src/views/maintenance/userManagement.vue
+++ b/src/views/maintenance/userManagement.vue
@@ -5,7 +5,7 @@
`${$t('userManage.userManage')}`,
]"></My-bread>
<el-divider />
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
ref="queryForm"
:model="queryForm"
@@ -92,7 +92,7 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box subpage_Div">
<el-table
:data="tableData"
border
@@ -1203,18 +1203,13 @@
},
};
</script>
-<style>
-/deep/ .el-table__fixed-right {
- height: 100% !important;
-}
-</style>
+
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.userInfo_box {
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
.el-input {
width: 300px;
@@ -1227,7 +1222,7 @@
margin-top: 20px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 20px;
.el-form-item {
margin: 5px;
@@ -1237,67 +1232,8 @@
height: 60%;
padding: 10px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
overflow: auto;
-
- /*淇敼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;
- }
- }
}
.el-dialog {
.el-form-item {
@@ -1320,78 +1256,6 @@
}
}
}
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/.el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/ .el-dialog__body {
- padding: 10px 0 0 0;
- }
- .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/.userInfo_box .pagination_box .btn-next {
- background: white;
- }
}
</style>
-<style>
-.el-select-dropdown {
- background: #303030;
- border-color: 1px solid;
-}
-
-.el-scrollbar__wrap {
- margin-bottom: -20px !important;
- margin-right: -20px !important;
-}
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
- background: rgba(255, 255, 255, 0.3);
-}
-.el-select-dropdown__item {
- color: white !important;
-}
-</style>
+
diff --git a/src/views/userManage/authorityManage.vue b/src/views/userManage/authorityManage.vue
index cf2bac3..16b6b51 100644
--- a/src/views/userManage/authorityManage.vue
+++ b/src/views/userManage/authorityManage.vue
@@ -5,7 +5,7 @@
`${$t('userManage.authorityManage')}`,
]"></My-bread>
<el-divider />
- <div class="power_quire">
+ <div class="power_quire subpage_Div">
<el-form
ref="form"
:model="ruleForm"
@@ -43,7 +43,7 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box subpage_Div">
<el-table
:data="tableData"
style="width: 100%"
@@ -142,7 +142,7 @@
</div>
<div
- class="infoBox"
+ class="infoBox subpage_Div box_div"
v-show="showinfoBox"
>
<el-card class="box-card">
@@ -514,25 +514,15 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.el-input {
width: 300px;
}
.power_quire {
overflow: auto;
padding: 8px;
-
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/.el-form-item {
- margin-bottom: 0px;
- }
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
-
+
margin-bottom: 10px;
}
.table_box {
@@ -540,187 +530,12 @@
padding: 10px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- }
- .infoBox {
- width: 500px;
- position: absolute;
- z-index: 100;
- top: 15%;
- right: 12%;
- background-color: #303030;
- .el-icon-close {
- color: white;
- }
- .el-card {
- background-color: transparent;
- span {
- font-size: 16px;
- font-weight: 600;
- color: white;
- }
- }
- .contentBox {
- margin: 0 aotu 10px;
- height: 485px;
- overflow: auto;
- p {
- color: white;
- font-size: 14px;
- }
- .boxlabel {
- margin-left: 10px;
- }
- }
- /* 鏁翠綋鏍峰紡 */
- .contentBox::-webkit-scrollbar {
- width: 6px;
- height: 6px;
- }
-
- /* 婊氬姩鏉� */
- .contentBox::-webkit-scrollbar-thumb {
- background-color: #b3d8ff;
- border-radius: 6px;
- }
-
- /* 婊氬姩鏉￠紶鏍囩粡杩囨牱寮� */
- .contentBox::-webkit-scrollbar-thumb:hover {
- background-color: #b3d8ff;
- border-radius: 6px;
- }
-
- /* 婊氬姩鏉¤建閬� */
- .contentBox::-webkit-scrollbar-track-piece {
- -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
- border-radius: 10px;
- background: #ededed;
- }
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
- }
+
+
+
}
</style>
-<style>
-.el-select-dropdown {
- background: #303030;
- border-color: 1px solid;
-}
-
-.el-scrollbar__wrap {
- margin-bottom: -20px !important;
- margin-right: -20px !important;
-}
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
- background: rgba(255, 255, 255, 0.3);
-}
-.el-select-dropdown__item {
- color: white !important;
-}
-</style>
+
\ No newline at end of file
diff --git a/src/views/userManage/orgManage.vue b/src/views/userManage/orgManage.vue
index fe08415..2e60edf 100644
--- a/src/views/userManage/orgManage.vue
+++ b/src/views/userManage/orgManage.vue
@@ -6,7 +6,7 @@
]"></My-bread>
<el-divider />
<div class="cataLogContent">
- <div class="left_Tree">
+ <div class="left_Tree subpage_Div">
<div style="min-width:200px">
<el-tree
ref="tree"
@@ -20,7 +20,7 @@
</el-tree>
</div>
</div>
- <div class="right_menu">
+ <div class="right_menu subpage_Div">
<div style="display:flex;justify-content:space-between">
<el-breadcrumb separator="/">
@@ -30,35 +30,40 @@
</el-breadcrumb>
<div>
- <el-button v-if="menuStatus.update"
+ <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"
+ <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"
+ <el-button
+ v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(1)"
type="success"
icon="el-icon-plus"
size="small"
>鏂板鍚岀骇</el-button>
- <el-button v-if="menuStatus.insert"
+ <el-button
+ v-if="menuStatus.insert"
:disabled="itemdetail.pid == null ? true : false"
@click="setNewNode(2)"
type="success"
icon="el-icon-plus"
size="small"
>鏂板瀛愮骇</el-button>
- <el-button v-if="menuStatus.delete"
+ <el-button
+ v-if="menuStatus.delete"
@click="setDelNode()"
:disabled="itemdetail.pid == null ? true : false"
type="danger"
@@ -795,10 +800,10 @@
break;
}
},
- getPerms() {
+ getPerms() {
var val = this.$store.state.currentPerms;
var permsEntity = this.$store.state.permsEntity;
-
+
if (permsEntity.length == 0) {
getPerms().then((res) => {
if (res.code == 200) {
@@ -816,7 +821,7 @@
},
mounted() {
this.getMenuTree();
- this.getPerms();
+ this.getPerms();
},
created() {
// var val = this.$store.state.currentPerms;
@@ -835,7 +840,7 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.cataLogContent {
width: 100%;
height: 92%;
@@ -845,22 +850,15 @@
.left_Tree {
width: 15%;
height: 91%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
overflow-y: auto;
-
- .el-icon-circle-plus {
- color: gray;
- }
- .el-icon-delete-solid {
- color: gray;
- }
}
.right_menu {
width: 80%;
height: 91%;
- border: 1px solid white;
+
border-radius: 5px;
padding: 1%;
overflow: auto;
@@ -868,158 +866,6 @@
.el-input {
width: 400px;
}
- /deep/.el-form-item__label {
- color: white;
- }
- }
- .el-card-define {
- height: 680px;
- background: #303030;
- border: 1px solid gray;
- padding: 1px;
- }
- .card_tree {
- display: block;
- height: 650px;
- overflow-y: auto;
- // 鏇存敼鎸囨爣鏍戝浘鏍囬鑹�
- /deep/ .el-tree .el-icon-caret-right:before {
- color: white; /** 杩欓噷鏄淇敼鍥炬爣鐨勯鑹� **/
- }
- /deep/ .el-tree {
- color: white; /** 杩欓噷鏄淇敼鍥炬爣鐨勯鑹� **/
- background: transparent;
- }
- /deep/.el-tree-node__content {
- &:hover {
- background-color: rgba(255, 255, 255, 0.3) !important;
- }
- }
- /deep/.el-tree-node.is-current > .el-tree-node__content {
- background-color: rgba(255, 255, 255, 0.3) !important;
- color: #409eff;
- }
- }
- // .menuSettings_tree {
- // position: relative;
- // width: 344px;
- // height: 100%;
- // background: rgb(240, 242, 245);
- // padding: 20px;
- // border-radius: 10px;
- // box-sizing: border-box;
- // overflow: auto;
- // .saveBtn {
- // position: absolute;
- // left: 250px;
- // top: 23px;
- // }
- // .depTreeBox {
- // height: 88%;
- // width: 100%;
- // overflow: auto;
- // .el-tree {
- // background: transparent;
- // font-size: 15px;
- // font-family: Microsoft YaHei;
- // font-weight: 400;
- // color: #000000;
- // /deep/ .el-tree-node {
- // padding-top: 10px;
- // // padding-bottom: 10px;
- // }
- // /deep/ .el-tree-node:focus > .el-tree-node__content {
- // background-color: #b9b9b9;
- // }
- // /deep/ .el-tree-node__content:hover {
- // background-color: rgb(153, 153, 153);
- // }
- // .btnBox {
- // margin: 0 10px 0 5px;
- // .el-button + .el-button {
- // margin-left: 5px;
- // }
- // }
- // }
- // }
- // }
- // .itemSettings {
- // width: calc(100% - 344px);
- // border-radius: 10px;
- // background: rgb(240, 242, 245);
- // margin-left: 10px;
- // height: 100%;
- // padding: 10px;
- // box-sizing: border-box;
- // .title_box {
- // background: #fff;
- // padding: 10px;
- // margin-bottom: 24px;
- // display: flex;
- // border-radius: 10px;
- // border: 1px solid rgb(202, 201, 204);
- // box-sizing: border-box;
- // }
- // .form_box {
- // border: 1px solid rgb(202, 201, 204);
- // border-radius: 10px;
- // background: #fff;
- // padding-top: 30px;
- // box-sizing: border-box;
- // width: 100%;
- // .el-input,
- // /deep/ .el-textarea {
- // width: 400px;
- // }
- // .btnBox {
- // margin: 0 270px 20px;
- // width: 200px;
- // display: flex;
- // justify-content: space-between;
- // }
- // }
- // }
- /deep/ .el-dialog__body {
- padding: 0 30px 0 0;
- }
- /*閲岄潰鐨勪唬鐮佸彲浠ユ牴鎹嚜宸遍渶姹傚幓杩涜鏇存敼*/
- /* 璁剧疆婊氬姩鏉＄殑鏍峰紡 */
- ::-webkit-scrollbar {
- width: 4px;
- }
- /* 婊氬姩妲� */
- ::-webkit-scrollbar-track {
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
- border-radius: 10px;
- }
- /* 婊氬姩鏉℃粦鍧� */
- ::-webkit-scrollbar-thumb {
- border-radius: 10px;
- background: #8b8b8b;
- -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
- }
- ::-webkit-scrollbar-thumb:window-inactive {
- background: #8b8b8b;
- height: 289px;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
}
}
</style>
diff --git a/src/views/userManage/resourceManage.vue b/src/views/userManage/resourceManage.vue
index 1367994..8965229 100644
--- a/src/views/userManage/resourceManage.vue
+++ b/src/views/userManage/resourceManage.vue
@@ -5,7 +5,7 @@
`${$t('userManage.resManage')}`,
]"></My-bread>
<el-divider />
- <div class="power_quire">
+ <div class="power_quire subpage_Div">
<el-form
ref="form"
:model="ruleForm"
@@ -45,7 +45,7 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box ">
<el-table
:data="tableData"
style="width: 100%"
@@ -141,7 +141,7 @@
</el-pagination>
</div>
<div
- class="infoBox"
+ class="infoBox box_div "
v-show="showinfoBox"
>
<el-card class="box-card">
@@ -157,6 +157,7 @@
<i class="el-icon-close"></i>
</div>
</div>
+ <el-divider></el-divider>
<div class="contentBox">
<p>
<label> {{ $t('userManage.resManageObj.name') }}:</label>
@@ -550,7 +551,7 @@
</div>
</div>
<div
- class="leftTree"
+ class="leftTree box_div"
v-if="showDepCata"
>
<div class="treeBox">
@@ -893,23 +894,16 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
+
.el-input {
width: 730px;
}
- /deep/.el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
- }
+
.power_quire {
padding: 10px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
+
margin-bottom: 10px;
.el-form-item {
margin: 5px;
@@ -918,100 +912,8 @@
width: 467px;
}
}
- .table_box {
- padding: 10px;
- border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
-
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- }
+
+
.leftTree {
position: absolute;
z-index: 10;
@@ -1020,14 +922,11 @@
left: 800px;
width: 400px;
height: 600px;
- background: #303030;
- border: 1px solid #000;
+
.treeBox {
height: 550px;
overflow: auto;
- /deep/ .el-tree-node__content:hover {
- background-color: rgb(153, 153, 153);
- }
+
}
.btnBox {
width: 160px;
@@ -1035,103 +934,8 @@
// background-color: red;
}
}
- .infoBox {
- width: 500px;
-
- position: absolute;
- z-index: 100;
- top: 25%;
- right: 12%;
- .el-icon-close {
- color: white;
- }
- background-color: #303030;
- .el-card {
- background-color: transparent;
- span {
- font-size: 16px;
- font-weight: 600;
- color: white;
- }
- }
- .contentBox {
- margin: 0 aotu 10px;
- height: 485px;
- overflow: auto;
- p {
- // background-color: #bfa;
- // margin-bottom: 10px;
- color: white;
- font-size: 14px;
- }
- .boxlabel {
- margin-left: 10px;
- }
- }
- /* 鏁翠綋鏍峰紡 */
- .contentBox::-webkit-scrollbar {
- width: 6px;
- height: 6px;
- }
-
- /* 婊氬姩鏉� */
- .contentBox::-webkit-scrollbar-thumb {
- background-color: #b3d8ff;
- border-radius: 6px;
- }
-
- /* 婊氬姩鏉￠紶鏍囩粡杩囨牱寮� */
- .contentBox::-webkit-scrollbar-thumb:hover {
- background-color: #b3d8ff;
- border-radius: 6px;
- }
-
- /* 婊氬姩鏉¤建閬� */
- .contentBox::-webkit-scrollbar-track-piece {
- -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
- border-radius: 10px;
- background: #ededed;
- }
- }
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/.el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/ .el-dialog__body {
- padding: 10px 0 0 0;
- }
+
+
}
</style>
-<style >
-.el-select-dropdown {
- background: #303030;
- border-color: 1px solid;
-}
-
-.el-scrollbar__wrap {
- margin-bottom: -20px !important;
- margin-right: -20px !important;
-}
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
- background: rgba(255, 255, 255, 0.3);
-}
-.el-select-dropdown__item {
- color: white !important;
-}
-</style>
+
\ No newline at end of file
diff --git a/src/views/userManage/roleDepTree.vue b/src/views/userManage/roleDepTree.vue
index dc2bd87..0bf47cf 100644
--- a/src/views/userManage/roleDepTree.vue
+++ b/src/views/userManage/roleDepTree.vue
@@ -319,24 +319,10 @@
font-size: 15px;
font-family: Microsoft YaHei;
font-weight: 400;
- color: #000000;
+
- // /deep/ .el-tree-node__label {
- // font-size: 18px;
- // }
- /deep/ .el-tree-node {
- padding-top: 10px;
- // padding-bottom: 10px;
- }
-
- /deep/ .el-tree-node:focus > .el-tree-node__content {
- background-color: #b9b9b9;
- }
-
- /deep/ .el-tree-node__content:hover {
- background-color: rgb(153, 153, 153);
- }
-
+
+
.btnBox {
margin-left: 5px;
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index 8c052da..517372e 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -5,7 +5,7 @@
`${$t('userManage.roleManage')}`,
]"></My-bread>
<el-divider />
- <div class="inquire">
+ <div class="inquire subpage_Div">
<el-form
ref="ruleForm"
:model="roleForm"
@@ -75,7 +75,7 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box">
+ <div class="table_box subpage_Div">
<el-table
:data="tableData"
style="width: 100%"
@@ -353,7 +353,7 @@
</div>
</el-dialog>
<div
- class="leftTree"
+ class="leftTree subpage_Div box_div"
v-if="showCata"
>
<div class="treeBox">
@@ -374,7 +374,7 @@
</div>
<div
- class="infoBox"
+ class="infoBox box_div subpage_Div"
v-show="showinfoBox"
>
<el-card>
@@ -721,7 +721,6 @@
height: 98%;
width: 98%;
padding: 1%;
- position: absolute;
overflow: auto;
.el-input {
width: 300px;
@@ -733,15 +732,10 @@
left: 37%;
width: 400px;
height: 600px;
- background: #303030;
- border: 1px solid #000;
- color: black;
+
.treeBox {
height: 550px;
overflow: auto;
- /deep/ .el-tree-node__content:hover {
- background-color: rgb(153, 153, 153);
- }
}
.btnBox {
width: 123px;
@@ -757,18 +751,9 @@
margin-top: 10px;
width: calc(100% - 22px);
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
.el-form-item {
margin: 7px;
- }
- /deep/ .el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/.el-form-item__label {
- color: white;
}
}
.table_box {
@@ -778,181 +763,9 @@
margin-bottom: 10px;
margin-top: 10px;
border-radius: 5px;
- border: 1px solid rgb(202, 201, 204);
- /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: #1890ff;
- }
- /deep/.el-pager li {
- color: white;
- background: transparent;
- }
- /deep/.el-pager li {
- color: white;
- }
- /deep/.btn-prev {
- background: transparent;
- }
- /deep/.btn-next {
- background: transparent;
- }
- /*淇敼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: 10px;
- /*婊氬姩鏉￠珮搴�*/
- }
- /*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
- .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;
- }
- }
}
.text-center {
text-align: center;
- }
- .infoBox {
- width: 500px;
-
- position: absolute;
- z-index: 100;
- top: 15%;
- right: 12%;
- background-color: #303030;
- .el-icon-close {
- color: white;
- }
- .el-card {
- background-color: transparent;
- span {
- font-size: 16px;
- font-weight: 600;
- color: white;
- }
- }
- .contentBox {
- margin: 0 aotu 10px;
- height: 485px;
- overflow: auto;
- p {
- // background-color: #bfa;
- // margin-bottom: 10px;
- font-size: 14px;
- color: white;
- }
- .boxlabel {
- margin-left: 10px;
- }
- }
- /* 鏁翠綋鏍峰紡 */
- .contentBox::-webkit-scrollbar {
- width: 6px;
- height: 6px;
- }
-
- /* 婊氬姩鏉� */
- .contentBox::-webkit-scrollbar-thumb {
- background-color: #b3d8ff;
- border-radius: 6px;
- }
-
- /* 婊氬姩鏉￠紶鏍囩粡杩囨牱寮� */
- .contentBox::-webkit-scrollbar-thumb:hover {
- background-color: #b3d8ff;
- border-radius: 6px;
- }
-
- /* 婊氬姩鏉¤建閬� */
- .contentBox::-webkit-scrollbar-track-piece {
- -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
- border-radius: 10px;
- background: #ededed;
- }
- }
- /deep/.el-form-item__label {
- color: white;
- }
- /deep/.el-input__inner {
- background-color: transparent !important;
- border: 1px solid;
- color: white;
- }
- /deep/ .el-dialog {
- background: #303030;
- }
- /deep/.el-range-editor.is-active,
- .el-range-editor.is-active:hover,
- .el-select .el-input.is-focus .el-input__inner {
- border: 1px solid;
- }
- /deep/.el-dialog__title {
- color: white;
- }
- /deep/ .el-dialog__body {
- padding: 10px 0 0 0;
- }
- /deep/ .el-radio {
- color: white;
- }
- /deep/.el-radio__input.is-checked + .el-radio__label {
- color: #1890ff;
}
}
</style>
--
Gitblit v1.9.3