diff --git a/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust b/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust index 5d47cfdf..907f5c22 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust +++ b/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust @@ -1,8 +1,8 @@ # VITE_APP_PROXY_TARGET = 'http://139.186.148.21:8080' # VITE_APP_PROXY_TARGET = 'http://10.132.108.3:85/efcode20-sup-web/prod-api' -VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080' +# VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080' # VITE_APP_PROXY_TARGET = 'http://172.16.21.93:8080' -# VITE_PROXY_TARGET = 'http://172.16.20.72:8080' +VITE_APP_PROXY_TARGET = 'http://172.16.20.72:8080' # 页面标题 VITE_APP_TITLE = 执法监督码•执法监督 VITE_APP_LOGO_TITLE = 执法监督码•执法监督 @@ -11,7 +11,8 @@ VITE_APP_LOGO_TITLE = 执法监督码•执法监督 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = '/dev-api' +# VITE_APP_BASE_API = '/dev-api' +VITE_APP_BASE_API = '/efcode20-sup-web/prod-api' # 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/efcode20-sup-web/' diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/assets/styles/sidebar.scss b/zdxt-web-client/zdxt-admin-plus-ui/src/assets/styles/sidebar.scss index e591eea2..e2872074 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/assets/styles/sidebar.scss +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/assets/styles/sidebar.scss @@ -20,7 +20,7 @@ height: calc(100% - 50px); position: fixed; font-size: 0; - top: 50px; + top: 80px; bottom: 0; left: 0; z-index: 1001; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue index ac1f51bd..ef7d2775 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/Navbar.vue @@ -1,14 +1,13 @@ - + + + - - 执法监督码 - · - 执法监督 - @@ -27,23 +26,25 @@ - - - - - - {{ userStore.nickname || 'admin' }} - 深圳市司法局 - - + + + + + + {{ userStore.nickname || 'admin' }} + {{ userStore.deptName || '' }} + + + - 退出登录 + 个人中心 + + 退出登录 - @@ -80,7 +81,12 @@ const handleSystemCodeChange = async (systemCode: string) => { }; const handleCommand = async (command: string) => { - if (command === 'logout') { + if (command === 'profile') { + router.push({ path: '/user/profile' }); + } else if (command === 'settings') { + // 布局设置 — 打开设置抽屉(复用 Settings 组件或直接跳设置页) + router.push({ path: '/settings' }); + } else if (command === 'logout') { await ElMessageBox.confirm('确定注销并退出系统吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -94,8 +100,9 @@ const handleCommand = async (command: string) => {