diff --git a/core/core-frontend/src/components/visualization/DvSidebar.vue b/core/core-frontend/src/components/visualization/DvSidebar.vue index 53f0295..f7229b8 100644 --- a/core/core-frontend/src/components/visualization/DvSidebar.vue +++ b/core/core-frontend/src/components/visualization/DvSidebar.vue @@ -399,15 +399,15 @@ const menuOpt = optName => { - \ No newline at end of file diff --git a/core/core-frontend/src/viewsnew/application/permissionset/organization/index.vue b/core/core-frontend/src/viewsnew/application/permissionset/organization/index.vue index a7cc39e..2893218 100644 --- a/core/core-frontend/src/viewsnew/application/permissionset/organization/index.vue +++ b/core/core-frontend/src/viewsnew/application/permissionset/organization/index.vue @@ -371,7 +371,7 @@ function formatDateTime(dateArray:any){ + @node-click="nodeclick" style="margin-top: 15px;"> @@ -379,7 +379,7 @@ function formatDateTime(dateArray:any){ - + @@ -387,7 +387,7 @@ function formatDateTime(dateArray:any){ - + @@ -415,7 +415,7 @@ function formatDateTime(dateArray:any){ - @@ -508,9 +508,10 @@ function formatDateTime(dateArray:any){ .organization-leftbox{ width: 240px; height: 100%; - background: rgb(33,33,33); border-radius: 5px; margin-right: 15px; + background: #ffffff; + box-shadow: 0px 0px 10px rgba(219, 225, 236, 1); .leftbox-title{ width: 100%; height: 44px; @@ -519,8 +520,8 @@ function formatDateTime(dateArray:any){ font-weight: 700; font-style: normal; font-size: 15px; - color: #FFFFFF; - border-bottom: 1px solid #282828; + color: #000000; + border-bottom: 1px solid #e8e8e8; padding-left: 20px; } .leftbox-btn{ @@ -528,21 +529,25 @@ function formatDateTime(dateArray:any){ height: 40px; border-width: 1px; border-style: solid; - border-color: rgba(0, 137, 255, 1); + border-color: #409eff; border-radius: 3px; font-size: 14px; - color: #0089FF; + color: #409eff; margin: 0 auto; margin-top: 15px; display: flex; align-items: center; justify-content: center; + cursor: pointer; + } + .leftbox-btn:hover{ + background: rgba(64, 158, 255,0.1); } } .organization-rightbox{ width: calc(100% - 240px); height: 100%; - background: rgb(33,33,33); + background: #ffffff; border-radius: 5px; padding: 20px; } @@ -552,194 +557,4 @@ function formatDateTime(dateArray:any){ margin-bottom: 20px; } } - :deep(.el-tree){ - background:#212121; - height: calc(100vh - 210px); - overflow: auto; - margin-top: 20px; - color: #ffffff; - font-size: 14px; - } - :deep(.el-tree-node__content){ - height: 40px; - line-height: 40px; - } - :deep(.el-tree-node__content:hover){ - background: rgba(61,158, 255, 0.1); - color: #0089FF; - } - :deep(.custom-tree-node){ - flex: 1; - display: flex; - align-items: center; - justify-content: space-between; - font-size: 14px; - padding-right: 8px; - } - :deep(.el-tree-node__content>.ed-tree-node__expand-icon){ - padding: 2px; - } - :deep(.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content){ - background: #409eff; - color: #ffffff; - } - :deep(.el-tree-node:focus>.el-tree-node__content){ - background:#212121; - color: #ffffff; - } - \ No newline at end of file diff --git a/core/core-frontend/src/viewsnew/application/permissionset/role/index.vue b/core/core-frontend/src/viewsnew/application/permissionset/role/index.vue index 51b3db8..43527dc 100644 --- a/core/core-frontend/src/viewsnew/application/permissionset/role/index.vue +++ b/core/core-frontend/src/viewsnew/application/permissionset/role/index.vue @@ -364,7 +364,8 @@ function menuChange(data: any, ids: any) { .organization-box{ width: 100%; height: 100%; - background: rgb(33,33,33); + background: #ffffff; + box-shadow: 0px 0px 10px rgba(219, 225, 236, 1); border-radius: 5px; padding: 20px; .querybox{ @@ -373,56 +374,7 @@ function menuChange(data: any, ids: any) { margin-bottom: 20px; } } - - \ No newline at end of file diff --git a/core/core-frontend/src/viewsnew/application/permissionset/user/index.vue b/core/core-frontend/src/viewsnew/application/permissionset/user/index.vue index 085e83f..c1fc5f6 100644 --- a/core/core-frontend/src/viewsnew/application/permissionset/user/index.vue +++ b/core/core-frontend/src/viewsnew/application/permissionset/user/index.vue @@ -278,13 +278,25 @@ function setisValid(row:any){ }) } function resetclick(row:any){ - resetPassword(row.id).then(res => { - if(res.data.code == '0'){ - ElMessage.success('重置成功') - }else{ - ElMessage.error('重置失败') + ElMessageBox.confirm( + '是否重置该用户密码?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', } - }) + ) + .then(() => { + resetPassword(row.id).then(res => { + if(res.data.code == '0'){ + ElMessage.success('重置成功') + }else{ + ElMessage.error('重置失败') + } + }) + }) + .catch(() => {}) } @@ -354,7 +366,7 @@ function resetclick(row:any){ - @@ -396,7 +408,8 @@ function resetclick(row:any){ .organization-leftbox{ width: 240px; height: 100%; - background: rgb(33,33,33); + background: #ffffff; + box-shadow: 0px 0px 10px rgba(219, 225, 236, 1); border-radius: 5px; margin-right: 15px; .leftbox-title{ @@ -407,8 +420,8 @@ function resetclick(row:any){ font-weight: 700; font-style: normal; font-size: 15px; - color: #FFFFFF; - border-bottom: 1px solid #282828; + color: #000000; + border-bottom: 1px solid #e8e8e8; padding-left: 20px; } .leftbox-btn{ @@ -426,22 +439,10 @@ function resetclick(row:any){ align-items: center; justify-content: center; } - :deep(.el-tree){ - background:#212121; - height: calc(100vh - 145px); - overflow: auto; - margin-top: 5px; - color: #ffffff; - font-size: 14px; - } :deep(.el-tree-node__content){ height: 40px; line-height: 40px; } - :deep(.el-tree-node__content:hover){ - background: rgba(61,158, 255, 0.1); - color: #0089FF; - } :deep(.custom-tree-node){ flex: 1; display: flex; @@ -453,25 +454,15 @@ function resetclick(row:any){ :deep(.el-tree-node__content>.ed-tree-node__expand-icon){ padding: 2px; } - :deep(.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content){ - background: #409eff; - color: #ffffff; - } - :deep(.el-tree-node:focus>.el-tree-node__content){ - background:#212121; - color: #ffffff; - } - :deep(.el-text){ - color: #ffffff; - } - :deep(.el-tree-node__expand-icon){ - color: #ffffff; + :deep(.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content .el-text){ + color: #409eff; } } .organization-rightbox{ width: calc(100% - 240px); height: 100%; - background: rgb(33,33,33); + background: #ffffff; + box-shadow: 0px 0px 10px rgba(219, 225, 236, 1); border-radius: 5px; padding: 20px; } @@ -481,174 +472,4 @@ function resetclick(row:any){ margin-bottom: 20px; } } - - \ No newline at end of file