diff --git a/.vscode/settings.json b/.vscode/settings.json
index fff106c..b0e1276 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,11 +5,7 @@
"editor.formatOnPaste": true,
"editor.formatOnType": true,
// 配置eslint适用于vue代码
- "eslint.validate": [
- "javascript",
- "typescript",
- "vue"
- ],
+ "eslint.validate": ["javascript", "typescript", "vue"],
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
@@ -22,12 +18,15 @@
"[js]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
+ "[json]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
// 保存时 prettier 自动格式化
"editor.formatOnSave": true,
// 保存时自动启用 eslint --fix 自动修复
"editor.codeActionsOnSave": {
"source.fixAll": true,
- "eslint.autoFixOnSave": true,
+ "eslint.autoFixOnSave": true
},
"eslint.options": {
"overrideConfig": {
@@ -49,16 +48,12 @@
},
"i18n-ally.displayLanguage": "zh-cn",
"i18n-ally.enabledParsers": ["json", "js"],
- "i18n-ally.localesPaths": [
- "src/i18n/lang",
- "src/i18n/pages/login",
- "src/i18n/pages/menu",
- ],
+ "i18n-ally.localesPaths": ["src/i18n/lang", "src/i18n/pages/login", "src/i18n/pages/menu"],
"i18n-ally.extract.parsers.html": {
"attributes": ["text", "title", "alt", "placeholder", "label", "aria-label"],
"ignoredTags": ["script", "style"],
"vBind": true,
"inlineText": true
},
- "i18n-ally.keystyle": "nested",
-}
\ No newline at end of file
+ "i18n-ally.keystyle": "nested"
+}
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index ef6264c..12e1064 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -21,7 +21,7 @@
{{ $t('layout.darkMode') }}
{{ $t('layout.lightMode') }}
- cafe
+
diff --git a/src/router/index.js b/src/router/index.js
index 76f9155..1cc4762 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -68,7 +68,7 @@ export const constantRoutes = [
path: '/index',
component: () => import('@/views/index'),
name: 'Index',
- meta: { title: '首页', icon: 'dashboard', affix: true, titleKey: 'menu.home' }
+ meta: { title: '首页', icon: 'index', affix: true, titleKey: 'menu.home' }
}
]
},
diff --git a/src/settings.js b/src/settings.js
index c3b9050..c7c67ac 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -2,7 +2,7 @@ export default {
/**
* 框架版本号
*/
- version: '3.8.2',
+ version: '20230811',
/**
* 网页标题
*/
diff --git a/src/views/components/icons/index.vue b/src/views/components/icons/index.vue
index 8a28fe1..9f1c9cd 100644
--- a/src/views/components/icons/index.vue
+++ b/src/views/components/icons/index.vue
@@ -7,6 +7,7 @@
{{ generateIconCode(item) }}
+ {{ item }}
@@ -17,6 +18,7 @@
{{ generateElementIconCode(item) }}
+ {{ item }}
@@ -54,7 +56,7 @@ function generateElementIconCode(symbol) {
margin: 20px;
height: 60px;
text-align: center;
- width: 60px;
+ width: 77px;
float: left;
font-size: 30px;
color: #24292e;
diff --git a/src/views/index.vue b/src/views/index.vue
index 6ddf019..e6b6f46 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -39,7 +39,7 @@
ZRAdmin.NET {{ $t('layout.backstageManagement') }}
ZRAdmin.NET借鉴了很多开源项目的优点,让你开发Web管理系统更简单,所以我也把它给开源了(前端
- vue页面主要参考若依,在此表示感谢.)
+ vue页面主要使用了若依,后端参考Ruoyi stringboot版本,在此表示感谢.)
{{ $t('layout.content1') }}
diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
index dd8aa6a..bea6d31 100644
--- a/src/views/index_v1.vue
+++ b/src/views/index_v1.vue
@@ -31,14 +31,8 @@
{{ currentTime }} {{ weekName }}
-
-
今日工作时长
-
{{ onlineInfo.onlineTime }}分
-
-
-
在线设备数
-
{{ onlineInfo.clientNum }}
-
+
+
@@ -53,7 +47,7 @@
{{ $t('btn.add') }}
-
+
diff --git a/src/views/login.vue b/src/views/login.vue
index 65faf80..a91f766 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -24,7 +24,7 @@
-
+
@@ -38,7 +38,7 @@
{{ $t('login.rememberMe') }}
- 忘记密码
+ {{ $t('login.forgotPwd') }}
{{ $t('login.register') }}
@@ -58,8 +58,8 @@
-
-
请使用移动端app扫码登录
+
+
请使用移动端app扫码登录
@@ -218,8 +218,8 @@ function generateCode() {
new QRCode(document.getElementById('imgContainer'), {
// text: 'https://qm.qq.com/cgi-bin/qm/qr?k=kgt4HsckdljU0VM-0kxND6d_igmfuPlL&authKey=r55YUbruiKQ5iwC/folG7KLCmZ++Y4rQVgNlvLbUniUMkbk24Y9+zNuOmOnjAjRc&noverify=0',
text: JSON.stringify(data.codeContent),
- width: 200,
- height: 200
+ width: 160,
+ height: 160
})
}
})
@@ -279,4 +279,9 @@ getCookie()
.other-login {
padding: 0px 10px 5px;
}
+.qrCode {
+ width: 160px;
+ height: 160px;
+ line-height: 160px;
+}