Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/ClientApp/src/assets/student-web/component_styles/event-list-new.less

@@ -127,6 +127,7 @@
 
         & > span{
             padding: 0 5px;
+            white-space: pre;
         }
 
         & > p {

TEAMModelOS/ClientApp/src/assets/student-web/component_styles/new-home-view.less

@@ -442,6 +442,7 @@
 
         & > span{
             padding: 0 5px;
+            white-space: pre;
         }
 
         & > p {

TEAMModelOS/ClientApp/src/assets/student-web/component_styles/new-mission-list-card.less

@@ -176,6 +176,7 @@
             
                     & > span{
                         padding: 0 5px;
+                        white-space: pre;
                     }
             
                     & > p {

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

@@ -173,12 +173,12 @@
                                         <div style="margin-left: 20px;">
                                             <div class="item-explain">
                                                 <span class="explain-title">【{{ $t("studentWeb.exam.report.ansRes") }}】</span>
+                                                <div v-if="!children.stuAns || !children.stuAns.length" class="item-explain-details">
+                                                    <span>{{ $t('studentWeb.exam.report.noAns') }}</span>
+                                                </div>
                                                 <div v-if="children.stuAns.length" class="item-explain-details">
                                                     <span v-for="(stuAnsC, indexAC) in children.stuAns" :key="indexAC" v-html="stuAnsC"></span>
                                                 </div>
-                                                <div v-if="!children.stuAns.length" class="item-explain-details">
-                                                    <span>{{ $t('studentWeb.exam.report.noAns') }}</span>
-                                                </div>
                                             </div>
                                         </div>
                                         <div style="margin-left: 20px;" v-show="children.open">
@@ -269,12 +269,12 @@
                             <div v-if="exam.type !== 'compose'">
                                 <div class="item-explain">
                                     <span class="explain-title">【{{ $t("studentWeb.exam.report.ansRes") }}】</span>
+                                    <div v-if="!exam.stuAns || !exam.stuAns.length" class="item-explain-details">
+                                        <span>{{ $t('studentWeb.exam.report.noAns') }}</span>
+                                    </div>
                                     <div v-if="exam.stuAns.length" class="item-explain-details">
                                         <span v-for="(stuAns, indexA) in exam.stuAns" :key="indexA" v-html="stuAns"></span>
                                     </div>
-                                    <div v-if="!exam.stuAns.length" class="item-explain-details">
-                                        <span>{{ $t('studentWeb.exam.report.noAns') }}</span>
-                                    </div>
                                 </div>
                             </div>
                             <div v-if="exam.type !== 'compose'" v-show="exam.open">
@@ -413,12 +413,12 @@
                                 <div>
                                     <div class="item-explain">
                                         <span class="explain-title">【{{ $t("studentWeb.exam.report.ansRes") }}】</span>
+                                        <div v-if="!exam.stuAns || !exam.stuAns.length" class="item-explain-details">
+                                            <span>{{ $t('studentWeb.exam.report.noAns') }}</span>
+                                        </div>
                                         <div v-if="exam.stuAns.length" class="item-explain-details">
                                             <span v-for="(stuAns, indexA) in exam.stuAns" :key="indexA" v-html="stuAns"></span>
                                         </div>
-                                        <div v-if="!exam.stuAns.length" class="item-explain-details">
-                                            <span>{{ $t('studentWeb.exam.report.noAns') }}</span>
-                                        </div>
                                     </div>
                                     <!-- 批注 -->
                                     <!-- <div class="item-explain" v-if="exam.type != 'single' && exam.type != 'multiply' && exam.type != 'judge'">
@@ -805,7 +805,7 @@
                                     exam[i].children[c].getScore = 0
                                     exam[i].children[c].parentInfo = Object.assign({}, exam[i])
                                     exam[i].children[c].parentInfo.children = []
-                                    exam[i].children[c].stuAns = this.ansData[examNum + c + 1]
+                                    exam[i].children[c].stuAns = this.ansData[examNum + c + 1] ? this.ansData[examNum + c + 1] : []
                                     exam[i].children[c].mark = this.examInfo.mark[examNum + c + 1]
                                     exam[i].children[c].getScore = this.examInfo.stuScore[examNum + c + 1]
                                     exam[i].getScore += exam[i].children[c].getScore
@@ -821,7 +821,7 @@
                             examNum = examNum + exam[i].children.length
                         } else {
                             examNum = i
-                            exam[i].stuAns = this.ansData[examNum]
+                            exam[i].stuAns = this.ansData[examNum] ? this.ansData[examNum] : []
                             exam[i].mark = this.examInfo.mark[examNum]
                             exam[i].getScore = this.examInfo.stuScore[examNum]
                             paper.push(exam[i])

TEAMModelOS/ClientApp/src/components/student-web/HomeView/CourseView/ActivityView.less

@@ -120,6 +120,7 @@
 
             & > span{
                 padding: 0 5px;
+                white-space: pre;
             }
     
             & > p {