From 51cf28daef668cb95246c7fd16ba0194af8d4672 Mon Sep 17 00:00:00 2001 From: renna <576157508@qq.com> Date: Thu, 19 Jun 2025 18:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 28 +- src/api/system/driver.js | 75 ++ src/api/system/user.js | 8 + src/assets/images/avatar.png | Bin 0 -> 9462 bytes src/assets/styles/element-ui.scss | 103 +- src/assets/styles/index.scss | 36 + src/assets/styles/ruoyi.scss | 9 +- src/components/Pagination/index.vue | 2 +- src/layout/components/AppMain.vue | 2 +- src/layout/components/Navbar.vue | 3 + src/layout/components/TagsView/ScrollPane.vue | 5 +- src/layout/components/TagsView/index.vue | 111 +- src/plugins/modal.js | 4 +- src/router/index.js | 21 +- src/store/modules/tagsView.js | 5 + src/views/car/park/index.vue | 961 +++++++++++++++++- src/views/car/type/index.vue | 482 ++++++++- src/views/monitor/index.vue | 456 --------- src/views/system/config/index.vue | 2 +- src/views/system/dept/index.vue | 274 ----- src/views/system/dict/data.vue | 2 +- src/views/system/dict/index.vue | 2 +- src/views/system/driver/index.vue | 848 ++++++++++++++-- src/views/system/notice/index.vue | 2 +- src/views/system/operlog/index.vue | 447 +++++--- src/views/system/post/index.vue | 2 +- src/views/system/role/index.vue | 784 ++++++++++---- src/views/system/user/authRole.vue | 2 +- src/views/system/user/index.vue | 400 ++++++-- 29 files changed, 3773 insertions(+), 1303 deletions(-) create mode 100644 src/api/system/driver.js create mode 100644 src/assets/images/avatar.png delete mode 100644 src/views/monitor/index.vue delete mode 100644 src/views/system/dept/index.vue diff --git a/README.md b/README.md index e007683..622979a 100644 --- a/README.md +++ b/README.md @@ -31,30 +31,6 @@ yarn dev -我已经完成了路由配置的修改，实现了您描述的导航结构： -顶部导航栏： -平台概览 -车辆管理 -系统管理 -左侧导航栏： -点击平台概览时不显示左侧导航栏 -点击车辆管理时显示： -车辆监控 -车辆管理 - 车辆入库 - 类型管理 -点击系统管理时显示： -角色管理 -人员管理 - 用户管理 - 驾驶员管理 - 菜单管理 -操作日志 +td: 68px -handleTabClick 点击事件处理的存在问题导致显示不对 之前的菜单是通过SidebarItem来获取的是吗？只是当前我想修改样式 并且将这个原始的导航栏分在不同的Tab栏展示 我觉得可以根据数据库获取到所有的菜单 然后再根据不同的Tab栏来确定是否显示呀 - - -点击平台概览：不显示标签 -，其余都不显示，只有点击二级菜单的时候才在右侧显示 -点击系统管理：只显示默认显示"角色管理"标签，其余都不显示只有点击二级菜单的时候才在右侧显示 先理解我的需求 不明白的问我 -现在我需要修改tagsView的展示：当我点击顶部导航栏车辆管理的时候 默认显示车辆监控5690E7（不可关闭），当我点击车辆管理下的车辆入库，则显示：车辆监控（白色） 车辆入库（5690E7），鼠标滑入显示车辆入库（5690E7）叉号（5690E7），点击叉号返回到车辆监控；点击车辆管理下的类型管理，则显示：车辆监控（白色） 类型管理（5690E7），鼠标滑入显示类型管理（5690E7）叉号（5690E7），点击叉号返回到车辆监控；点击系统管理默认显示角色管理5690E7（不可关闭），当我点击​人员管理下的用户管理，则显示：角色管理（白色） 用户管理（5690E7），鼠标滑入显示用户管理（5690E7）叉号（5690E7），点击叉号返回到角色管理；当我点击​人员管理下的驾驶员理，则显示：角色管理（白色） 驾驶员管理（5690E7），鼠标滑入显示驾驶员管理（5690E7）叉号（5690E7），点击叉号返回到角色管理；当我点击操作日志则显示：角色管理（白色） 操作日志（5690E7），鼠标滑入显示操作日志（5690E7）叉号（5690E7），点击叉号返回到角色管理 我们可以点击车辆管理：只默认显示"车辆监控"标签理解为将车辆管理下的车辆监控和系统管理下的角色管理作为首页来看 \ No newline at end of file +1.新增弹窗的label驾驶证类型没有占一行2.人像的矩形右上角的计数器位置与编辑一致 \ No newline at end of file diff --git a/src/api/system/driver.js b/src/api/system/driver.js new file mode 100644 index 0000000..92de849 --- /dev/null +++ b/src/api/system/driver.js @@ -0,0 +1,75 @@ +import request from '@/utils/request' +import { parseStrEmpty } from "@/utils/ruoyi"; + +// 查询驾驶员列表 +export function listDriver(query) { + return request({ + url: '/system/driver/list', + method: 'get', + params: query + }) +} + +// 查询驾驶员详细 +export function getDriver(driverId) { + return request({ + url: '/system/driver/' + parseStrEmpty(driverId), + method: 'get' + }) +} + +// 新增驾驶员 +export function addDriver(data) { + return request({ + url: '/system/driver', + method: 'post', + data: data + }) +} + +// 修改驾驶员 +export function updateDriver(data) { + return request({ + url: '/system/driver', + method: 'put', + data: data + }) +} + +// 删除驾驶员 +export function delDriver(driverId) { + return request({ + url: '/system/driver/' + driverId, + method: 'delete' + }) +} + +// 驾驶员状态修改 +export function changeDriverStatus(driverId, status) { + const data = { + driverId, + status + } + return request({ + url: '/system/driver/changeStatus', + method: 'put', + data: data + }) +} + +// 用户头像上传 +export function uploadAvatar(data) { + return request({ + url: '/system/driver/avatar', + method: 'post', + data: data + }) +} + +// 获取驾驶员初始密码 +export function getInitPassword() { + return request({ + url: '/system/driver/initPassword', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/api/system/user.js b/src/api/system/user.js index f2f76ef..b184eab 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -133,3 +133,11 @@ export function deptTreeSelect() { method: 'get' }) } + +// 获取用户初始密码 +export function getInitPassword() { + return request({ + url: '/system/user/initPassword', + method: 'get' + }) +} diff --git a/src/assets/images/avatar.png b/src/assets/images/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..cb2ce08f2acfa764b3feb41f5df65d92ac3f698a GIT binary patch literal 9462 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 literal 0 HcmV?d00001 diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index fbce840..1a2f8e9 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -93,7 +93,7 @@ color: #96A0B5 !important; border-radius: 8px !important; height: 36px !important; - border: none !important; + border: none; box-shadow: none !important; } @@ -101,6 +101,13 @@ color: #96A0B5 !important; } // to fixed https://github.com/ElemeFE/element/issues/2461 +.el-overlay-dialog{ + width:100%!important; + height:100%!important; + display: flex; + justify-content: center; + align-items: center; +} .el-dialog { transform: none; left: 0; @@ -109,9 +116,14 @@ border-radius: 12px!important; background: #292C38!important; color: #fff!important; + --el-text-color-regular: #96A0B5!important; .el-dialog__title { color: #fff!important; } + .el-dialog__header{ + border-bottom: 1px solid #4C4F5F!important; + margin: 0px!important; + } .el-dialog__headerbtn .el-dialog__close { color: #fff!important; } @@ -119,7 +131,94 @@ color:rgba(255,255,255,0.6)!important; } } - +.el-message-box { + border-radius: 12px!important; + background: #292C38!important; + color: #fff!important; + border: none!important; + --el-messagebox-title-color: #fff!important; + --el-color-info: #fff!important; + --el-messagebox-content-color: #fff!important; + --el-color-warning: #FF4C4C; + + .el-message-box__header { + border-bottom: 1px solid #4C4F5F!important; + padding: 15px 20px!important; + } + + .el-message-box__title { + color: #fff!important; + font-size: 16px!important; + font-weight: normal!important; + } + + .el-message-box__content { + padding: 20px 48px!important; + color: #fff!important; + } + + .el-message-box__container { + display: flex!important; + align-items: center!important; + } + + .el-message-box__status { + font-size: 64px!important; + position: static!important; + transform: none!important; + margin-right: 15px!important; + } + + .el-message-box__message { + padding-left: 0!important; + color: #fff!important; + font-size: 16px!important; + } + + .el-message-box__btns { + padding: 0px 20px 20px!important; + text-align: right!important; + + .el-button { + border-radius: 8px!important; + padding: 8px 20px!important; + margin-left: 10px!important; + font-size: 15px!important; + height: 36px!important; + width: 68px!important; + } + + .el-button--default { + background-color: #343744!important; + border-color: #343744!important; + color: #fff!important; + + &:hover { + background-color: #3F4254!important; + border-color: #3F4254!important; + } + } + + .el-button--primary { + background-color: #347AE2!important; + border-color: #347AE2!important; + + &:hover { + background-color: #4A7FD5!important; + border-color: #4A7FD5!important; + } + } + } + + .el-message-box__close { + color: #fff!important; + font-size: 18px!important; + + &:hover { + color: #5690E7!important; + } + } +} // refine element ui upload .upload-container { .el-upload { diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 1f8eb78..596e3d8 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -193,3 +193,39 @@ aside { .multiselect--active { z-index: 1000 !important; } +/* 全局滚动条样式 */ +::-webkit-scrollbar { + width: 8px; /* 垂直滚动条的宽度 */ + height: 8px; /* 水平滚动条的高度 */ +} + +::-webkit-scrollbar-track { + background: rgba(0, 0, 0, 0.1); + border-radius: 4px; +} + +::-webkit-scrollbar-thumb { + background: rgba(144, 147, 153, 0.5); + border-radius: 4px; + transition: all 0.3s ease; +} + +::-webkit-scrollbar-thumb:hover { + background: rgba(144, 147, 153, 0.8); +} + +/* Firefox 滚动条样式 */ +* { + scrollbar-width: thin; + scrollbar-color: rgba(144, 147, 153, 0.5) rgba(0, 0, 0, 0.1); +} + +/* 隐藏特定元素的滚动条但保持可滚动 */ +.hide-scrollbar { + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ +} + +.hide-scrollbar::-webkit-scrollbar { + display: none; /* Chrome, Safari and Opera */ +} \ No newline at end of file diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index e10ee33..6dfdf58 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -75,7 +75,7 @@ } .el-table { - min-height: calc(100vh - 310px)!important; + min-height: calc(100vh - 295px)!important; .el-table__header-wrapper, .el-table__fixed-header-wrapper { th { word-break: break-word; @@ -111,10 +111,13 @@ // } /* tree border */ +.el-tree{ + background: transparent!important; +} .tree-border { margin-top: 5px; - border: 1px solid #e5e6e7; - background: #FFFFFF none; + border: none!important; + background: transparent!important; border-radius:4px; width: 100%; } diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue index 8ca2ec5..7eef752 100644 --- a/src/components/Pagination/index.vue +++ b/src/components/Pagination/index.vue @@ -99,7 +99,7 @@ function handleCurrentChange(val) { \ No newline at end of file diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 086062b..6e0f00d 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -14,7 +14,7 @@ @contextmenu.prevent="openMenu(tag, $event)" > {{ tag.title }} - + @@ -186,6 +186,11 @@ function shouldShowTag(tag) { return route.path.startsWith('/system/'); } + // 对于操作日志标签，只有在/system/路径下才显示 + if (tag.path === '/system/operlog') { + return route.path.startsWith('/system/'); + } + // 用户管理页面特殊处理 - 只在访问用户管理页面时显示 if ((tag.path === '/system/user' || tag.path === '/system/user/index' || (tag.meta && tag.meta.title === '用户管理'))) { @@ -263,6 +268,20 @@ function ensureUserManagementTag() { // 监听路由变化 watch(route, (newRoute) => { console.log('Route changed to:', newRoute.path, newRoute.meta?.title); + console.log('当前访问标签数:', visitedViews.value.length); + console.log('当前访问标签:', visitedViews.value.map(tag => ({path: tag.path, title: tag.title}))); + + // 检查并清理菜单管理标签（如果存在） + const menuManageTags = visitedViews.value.filter(tag => + tag.title === '菜单管理' || tag.path === '/system/menu' + ); + if (menuManageTags.length > 0) { + console.log('发现菜单管理标签，将其移除'); + useTagsViewStore().visitedViews = visitedViews.value.filter(tag => + tag.title !== '菜单管理' && tag.path !== '/system/menu' + ); + } + addTags(); moveToCurrentTag(); @@ -272,6 +291,7 @@ watch(route, (newRoute) => { ensureUserManagementTag(); } }); + watch(visible, (value) => { if (value) { document.body.addEventListener('click', closeMenu) @@ -279,6 +299,7 @@ watch(visible, (value) => { document.body.removeEventListener('click', closeMenu) } }) + onMounted(() => { // 动态获取菜单信息 const { menuInfo, mainMenus } = getMenuInfoFromRoutes(); @@ -319,7 +340,9 @@ onMounted(() => { }); function isActive(r) { - return r.path === route.path + // 为更好地调试，添加日志 + console.log('检查标签是否活动:', r.path, '当前路由:', route.path, r.path === route.path); + return r.path === route.path; } function activeStyle(tag) { @@ -341,6 +364,14 @@ function activeStyle(tag) { } function isAffix(tag) { + // 添加调试日志 + console.log('检查是否固定标签:', tag.path, tag.title, tag.meta?.affix); + + // 特殊处理操作日志标签，让它可以被关闭 + if (tag.path === '/system/operlog') { + return false; + } + // 判断是否为主菜单的默认页面，如果是则不允许关闭 return (tag.meta && tag.meta.affix) || isDefaultMenuTag(tag); } @@ -514,9 +545,11 @@ function addTags() { return false; } - // 处理系统管理相关页面 - if (route.path.startsWith('/system/') && route.path !== '/system/role') { - // 清除之前的非默认系统管理标签 + // 特殊处理操作日志页面 + if (route.path === '/system/operlog' || (route.meta && route.meta.title === '操作日志')) { + console.log('特别处理操作日志页面'); + + // 清除所有非系统管理相关标签和系统管理默认标签以外的标签 const cleanedViews = useTagsViewStore().visitedViews.filter(tag => { // 保留非系统管理相关标签和角色管理标签 return !tag.path.startsWith('/system/') || tag.path === '/system/role'; @@ -531,6 +564,49 @@ function addTags() { meta: { title: '角色管理', affix: true } }; + // 确保roleTag在数组开头 + const hasRoleTag = useTagsViewStore().visitedViews.some(tag => tag.path === '/system/role'); + if (!hasRoleTag) { + // 找到首页标签的位置，在其后添加角色管理标签 + const indexPosition = useTagsViewStore().visitedViews.findIndex(tag => tag.path === '/index'); + if (indexPosition !== -1) { + useTagsViewStore().visitedViews.splice(indexPosition + 1, 0, roleTag); + } else { + useTagsViewStore().visitedViews.unshift(roleTag); + } + } + + // 添加操作日志标签 + const operlogTag = { + fullPath: '/system/operlog', + path: '/system/operlog', + name: 'systemOperlog', + meta: { title: '操作日志', icon: 'form', affix: false } + }; + + // 添加到访问视图中 + useTagsViewStore().addVisitedView(operlogTag); + + return false; + } + + // 处理系统管理相关页面 + if (route.path.startsWith('/system/') && route.path !== '/system/role' && route.path !== '/system/operlog') { + // 清除之前的非默认系统管理标签 + const cleanedViews = useTagsViewStore().visitedViews.filter(tag => { + // 保留非系统管理相关标签、角色管理标签和操作日志标签 + return !tag.path.startsWith('/system/') || tag.path === '/system/role' || tag.path === '/system/operlog'; + }); + useTagsViewStore().visitedViews = cleanedViews; + + // 确保系统管理的默认标签（角色管理）在前面 + const roleTag = { + fullPath: '/system/role', + path: '/system/role', + name: 'systemRole', + meta: { title: '角色管理', affix: true } + }; + // 确保roleTag在数组开头（可能在第1个位置，如果0是首页的话） const hasRoleTag = useTagsViewStore().visitedViews.some(tag => tag.path === '/system/role'); if (!hasRoleTag) { @@ -614,6 +690,19 @@ function refreshSelectedTag(view) { } function closeSelectedTag(view) { + // 添加调试日志 + console.log('关闭标签:', view.path, view.title); + + // 特殊处理操作日志标签 + if (view.path === '/system/operlog') { + console.log('关闭操作日志标签，跳转到角色管理页面'); + // 从标签列表中移除操作日志标签 + useTagsViewStore().delVisitedView(view); + // 直接跳转到角色管理页面 + router.push('/system/role'); + return; + } + proxy.$tab.closePage(view).then(({ visitedViews }) => { if (isActive(view)) { // 获取当前路径所属的主菜单 @@ -702,15 +791,21 @@ function closeMenu() { function handleScroll() { closeMenu() } + +// 处理关闭标签的点击事件，增加调试信息 +function handleCloseTag(tag) { + console.log('点击关闭标签按钮:', tag.path, tag.title); + closeSelectedTag(tag); +} + diff --git a/src/views/car/type/index.vue b/src/views/car/type/index.vue index cff38d7..3affbf7 100644 --- a/src/views/car/type/index.vue +++ b/src/views/car/type/index.vue @@ -1,7 +1,483 @@ - + + diff --git a/src/views/monitor/index.vue b/src/views/monitor/index.vue deleted file mode 100644 index 743bb45..0000000 --- a/src/views/monitor/index.vue +++ /dev/null @@ -1,456 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue index 75b1af6..348cbf1 100644 --- a/src/views/system/config/index.vue +++ b/src/views/system/config/index.vue @@ -131,7 +131,7 @@ - + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue deleted file mode 100644 index d073a26..0000000 --- a/src/views/system/dept/index.vue +++ /dev/null @@ -1,274 +0,0 @@ - - - diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index b900666..e40b5c8 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -126,7 +126,7 @@ - + diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 297ac84..4f487cc 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -141,7 +141,7 @@ - + diff --git a/src/views/system/driver/index.vue b/src/views/system/driver/index.vue index c67ad8e..2136b91 100644 --- a/src/views/system/driver/index.vue +++ b/src/views/system/driver/index.vue @@ -11,13 +11,13 @@ class="search-input" /> - + @@ -30,7 +30,7 @@ 新增 导入 导出 - 删除 + 删除 @@ -42,6 +42,7 @@ style="width: 100%" class="custom-table" :header-cell-style="{ backgroundColor: '#343744', color: '#fff' }" + :bg-color="'#292C38'" > @@ -55,11 +56,19 @@ 删除 - - + + + + + + - - + + @@ -86,32 +95,46 @@ - - + + + + + - - + + - - + + + + - - - - - - - - - + + + + {{ role.roleName }} + + @@ -128,6 +151,35 @@ + + + +
+
+ +
1/1
+
+ +
+
+ +
+ +
0/1
+
+ +
+ + +