Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -7555,6 +7555,7 @@ const LANG_EN_US = {
             studentTime: 'Total Accumulated Time of Student Participation',
             classroomTotal: 'Total Lesson Periods',
             classroomTime: 'Total Time of All Lessons',
+            totals:'totals'
         },
         classrooming: {
             title: 'Lesson Statistics',

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -7559,6 +7559,7 @@ const LANG_ZH_CN = {
             studentTime: '学生参与总时数',
             classroomTotal: '课堂总数',
             classroomTime: '课堂总时数',
+            totals:'总计',
         },
         classrooming: {
             title: '课中统计',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -7555,6 +7555,7 @@ const LANG_ZH_TW = {
             studentTime: '學生參與總時數',
             classroomTotal: '課堂總數',
             classroomTime: '課堂總時數',
+            totals: '總計',
         },
         classrooming: {
             title: '應用統計',

TEAMModelOS/ClientApp/src/view/classrecord/eventchart/SmartRating.vue

@@ -44,7 +44,13 @@
             <div class="mutal-info" v-if="mutalInfo">
                 <img v-if="smartRate.smartRateSummary.rateInfo.RatingSource === 'StudentWork'" :src="mutalInfo.material" />
                 <p v-if="smartRate.smartRateSummary.rateInfo.RatingSource === 'IRS'" v-html="mutalInfo.material"></p>
-                <span class="svg-box" v-for="(item, index) in mutalInfo.obtained" :key="index" v-html="item.strokeComment"></span>
+                
+                <Carousel v-model="mutalInfoCar" :radius-dot="true" loop class="svg-box">
+                    <CarouselItem v-for="(item, index) in mutalInfo.obtained" :key="index">
+                        <span v-html="item.strokeComment"></span>
+                    </CarouselItem>
+                </Carousel>
+                <!-- <span class="svg-box" v-for="(item, index) in mutalInfo.obtained" :key="index" v-html="item.strokeComment"></span> -->
             </div>
             <div v-for="(item, index) in showResult" :key="index" style="margin-bottom: 5px;">
                 <span style="color: #2d8cf0;">{{ item.name }}</span>：
@@ -98,6 +104,7 @@ export default {
             isComment: false,
             allResult: [],
             mutalInfo: undefined,
+            mutalInfoCar: 0,
         }
     },
     computed: {
@@ -295,6 +302,8 @@ export default {
         position: absolute;
         top: 0;
         left: 0;
+        height: 100%;
+        width: 300px;
     }
     svg {
         width: 300px;

TEAMModelOS/ClientApp/src/view/iot/schooliot.vue

@@ -46,7 +46,7 @@
                                         <span class="timetag">Min</span>
                                         <br/>
                                         <span>
-                                            <span class="total-text">总计</span>
+                                            <span class="total-text">{{$t('schoolIot.basics.totals')}}</span>
                                             {{Math.round(item.value/60)}}
                                             <span class="timetag">H</span>
                                         </span>