diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index bcfad3eae..7803ead5f 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@ spring:
master:
url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: password
+ password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index d15705c48..6e3e316e3 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -74,7 +74,7 @@ spring:
# 数据库索引
database: 0
# 密码
- password:
+ password: 123456
# 连接超时时间
timeout: 10s
lettuce:
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index 18b2a3ed4..7b61980ff 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 数据资源管理系统
# 开发环境配置
ENV = 'development'
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index cb064ec84..51b19d26f 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 数据资源管理系统
# 生产环境配置
ENV = 'production'
diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging
index 730af3426..c2dfd25b9 100644
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 数据资源管理系统
BABEL_ENV = production
diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss
index f1c821f15..f7a6c349b 100644
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@@ -12,20 +12,20 @@
}
.sidebar-container {
- -webkit-transition: width .28s;
- transition: width 0.28s;
- width: $base-sidebar-width !important;
- background-color: $base-menu-background;
- height: 100%;
- position: fixed;
- font-size: 0px;
- top: 0;
- bottom: 0;
- left: 0;
- z-index: 1001;
- overflow: hidden;
- -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
- box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+ -webkit-transition: width .28s;
+ transition: width 0.28s;
+ width: $base-sidebar-width !important;
+ background-color: $base-menu-background;
+ height: 100%;
+ position: fixed;
+ font-size: 14px;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 1001;
+ overflow-x: visible;
+ overflow-y: auto;
+ box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
// reset element-ui css
.horizontal-collapse-transition {
@@ -57,7 +57,6 @@
a {
display: inline-block;
width: 100%;
- overflow: hidden;
}
.svg-icon {
@@ -71,9 +70,11 @@
}
.el-menu-item, .el-submenu__title {
- overflow: hidden !important;
- text-overflow: ellipsis !important;
white-space: nowrap !important;
+ font-size: 14px;
+ padding: 0 20px !important;
+ height: 50px !important;
+ line-height: 50px !important;
}
// menu hover
diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
index 37214aa0b..3186b23f4 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/Item.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
@@ -21,11 +21,7 @@ export default {
}
if (title) {
- if (title.length > 5) {
- vnodes.push({(title)})
- } else {
- vnodes.push({(title)})
- }
+ vnodes.push({(title)})
}
return vnodes
}
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index bbfd2374d..b04cfcb88 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -68,7 +68,7 @@ export const constantRoutes = [
children: [
{
path: 'index',
- component: () => import('@/views/index'),
+ component: () => import('@/views/dashboard/index'),
name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true }
}
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index 7311f23c3..c7d010537 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -42,7 +42,17 @@ const permission = {
rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
router.addRoutes(asyncRoutes)
commit('SET_ROUTES', rewriteRoutes)
- commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
+ // 确保首页固定在顶部
+ const homeRouteIndex = constantRoutes.findIndex(route => route.children && route.children.some(child => child.name === 'Index'));
+ if (homeRouteIndex > 0) {
+ // 将首页路由移到最前面
+ const routes = [...constantRoutes];
+ const homeRoute = routes.splice(homeRouteIndex, 1)[0];
+ routes.unshift(homeRoute);
+ commit('SET_SIDEBAR_ROUTERS', routes.concat(sidebarRoutes));
+ } else {
+ commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes));
+ }
commit('SET_DEFAULT_ROUTES', sidebarRoutes)
commit('SET_TOPBAR_ROUTES', sidebarRoutes)
resolve(rewriteRoutes)