From 2d0694ec8581f5cf66656ae93356946817ac57fc Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Mon, 25 Oct 2021 16:28:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 50 +------------------ src/layouts/header/index.vue | 12 +++-- src/main.js | 2 +- src/pages/achievement/edit/index.vue | 2 +- src/pages/achievement/list/index.vue | 2 +- .../information/contentManage/contentList.vue | 2 +- src/pages/match/add/index.vue | 4 +- src/pages/match/list/manage/matchDetail.vue | 6 ++- src/pages/match/manage/matchDetail.vue | 7 ++- src/pages/project/add/index.vue | 2 +- src/pages/setting/list/index.vue | 5 +- src/pages/student/list/index.vue | 32 ++++++++++-- src/pages/system/list/staff.vue | 32 ++++++++++-- src/plugins/requests/index.js | 2 +- src/router/index.js | 2 +- src/store/modules/user.js | 5 +- 16 files changed, 92 insertions(+), 75 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index e5d6ae0..b7ff9f3 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -169,8 +169,8 @@ export default { queryUserInfoDetails: `${host}users/users/userAccount/queryUserInfoDetails`,//个人中心信息展示 updatePersonCenter: `${host}users/users/userAccount/updatePersonCenter`,//个人中心信息修改 examinePassword: `${host}users/users/userAccount/examinePassword`,//更换密码 - bindPhoneOrEmail: `${host}/users/users/userAccount/bindPhoneOrEmail`,// 绑定手机或邮箱 - sendPhoneOrEmailCode: `${host}/users/users/userAccount/sendPhoneOrEmailCode`,// 更换手机号或邮箱--发送手机验证码 + bindPhoneOrEmail: `${host}users/users/userAccount/bindPhoneOrEmail`,// 绑定手机或邮箱 + sendPhoneOrEmailCode: `${host}users/users/userAccount/sendPhoneOrEmailCode`,// 更换手机号或邮箱--发送手机验证码 // 系统设置 // 员工组织架构 @@ -207,52 +207,6 @@ export default { - - - - updateLogInNumber: `${host}liuwanr/userInfo/updateLogInNumber`, //用户登录修改登录次数和登陆时间 - queryAccountIsExist: `${host}liuwanr/userInfo/queryAccountIsExist`,//查询员工，学生账号是否存在接口 - queryWorkNumberIsExist: `${host}liuwanr/userInfo/queryWorkNumberIsExist`,//查询学号、工号是否存在 - querySchool: `${host}liuwanr/customer/querySchool`, //根据学校名称查询学校信息 - - queryPersonalCenter: `${host}liuwanr/personalCenter/queryPersonalCenter`, - addStaffPro: `${host}liuwanr/staffProfessionalArchitecture/addStaffProfessionalArchitecture`, //添加员工专业 - queryStaffPro: `${host}liuwanr/staffProfessionalArchitecture/queryAllStaffProfessionalArchitecture`, //查询员工专业 - deleteStaffPro: `${host}liuwanr/staffProfessionalArchitecture/deleteStaffProfessionalArchitecture`, //删除员工专业 - deleteStaffGrade: `${host}liuwanr/staffGrade/deleteStaffGrade`, //删除员工部门 - updateStaffPro: `${host}liuwanr/staffProfessionalArchitecture/updateStaffProfessionalArchitecture`, //编辑员工专业 - queryStaffGrade: `${host}liuwanr/staffGrade/queryStaffGrade`, //查询员工部门 - queryStaffGradeDetails: `${host}liuwanr/staffGrade/queryStaffGradeDetails`, //查询员工部门详情 - addStaffGrade: `${host}liuwanr/staffGrade/addStaffGrade`, //新增员工部门 - updateStaffGrade: `${host}liuwanr/staffGrade/updateStaffGrade`, //编辑员工部门 - queryPhone: `${host}liuwanr/user/queryPhone`, //查询电话是否存在 - queryEmail: `${host}liuwanr/user/queryEmail`, //查询邮箱是否存在 - queryStaffPAN: `${host}liuwanr/staffProfessionalArchitecture/queryStaffPAN`,//查询员工专业是否存在 - - - - // 员工管理 - addStaff: `${host}evaluation/tms/system/addStaff`, - daleteBatchStaff: `${host}evaluation/tms/system/daleteBatchStaff`, - queryStaff: `${host}evaluation/tms/system/queryStaff`, - querystaffDetail: `${host}evaluation/tms/system/querystaffDetail`, - updateStaff: `${host}evaluation/tms/system/updateStaff`, - downloadStaff: `${host}evaluation/tms/system/download`, - export_failureStaff: `${host}evaluation/tms/system/export_failure`, - uploadFileStaff: `${host}evaluation/tms/system/uploadFile`, - queryAccountStaff: `${host}evaluation/tms/system/queryAccount`, - // resetPwd: `${host}evaluation/tms/system/resetPwd`, - dalStaffByStaffGradeId: `${host}evaluation/tms/system/dalStaffByStaffGradeId`, - dalStaffByProfessionalId: `${host}evaluation/tms/system/dalStaffByProfessionalId`, - - // 角色权限 - rolePermissionList: `${host}evaluation/sys-permission/rolePermissionList`, - saveRolePermission: `${host}evaluation/sys-permission/saveRolePermission`, - updateRolePermission: `${host}evaluation/sys-permission/updateRolePermission`, - delRolePermission: `${host}evaluation/sys-permission/delRolePermission`, - queryPermissionArrById: `${host}evaluation/sys-permission/queryPermissionArrById`, - roleTree: `${host}evaluation/sys-permission/tree`, - // 教师评语 addComment: `${host}evaluation/comment/addComment`, queryComment: `${host}evaluation/comment/queryComment`, diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 291f360..e816e88 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -31,10 +31,11 @@ export default { }, mounted() { this.getSystemDetail(); + this.getUserDetail(); }, methods: { ...mapActions("user", [ - "logout", "setTitle", "setLogoUrl" + "logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName" ]), toPersonal() { if (!this.customer) { @@ -48,11 +49,16 @@ export default { this.setTitle(res.data.title); this.setLogoUrl(res.data.logoUrl); } - } else { - util.errorMsg(res.message); } }).catch(res => {}); }, + getUserDetail () { // 获取用户详情 + this.$get(this.api.queryUserInfoDetails).then(res => { + let info = res.result.hrUserInfo; + this.setAvatar(info.userAvatars ? info.userAvatars : ""); + this.setUserName(info.userName); + }).catch(res => {}); + }, } }; diff --git a/src/main.js b/src/main.js index 4d783c7..719d2d7 100644 --- a/src/main.js +++ b/src/main.js @@ -39,7 +39,7 @@ Vue.prototype.auth = function(values){ // 直接拿值进行匹配,取得当前router的mate信息,传入，返回一个boolean，以此进行vif判断 // router.meta 信息匹配传进来的value，用vif去进行按钮级权限配置即可。 // $router.currentRoute.meta - console.log(router.currentRoute.meta,'当前路由的按钮权限数组') + // console.log(router.currentRoute.meta,'当前路由的按钮权限数组') return router.currentRoute.meta.btn.some(e=>e===values) } new Vue({ diff --git a/src/pages/achievement/edit/index.vue b/src/pages/achievement/edit/index.vue index 1ccd856..1b3445d 100644 --- a/src/pages/achievement/edit/index.vue +++ b/src/pages/achievement/edit/index.vue @@ -306,7 +306,7 @@ export default { util.successMsg("上传成功"); this.getSgin(); } else { - $message.error(res.errmessage); + $message.error(res.message); } }, goback() { diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue index bc4039a..cb87e7a 100644 --- a/src/pages/achievement/list/index.vue +++ b/src/pages/achievement/list/index.vue @@ -75,7 +75,7 @@ diff --git a/src/pages/information/contentManage/contentList.vue b/src/pages/information/contentManage/contentList.vue index dc0cd45..8f8f7c1 100644 --- a/src/pages/information/contentManage/contentList.vue +++ b/src/pages/information/contentManage/contentList.vue @@ -6,7 +6,7 @@
保存排序 批量删除 - 新增文章 + 新增文章
diff --git a/src/pages/match/add/index.vue b/src/pages/match/add/index.vue index 0119d8a..d81dc77 100644 --- a/src/pages/match/add/index.vue +++ b/src/pages/match/add/index.vue @@ -243,8 +243,8 @@ export default { getData() { this.$get(this.api.getContest + this.id) .then(res => { - if (res.errmessage == "success") { - let info = res.ExperimentalTeaching; + if (res.status == 200) { + let info = res.contest; this.coverUrl = info.coverUrl; this.description = info.description; this.name = info.name; diff --git a/src/pages/match/list/manage/matchDetail.vue b/src/pages/match/list/manage/matchDetail.vue index f22cf69..1f41419 100644 --- a/src/pages/match/list/manage/matchDetail.vue +++ b/src/pages/match/list/manage/matchDetail.vue @@ -103,6 +103,7 @@