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

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/unit.js

@@ -3,7 +3,7 @@ export default {
   text2: '%',
   text3: '套',
   text4: '次',
-  text5: '分钟',
+  text5: '分',//分钟
   text6: '则',
   text7: '人',
   text8: 'm',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/unit.js

@@ -3,7 +3,7 @@ export default {
 	text2: '%',
 	text3: '套',
 	text4: '次',
-	text5: '分鐘',
+	text5: '分',//分钟
 	text6: '則',
 	text7: '人',
 	text8: 'm',

TEAMModelOS/ClientApp/src/view/newcourse/MyCourse.less

@@ -404,7 +404,7 @@
     vertical-align: text-bottom;
 }
 .record-info{
-    margin-right: 30px;
+    margin-right: 24px;
 }
 .record-info-value{
     color: #17233d;
@@ -424,18 +424,6 @@
     background-position: center;
     margin-left: 5px;
 }
-// .record-poster{
-//     width: 120px;
-// }
-.info-split{
-    margin: 0px 2%;
-    display: inline-block;
-    width: 1px;
-    height: 12px;
-    margin-top: -7px;
-    background-color: #e8eaec;
-    vertical-align: baseline;
-}
 .course-info-btn{
     position: absolute;
     right: 15px;

TEAMModelOS/ClientApp/src/view/newcourse/MyCourse.vue

@@ -158,32 +158,45 @@
                                                 <Icon type="md-create" class="edit-ev-name" @click.stop="editRecordName(index)" :title="$t('cusMgt.edRdName')" />
                                             </p>
                                             <div slot="description" style="padding-left:10px;margin-top:10px">
-                                                <!-- 出席率 -->
+                                                <!-- 出席人数 -->
                                                 <span class="record-info">
-                                                    <span>{{$t('cusMgt.attendRate')}}</span>
-                                                    <span class="record-info-value">99%</span>
+                                                    <span>{{$t('cusMgt.rcd.attendCount')}}:</span>
+                                                    <span class="record-info-value"> {{item.attendCount}}{{$t('unit.text7')}}</span>
                                                 </span>
-                                                <!-- <span class="info-split"></span> -->
                                                 <!-- 总计分 -->
                                                 <span class="record-info">
                                                     <span>{{$t('cusMgt.rcdScore')}}</span>
-                                                    <span class="record-info-value">150</span>
+                                                    <span class="record-info-value">
+                                                        {{item.totalPoint}}
+                                                    </span>
+                                                </span>
+                                                <!-- 作品总数 -->
+                                                <span class="record-info">
+                                                    <span>{{$t('cusMgt.rcd.colctCount')}}: </span>
+                                                    <span class="record-info-value">
+                                                        {{item.collateCount}}
+                                                    </span>
+                                                </span>
+                                                <!-- 测验得分率 -->
+                                                <span class="record-info">
+                                                    <span>{{$t('cusMgt.rcd.scoreRate')}}: </span>
+                                                    <span class="record-info-value">
+                                                        {{item.examPointRate}}
+                                                    </span>
                                                 </span>
-                                                <!-- <span class="info-split"></span> -->
                                                 <!-- 互动总数 -->
                                                 <span class="record-info">
-                                                    <span>{{$t('cusMgt.interactNum')}}</span>
-                                                    <span class="record-info-value">60</span>
+                                                    <span>{{$t('cusMgt.rcd.scoreRate')}}: </span>
+                                                    <span class="record-info-value">
+                                                        {{item.clientInteractionCount}}
+                                                    </span>
                                                 </span>
-                                                <!-- <span class="info-split"></span> -->
                                                 <!-- 时长 -->
                                                 <span class="record-info">
                                                     <span>{{$t('cusMgt.duration')}}</span>
                                                     <span class="record-info-value">{{handleDuration(item.duration)}}</span>
                                                 </span>
-                                                <!-- <span class="info-split"></span> -->
                                                 <!-- 时间 -->
-                                                <!-- <Time class="record-time" :time="item.startTime" /> -->
                                                 <span>{{$jsFn.timeFormat(item.startTime)}}</span>
                                                 <div class="record-action-wrap">
                                                     <!-- <Icon class="action-icon" custom="iconfont icon-video" :title="$t('cusMgt.socrateMv')" @click.stop="viewVideo(item)" />
@@ -901,7 +914,7 @@ export default {
 
             //秒
             let sec = calc
-            return `${day > 0 ? day + this.$t('unit.day') : ''} ${hour > 0 ? hour + this.$t('unit.hour') : ''} ${min > 0 ? min + this.$t('unit.minute') : ''} ${sec > 0 ? sec + this.$t('unit.second') : ''}`
+            return `${day > 0 ? day + this.$t('unit.day') : ''} ${hour > 0 ? hour + this.$t('unit.hour') : ''} ${min > 0 ? min + this.$t('unit.text5') : ''} ${sec > 0 ? sec + this.$t('unit.second') : ''}`
         },
         generateQrcodes() {
             this.btnLoading = true

TEAMModelOS/ClientApp/src/view/teachermgmt/components/personnel/Index.vue

@@ -404,7 +404,7 @@ export default {
                             // data.name = this.$store.state.user?.schoolProfile?.school_base?.name
                             // data.random = '123456'
                             let url = `${window.location.origin}/hita/join-school?ts=${res.nowtime}&school=${this.$store.state.userInfo.schoolCode}&sname=${this.$store.state.user?.schoolProfile?.school_base?.name}`
-                            // let shortUrl = await this.$api.getShortUrl(encodeURI(url)) //暂不替换，等路由处理好了再替换
+                            // let shortUrl = await this.$api.getShortUrl(encodeURI(url))
                             let qrcode = new QRCode('teacher-qr-code', {
                                 width: 280, // 设置宽度，单位像素
                                 height: 280, // 设置高度，单位像素