diff --git a/src/views/match/manage/theoryReport.vue b/src/views/match/manage/theoryReport.vue index 0ba240e..f04af58 100644 --- a/src/views/match/manage/theoryReport.vue +++ b/src/views/match/manage/theoryReport.vue @@ -129,16 +129,18 @@ {{ ques.difficult }}
-

({{ ques.questionScore }}分)

+

({{ ques.questionScore }}分)

- - - + {{ numToLetter(j) }}. 
@@ -170,25 +172,34 @@
暂无解析
-
+
+ + -
题目分值:{{ ques.questionScore }}分
-
考生得分:分 +
题目分值:{{ ques.notScored ? '不计分' : ques.questionScore + '分' }}
+
考生得分: +
@@ -287,6 +303,10 @@ export default { id: 4, name: '待判分' }, + { + id: 5, + name: '不计分' + }, ], outlines: [], paper: [], @@ -331,6 +351,8 @@ export default { } } + n.notScored = n.questionScore === 0 // 不计分(题目分值=0,则为不计分) + if (n.notScored) n.userScore = '-' const opts = n.questionAnswerVersionsList if (type !== 'fill_blank' && type !== 'essay') { // 选择题 if (!n.userScore) n.userScore = 0 @@ -379,7 +401,7 @@ export default { // 填空题需要区分部分正确还是正确、错误 let rightLen = 0 if (n.userAnswerFill) rightLen = n.userAnswerFill.filter(m => m.correct).length // 正确的空的数量 - n.isCorrect = n.userScore && n.questionScore === n.userScore ? 1 : (rightLen ? 3 : 2) + n.isCorrect = n.notScored ? 5 : (n.userScore && n.questionScore === n.userScore ? 1 : (rightLen ? 3 : 2)) } else if (type === 'essay') { // 简答题 this.handleIsCorrect(n) } @@ -417,7 +439,7 @@ export default { }, // 判断试题的对错 handleIsCorrect (n) { - n.isCorrect = n.userScore === undefined ? 4 : (n.userScore === n.questionScore ? 1 : n.userScore ? 3 : 2) // 简答题没有reviewScore则显示待判分, 有则判断是否跟题目分数相同,完全相同是正确,小于则部分正确,0则错误 + n.isCorrect = n.notScored ? 5 : (n.userScore === undefined ? 4 : (n.userScore === n.questionScore ? 1 : n.userScore ? 3 : 2)) // 简答题没有reviewScore则显示待判分, 有则判断是否跟题目分数相同,完全相同是正确,小于则部分正确,0则错误 }, scrollToSmooth (position, duration) { let startTime = Date.now() @@ -633,7 +655,7 @@ samp { } .left { - width: 290px; + width: 320px; margin-right: 15px; background-color: #fff; @@ -713,6 +735,12 @@ samp { border-color: #fe9f0a; } + .status5 .serial { + color: #fff; + background-color: #d1d1d1; + border-color: #d1d1d1; + } + .score { height: 22px; padding: 0 2px; @@ -725,7 +753,7 @@ samp { .status-filter { display: flex; justify-content: space-between; - padding: 10px; + padding: 10px 0; border-top: 1px solid #e5e5e5; li { @@ -735,6 +763,7 @@ samp { font-size: 12px; color: #333; cursor: pointer; + white-space: nowrap; border: 1px solid transparent; &:before { @@ -778,7 +807,7 @@ samp { } } - &:last-child { + &:nth-child(4) { &.active { color: #fe9f0a; border-color: #fe9f0a; @@ -789,6 +818,17 @@ samp { } } + &:last-child { + &.active { + color: #d1d1d1; + border-color: #d1d1d1; + } + + &:before { + background-color: #d1d1d1; + } + } + &.active { font-weight: 600; } @@ -797,7 +837,7 @@ samp { } .right { - width: calc(100% - 325px); + width: calc(100% - 355px); height: calc(100vh - 287px); padding: 10px; background-color: #fff; diff --git a/src/views/parner/staff.vue b/src/views/parner/staff.vue index 5a58fce..3b57261 100644 --- a/src/views/parner/staff.vue +++ b/src/views/parner/staff.vue @@ -1,215 +1,198 @@ @@ -665,47 +648,58 @@ export default { .m-b-20 { margin-bottom: 20px; } + .org-name { margin-right: 20px; } + .w-100 { width: 100%; } + .wrap { display: flex; padding: 0 24px; + .side { - width: 300px; - padding: 24px 10px 24px 0; - margin-right: 24px; - border-right: 1px solid rgba(0, 0, 0, 0.06); + width: 300px; + padding: 24px 10px 24px 0; + margin-right: 24px; + border-right: 1px solid rgba(0, 0, 0, 0.06); } + .right { - width: calc(100% - 324px); - padding: 24px 0; + width: calc(100% - 324px); + padding: 24px 0; } } + .add-dia { .tips { font-size: 12px; color: #f00; } + .title { margin: 10px 0; font-size: 14px; + em { font-style: normal; } } + .des { font-size: 13px; color: #7a7a7a; } + .link-wrap { display: flex; align-items: center; margin: 10px 0 20px; } + .link { padding: 10px; margin-right: 15px; @@ -713,6 +707,7 @@ export default { border-radius: 4px; } } + /deep/.choose-dia { .member-list { li { @@ -721,17 +716,21 @@ export default { align-items: center; margin-bottom: 10px; } + .info { display: inline-flex; align-items: center; } + img { width: 40px; height: 40px; } + .name { - margin-left: 10px; + margin-left: 10px; } + .el-radio__label { display: none; }