+
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.competitionType ? '团队赛' : '个人赛' }}
-
+
{{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
-
+
- 排名
+ 排名
成绩管理
@@ -56,7 +32,6 @@
+
+
\ No newline at end of file
diff --git a/src/pages/match/manage/theoryReport.vue b/src/pages/match/manage/theoryReport.vue
new file mode 100644
index 0000000..09564ac
--- /dev/null
+++ b/src/pages/match/manage/theoryReport.vue
@@ -0,0 +1,1001 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/match/manage/matchReport.vue b/src/pages/match/manage/trialReport.vue
similarity index 94%
rename from src/pages/match/manage/matchReport.vue
rename to src/pages/match/manage/trialReport.vue
index 93ffe76..252112a 100644
--- a/src/pages/match/manage/matchReport.vue
+++ b/src/pages/match/manage/trialReport.vue
@@ -81,7 +81,7 @@
+
+
+
+
+ 答题卡
+
+
+
+
+
+
+ {{ arabicToChinese(i + 1) }}、{{ item.outlineName }}（本题共{{ item.questionNum }}小题，共{{ + item.targetScore }}分）
+-
+
+
-
+
{{ j + 1 }}
+{{ ques.userScore }}
+
+
+
-
+
- {{ item.name }} +
+
+
+ 导出报告
+
+ 标准成绩报告
+
+
+
+
+
+ 
+ 基本信息
+
+ -
+
-
+
+
+ {{ info.userName }} +
+ -
+
+
+ {{ info.workNumber }} +
+ -
+
+
+ {{ info.className }} +
+ -
+
+
+ + {{ info.score }} ++
+ （部分试题待判分，成绩待定）
+
+ -
+
+
+ {{ info.submitTime }} +
+ -
+
+
+ {{ info.timeSum }}分钟 +
+ -
+
+
+ {{ info.instructor }} +
+
+
+
+
+
+ {{ scope.row.targetScore }}分
+
+
+
+
+
+ {{ scope.row.questionType === 'essay' ? '-' : scope.row.scoreRatePercentage
+ }}
+
+
+
+
+
+ 
+ 得分情况
+
+ 待评分
+{{ scope.row.userTotalScore + }}分（部分试题待判分，成绩待定）
+{{ scope.row.userTotalScore }}分
+ +-
+
-
+ + {{ arabicToChinese(i + 1) }}、{{ item.outlineName }}（本题共{{ item.questionNum }}小题，共{{ + item.targetScore }}分） ++
+ ++++++ ++ {{ j + 1 }} / {{ item.questionNum }} + {{ item.questionTypeName }} ++{{ ques.difficult }} + + +（{{ ques.questionScore }}分）
+++ +++
+ 
+
+
+ {{ numToLetter(j) }}.
+
+ ++{{ ques.fileName || + ques.stemAttachment }} +下载 ++ 考生上传附件说明： + ++ + ++ 【知识点】 ++{{ kp.name + }} ++ 【解析】 + ++ +暂无解析++ +++ 参考答案： + +++ 考生答案： + ++未作答++ 考生上传附件： ++ + +{{ + ques.attachmentName }} +下载 +正确答案：{{ ques.quesAnswer }}++ 考生答案： ++ + +{{ ques.userAnswerStr }}
++++ 填空{{ j + 1 }}：{{ ans.studentAnswer || '未作答' }} +
+
+ ；
+ 题目分值：{{ ques.questionScore }}分+考生得分：+分 +
+
+
+
+
+
+ 
+ 考试总结与体会
+
+
@@ -157,7 +157,7 @@ export default {
editing: false,
loadIns: null,
loading: false,
- project: false,
+ isLc: false,
userScores: []
};
},
@@ -169,8 +169,6 @@ export default {
this.loading = true
this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => {
this.form = report
- this.expData = userScores
- this.project = this.expData.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
let form = this.form;
this.infoData = {
workNumber: form.workNumber,
@@ -183,17 +181,18 @@ export default {
className: form.className,
userName: form.userName
}
- const data = report.data
- this.userScores = userScores
+ const { data } = report
// 如果没有data，则添加，否则，直接使用
if (!data) {
+ this.expData = userScores
+ this.userScores = userScores
this.handleList(userScores)
this.$post(this.api.editExperimentalData, {
reportId,
data: JSON.stringify(userScores)
}).then(res => { }).catch(err => { })
} else {
- this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
+ this.handleList(JSON.parse(data))
}
}).catch(res => {
this.loading = false
@@ -201,8 +200,8 @@ export default {
},
// 处理实验数据
handleList (list) {
- this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
- if (this.project) {
+ this.isLc = list.find(e => e.lcRuleRecords) // 流程系统才有lcRuleRecords
+ if (this.isLc) {
list.map(e => {
e.assessmentPoint = ''
e.referenceAnswer = ''
@@ -232,7 +231,7 @@ export default {
if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
}
form.purpose = form.purpose.replace(/<[^>]+>/g, '')
- this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
+ this.$post(this.isLc ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
...form,
experimentalData: list
}).then(res => {
diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue
index a2c43b9..c571316 100644
--- a/src/pages/student/list/index.vue
+++ b/src/pages/student/list/index.vue
@@ -185,7 +185,7 @@