+
+ 查看实验报告
重新开始
提交
@@ -71,25 +72,30 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+ {{ competitionId ? '-' : scope.row.examScore }}
-
-
-
-
- {{ scope.row.examScore }}
-
-
+
+
@@ -145,6 +151,11 @@ export default {
courseId: Cookie.get('admin-courseId'),
projectId: Cookie.get('admin-projectId') ? Number(Cookie.get('admin-projectId')) : '',
assessmentId: Cookie.get('admin-assessmentId'),
+ competitionId: Cookie.get('admin-competitionId'),
+ stageId: Cookie.get('admin-stageId'),
+ teamId: Cookie.get('admin-teamId'),
+ resultsDetails: Cookie.get('admin-resultsDetails'),
+ resultAnnouncementTime: Cookie.get('admin-resultAnnouncementTime'),
curriculumName: Cookie.get('admin-curriculumName') ? unescape(Cookie.get('admin-curriculumName')) : 'python', // 课程名称
curSystemId: 1,
projectPermissions: 0, // 项目权限(0、练习 1、考核 2、竞赛)
@@ -171,11 +182,17 @@ export default {
taskList: [], // 实验任务列表
pannelTab: 'first', // 面板信息切换值
isSelected: false, // 是否选择过项目的标识，选择了会置为true
- statusTimer: null // 查询考核状态定时器
+ statusTimer: null, // 查询考核状态定时器
+ reportId: ''
};
},
mounted() {
- this.projectPermissions = this.assessmentId ? 1 : 0 // 1：考核，0：练习
+ // 2：竞赛，1：考核，0：练习
+ this.projectPermissions = this.assessmentId ?
+ 1 :
+ this.competitionId ?
+ 2 :
+ 0
if(this.assessmentId){ // 考核（考核才会从外面带进来assessmentId，练习是默认显示第一个项目)
this.getAssList()
}else{ // 练习
@@ -197,7 +214,7 @@ export default {
let data = {
systemId: this.systemId,
cId: this.courseId, // 课程id
- permissions: this.projectPermissions // 练习/考核
+ permissions: this.projectPermissions // 练习/考核/竞赛
}
return new Promise((resolve, reject) => {
this.$get(`${this.api.queryTestProject}`,data).then(res => {
@@ -259,9 +276,9 @@ export default {
this.experimentHint = project.experimentHint
this.hintOpen = !res.projectManage.hintOpen // 0显示，1不显示
this.$emit('tell', projectId, systemId, this.points)
- const isAss = this.projectPermissions == 1 // 是否是考核
- this.text = isAss ? '剩余' : '已用'
- this.countVal = isAss ? (new Date(this.endTime).getTime() - Date.now()) / 1000 : 0 // 如果是考核，取考核的结束时间减去当前时间去做倒计时，练习则直接给0做计时
+ const isPrac = this.projectPermissions == 0 // 是否是练习
+ this.text = isPrac ? '已用' : '剩余'
+ this.countVal = isPrac ? 0 : (new Date(this.endTime).getTime() - Date.now()) / 1000 // 如果是考核，取考核的结束时间减去当前时间去做倒计时，练习则直接给0做计时
this.startCount()
resolve()
}).catch(err => {
@@ -326,7 +343,7 @@ export default {
}
// 如果是没有代码的缓存，则只需要恢复项目，否则，就调接口查询缓存代码
if (cache && cache.empty && list.find(e => e.projectId === projectId) && !Cookie.get('admin-projectId')) {
- if (Cookie.get('admin-projectId')) {
+ if (Cookie.get('admin-projectId') && !this.competitionId) {
Cookie.remove('admin-projectId')
} else {
this.projectId = projectId
@@ -335,7 +352,7 @@ export default {
this.closeLoad()
localStorage.removeItem('codeCache')
} else {
- if (Cookie.get('admin-projectId')) {
+ if (Cookie.get('admin-projectId') && !this.competitionId) {
Cookie.remove('admin-projectId')
}
let newJudgmentId = '' // 要恢复到第一个有代码的判分规则，因为有代码的规则可能不是第一个，所以要判断如果这个为空，才把索引赋给该变量
@@ -438,6 +455,10 @@ export default {
this.$emit('recoveryCode') // 切换实训项目后回到第一个判分点
newmain.$emit('isSubmit', this.isSubmit) // 选择项目后把提交状态重置为未提交
},
+ // 查看实验报告
+ toReport() {
+ this.$router.push(`/report?reportId=${this.reportId}`)
+ },
//重新开始
reload() {
this.reloadCount()
@@ -520,14 +541,18 @@ export default {
totalScore: 100, // 判分点总分固定为100
systemId: this.curSystemId,
purpose: this.experimentTarget, // 实验目的
- attributesReqList
+ attributesReqList,
+ competitionId: this.competitionId,
+ stageId: this.stageId,
+ teamId: this.teamId,
}
- this.$post(this.api.submit, data).then(res => {
+
+ this.$post(this.api.submit, data).then(({ retInfo, reportId }) => {
localStorage.removeItem('codeCache')
this.isSubmit = true
newmain.$emit('isSubmit', this.isSubmit)
clearInterval(this.statusTimer)
- let list = res.retInfo
+ let list = retInfo
let taskList = this.taskList
let score = 0
// 给判分列表添加分数和运行结果
@@ -541,8 +566,16 @@ export default {
}
score += e.examScore // 计算总分
})
- this.grade = util.handleZero(score) // 前置加0
- this.editReport(res.reportId)
+ this.grade = util.handleZero(score) // 前置加0(竞赛不显示分数)
+ this.reportId = reportId
+ this.editReport(reportId)
+ // 如果是竞赛，并且勾选了公布成绩详情的选项，则弹框提示
+ this.competitionId && this.resultsDetails == 0 && this.$alert('提交成功，成绩将在' + this.resultAnnouncementTime + '小时后发布，请去参赛信息模块查看', '提示', {
+ confirmButtonText: '确定',
+ callback: action => {
+ this.$parent.back()
+ }
+ })
}).catch(err => {})
},
// 编辑实验报告
diff --git a/src/components/codemirror.vue b/src/components/codemirror.vue
index b7efade..e71db62 100644
--- a/src/components/codemirror.vue
+++ b/src/components/codemirror.vue
@@ -52,7 +52,7 @@
-
+
@@ -136,6 +136,7 @@ export default {
return {
token: Cookie.get('admin-token'),
assessmentId: Cookie.get('admin-assessmentId'), // 考核id
+ fromManager: Cookie.get('admin-fromManager'), // 是否是从教师端进入
courseId: Cookie.get('admin-courseId'), // 课程id
showTips: false, // 显示隐藏提示按钮
answer: '', // 正确答案
@@ -672,6 +673,9 @@ export default {
color:#fff;
}
/deep/.answer-wrap{
+ &.client {
+ // user-select: none;
+ }
pre{
width: 100%;
white-space: pre-wrap;
diff --git a/src/components/quill/index.vue b/src/components/quill/index.vue
new file mode 100644
index 0000000..b46b6d2
--- /dev/null
+++ b/src/components/quill/index.vue
@@ -0,0 +1,251 @@
+
+
+
+
+
+
diff --git a/src/components/quill/options.js b/src/components/quill/options.js
new file mode 100644
index 0000000..b368bcb
--- /dev/null
+++ b/src/components/quill/options.js
@@ -0,0 +1,16 @@
+export default [
+ ["bold", "italic", "underline", "strike"],
+ ["blockquote", "code-block"],
+ [{ "header": 1 }, { "header": 2 }],
+ [{ "list": "ordered" }, { "list": "bullet" }],
+ [{ "script": "sub" }, { "script": "super" }],
+ [{ "indent": "-1" }, { "indent": "+1" }],
+ [{ "direction": "rtl" }],
+ [{ "size": ["small", false, "large", "huge"] }],
+ [{ "header": [1, 2, 3, 4, 5, 6, false] }],
+ [{ "color": [] }, { "background": [] }],
+ [{ "font": [] }],
+ [{ "align": [] }],
+ ["clean"],
+ ["link", "image", "video"]
+];
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 166344c..65be01e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,7 +23,14 @@ const routes = [{
meta: {
title: 'excel预览'
},
- }
+ },
+ {
+ path: '/report',
+ component: resolve => require(['../views/Report'], resolve),
+ meta: {
+ title: '实验报告'
+ },
+ },
];
const router = new VueRouter({
diff --git a/src/util/index.js b/src/util/index.js
index c9c0aec..d28a1eb 100644
--- a/src/util/index.js
+++ b/src/util/index.js
@@ -68,6 +68,21 @@ export default {
}
x.send()
},
+ // 传入文件名和数据，下载文件
+ downloadFileDirect(fileName,data) {
+ if ('download' in document.createElement('a')) { // 非IE下载
+ const elink = document.createElement('a')
+ elink.download = fileName
+ elink.style.display = 'none'
+ elink.href = URL.createObjectURL(data)
+ document.body.appendChild(elink)
+ elink.click()
+ URL.revokeObjectURL(elink.href) // 释放URL 对象
+ document.body.removeChild(elink)
+ } else { // IE10+下载
+ navigator.msSaveBlob(data, fileName)
+ }
+ },
// 小于0前面加上0
handleZero (num) {
return num < 10 ? '0' + num : num
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 16f16a0..96cc102 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -66,6 +66,7 @@ export default {
return {
loaded: false, // 页面是否加载完的标识，页面默认隐藏，一进来先显示加载条，接口加载完后再显示页面，不然一开始会一闪而过没有样式的页面
loadIns: null, // loading实例
+ competitionId: Cookie.get('admin-competitionId'),
fromManager: Cookie.get('admin-fromManager'), // 是否是从教师端进入
courseId: Cookie.get('admin-courseId'), // 课程id
curriculumName: Cookie.get('admin-curriculumName') ? unescape(Cookie.get('admin-curriculumName')) : 'python', // 课程名称
@@ -179,6 +180,9 @@ export default {
// 考核
if (this.assessmentId) {
href += `ass/list`
+ } else if (this.competitionId) {
+ // 竞赛
+ href += `match/list`
} else {
// 练习
href += `station/preview?courseId=${this.courseId}&curriculumName=${this.curriculumName}`
diff --git a/src/views/Report.vue b/src/views/Report.vue
new file mode 100644
index 0000000..b63622b
--- /dev/null
+++ b/src/views/Report.vue
@@ -0,0 +1,399 @@
+
+
+
+
+
+
+
+ {{ editing ? "保存" : "编辑" }}
+
+ 导出报告
+
+
标准实验报告
+
+
+ 
+ 基本信息
+
+
+ -
+
+
+ {{ infoData.userName }}
+
+ -
+
+
+ {{ infoData.workNumber }}
+
+ -
+
+
+ {{ infoData.submitTime }}
+
+ -
+
+
+
+
{{ infoData.score }}
+
+
+ -
+
+
+ {{ infoData.className }}
+
+ -
+
+
+ {{ infoData.instructor }}
+
+ -
+
+
+ {{ infoData.period }}
+
+
+
+
+ 
+ 实验项目名称
+
+
+
+
+
+
+ 
+ 实验目的
+
+
+
+
+
+
+ 
+ 实验数据
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+ {{index+1}}. {{item.name}}
+
+
+
+
+
+
+
+
+
+ {{index+1}}. {{item.ruleAnswer}}
+
+
+
+
+
+ {{index+1}}. {{item.userAnswer}}
+
+
+ {{index+1}}. 未填写
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+ 
+ 实验总结与体会
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file