diff --git a/src/api/index.js b/src/api/index.js index 56ea0c0..aaaa72f 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -68,6 +68,7 @@ export default { getPracticeDetail: `${host}occupationlab/achievement/getPracticeDetail`, // 管理端练习成绩详情 myClass: `${host}occupationlab/achievement/myClass`, // 教师端:我的班级 deleteReportById: `${host}occupationlab/achievement/deleteReportById`, // 批量删除成绩管理中的项目/批量删除成绩管理中的考核 + experimentOverview: `${host}occupationlab/achievement/reportDetail`, // 查看实验报告 // 项目管理 getSystemIdBySchool: `${host}occupationlab/projectManage/getSystemIdBySchool`, // 获取学校下拥有的系统 diff --git a/src/pages/achievement/ass/index.vue b/src/pages/achievement/ass/index.vue index 0438a76..786944d 100644 --- a/src/pages/achievement/ass/index.vue +++ b/src/pages/achievement/ass/index.vue @@ -4,14 +4,7 @@
- -
-
-
- -
-
- + @@ -35,6 +28,14 @@
+ +
+
+
+ +
+
+
批量删除 diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue index cba500c..a6c9192 100644 --- a/src/pages/achievement/list/index.vue +++ b/src/pages/achievement/list/index.vue @@ -69,19 +69,19 @@ - + - - + + - + - + - +
@@ -157,9 +161,9 @@ export default { let data = { recordId: this.id }; - this.$get(this.api.queryVirtualReport, data).then(res => { - this.form = res.data.report; - let expData = res.data.data; + this.$get(this.api.experimentOverview, data).then(res => { + this.form = res.report; + let expData = res.userScores; let form = this.form; let score = form.score; @@ -193,12 +197,13 @@ export default { let data = { studentId: this.studentId, projectId: this.projectId, - recordId: this.id, + // recordId: this.id, reportId: this.reportId }; - this.$get(this.api.queryArchievement, data).then(res => { - this.form = res.data.report ? res.data.report : {}; - let expData = res.data.data; + this.$get(this.api.experimentOverview, data).then(res => { + console.log(res) + this.form = res.report ? res.report : {}; + let expData = res.userScores; let form = this.form; let score = form.score; diff --git a/src/pages/achievement/vir/index.vue b/src/pages/achievement/vir/index.vue index 59462d3..701c7c3 100644 --- a/src/pages/achievement/vir/index.vue +++ b/src/pages/achievement/vir/index.vue @@ -110,10 +110,11 @@ export default { }); }, show(row) { + console.log(row) if (this.permissions) { - this.$router.push(`show?id=${row.recordId}&projectId=${this.projectId}&reportId=${row.reportId}`); + this.$router.push(`show?id=${row.projectId}&projectId=${this.projectId}&reportId=${row.reportId}`); } else { - this.$router.push(`show?id=${row.recordId}&type=1`); + this.$router.push(`show?id=${row.projectId}&type=1`); } }, exportData() { diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue index 26e8c7b..864f0f1 100644 --- a/src/pages/assessment/add/index.vue +++ b/src/pages/assessment/add/index.vue @@ -9,6 +9,7 @@
+

考核名称

@@ -21,6 +22,7 @@ >
+

发布方式

@@ -147,7 +149,7 @@
{ // 编辑时，设置默认勾选 - if (this.form.stuInfo && this.form.stuInfo.length) { - let keys = this.form.stuInfo.map(i => { - return `${i.classId}-${i.stuAccountId}`; + if (this.form.classInfo && this.form.classInfo.length) { + let keys = this.form.classInfo.map(i => { + return i.id; }); this.defaultCheckedKeys = keys; } diff --git a/src/pages/match/manage/matchProgress.vue b/src/pages/match/manage/matchProgress.vue index 7db5e63..b436987 100644 --- a/src/pages/match/manage/matchProgress.vue +++ b/src/pages/match/manage/matchProgress.vue @@ -143,8 +143,8 @@ export default { status: 0 }); } - } - } + }, + }, }; diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue index 09a11cf..abe4c51 100644 --- a/src/pages/student/list/index.vue +++ b/src/pages/student/list/index.vue @@ -858,7 +858,6 @@ export default { // console.log(this.form.classId); treeList.forEach(i => { i.disabled = i.level < 3; - if (i.level === 3) { i.leaf = true; // 原本想在数据中添加勾选属性，但并没有效果，文档中props参数没有checked