Merge branch 'cmy/develop-bi' into develop

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

@@ -123,7 +123,7 @@
                     </dv-border-box-11>
                 </div>
                 <div class="restsbox-right">
-                    <dv-border-box-11 title="数量与占比">
+                    <dv-border-box-11 :title="$t('schoolIot.device.numAndproportion')">
                         <!--设备统计-->
                         <!-- <div class="right-box">
                             <div class="right-box-left">
@@ -150,7 +150,7 @@
                     <dv-border-box-12>
                         <div class="innerbox">
                             <p class="boxtitles">
-                                <span>基础数据</span>
+                                <span>{{$t('schoolIot.basicsChat.title')}}</span>
                                 <dv-decoration-3 style="width:200px;height:20px;"/>
                             </p>
                             <div class="innerbox-inside">
@@ -394,15 +394,15 @@ export default {
           this.basicaList[0].total = deviceAuthCnt
           this.basicaList[1].value= [...new Set(areaDatateach)].length
           this.basicaList[1].total = teacherCnt
-          this.basicaList[2].value = stuShow
-          this.basicaList[2].total = this.$tools.numberToTextWithUnit(studentCnt)
-          this.basicaList[3].value = stuLessonLengMin
-          this.basicaList[3].valueText=this.$tools.numberToTextWithUnit(stuLessonLengMin)
-          this.basicaList[3].valueHText=this.$tools.numberToTextWithUnit(Math.round(stuLessonLengMin/60))
-          this.basicaList[4].value = lessonRecord
-          this.basicaList[5].value = lessonLengMin
-          this.basicaList[5].valueText = this.$tools.numberToTextWithUnit(lessonLengMin)
-          this.basicaList[5].valueHText=this.$tools.numberToTextWithUnit(Math.round(lessonLengMin/60))
+          this.basicaList[2].value = lessonRecord
+          this.basicaList[2].total = this.$tools.numberToTextWithUnit(lessonRecord)
+          this.basicaList[3].value = lessonLengMin
+          this.basicaList[3].valueText=this.$tools.numberToTextWithUnit(lessonLengMin)
+          this.basicaList[3].valueHText=this.$tools.numberToTextWithUnit(Math.round(lessonLengMin/60))
+          this.basicaList[4].value = stuShow
+          this.basicaList[5].value = stuLessonLengMin
+          this.basicaList[5].valueText = this.$tools.numberToTextWithUnit(stuLessonLengMin)
+          this.basicaList[5].valueHText=this.$tools.numberToTextWithUnit(Math.round(stuLessonLengMin/60))
           //课中统计 和 设备统计
           let { mission, missionFin, item, interact, htcDevTotalCnt, htcDevCnt, htaDevTotalCnt, htaDevCnt, htccDevCnt } = res.area
           this.inuseList[0].value = mission