From 5139265d32cd9de6067b29a5a6f3deb2991cd2f5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 13 八月 2021 10:10:29 +0800
Subject: [PATCH] 默认首页使用keep-alive缓存
---
ruoyi-ui/src/utils/request.js | 2 +-
ruoyi-ui/src/views/system/role/selectUser.vue | 2 +-
ruoyi-ui/src/views/index.vue | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 1 -
ruoyi-ui/src/router/index.js | 4 ++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 1 -
6 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 278841f..bb3b47a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -13,7 +13,6 @@
import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import javax.annotation.PostConstruct;
import java.util.Collection;
import java.util.List;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index daad303..6179c35 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -12,7 +12,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import javax.annotation.PostConstruct;
import java.util.List;
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index b593898..95824b3 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -66,8 +66,8 @@
{
path: 'index',
component: (resolve) => require(['@/views/index'], resolve),
- name: '首页',
- meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+ name: 'Index',
+ meta: { title: '首页', icon: 'dashboard', affix: true }
}
]
},
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index b9b5ad8..7a058e8 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -64,7 +64,7 @@
location.href = '/index';
})
}).catch(() => {});
- return Promise.reject()
+ return Promise.reject('令牌验证失败')
} else if (code === 500) {
Message({
message: msg,
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 37c439b..2d7df7b 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -601,7 +601,7 @@
<script>
export default {
- name: "index",
+ name: "Index",
data() {
return {
// 版本号
diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue
index 300ce28..5a97095 100644
--- a/ruoyi-ui/src/views/system/role/selectUser.vue
+++ b/ruoyi-ui/src/views/system/role/selectUser.vue
@@ -64,7 +64,7 @@
props: {
// 角色编号
roleId: {
- type: String
+ type: [Number, String]
}
},
data() {
--
Gitblit v1.9.2