From 38b8109aa87f045cb6dbf135c2f77e265cecaf54 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Fri, 3 Dec 2021 10:10:55 +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/achievement/ass/index.vue | 2 --
src/pages/achievement/show/index.vue | 12 ++++++------
src/pages/achievement/teach/index.vue | 4 ++--
src/pages/achievement/vir/index.vue | 4 ++--
src/pages/assessment/list/index.vue | 2 +-
src/pages/system/list/staff.vue | 2 +-
6 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/pages/achievement/ass/index.vue b/src/pages/achievement/ass/index.vue
index f708e6d..c8821c7 100644
--- a/src/pages/achievement/ass/index.vue
+++ b/src/pages/achievement/ass/index.vue
@@ -56,8 +56,6 @@
{{ experimentalName }}
-
-
diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 933b8d0..6f78d13 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -173,7 +173,6 @@ export default {
let expData = res.userScores;
let form = this.form;
let score = form.score;
-
if (expData) {
if (score) {
expData.map(n => {
@@ -187,16 +186,16 @@ export default {
this.expData = expData;
}
-
this.infoData.push({
workNumber: form.workNumber,
experimentalClassName: form.experimentalClassName,
- instructor: form.instructor,
+ instructor: form.teacherName,
period: form.period,
laboratory: form.laboratory,
submitTime: form.submitTime,
score: form.score,
- userName: form.userName
+ userName: form.userName,
+ className:form.className,
});
}).catch(res => {
});
@@ -230,12 +229,13 @@ export default {
this.infoData.push({
workNumber: form.workNumber,
experimentalClassName: form.experimentalClassName,
- instructor: form.instructor,
+ instructor: form.teacherName,
period: form.period,
laboratory: form.laboratory,
submitTime: form.submitTime,
score: form.score,
- userName: form.userName
+ userName: form.userName,
+ className:form.className,
});
}).catch(res => {
});
diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue
index ee8cec7..191e0c8 100644
--- a/src/pages/achievement/teach/index.vue
+++ b/src/pages/achievement/teach/index.vue
@@ -163,7 +163,7 @@ export default {
},
responseType: 'blob'
}).then((res) => {
- util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+ util.downloadFileDirect(`学生考核成绩.xls`,new Blob([res.data]))
}).catch(res => {})
} else {
axios.get(`${this.api.exportAssessmentInfo}?assessmentId=${this.assessmentId}&classId=${this.classId}&ids=`,{
@@ -172,7 +172,7 @@ export default {
},
responseType: 'blob'
}).then((res) => {
- util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+ util.downloadFileDirect(`学生考核成绩.xls`,new Blob([res.data]))
}).catch(res => {})
}
},
diff --git a/src/pages/achievement/vir/index.vue b/src/pages/achievement/vir/index.vue
index f73d1f9..36ce388 100644
--- a/src/pages/achievement/vir/index.vue
+++ b/src/pages/achievement/vir/index.vue
@@ -133,7 +133,7 @@ export default {
},
responseType: 'blob'
}).then((res) => {
- util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+ util.downloadFileDirect(`学生练习成绩.xls`,new Blob([res.data]))
}).catch(res => {})
// location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=${ids.toString()}`;
} else {
@@ -143,7 +143,7 @@ export default {
},
responseType: 'blob'
}).then((res) => {
- util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+ util.downloadFileDirect(`学生练习成绩.xls`,new Blob([res.data]))
}).catch(res => {})
// location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=`;
}
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 19c885d..b923822 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -99,7 +99,7 @@
- 启动
+ 启动
修改
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index cbd3b01..54bc345 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -471,7 +471,7 @@ export default {
}
},
roleRemove(value) { // 处理移除角色
- let index = this.teacherForm.roleAndDeptList.findIndex(i => i.roleId === value);
+ let index = this.teacherForm.roleAndDeptList.findIndex(i => i.roleName === value);
if (index !== -1) {
this.teacherForm.roleAndDeptList.splice(index, 1);
}