提交

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`, // 单个、批量删除实验报告

src/pages/assessment/add/index.vue

@@ -102,14 +102,10 @@
                     <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
                     <el-table-column prop="auth" label="项目权限" align="center">
                         <template slot-scope="scope">
-                            {{ founderKeys[scope.row.founder] }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="creater" label="创建人" align="center">
-                        <template slot-scope="scope">
-                            {{ permissionsKeys[scope.row.permissions] }}
+                            {{ permissionsKeys[scope.row.projectPermissions] }}
                         </template>
                     </el-table-column>
+                    <el-table-column prop="createUser" label="创建人" align="center"></el-table-column>
                     <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
                     <el-table-column label="操作" align="center">
                         <template slot-scope="scope">
@@ -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);

src/pages/assessment/list/index.vue

@@ -85,7 +85,7 @@
             </el-table-column>
             <el-table-column label="倒计时" align="center">
                 <template slot-scope="scope">
-                    <span>{{ timeChange(scope.row.countDown) }}</span>
+                    <span>{{ changeTime(scope.row.countDown) }}</span>
                 </template>
             </el-table-column>
             <el-table-column label="实验状态" align="center">
@@ -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);

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();

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,

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 => {
+                }).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(() => {
-                    });
+                    }).catch(res => {});
+                }).catch(() => {});
             } else {
                 util.errorMsg("请先选择数据 ！");
             }