diff --git a/src/api/index.js b/src/api/index.js index b68a15b..aaaa72f 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -52,10 +52,10 @@ export default { pageByCondition: `${host}occupationlab/assessment/pageByCondition`, // 考核管理列表 saveAssessment: `${host}occupationlab/assessment/saveAssessment`, // 创建考核 modifyAssessment: `${host}occupationlab/assessment/modifyAssessment`, // 编辑考核 + enableAssessment: `${host}occupationlab/assessment/enableAssessment`, // 修改考核状态 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`, // 根据课程id获取实训项目列表 @@ -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/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index bd80cae..3298561 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -54,7 +54,7 @@ export default { { icon: "el-icon-collection", index: "/achievement/list", - title: "成绩管理" + title: "成绩管理", }, { icon: "el-icon-news", @@ -102,7 +102,9 @@ export default { for (let i in this.actives) { if (actives[i].includes(this.$route.name)) this.active = `/${i}/list`; } - this.active = this.$route.path; + let arr=this.$route.path.split("/"); + let name = `/${arr[1]}/list` + this.active = name; } }, created() { diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index caacd91..0465445 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -36,6 +36,9 @@ +
+ 依据国家政策法规，需绑定手机号进行实网络实名才可登录使用本平台 +
@@ -217,7 +220,6 @@ export default { height: 100%; background-image: url(../../../assets/img/login-bg.png); background-size: 100%; - .header { width: 100%; height: 60px; @@ -239,7 +241,6 @@ export default { } } } - /deep/ .main { position: absolute; left: 50%; diff --git a/src/pages/achievement/ass/index.vue b/src/pages/achievement/ass/index.vue index 958754f..f708e6d 100644 --- a/src/pages/achievement/ass/index.vue +++ b/src/pages/achievement/ass/index.vue @@ -4,17 +4,13 @@
- -
-
-
- -
-
- + + + +
@@ -32,6 +28,14 @@
+ +
+
+
+ +
+
+
批量删除 @@ -76,16 +80,19 @@ diff --git a/src/pages/match/manage/matchProgress.vue b/src/pages/match/manage/matchProgress.vue index 7db5e63..5741310 100644 --- a/src/pages/match/manage/matchProgress.vue +++ b/src/pages/match/manage/matchProgress.vue @@ -63,7 +63,8 @@ export default { multipleSelection: [], pageNo: 1, pageSize: 10, - totals: 0 + totals: 0, + touchTime:0, }; }, mounted() { @@ -81,12 +82,14 @@ export default { if (data.title.length) { if (row.id) { this.$put(this.api.editContestProgress, data).then(res => { + this.touchTime = this.touchTime-1 util.successMsg("修改成功"); this.getData(); }).catch(res => { }); } else { this.$post(this.api.addContestProgress, data).then(res => { + this.touchTime = this.touchTime-1 util.successMsg("创建成功"); this.getData(); }).catch(res => { @@ -110,18 +113,18 @@ export default { handleDelete(row) { this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", { type: "warning" - }) - .then(() => { - this.$del(`${this.api.deleteContestProgress}/${row.id}`).then(res => { - util.successMsg("删除成功"); - this.getData(); - }).catch(res => { - }); - }) - .catch(() => { + }).then(() => { + this.touchTime = this.touchTime+1 + this.$del(`${this.api.deleteContestProgress}/${row.id}`).then(res => { + util.successMsg("删除成功"); + this.getData(); + }).catch(res => { }); + }).catch(() => { + }); }, addData() { + this.touchTime = this.touchTime+1 if (this.listData.length) { if (this.listData[this.listData.length - 1].id) { this.listData.push({ @@ -131,6 +134,7 @@ export default { description: "", status: 0 }); + console.log(this.listData) } else { util.warningMsg("请先保存新数据"); } @@ -143,8 +147,50 @@ export default { status: 0 }); } + }, + }, + beforeDestroy() { + if (this.touchTime>0){ + this.$confirm('暂未保存，是否保存本次编辑?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let num = 0; + for(var i=0;i { + + }).catch(res => { + }); + }else{ + num = num+1 + } + }else{ + num = num+1 + } + } + if (num >0){ + this.$message({ + type: 'error', + message: '保存失败，有未填项目' + }); + }else{ + this.$message({ + type: 'success', + message: '保存成功!' + }); + } + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消保存' + }); + }); } - } + }, }; diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue index 876a045..e34ffa0 100644 --- a/src/pages/project/add/index.vue +++ b/src/pages/project/add/index.vue @@ -194,7 +194,7 @@ export default { return { projectId: this.$route.query.projectId, systemList: [], - token: btoa(util.local.get(Setting.tokenKey)), + token: util.local.get(Setting.tokenKey), isDetail: Boolean(this.$route.query.show), projectManage: { @@ -510,6 +510,7 @@ export default { this.$refs.judgementTable.clearSelection(); }); let params = { + enable:0, name: this.judgementpointsquery, pageNum: 1, pageSize: 10000, diff --git a/src/pages/project/add/index.vue.copy b/src/pages/project/add/index.vue.copy new file mode 100644 index 0000000..a5df029 --- /dev/null +++ b/src/pages/project/add/index.vue.copy @@ -0,0 +1,1080 @@ + + + + + \ No newline at end of file diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue index 8dcf2fa..8adc55c 100644 --- a/src/pages/project/list/index.vue +++ b/src/pages/project/list/index.vue @@ -86,8 +86,8 @@