From c19c41390d563a261b321d3e28c1e11b6544dfde Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 29 Sep 2021 15:56:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/index.js | 3 ++-
src/pages/assessment/add/index.vue | 14 +++-------
src/pages/assessment/list/index.vue | 6 ++---
src/pages/course/courseManagement/add.vue | 7 -----
.../courseManagement/contentSettings.vue | 1 -
src/pages/match/index.vue | 27 +++++++------------
6 files changed, 18 insertions(+), 40 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index f121e7b..befa64e 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -59,8 +59,9 @@ export default {
getDetailById: `${host}occupationlab/assessment/getDetailById`, // 根据考核Id查询考核详情
deleteAssessment: `${host}occupationlab/assessment/deleteAssessment`, // 单个、批量删除
collectPaper: `${host}occupationlab/assessment/collectPaper`, // 收卷（提前结束）
+
schoolCourse: `${host}nakadai/nakadai/curriculum/schoolCourse`, // 获取学校购买订单后的课程
- projectListByCourseId: `${host}nakadai/nakadai/curriculum/projectListByCourseId`, // 获取学校购买订单后的课程
+ projectListByCourseId: `${host}nakadai/nakadai/curriculum/projectListByCourseId`, // 根据课程id获取实训项目列表
// 成绩管理
deleteExperimentalReport: `${host}occupationlab/achievement/deleteExperimentalReport`, // 单个、批量删除实验报告
diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue
index 43b04f5..318cbbb 100644
--- a/src/pages/assessment/add/index.vue
+++ b/src/pages/assessment/add/index.vue
@@ -102,14 +102,10 @@
- {{ founderKeys[scope.row.founder] }}
-
-
-
-
- {{ permissionsKeys[scope.row.permissions] }}
+ {{ permissionsKeys[scope.row.projectPermissions] }}
+
@@ -202,10 +198,6 @@ import { mapState, mapActions } from "vuex";
export default {
data() {
return {
- founderKeys: {
- 0: "系统",
- 1: "老师"
- },
permissionsKeys: {
0: "练习",
1: "考核",
@@ -392,7 +384,7 @@ export default {
this.$get(`${this.api.projectListByCourseId}?cid=${this.form.curriculumId}&permissions=1&projectName=${this.keyword}`).then(res => {
let { status, data } = res;
if (status === 200 && data) {
- let list = data.records;
+ let list = data;
let result = [];
list.map(n => {
n.enable || result.push(n);
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 0181eb2..0213b98 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -85,7 +85,7 @@
- {{ timeChange(scope.row.countDown) }}
+ {{ changeTime(scope.row.countDown) }}
@@ -241,10 +241,10 @@ export default {
}
}, 1000);
},
- timeChange(countDown) {
+ changeTime(countDown) {
let that = this;
if (countDown < 0) {
- clearInterval(setInterval(this.timeChange(countDown), 1000));
+ clearInterval(setInterval(this.changeTime(countDown), 1000));
}
let hh = that.fillNumber(countDown / (60 * 60));
let mm = that.fillNumber(countDown % (60 * 60) / 60);
diff --git a/src/pages/course/courseManagement/add.vue b/src/pages/course/courseManagement/add.vue
index 3cdb0e0..debc91b 100644
--- a/src/pages/course/courseManagement/add.vue
+++ b/src/pages/course/courseManagement/add.vue
@@ -190,13 +190,6 @@ export default {
}).catch(res => {
});
},
- uploadSure() {
- this.importVisible = false;
- this.pageNo = 1;
- this.staffGradeId = "";
- this.keyword = "";
- this.getTeacher();
- },
goback() {
if (this.isDetail) {
this.$router.back();
diff --git a/src/pages/course/courseManagement/contentSettings.vue b/src/pages/course/courseManagement/contentSettings.vue
index d1ad1e0..d0ae458 100644
--- a/src/pages/course/courseManagement/contentSettings.vue
+++ b/src/pages/course/courseManagement/contentSettings.vue
@@ -194,7 +194,6 @@ export default {
token: util.local.get(Setting.tokenKey)
},
id: "",
- userId: this.$store.state.userLoginId,
chapters: [],
sorting: false,
uploading: false,
diff --git a/src/pages/match/index.vue b/src/pages/match/index.vue
index 2a66cd5..8e6d593 100644
--- a/src/pages/match/index.vue
+++ b/src/pages/match/index.vue
@@ -218,26 +218,19 @@ export default {
},
delAllData() {
if (this.multipleSelection.length != "") {
- let newArr = this.multipleSelection;
- let delList = newArr.map(item => {
- return item.id;
- });
-
this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
type: "warning"
- })
- .then(() => {
- let data = delList;
- this.$post(this.api.deleteContest, data).then(res => {
- this.multipleSelection = [];
- this.$refs.table.clearSelection();
- util.successMsg("删除成功");
- this.getData();
- }).catch(res => {
- });
- })
- .catch(() => {
+ }).then(() => {
+ let delList = this.multipleSelection.map(item => {
+ return item.id;
});
+ this.$post(this.api.deleteContest, delList).then(res => {
+ this.multipleSelection = [];
+ this.$refs.table.clearSelection();
+ util.successMsg("删除成功");
+ this.getData();
+ }).catch(res => {});
+ }).catch(() => {});
} else {
util.errorMsg("请先选择数据 ！");
}