From b6fbb65e27308fa505087924106f0d9254ec820e Mon Sep 17 00:00:00 2001 From: e <2432808546@qq.com> Date: Thu, 11 Nov 2021 17:51:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/account/login/index.vue | 1 + src/pages/achievement/list/index.vue | 12 +++++++++--- src/pages/assessment/list/index.vue | 2 +- src/pages/student/list/index.vue | 15 +++++++++------ src/pages/system/list/staff.vue | 9 ++++++--- src/styles/common.scss | 1 + 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index caacd91..e3f348c 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -36,6 +36,7 @@ + 依据国家政策法规，需绑定手机号进行实网络实名才可登录使用本平台 diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue index be5eeab..5bbec49 100644 --- a/src/pages/achievement/list/index.vue +++ b/src/pages/achievement/list/index.vue @@ -210,10 +210,15 @@ export default { pageNum: this.page, pageSize: this.pageSize }; - this.$post(this.api.getAchievementInfo, data).then(res => { - this.listData = res.page.records; - this.total = res.page.total; + console.log(res) + if(this.projectPermissions == 0){ + this.listData = res.page; + this.total = res.total; + }else{ + this.listData = res.page.records; + this.total = res.page.total; + } this.$nextTick(() => { this.loadIns.close(); }); @@ -231,6 +236,7 @@ export default { return true; }, entry(row) { // 成绩管理 + console.log(row) if (this.projectPermissions === 1) { let list = row.classList.map(i => { return { id: i.id.toString(), name: i.className }; diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue index f119be2..bf3fbb5 100644 --- a/src/pages/assessment/list/index.vue +++ b/src/pages/assessment/list/index.vue @@ -5,7 +5,7 @@
  • - + {{ item.name }} diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue index 13d4a33..fe45c09 100644 --- a/src/pages/student/list/index.vue +++ b/src/pages/student/list/index.vue @@ -214,8 +214,8 @@ - 保存 - 保存并继续添加 + 保存 + 保存并继续添加 取消 @@ -346,7 +346,7 @@ export default { { required: true, message: "请输入名称", trigger: "blur" } ], account: [ - { validator: accountPass, trigger: 'blur' } + { required: true,validator: accountPass, trigger: 'blur' } // { required: true, message: "请输入账号", trigger: "blur" }, // { // pattern: /^[A-Za-z0-9]*$/, @@ -358,7 +358,7 @@ export default { { required: true, message: "请输入学生姓名", trigger: "blur" } ], workNumber: [ - { validator: workNumberPass, trigger: 'blur' } + { required: true,validator: workNumberPass, trigger: 'blur' } // { required: true, message: "请输入学生学号", trigger: "blur" }, // { // pattern: /^[A-Za-z0-9]*$/, @@ -405,7 +405,8 @@ export default { exportCode: "", headers: { token: util.local.get(Setting.tokenKey) - } + }, + disableds:false }; }, mounted() { @@ -741,6 +742,7 @@ export default { url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=1&accountId=${this.form.accountId}&account=${this.form.account}&workNumber=`; } this.$post(url).then(res => { + this.disableds = false if (this.isAdd && this.form.accountId) { this.$refs.form.clearValidate(); this.form = { @@ -758,6 +760,7 @@ export default { } this.accountReapeat = false; }).catch(err => { + this.disableds = true if (this.isAdd) { this.showTree = false; this.$post(`${this.api.getDetailByAccount}?workNumber=${this.form.workNumber}&platformId=${Setting.platformId}&type=1`).then(res => { @@ -990,7 +993,7 @@ export default { this.exportCode = res.data.exportCode; this.uploadFaild = true; } - util.successMsg(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`); + util.successMsg(`本次上传有${res.data.failureNum}个失败`); } else { res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据"); } diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue index 5d24539..1b26d87 100644 --- a/src/pages/system/list/staff.vue +++ b/src/pages/system/list/staff.vue @@ -144,7 +144,7 @@ export default { if (value === '') { callback(new Error('请输入职工工号')); } else { - var pattern = /^[0-9]*$/; + var pattern = /^[a-zA-Z0-9]*$/; if(pattern.test(value)){ this.workNumberChange(); callback(); @@ -311,6 +311,7 @@ export default { }, getRoleData() { // 获取角色数据 this.$get(`${this.api.roleList}?page=1&size=100&name=''&platformId=1`).then(res => { + console.log(res) this.roleList = res.rolePage.records; }).catch(res => {}); }, @@ -340,7 +341,8 @@ export default { this.$get(`${this.api.staffDetail}?accountId=${accountId}`).then(res => { let { data } = res; this.teacherForm = data; - this.teacherForm.roleValue = data.roleAndDeptList.map(i => i.roleId); + this.roleList = data.roleAndDeptList + this.teacherForm.roleValue = data.roleAndDeptList.map(i => i.roleName); this.teacherForm.roleAndDeptList = data.roleAndDeptList.map(i => { i.cascaderValue = [i.staffArchitectureId, i.gradeId] return i; @@ -450,7 +452,8 @@ export default { cascaderValue: [] }; if (value.includes(i.id) && !ids.includes(i.id)) { - obj.roleId = i.id; + console.log(i) + obj.roleId = i.roleId; obj.roleName = i.roleName; this.teacherForm.roleAndDeptList.push(obj); } diff --git a/src/styles/common.scss b/src/styles/common.scss index acb436e..9330025 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -38,6 +38,7 @@ font-size: 14px !important; background-color: $--color-primary !important; border-radius: 4px !important; + border: none; } .el-input {