diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index db4ce259..30b2b945 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -3,8 +3,8 @@ const t = {} t.loading = '加载中...' t.brand = {} -t.brand.lg = '人人微服务平台' -t.brand.mini = '人人' +t.brand.lg = '党群e家后台管理系统' +t.brand.mini = '党群' t.add = '新增' t.delete = '删除' @@ -72,7 +72,7 @@ t.login.username = '用户名' t.login.password = '密码' t.login.captcha = '验证码' t.login.demo = '在线演示' -t.login.copyright = '人人开源' +t.login.copyright = '青岛亿联信息科技股份有限公司' t.home = {} t.home.desc = {} diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 42d1ce3c..427e932d 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -1,39 +1,67 @@ @@ -100,8 +129,8 @@ export default { } clearLoginInfo() this.$router.push({ name: 'login' }) - }).catch(() => {}) - }).catch(() => {}) + }).catch(() => { }) + }).catch(() => { }) } } } diff --git a/src/views/modules/home.vue b/src/views/modules/home.vue index 7d50d9b8..6c2da8d1 100644 --- a/src/views/modules/home.vue +++ b/src/views/modules/home.vue @@ -1,10 +1,8 @@ diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue index 5359337a..d22c57fb 100644 --- a/src/views/modules/sys/user-add-or-update.vue +++ b/src/views/modules/sys/user-add-or-update.vue @@ -1,52 +1,104 @@ @@ -83,8 +136,10 @@ export default { email: '', mobile: '', roleIdList: [], - status: 1 - } + status: 1, + userTagKey: '' + }, + userTagDictList: [] } }, computed: { @@ -139,6 +194,9 @@ export default { mobile: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: validateMobile, trigger: 'blur' } + ], + userTagKey: [ + { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] } } @@ -158,6 +216,7 @@ export default { } }) }) + this.getUserTagDicList() }, // 获取部门列表 getDeptList () { @@ -166,7 +225,7 @@ export default { return this.$message.error(res.msg) } this.deptList = res.data - }).catch(() => {}) + }).catch(() => { }) }, // 获取角色列表 getRoleList () { @@ -175,7 +234,16 @@ export default { return this.$message.error(res.msg) } this.roleList = res.data - }).catch(() => {}) + }).catch(() => { }) + }, + // 获取用户标签字典列表 + getUserTagDicList () { + this.$http.get(`/sys/dict/listSimple/user_tag`).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.userTagDictList = res.data + }).catch(() => { }) }, // 获取信息 getInfo () { @@ -197,7 +265,7 @@ export default { } this.roleIdListDefault.push(res.data.roleIdList[i]) } - }).catch(() => {}) + }).catch(() => { }) }, // 所属部门树, 选中 deptListTreeCurrentChangeHandle (data, node) { @@ -230,7 +298,7 @@ export default { this.$emit('refreshDataList') } }) - }).catch(() => {}) + }).catch(() => { }) }) }, 1000, { 'leading': true, 'trailing': false }) } diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index bb24c179..8d4d44f5 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -3,55 +3,78 @@
- +
@@ -112,7 +135,7 @@ export default { } Cookies.set('token', res.data.token) this.$router.replace({ name: 'home' }) - }).catch(() => {}) + }).catch(() => { }) }) }, 1000, { 'leading': true, 'trailing': false }) }