diff --git a/nezha-fronted/src/assets/css/components/common/intro.scss b/nezha-fronted/src/assets/css/components/common/intro.scss
new file mode 100644
index 000000000..932c2245f
--- /dev/null
+++ b/nezha-fronted/src/assets/css/components/common/intro.scss
@@ -0,0 +1,46 @@
+.is-intro.el-dialog{
+ max-height: unset;
+ max-width: unset;
+ height: 100%;
+ .el-dialog__header{
+ display: none;
+ }
+ .el-dialog__body{
+ height: 100%;
+ padding: 0;
+ > div{
+ height: 100%;
+ }
+ }
+}
+.dc-img{
+ width: 100%;
+ height: 100%;
+ background: url("~@/assets/img/jj.png") no-repeat;
+ background-size:cover;
+}
+.dc-img1{
+ width: 100%;
+ height: 100%;
+ background: url("~@/assets/img/jj1.png") no-repeat;
+ background-size:cover;
+}
+.dc-img2{
+ width: 100%;
+ height: 100%;
+ background: url("~@/assets/img/jj3.png") no-repeat;
+ background-size:cover;
+}
+.dc-img3{
+ width: 100%;
+ height: 100%;
+ background: url("~@/assets/img/dc3.png") no-repeat;
+ background-size:cover;
+}
+.intro-bottom{
+ position: fixed;
+ right: 20px;
+ bottom: 20px;
+ display: flex;
+ flex-direction: column;
+}
diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss
index 17add18bb..63f21c1d0 100644
--- a/nezha-fronted/src/assets/css/components/index.scss
+++ b/nezha-fronted/src/assets/css/components/index.scss
@@ -67,6 +67,7 @@
@import './common/elementSet.scss';
@import './common/loading.scss';
@import './common/login.scss';
+@import './common/intro.scss';
@import './common/multipleTime.scss';
@import './common/nezhaColor.scss';
@import './common/nzTransfer.scss';
diff --git a/nezha-fronted/src/assets/img/dc.png b/nezha-fronted/src/assets/img/dc.png
new file mode 100644
index 000000000..53bd7fc95
Binary files /dev/null and b/nezha-fronted/src/assets/img/dc.png differ
diff --git a/nezha-fronted/src/assets/img/dc1.png b/nezha-fronted/src/assets/img/dc1.png
new file mode 100644
index 000000000..722e69b16
Binary files /dev/null and b/nezha-fronted/src/assets/img/dc1.png differ
diff --git a/nezha-fronted/src/assets/img/dc2.png b/nezha-fronted/src/assets/img/dc2.png
new file mode 100644
index 000000000..77553a22d
Binary files /dev/null and b/nezha-fronted/src/assets/img/dc2.png differ
diff --git a/nezha-fronted/src/assets/img/dc3.png b/nezha-fronted/src/assets/img/dc3.png
new file mode 100644
index 000000000..e8859fa13
Binary files /dev/null and b/nezha-fronted/src/assets/img/dc3.png differ
diff --git a/nezha-fronted/src/assets/img/jj.png b/nezha-fronted/src/assets/img/jj.png
new file mode 100644
index 000000000..99cea293c
Binary files /dev/null and b/nezha-fronted/src/assets/img/jj.png differ
diff --git a/nezha-fronted/src/assets/img/jj1.png b/nezha-fronted/src/assets/img/jj1.png
new file mode 100644
index 000000000..f57d4e7a1
Binary files /dev/null and b/nezha-fronted/src/assets/img/jj1.png differ
diff --git a/nezha-fronted/src/assets/img/jj3.png b/nezha-fronted/src/assets/img/jj3.png
new file mode 100644
index 000000000..55bf6fb1c
Binary files /dev/null and b/nezha-fronted/src/assets/img/jj3.png differ
diff --git a/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue b/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue
index 122dce97b..daf701152 100644
--- a/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue
+++ b/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue
@@ -109,7 +109,7 @@ export default {
show: true,
width: 150
}, {
- label: this.$t('overall.enable'),
+ label: this.$t('overall.enabled'),
prop: 'status',
show: true,
width: 100
diff --git a/nezha-fronted/src/components/common/i18n.js b/nezha-fronted/src/components/common/i18n.js
index 1165394f8..a4c930eca 100644
--- a/nezha-fronted/src/components/common/i18n.js
+++ b/nezha-fronted/src/components/common/i18n.js
@@ -3,6 +3,8 @@ import locale from 'element-ui/lib/locale'
import VueI18n from 'vue-i18n'
import { get } from '@/http'
import messages from './language'
+import enLocale from 'element-ui/lib/locale/lang/en' // 引入element语言包
+import zhLocale from 'element-ui/lib/locale/lang/zh-CN' // 引入element语言包
Vue.use(VueI18n)
// 从localStorage获取语言选择。
const i18n = new VueI18n({
@@ -14,7 +16,12 @@ locale.i18n((key, value) => i18n.t(key, value)) // 兼容element
export function loadI18n (i18nData) {
if (i18nData) {
Object.keys(i18nData).forEach(lang => {
- i18n.setLocaleMessage(lang, i18nData[lang])
+ if (lang === 'zh') {
+ Object.assign(i18nData[lang], { ...zhLocale })
+ } else if (lang === 'en') {
+ Object.assign(i18nData[lang], { ...enLocale })
+ }
+ i18n.setLocaleMessage(lang, { ...i18nData[lang] })
})
}
}
diff --git a/nezha-fronted/src/components/common/intro.vue b/nezha-fronted/src/components/common/intro.vue
new file mode 100644
index 000000000..86a7d25ce
--- /dev/null
+++ b/nezha-fronted/src/components/common/intro.vue
@@ -0,0 +1,78 @@
+
+