-
+
diff --git a/mayfly_go_web/src/router/index.ts b/mayfly_go_web/src/router/index.ts
index b56325c4..eaf1df3f 100644
--- a/mayfly_go_web/src/router/index.ts
+++ b/mayfly_go_web/src/router/index.ts
@@ -244,6 +244,7 @@ export async function initRouter() {
}
let SysWs: any;
+let loadRouter = false;
// 路由加载前
router.beforeEach(async (to, from, next) => {
@@ -283,8 +284,10 @@ router.beforeEach(async (to, from, next) => {
if (!SysWs && to.path != '/machine/terminal') {
SysWs = sockets.sysMsgSocket();
}
- if (useRoutesList().routesList.length == 0) {
+ // 不存在路由(避免刷新页面找不到路由)并且未加载过(避免token过期,导致获取权限接口报权限不足,无限获取),则重新初始化路由
+ if (useRoutesList().routesList.length == 0 && !loadRouter) {
await initRouter();
+ loadRouter = true;
next({ path: to.path, query: to.query });
} else {
next();
diff --git a/mayfly_go_web/src/theme/app.scss b/mayfly_go_web/src/theme/app.scss
index 95ccf8b4..c2a3e564 100644
--- a/mayfly_go_web/src/theme/app.scss
+++ b/mayfly_go_web/src/theme/app.scss
@@ -328,6 +328,10 @@ body,
float: left;
}
+.fr {
+ float: right;
+}
+
.search-form {
.el-form-item {
margin-bottom: 3px;
diff --git a/mayfly_go_web/src/views/ops/redis/DataOperation.vue b/mayfly_go_web/src/views/ops/redis/DataOperation.vue
index 5027fce9..4d7a3f27 100644
--- a/mayfly_go_web/src/views/ops/redis/DataOperation.vue
+++ b/mayfly_go_web/src/views/ops/redis/DataOperation.vue
@@ -46,26 +46,16 @@
scan
-
-
-
-
- string
- hash
- set
-
-
+
keys: {{ state.dbsize }}
-
+
@@ -79,7 +69,8 @@
- 查看
+ 查看
删除
@@ -93,21 +84,37 @@
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+