diff --git a/src/pages/modules/systemmanage/role.vue b/src/pages/modules/systemmanage/role.vue index ce90f93..497df5b 100644 --- a/src/pages/modules/systemmanage/role.vue +++ b/src/pages/modules/systemmanage/role.vue @@ -187,9 +187,11 @@ export default { return } try { - await sysRoleAdd(this.rolename, this.remark) - this.toast('操作成功') - this._sysRoleQuery() + let res = await sysRoleAdd(this.rolename, this.remark) + if (res.code === '1') { + this._sysRoleQuery() + } + this.toast(res.desc) this.$refs.child.active = false this.$refs.child.disabled = false } catch (e) { @@ -205,9 +207,11 @@ export default { return } try { - await sysRoleEdit(this.pkObj.roleId, this.rolename, this.remark) - this.toast('操作成功') - this._sysRoleQuery() + let res = await sysRoleEdit(this.pkObj.roleId, this.rolename, this.remark) + if (res.code === '1') { + this._sysRoleQuery() + } + this.toast(res.desc) this.$refs.child.active = false this.$refs.child.disabled = false } catch (e) { @@ -218,9 +222,11 @@ export default { async _sysRoleDelete () { this.$refs.child.disabled = true try { - await sysRoleDelete([this.pkObj.roleId]) - this.toast('操作成功') - this._sysRoleQuery() + let res = await sysRoleDelete([this.pkObj.roleId]) + if (res.code === '1') { + this._sysRoleQuery() + } + this.toast(res.desc) this.$refs.child.active = false this.$refs.child.disabled = false } catch (e) { diff --git a/src/pages/modules/systemmanage/user.vue b/src/pages/modules/systemmanage/user.vue index 71ecaec..d7f8c9a 100644 --- a/src/pages/modules/systemmanage/user.vue +++ b/src/pages/modules/systemmanage/user.vue @@ -290,9 +290,11 @@ export default { phone: this.phone, rolesIds: rolesIds } - await usersEdit(obj) - this.toast('操作成功') - this._usersQuery() + let res = await usersEdit(obj) + if (res.code === '1') { + this._usersQuery() + } + this.toast(res.desc) this.$refs.child.active = false this.$refs.child.disabled = false } catch (e) { @@ -307,9 +309,11 @@ export default { userId: this.pkObj.userId, password: '123456' } - await usersEdit(obj) - this.toast('操作成功') - this._usersQuery() + let res = await usersEdit(obj) + if (res.code === '1') { + this._usersQuery() + } + this.toast(res.desc) this.$refs.child.active = false this.$refs.child.disabled = false } catch (e) { @@ -320,9 +324,11 @@ export default { async _usersDelete () { this.$refs.child.disabled = true try { - await usersDelete([this.pkObj.userId]) - this.toast('操作成功') - this._usersQuery() + let res = await usersDelete([this.pkObj.userId]) + if (res.code === '1') { + this._usersQuery() + } + this.toast(res.desc) this.$refs.child.active = false this.$refs.child.disabled = false } catch (e) { diff --git a/src/pages/modules/teach/teach.vue b/src/pages/modules/teach/teach.vue index 1e3b037..4fa7ed0 100644 --- a/src/pages/modules/teach/teach.vue +++ b/src/pages/modules/teach/teach.vue @@ -1,12 +1,19 @@ diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue index 2c58cb4..4a4f696 100644 --- a/src/pages/shells/index/index.vue +++ b/src/pages/shells/index/index.vue @@ -228,7 +228,6 @@ export default { z-index 150 _fj() _wh(100%, 81px) - overflow-x auto line-height 79px padding 0 10px border-bottom 1px solid #f1f1f1 @@ -348,4 +347,5 @@ export default { padding 0 10px } } + diff --git a/src/style/reset.css b/src/style/reset.css index 82498a7..f2a4c9b 100644 --- a/src/style/reset.css +++ b/src/style/reset.css @@ -71,6 +71,12 @@ html,body { /* max-width: 1920px; */ } +@media only screen and (max-width: 1440px) { + html,body { + width: 1440px + } +} + select, option, textarea { appearance: none; outline: none;