From 6137b7a340850d5a461c1a3ddb45c863e0c504c8 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 19 八月 2024 13:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/locales/zh-CN.ts | 4 ++--
src/router/modules/remaining.ts | 21 ---------------------
src/views/Login/components/SSOLogin.vue | 2 ++
src/views/infra/redis/index.vue | 2 +-
4 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 0721651..0666d6f 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -114,7 +114,7 @@
},
login: {
welcome: '欢迎使用本系统',
- message: '开箱即用的中后台管理系统',
+ message: 'IAILAB中后台管理系统',
tenantname: '租户名称',
username: '用户名',
password: '密码',
@@ -368,7 +368,7 @@
qrSignInFormTitle: '二维码登录',
signUpFormTitle: '注册',
forgetFormTitle: '重置密码',
- signInTitle: '开箱即用的中后台管理系统',
+ signInTitle: 'IAILAB中后台管理系统',
signInDesc: '输入您的个人详细信息开始使用！',
policy: '我同意xxx隐私政策',
scanSign: `扫码后点击"确认"，即可完成登录`,
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 78cc3e8..90fa84b 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -328,27 +328,6 @@
}
]
},
- {
- path: '/ai',
- component: Layout,
- name: 'Ai',
- meta: {
- hidden: true
- },
- children: [
- {
- path: 'image/square',
- component: () => import('@/views/ai/image/square/index.vue'),
- name: 'AiImageSquare',
- meta: {
- title: '绘图作品',
- icon: 'ep:home-filled',
- noCache: false,
- affix: true
- }
- }
- ]
- }
]
export default remainingRouter
diff --git a/src/views/Login/components/SSOLogin.vue b/src/views/Login/components/SSOLogin.vue
index 435d750..bd4a4a5 100644
--- a/src/views/Login/components/SSOLogin.vue
+++ b/src/views/Login/components/SSOLogin.vue
@@ -9,6 +9,8 @@
<el-form :model="formData" class="login-form">
<!-- 授权范围的选择 -->
此第三方应用请求获得以下权限：
+ <br/>
+ <br/>
<el-form-item prop="scopes">
<el-checkbox-group v-model="formData.scopes">
<el-checkbox
diff --git a/src/views/infra/redis/index.vue b/src/views/infra/redis/index.vue
index 1924b79..67b4c59 100644
--- a/src/views/infra/redis/index.vue
+++ b/src/views/infra/redis/index.vue
@@ -244,7 +244,7 @@
fontSize: 30, // 文字的字体大小,默认 15。
formatter: cache.value!.info.used_memory_human // 格式化函数或者字符串
}
-
+ console.log(cache.value!.info.used_memory_human)
usedmemoryEchartChika.series[0].data[0] = {
value: cache.value!.info.used_memory_human,
name: '内存消耗'
--
Gitblit v1.9.3