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

TEAMModelOS/ClientApp/src/view/classrecord/ClassRecord.less

@@ -81,6 +81,10 @@
         bottom: 20px;
         cursor: pointer;
     }
+
+    .data-count-container {
+        box-shadow: none;
+    }
 }
 
 .courseware-wrap {

TEAMModelOS/ClientApp/src/view/classrecord/ClassRecord.vue

@@ -48,12 +48,12 @@
           <div class="class-content mouse-over-status">
             <video-player2 v-if="hasVideo && playerOptions.sources.length" v-show="isShowVd" @on-vd-error="videoError" class="video-player-box" :markers="markers" ref="videoPlayer" :options="playerOptions" :playsinline="true" @getCurPage="getCurPage">
             </video-player2>
-            <div v-show="!isShowVd" class="video-player-box" style="padding:15px 0px">
+            <div v-show="!isShowVd" class="video-player-box" style="padding:15px 0px" v-if="!isGlobalSite">
               <!-- <Alert v-show="!hasVideo" class="no-video-tips" type="warning" show-icon>
                 {{$t('cusMgt.rcd.noVideo')}}
               </Alert> -->
               <!-- 大陆站显示四大维度数据 -->
-              <div style="width:100%;display:flex;flex-direction:column;align-items:center;justify-content:center" v-if="!isGlobalSite">
+              <div style="width:100%;display:flex;flex-direction:column;align-items:center;justify-content:center" v-show="!isShowBase">
                 <div style="display: flex;justify-content: center;font-weight: bold">
                   <span style="display: flex;justify-content: center;flex-direction: column;align-items: center">
                     <span :style="{ backgroundColor: getLevelColor(recordInfo.tLevel),boxShadow:'0 0 6px ' + getLevelColor(recordInfo.tLevel) }" class="level-light"></span>
@@ -88,11 +88,12 @@
                 </div>
                 <BaseReportRadar v-if="recordInfo" :lessonInfo="recordInfo"></BaseReportRadar>
               </div>
-
+              <DataCount :rcdInfo="baseData.report" v-if="baseData" v-show="isShowBase"></DataCount>
+              <Icon type="md-swap" class="action-icon" color="#25b0c4" size="20" v-if="baseData" @click="isShowBase = !isShowBase" :title="$t('lessonRecord.action1')" />
               <!-- <Icon type="md-pie" class="action-icon" color="#25b0c4" size="20" @click="reportModal = true" :title="$t('lessonRecord.action1')" /> -->
             </div>
             <!-- 国际站显示统计数据 -->
-            <DataCount :rcdInfo="baseData.report" v-if="baseData"></DataCount>
+            <DataCount :rcdInfo="baseData.report" v-else-if="baseData"></DataCount>
             <div class="courseware-wrap">
               <div class="custom-page-change custom-prev" @click="changePage('prev')">
                 <Icon type="ios-arrow-back" />
@@ -331,6 +332,7 @@ export default {
       events: [],//事件ID
       hiTeachEvent: [],//需要解析的事件信息
       isShowVd: true,
+      isShowBase: false,
       hasVideo: true,
       eventClick: false,
       sokratesRecords: [],