diff --git a/src/pages/achievement/ass/index.vue b/src/pages/achievement/ass/index.vue deleted file mode 100644 index 7bf586f..0000000 --- a/src/pages/achievement/ass/index.vue +++ /dev/null @@ -1,368 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue index 099d458..c5f5cd3 100644 --- a/src/pages/achievement/list/index.vue +++ b/src/pages/achievement/list/index.vue @@ -246,15 +246,9 @@ export default { if ((row.isAdmin === 1 && (row.isDel === 1 || row.courseDel === 1)) || (row.isAdmin === 0 && row.isDel === 1)) return true return false }, - entry(row) { // 成绩管理 - if (this.projectPermissions === 1) { - let list = row.classList.map(i => { - return { id: i.id.toString(), name: i.className }; - }); - this.$router.push(`teach?assessmentId=${row.assessmentId}&projectName=${row.projectName}&permissions=${row.permissions}&classList=${JSON.stringify(list)}`); - } else { - this.$router.push(`vir?projectId=${row.projectId}&projectName=${row.projectName}&permissions=${row.permissions}`); - } + // 进入实验记录 + entry(row) { + this.$router.push(`teach?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions}`) }, handleDelete(row) { // 删除 this.$confirm("该项目下的所有成绩报告将会删除,是否继续?", "提示", { diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue index 1ba512e..f89492a 100644 --- a/src/pages/achievement/show/index.vue +++ b/src/pages/achievement/show/index.vue @@ -135,7 +135,6 @@ export default { data() { return { reportId: this.$route.query.reportId, - projectId: this.$route.query.projectId, title: "实验报告", form: { className: "", diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue index 61a5469..b0998d8 100644 --- a/src/pages/achievement/teach/index.vue +++ b/src/pages/achievement/teach/index.vue @@ -44,24 +44,25 @@ - + - + - - - - + + + + + - + - - \ No newline at end of file diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue index 670a869..4fb3730 100644 --- a/src/pages/assessment/list/index.vue +++ b/src/pages/assessment/list/index.vue @@ -344,7 +344,7 @@ export default { this.$router.push(`add?id=${row.id}`); }, show(row) { - this.$router.push(`/achievement/ass?id=${row.id}&classId=${row.classId}&projectId=${row.projectId}&classInfo=${JSON.stringify(row.classInfo)}&experimentalName=${row.experimentalName}&class=${row.experimentalClassName}`); + this.$router.push(`/achievement/teach?id=${row.id}&projectName=${row.projectName}&permissions=1`) }, start(row) { this.$post(`${this.api.enableAssessment}?id=${row.id}`).then(res => {