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

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

@@ -16,7 +16,7 @@
                             <Card class="score-card">
                                 <p class="card-title">{{$t('studentWeb.exam.score')}}</p>
                                 <div class="card-content">
-                                    <span class="myscore">{{testScore}}</span> / 100
+                                    <span class="myscore">{{testScore}}</span> / {{ paperInfo.score }}
                                 </div>
                             </Card>
                         </i-col>
@@ -308,7 +308,7 @@
                 closeAnsDetail: false,
                 checkedAns: ["right", "wrong", "noAns"],
                 testState: 0,// 表示有没有作答
-                paperData: [],
+                paperData: [], //所有题目信息
                 ansData: [],
                 repairSource: {
                     normal: [],

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

@@ -198,9 +198,10 @@
                     <button @click="preQ()" :disabled="queNo == 0" :class="{disable: queNo == 0}">
                         <Icon type="ios-arrow-back" />{{$t("studentWeb.exam.testpop.previous")}}
                     </button>
-                    <button @click="changeAnalysisType(true)" style="margin: 0"
-                             v-if="isWrong"
-                            :disabled="checkers[queNo].length < 0 && checkers[queNo].length != 0"
+                    <button @click="changeAnalysisType(true)"
+                            style="margin: 0"
+                            v-if="isWrong"
+                            :disabled="!checkers[queNo].length > 0"
                             :class="checkers[queNo] == '' ? 'disable' : ''"
                     >
                         {{$t("studentWeb.exam.testpop.showAns")}}
@@ -364,7 +365,7 @@
             //獲取富文本返回數據
             getComposeAns(data, index) {
                 if (index !== undefined) {
-                    this.checkers[index] = []
+                    this.checkers[index].splice(0)
                     if (data !== "") {
                         this.checkers[index].push(data)
                     }

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventList.vue

@@ -167,8 +167,8 @@
                 selectedEventStatusNow: this.$t('studentWeb.event.allStatus'),
                 hideIconbtn: false,
                 isListNoItem: false, //清單為空
-                eventList: [],
-                eventShow: [],
+                eventList: [], //活动数据
+                eventShow: [], //展示的活动数据
                 dateTime: Date.parse(new Date())
             };
         },