Merge branch 'develop3.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0-tmd

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/LessonTest.vue

@@ -129,7 +129,7 @@
             <div class="title-rect-group" v-if="chooseData.subject !== undefined">
                 <div class="title-rect" />
                 <h2 class="title-rect-name">当前科目：{{chooseData.subject.name}}</h2>
-                <span @click="showTest" style="margin-left: 25px;color: #03966a;cursor:pointer">试卷详情</span>
+                <span v-show="isExamDown" @click="showTest" style="margin-left: 25px;color: #03966a;cursor:pointer">试卷详情</span>
                 <div>
                     <LessonTestReport :examInfo="chooseData" />
                 </div>
@@ -382,18 +382,16 @@
                     this.chooseData = data
                     this.selectData = await this.$evTools.getStuPaper(code)
                     if (this.selectData.item.length > 0) {
-                        let k = false
-                        for (let item of data.stuScore) {
-                            if (item == -1) {
-                                this.isExam = true
-                                break;
+                        let k = 0
+                        for (let item of data.stuAns) {
+                            if (item.length == 0) {
+                                k++
                             }
                         }
-                        if (this.isExam) {
-                            //this.$store.commit("ToggleLessonTestPopWithSubject", data)
-                        } else {
+                        if (k != data.stuAns.length) {
                             this.isExamDown = true
-                        }
+                            //this.$store.commit("ToggleLessonTestPopWithSubject", data)
+                        } 
                         this.$store.commit("SetPaperInfo", this.selectData)
                         this.$store.commit("SetExamInfo", data)
                         //console.log(this.chooseData)

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/LessonTestReport.vue

@@ -8,7 +8,7 @@
 
         <br />
         <div class="scoreboard" v-show='testState == 1'>
-            <span>点击<span @click="showTest" style="color: #03966a;cursor:pointer;font-weight:800">试卷详情</span>前往作答</span>
+                <span @click="showTest" style="color: #03966a;width: 100%;cursor: pointer;font-size:18px;font-weight: 800;text-align: center">前往作答</span>
         </div>
         <div class="scoreboard" v-show='testState == 2'>
             <h4>成绩尚未结算</h4>
@@ -46,7 +46,7 @@
                         </i-col>
                         <i-col :xs="24" :sm="24" :md="12" :lg="12">
                             <Card class="score-card">
-                                <p class="card-title">{{$t('studentWeb.exam.rightNum')}}</p>
+                                <p class="card-title">得分题目数</p>
                                 <div class="card-content">
                                     <span class="myscore">{{rightAns.right}}</span> / {{rightAns.all}}
                                 </div>