From 10660a5b4bb261141e0120b15fc8ca5b13208a9e Mon Sep 17 00:00:00 2001
From: jingna <1264204245@qq.com>
Date: Wed, 11 Jun 2025 18:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=99=BD=E8=89=B2=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/visualization/DvSidebar.vue    |   6 +-
 .../SfcEditor/LoginEditor/editlogin.vue       |   2 +-
 .../SfcEditor/LoginEditor/previewLogin.vue    |   2 +-
 .../SfcEditor/NavbarEditor/Navbar.vue         |  30 ++-
 .../SfcEditor/NavbarEditor/editNavbar.vue     |   2 +-
 .../SfcEditor/NavbarEditor/previewNavSfc.vue  |   2 +-
 .../src/viewsnew/application/SystemLogin.vue  |   2 +-
 .../application/permissionset/index.vue       | 183 +++++++++++---
 .../permissionset/organization/index.vue      | 215 ++--------------
 .../application/permissionset/role/index.vue  |  58 +----
 .../application/permissionset/user/index.vue  | 233 ++----------------
 11 files changed, 227 insertions(+), 508 deletions(-)

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 => {
 </style>
 <style>
 .ed-popper.is-light {
-    border: 1px solid #434343;
+    border: 1px solid #434343 !important;
     background: rgba(41, 41, 41, 1) !important;
 }
 .ed-popper[data-popper-placement^=bottom] .ed-popper__arrow::before {
     background: rgba(41, 41, 41, 1) !important;
 }
 .ed-popover.ed-popper{
-  background: rgba(41, 41, 41, 1);
-  border: 1px solid #434343;
+  background: rgba(41, 41, 41, 1) !important;
+  border: 1px solid #434343 !important;
 }
 .ed-collapse-item.ed-collapse--light .ed-collapse-item__header{
   background-color: #1a1a1a;
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/editlogin.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/editlogin.vue
index 582bc24..324749c 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/editlogin.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/editlogin.vue
@@ -32,7 +32,7 @@
   import { ElMessage } from 'element-plus-secondary'
   import { useRoute, useRouter } from 'vue-router'
   import * as Vue from 'vue/dist/vue.esm-bundler.js'
-  import ElementPlus from 'element-plus'
+  import * as ElementPlus from 'element-plus'
   import * as VueRouter from 'vue-router'
   import { loadModule } from 'vue3-sfc-loader'
   import less from 'less'
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/previewLogin.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/previewLogin.vue
index 4d098d4..5a691d9 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/previewLogin.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/LoginEditor/previewLogin.vue
@@ -7,7 +7,7 @@
 import { ref, onMounted,onUnmounted } from 'vue'
 import { loadModule } from 'vue3-sfc-loader'
 import * as Vue from 'vue/dist/vue.esm-bundler.js'
-import ElementPlus from 'element-plus'
+import * as ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import less from 'less'
 import { i18n } from '@/plugins/vue-i18n'
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue
index bd378c5..79a6c98 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue
@@ -3,6 +3,9 @@ import { ref, watch, onMounted, onBeforeUnmount, shallowRef } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import Assocmodule from '@/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue'
 import PermissionSet from '@/viewsnew/application/permissionset/index.vue'
+import {useRoute, useRouter } from 'vue-router'
+const router = useRouter()
+const route = useRoute()
 const props = defineProps({
   menuList: {
     type: Array, // 根据实际数据结构调整
@@ -54,7 +57,7 @@ function childmenuclick(item: any) {
   }
 }
 // 时间相关逻辑移动到独立组件中
-const TimeDispl                           ay = {
+const TimeDisplay = {
   template: `
     <div class="Navbar-menu-time">
       <div class="Navbar-menu-time-text">{{ currentTime }}</div>
@@ -106,6 +109,25 @@ function permissionClick() {
   showmodule.value = false
   showermission.value = true
 }
+function logout(){
+  ElMessageBox.confirm(
+    '确定退出登录?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      router.push({
+        path: '/SystemLogin',
+        query: { id: props.applicationId, name: props.projectName }
+      })
+    })
+    .catch(() => {})
+    
+}
 </script>
 <template>
   <div class="system-box">
@@ -139,7 +161,7 @@ function permissionClick() {
           <div style="margin-right: 10px;cursor: pointer;"><img src="@/assets/img/nav1.png" alt=""></div>
           <div style="margin-right: 15px;min-width: 45px;">admin</div>
           <div style="margin-right: 15px;"><img src="@/assets/img/nav3.png" alt=""></div>
-          <div><img src="@/assets/img/nav4.png" alt=""></div>
+          <div @click="logout"><img src="@/assets/img/nav4.png" alt=""></div>
         </div>
       </div>
     </div>
@@ -248,7 +270,7 @@ function permissionClick() {
 </style>
 <style>
 .tsmenu-popover.el-popover.el-popper {
-  background: linear-gradient(to bottom, rgba(0, 52, 102, 1), rgba(0, 55, 110, 0.5)) !important;
+  background: linear-gradient(to bottom, rgba(0, 52, 102, 1), rgba(0, 55, 110, 0.5));
   ;
   color: #fff;
   border: none;
@@ -258,7 +280,7 @@ function permissionClick() {
 }
 
 .tsmenu-popover.ed-popover.ed-popper {
-  background: linear-gradient(to bottom, rgba(0, 52, 102, 1), rgba(0, 55, 110, 0.5)) !important;
+  background: linear-gradient(to bottom, rgba(0, 52, 102, 1), rgba(0, 55, 110, 0.5));
   ;
   color: #fff;
   border: none;
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue
index 9c4660e..e2c37ba 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/editNavbar.vue
@@ -33,7 +33,7 @@ import { ElIcon, ElMessage } from 'element-plus-secondary'
 import { useRoute, useRouter } from 'vue-router'
 import { loadModule } from 'vue3-sfc-loader'
 import * as Vue from 'vue/dist/vue.esm-bundler.js'
-import ElementPlus from 'element-plus'
+import * as ElementPlus from 'element-plus'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs' 
 import * as VueRouter from 'vue-router'
 import less from 'less'
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/previewNavSfc.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/previewNavSfc.vue
index 2e6c81c..9fc628d 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/previewNavSfc.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/previewNavSfc.vue
@@ -7,7 +7,7 @@
 import { ref, onMounted, onUnmounted } from 'vue'
 import { loadModule } from 'vue3-sfc-loader'
 import * as Vue from 'vue/dist/vue.esm-bundler.js'
-import ElementPlus from 'element-plus'
+import * as ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import less from 'less'
 import * as VueRouter from 'vue-router'
diff --git a/core/core-frontend/src/viewsnew/application/SystemLogin.vue b/core/core-frontend/src/viewsnew/application/SystemLogin.vue
index ab8971a..d7aebfe 100644
--- a/core/core-frontend/src/viewsnew/application/SystemLogin.vue
+++ b/core/core-frontend/src/viewsnew/application/SystemLogin.vue
@@ -6,7 +6,7 @@ import * as VueRouter from 'vue-router'
 import { loadModule } from 'vue3-sfc-loader'
 import * as Vue from 'vue/dist/vue.esm-bundler.js'
 import { i18n } from '@/plugins/vue-i18n'
-import ElementPlus from 'element-plus'
+import * as ElementPlus from 'element-plus'
 import less from 'less'
 import defaultTemplate from '@/viewsnew/application/SfcEditor/LoginEditor/login.vue?raw'
 import { moduleList, moduleById } from '@/api/application/module'
diff --git a/core/core-frontend/src/viewsnew/application/permissionset/index.vue b/core/core-frontend/src/viewsnew/application/permissionset/index.vue
index 9f84293..2b3580b 100644
--- a/core/core-frontend/src/viewsnew/application/permissionset/index.vue
+++ b/core/core-frontend/src/viewsnew/application/permissionset/index.vue
@@ -48,28 +48,31 @@ function menuclick(name){
 
 <style lang="less" scoped>
 .permission-box{
-   background: rgb(21,21,21);
+   background: #E3E8F0;
    height: calc(100vh - 60px);
    display: flex;
    .permission-leftbox{
       width: 260px;
       height: 100%;
-      border-right: 1px solid #4f5052;
-      background: rgb(37,38,38);
+      // border-right: 1px solid #4f5052;
+      // box-shadow: 0px 0px 10px rgba(219, 225, 236, 1);
+      background: #fff;
       padding-top: 10px;
       .permission-leftbox-menu{
         width: 100%;
         height: 40px;
         line-height: 40px;
-        color: #ffffff;
+        color: #505050;
         font-size: 14px;
         padding-left: 35px;
+        cursor: pointer;
       }
       .permission-leftbox-menu:hover{
-        background: rgb(54,55,56);
+        color: #0099ff;
       }
       .permission-leftbox-menu-active{
-        background: rgb(26,68,103);
+        background: rgba(64, 158, 255,0.1);
+        color: #0099ff;
       }
    }
    .permission-rightbox{
@@ -78,35 +81,141 @@ function menuclick(name){
       padding: 13px;
    }
 }
+  :deep(.el-tree){
+    background:#ffffff;
+    height: calc(100vh - 210px);
+    overflow: auto;
+    color: #505050;
+    font-size: 14px;
+   }
+   :deep(.el-tree-node__content){
+    height: 40px;
+    line-height: 40px;
+  }
+  :deep(.el-tree-node__content:hover){
+    background:#ffffff;
+    color: #409eff;
+  }
+  :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: rgba(64, 158, 255,0.1);
+    color: #409eff;
+  }
+  :deep(.el-tree-node:focus>.el-tree-node__content){
+    background:#ffffff;
+    color: #409eff;
+  }
+  :deep(.ed-input__wrapper){
+    background: #ffffff;
+    border: 1px solid #dcdfe6;
+    box-shadow: none;
+  }
+  :deep(.ed-input__inner){
+    color: #383838;
+  }
+  :deep(.ed-button){
+    border-color: #dcdfe6;
+  }
+  :deep(.ed-button--primary){
+    background-color:#409eff;
+    color: #ffffff;
+    border-color: #409eff;
+  }
+  :deep(.ed-button.is-disabled){
+    background: #ffffff; 
+    color:#C9C9C9;
+    border-color: #f2f2f2; 
+  }
+  :deep(.ed-button.is-disabled, .ed-button.is-disabled:focus, .ed-button.is-disabled:hover){
+    background: #ffffff; 
+    color:#C9C9C9;
+    border-color: #f2f2f2;
+  }
+  :deep(.el-table){
+    background-color: #ffffff;
+  }
+  :deep(.el-table th.el-table__cell){
+    background-color: #fafafa;
+    border-color: #f0f1f2;
+    color: #787878 ;
+  }
+  :deep(.el-table tr){
+    background-color: #ffffff;
+    border-color: #f0f1f2;
+  }
+  :deep(.el-table--border .el-table__inner-wrapper:after, .el-table--border:after, .el-table--border:before, .el-table__inner-wrapper:before){
+    background-color: #f0f1f2;
+  }
+  :deep(.el-table__border-bottom-patch, .el-table__border-left-patch){
+    background-color: #f0f1f2;
+  }
+  :deep(.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf){
+    border-color: #f0f1f2;
+  }
+  :deep(.el-table .el-table__cell){
+    background: #ffffff;
+    color: #787878;
+  }
+  :deep(.el-table__body-wrapper tr td.el-table-fixed-column--left, .el-table__body-wrapper tr td.el-table-fixed-column--right, .el-table__body-wrapper tr th.el-table-fixed-column--left, .el-table__body-wrapper tr th.el-table-fixed-column--right, .el-table__footer-wrapper tr td.el-table-fixed-column--left, .el-table__footer-wrapper tr td.el-table-fixed-column--right, .el-table__footer-wrapper tr th.el-table-fixed-column--left, .el-table__footer-wrapper tr th.el-table-fixed-column--right, .el-table__header-wrapper tr td.el-table-fixed-column--left, .el-table__header-wrapper tr td.el-table-fixed-column--right, .el-table__header-wrapper tr th.el-table-fixed-column--left, .el-table__header-wrapper tr th.el-table-fixed-column--right){
+    background-color: #ffffff;
+  }
+  :deep(.hover-row > td){
+    background: rgb(247,251,255) !important;
+  }
+  :deep(.ed-checkbox__input.is-checked .ed-checkbox__inner) {
+    background-color: #409eff;
+    border-color: #409eff;
+  }
+  :deep(.ed-switch.is-checked .ed-switch__core){
+    border-color: #409eff;
+    background-color: #409eff;
+  }
+  :deep(.ed-checkbox__input.is-indeterminate .ed-checkbox__inner){
+    border-color: #409eff;
+    background-color: #409eff;
+  }
+  :deep(.ed-input.is-disabled .ed-input__wrapper){
+    box-shadow: none;
+  }
+  :deep(.ed-textarea__inner){
+    border: 1px solid #dcdfe6;
+    box-shadow: none;
+  }
+  :deep(.ed-select .ed-input.is-focus .ed-input__wrapper){
+    box-shadow: none !important;
+  }
+  :deep(.ed-select:hover:not(.ed-select--disabled) .ed-input__wrapper){
+    box-shadow: none !important;
+  }
+  :deep(.ed-select .ed-input__wrapper.is-focus){
+    box-shadow: none !important;
+  }
+  :deep(.ed-dialog__header){
+    padding: 13px 20px;
+    border-bottom: 1px solid #f2f2f2;
+    margin-right: 0px;
+    background-color: #f8f8f8;
+  }
+  :deep(.ed-dialog__headerbtn){
+    color: #323232;
+    top: 11px !important;
+    right: 15px !important;
+  }
+  :deep(.ed-dialog__title){
+    color: #323232;
+  }
+  :deep(.ed-form-item.is-error .ed-input__wrapper){
+    box-shadow:none;
+    border: 1px solid #f54a45;
+  }
 </style>
-<style>
-.ed-dialog__header{
-  padding: 13px 20px;
-  border-bottom: 1px solid #333333;
-  margin-right: 0px;
-}
-.ed-dialog__headerbtn{
-  color: #ffffff;
-  top: 11px !important;
-  right: 15px !important;
-}
-.ed-dialog__title{
-  color: #ffffff;
-}
-
-.ed-dialog {
-  border: 1px solid #5f5f5f;
-  border-radius: 4px;
-  background: #212121;
-}
-.dialog-footer .ed-button{
-  color: #F2F4F5;
-  background-color: #212121;
-  border: 1px solid #363636;
-}
-.dialog-footer .ed-button--primary{
-  color: #F2F4F5;
-  background-color: #0089ff;
-  border: 1px solid #0089ff;
-}
-</style>
\ 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){
         </div>
         <el-tree v-loading="treeloading" ref="treeRef" :data="treeData" node-key="id" :props="defaultProps"
           default-expand-all :expand-on-click-node="false" highlight-current
-          @node-click="nodeclick">
+          @node-click="nodeclick" style="margin-top: 15px;">
           <template #default="{ node, data }">
             <div class="custom-tree-node" @mouseenter="handleMouseEnter(node)"
             @mouseleave="handleMouseLeave()">
@@ -379,7 +379,7 @@ function formatDateTime(dateArray:any){
             <div v-show="hoverNodeId === node.key || currentNodeId === node.key" style="display: flex;" >
               <div>
                 <el-icon v-if="currentNodeId === node.key" @click.stop="edittree(data)">
-                  <icon_permission_edit_white class="svg-icon"/>
+                  <icon_permission_edit_blue class="svg-icon"/>
                 </el-icon>
                 <el-icon v-else @click.stop="edittree(data)">
                   <icon_permission_edit_blue class="svg-icon"/>
@@ -387,7 +387,7 @@ function formatDateTime(dateArray:any){
               </div>
               <div style="margin-left: 8px;">
                 <el-icon v-if="currentNodeId === node.key" @click.stop="deltree(data)" style="cursor: pointer;">
-                  <icon_permission_del_white class="svg-icon"/>
+                  <icon_permission_del_blue class="svg-icon"/>
                 </el-icon>
                 <el-icon v-else @click.stop="deltree(data)" style="cursor: pointer;">
                   <icon_permission_del_blue class="svg-icon" />
@@ -415,7 +415,7 @@ function formatDateTime(dateArray:any){
             </el-button>
           </div>
         </div>
-        <el-table v-loading="tableloading" ref="multipleTableRef" :data="tableData" border style="width: 100%"
+        <el-table class="whitetable" v-loading="tableloading" ref="multipleTableRef" :data="tableData" border style="width: 100%"
           @selection-change="handleSelectionChange" height="calc(100vh - 175px)">
           <el-table-column type="selection" width="55" /> 
           <el-table-column prop="orgcode" label="部门编号" width="90"/>
@@ -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;
-  }
 </style>
-<style>
-.el-message-box{
-    background: #212121;
-  }
-  .el-message-box__content{
-    color: #ffffff;
-  }
-  .el-message-box__title{
-    color: #ffffff;
-  }
-  .el-message-box__btns .el-button{
-    color: #F2F4F5;
-    background-color: #212121;
-    border: 1px solid #434343;
-  }
-  .el-message-box__btns .el-button--primary{
-    background: #0089ff;
-    border-color: #0089ff;
-  }
-  .ed-form-item__label{
-    color: #D2D2D2;
-  }
-  .ed-input__wrapper {
-    background-color: #252626;
-    box-sizing: border-box;
-    border-width: 1px;
-    border-style: solid;
-    border-color: rgba(67, 67, 67, 0);
-    border-radius: 4px;
-    box-shadow: none;
-    border: 1px solid #434343;
-  }
-  .ed-form-item.is-error .ed-input__wrapper{
-    box-shadow: none;
-    border: 1px solid #f54a45;
-  }
-  .ed-input__wrapper.is-focus{
-    box-shadow: none;
-    border: 1px solid #0089ff;
-  }
-  .ed-input__wrapper:hover{
-    box-shadow: none;
-    border: 1px solid #0089ff;
-  }
-  .ed-input__inner{
-    color: #fff;
-  }
-  .ed-button {
-    color: #ffffff;
-    background-color: rgb(54,55,56);
-    border: 1px solid #363636;
-  }
-  .ed-button:focus, .ed-button:hover{
-    color: #ffffff;
-    background-color: rgb(54,55,56);
-    border: 1px solid #363636;
-  }
-  .ed-button--primary{
-    background-color: #0089ff;
-    border-color:#0089ff ;
-  }
-  .ed-button--primary:focus, .ed-button--primary:hover{
-    background-color: #0089ff;
-    border-color:#0089ff ;
-  }
-  .ed-button.is-disabled{
-    color: #949494;
-    background-color: rgb(54,55,56);
-    border: 1px solid rgb(54,55,56);
-  }
-  .ed-button.is-disabled, .ed-button.is-disabled:focus, .ed-button.is-disabled:hover{
-    color: #949494;
-    background-color: rgb(54,55,56);
-    border: 1px solid rgb(54,55,56);
-  }
-  .el-table{
-    background-color: rgb(33,33,33);
-  }
-  .el-table tr{
-    background: rgb(40,40,40);
-    border-color: #434343;
-  }
-  .el-table th.el-table__cell {
-    background-color: rgb(40,40,40);
-    border-color: #434343;
-  }
-  .el-table.is-scrolling-none th.el-table-fixed-column--left, .el-table.is-scrolling-none th.el-table-fixed-column--right {
-    background-color: rgb(40,40,40);
-  }
-  .el-table--border .el-table__inner-wrapper:after, .el-table--border:after, .el-table--border:before, .el-table__inner-wrapper:before{
-    background-color: #434343;
-  }
-  .el-table__border-bottom-patch, .el-table__border-left-patch{
-    background-color: #434343;
-  }
-  .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
-    border-color: #434343;
-  }
-  .ed-checkbox__inner{
-    background: transparent;
-    border-color: #787878;
-  }
-  .ed-checkbox__input.is-disabled .ed-checkbox__inner{
-    background: #434343;
-    border-color: #787878;
-  }
-  .el-table thead{
-    color: #E4E4E4;
-  }
-  .el-table .el-table__cell{
-    background: #212121;
-    color: #F2F4F5;
-  }
-  .el-table__body-wrapper tr td.el-table-fixed-column--left, .el-table__body-wrapper tr td.el-table-fixed-column--right, .el-table__body-wrapper tr th.el-table-fixed-column--left, .el-table__body-wrapper tr th.el-table-fixed-column--right, .el-table__footer-wrapper tr td.el-table-fixed-column--left, .el-table__footer-wrapper tr td.el-table-fixed-column--right, .el-table__footer-wrapper tr th.el-table-fixed-column--left, .el-table__footer-wrapper tr th.el-table-fixed-column--right, .el-table__header-wrapper tr td.el-table-fixed-column--left, .el-table__header-wrapper tr td.el-table-fixed-column--right, .el-table__header-wrapper tr th.el-table-fixed-column--left, .el-table__header-wrapper tr th.el-table-fixed-column--right{
-    background: #212121;
-  }
-  .hover-row > td {
-    background-color: rgb(48,48,48) !important;
-  }
-  .ed-checkbox__input.is-checked .ed-checkbox__inner {
-    background-color: #409eff;
-    border-color: #409eff;
-  }
-  .ed-switch.is-checked .ed-switch__core{
-    border-color: #0089ff;
-    background-color: #0089ff;
-  }
-  .ed-textarea__inner{
-    background-color: #252626;
-    box-sizing: border-box;
-    border-width: 1px;
-    border-style: solid;
-    border-color: rgba(67, 67, 67, 0);
-    border-radius: 4px;
-    box-shadow: none;
-    border: 1px solid #434343;
-    color: #fff;
-  }
-  .ed-textarea__inner:hover{
-    box-shadow: none;
-    border: 1px solid #0089ff;
-  }
-  .ed-textarea__inner:focus{
-    box-shadow: none;
-    border: 1px solid #0089ff;
-  }
-  .ed-input.is-disabled .ed-input__wrapper{
-    border: 1px solid #434343;
-    background: #212121;
-    box-shadow: none;
-  }
-  .el-loading-mask{
-    background-color: rgba(37,38, 38, 0.9);
-  }
-</style>
\ 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;
   }
 }
-</style>
-<style>
-  .ed-select .ed-input.is-focus .ed-input__wrapper{
-    box-shadow: none !important;
-  }
-  .ed-select:hover:not(.ed-select--disabled) .ed-input__wrapper{
-    box-shadow: none;
-  }
-  .ed-select .ed-input__wrapper.is-focus{
-    box-shadow: none !important;
-  }
-  .ed-select__popper.ed-popper{
-    background: rgba(41, 41, 41, 1);
-    border: 1px solid #434343;
-    color: #fff;
-  }
-  .ed-select-dropdown__item{
-    color: #fff;
-  }
-  .ed-select-dropdown__item.hover, .ed-select-dropdown__item:hover{
-    background: #434343;
-  }
-  .ed-select-dropdown__item.selected{
-    color: #0089ff;
-  }
-  .el-tree{
-    background:#212121;
-    color: #ffffff;
-    font-size: 14px;
-  }
-  .el-tree-node__content{
-    height: 40px;
-    line-height: 40px;
-  }
-  .el-tree-node__content:hover{
-    background: rgba(61,158, 255, 0.1);
-    color: #0089FF;
-  }
-  .el-tree-node:focus>.el-tree-node__content{
-    background:#212121;
-    color: #ffffff;
-  }
-  .el-text{
-    color: #ffffff;
-  }
-  .el-tree-node__expand-icon{
-    color: #ffffff;
-  }
-  .el-checkbox__inner{
-    background:#212121;
-    border-color:#636363;
-  }
+:deep(.ed-dialog__body){
+  padding: 10px 24px;
+}
 </style>
\ 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(() => {})
 }
 </script>
 <template>
@@ -354,7 +366,7 @@ function resetclick(row:any){
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination :current-page="currentPage" :page-size="pageSize" :page-sizes="[10, 20, 50, 100]" 
+        <el-pagination :current-page="currentPage" :page-size="pageSize" :page-sizes="[10, 20, 30, 50, 100]" 
          background layout="total, sizes, prev, pager, next, jumper" :total="total" style="margin-top: 20px;"
           @size-change="handleSizeChange" @current-change="handleCurrentChange"/>
       </div>
@@ -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;
   }
 }
-</style>
-<style>
-  .ed-form-item__label{
-    color: #D2D2D2;
-  }
-  .ed-input__wrapper {
-    background-color: #252626;
-    box-sizing: border-box;
-    border-width: 1px;
-    border-style: solid;
-    border-color: rgba(67, 67, 67, 0);
-    border-radius: 4px;
-    box-shadow: none;
-    border: 1px solid #434343;
-  }
-  .ed-form-item.is-error .ed-input__wrapper{
-    box-shadow: none;
-    border: 1px solid #f54a45;
-  }
-  .ed-input__wrapper.is-focus{
-    box-shadow: none;
-    border: 1px solid #0089ff;
-  }
-  .ed-input__wrapper:hover{
-    box-shadow: none;
-    border: 1px solid #0089ff;
-  }
-  .ed-input__inner{
-    color: #fff;
-  }
-  .ed-button {
-    color: #ffffff;
-    background-color: rgb(54,55,56);
-    border: 1px solid #363636;
-  }
-  .ed-button:focus, .ed-button:hover{
-    color: #ffffff;
-    background-color: rgb(54,55,56);
-    border: 1px solid #363636;
-  }
-  .ed-button--primary{
-    background-color: #0089ff;
-    border-color:#0089ff ;
-  }
-  .ed-button--primary:focus, .ed-button--primary:hover{
-    background-color: #0089ff;
-    border-color:#0089ff ;
-  }
-  .ed-button.is-disabled{
-    color: #949494;
-    background-color: rgb(54,55,56);
-    border: 1px solid rgb(54,55,56);
-  }
-  .ed-button.is-disabled, .ed-button.is-disabled:focus, .ed-button.is-disabled:hover{
-    color: #949494;
-    background-color: rgb(54,55,56);
-    border: 1px solid rgb(54,55,56);
-  }
-  .el-table{
-    background-color: rgb(33,33,33);
-  }
-  .el-table tr{
-    background: rgb(40,40,40);
-    border-color: #434343;
-  }
-  .el-table th.el-table__cell {
-    background-color: rgb(40,40,40);
-    border-color: #434343;
-  }
-  .el-table.is-scrolling-none th.el-table-fixed-column--left, .el-table.is-scrolling-none th.el-table-fixed-column--right {
-    background-color: rgb(40,40,40);
-  }
-  .el-table--border .el-table__inner-wrapper:after, .el-table--border:after, .el-table--border:before, .el-table__inner-wrapper:before{
-    background-color: #434343;
-  }
-  .el-table__border-bottom-patch, .el-table__border-left-patch{
-    background-color: #434343;
-  }
-  .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
-    border-color: #434343;
-  }
-  .ed-checkbox__inner{
-    background: transparent;
-    border-color: #787878;
-  }
-  .ed-checkbox__input.is-disabled .ed-checkbox__inner{
-    background: #434343;
-    border-color: #787878;
-  }
-  .el-table thead{
-    color: #E4E4E4;
-  }
-  .el-table .el-table__cell{
-    background: #212121;
-    color: #F2F4F5;
-  }
-  .el-table__body-wrapper tr td.el-table-fixed-column--left, .el-table__body-wrapper tr td.el-table-fixed-column--right, .el-table__body-wrapper tr th.el-table-fixed-column--left, .el-table__body-wrapper tr th.el-table-fixed-column--right, .el-table__footer-wrapper tr td.el-table-fixed-column--left, .el-table__footer-wrapper tr td.el-table-fixed-column--right, .el-table__footer-wrapper tr th.el-table-fixed-column--left, .el-table__footer-wrapper tr th.el-table-fixed-column--right, .el-table__header-wrapper tr td.el-table-fixed-column--left, .el-table__header-wrapper tr td.el-table-fixed-column--right, .el-table__header-wrapper tr th.el-table-fixed-column--left, .el-table__header-wrapper tr th.el-table-fixed-column--right{
-    background: #212121;
-  }
-  .hover-row > td {
-    background-color: rgb(48,48,48) !important;
-  }
-  .ed-checkbox__input.is-checked .ed-checkbox__inner {
-    background-color: #409eff;
-    border-color: #409eff;
-  }
-  .ed-switch.is-checked .ed-switch__core{
-    border-color: #0089ff;
-    background-color: #0089ff;
-  }
-  .ed-textarea__inner{
-    background-color: #252626;
-    box-sizing: border-box;
-    border-width: 1px;
-    border-style: solid;
-    border-color: rgba(67, 67, 67, 0);
-    border-radius: 4px;
-    box-shadow: none;
-    border: 1px solid #434343;
-    color: #fff;
-  }
-  .ed-textarea__inner:hover{
-    box-shadow: none;
-    border: 1px solid #0089ff;
-  }
-  .ed-textarea__inner:focus{
-    box-shadow: none;
-    border: 1px solid #0089ff;
-  }
-  .ed-pagination__total{
-    color: #F2F4F5;
-  }
-  .ed-pagination__jump{
-    color: #F2F4F5;
-  }
-  .ed-pagination .ed-pager li{
-    background: #252626;
-    border: 1px solid #434343 !important;
-    color:#fff !important;
-  }
-  .ed-pagination .ed-pager li:hover{
-    background: #252626;
-  }
-  .ed-pagination button.is-disabled, .ed-pagination button:disabled {
-    color: #787878;
-    background-color: #252626;
-    border-color: #636363 !important;
-  } 
-  .ed-pagination .btn-next[aria-disabled=true]:active, .ed-pagination .btn-next[aria-disabled=true]:hover, .ed-pagination .btn-prev[aria-disabled=true]:active, .ed-pagination .btn-prev[aria-disabled=true]:hover{
-    color: #bbbfc4 !important;
-    background-color: #252626 !important;
-    border-color: #636363 !important;
-  }
-  .ed-pagination__jump{
-    color:#fff !important;
-  }
-  .ed-pagination .btn-next:hover, .ed-pagination .btn-prev:hover{
-    background: #252626 !important;
-    border: 1px solid #0089ff !important;
-    color:#0089ff !important;
-  }
-  .ed-pagination button{
-    background: #252626;
-    border: 1px solid #434343 !important;
-    color:#fff !important;
-  }
-  .ed-pagination.is-background .btn-next.is-active, .ed-pagination.is-background .btn-prev.is-active, .ed-pagination.is-background .ed-pager li.is-active {
-    border-color: #0089ff  !important;
-    color: #0089ff  !important;
-  }
 </style>
\ No newline at end of file