Merge branch 'cmy/develop-bi' into develop

TEAMModelBI/ClientApp/src/view/index/index.vue

@@ -168,7 +168,8 @@
                                 </svg>
                             </div>
                             </p>
-                            <div class="commonbox-versions">
+                            <div class="commonbox-versions" v-loading="loading.versions"
+                                element-loading-background="rgba(0, 0, 0, 0.2)">
                                 <div class="commonbox-versions-title">
                                     <p class="versions-title-name">基础版</p>
                                     <p class="versions-title-num">数量：
@@ -180,7 +181,8 @@
                                 </div>
 
                             </div>
-                            <div class="commonbox-versions">
+                            <div class="commonbox-versions" v-loading="loading.versions"
+                                element-loading-background="rgba(0, 0, 0, 0.2)">
                                 <div class="commonbox-versions-title">
                                     <p class="versions-title-name">标准版</p>
                                     <p class="versions-title-num">数量：
@@ -192,7 +194,8 @@
                                 </div>
 
                             </div>
-                            <div class="commonbox-versions">
+                            <div class="commonbox-versions" v-loading="loading.versions"
+                                element-loading-background="rgba(0, 0, 0, 0.2)">
                                 <div class="commonbox-versions-title">
                                     <p class="versions-title-name">专业版</p>
                                     <p class="versions-title-num">数量：
@@ -215,7 +218,8 @@
                             </svg>
                         </div>
                         </p>
-                        <div class="bottom-rightbox-right">
+                        <div class="bottom-rightbox-right" v-loading="loading.sizeType"
+                            element-loading-background="rgba(0, 0, 0, 0.2)">
                             <Size :lineData="totalArea.sizePie" :sizenum="allSize"></Size>
                         </div>
                     </div>
@@ -331,9 +335,11 @@ export default {
         let loading = ref({
             basics: true,
             basics2: true,
-            lessonData: true,
-            lessonAndactivity: true,
+            // lessonData: true,
+            // lessonAndactivity: true,
             active: true,
+            versions: true,
+            sizeType: true,
         })
         let onlineModels = ref('all')
         let allSize = ref({
@@ -1220,6 +1226,7 @@ export default {
                             let nums = parseInt(i) + 1
                             replaceTime[i].value == onlineData[onlineData.length - 1].key ? replaceTime.splice(nums) : ''
                         }
+                        console.log(onlineData, '查看内容')
                         //在线人数趋势
                         onlineData.forEach((x) => {
                             for (let s in replaceTime) {
@@ -1235,13 +1242,13 @@ export default {
                         //处理在线人员区分（学生）
                         onlineStudent.forEach((u) => {
                             for (let s in replaceTime) {
-                                replaceTime[s].value === u.key ? (replaceTime[s].num = u.value) : ''
+                                replaceTime[s].value === u.key ? (replaceTime[s].student = u.value) : ''
                             }
                         })
                         //处理在线人员区分（醍摩豆学生）
                         onlineTmdstudent.forEach((t) => {
                             for (let s in replaceTime) {
-                                replaceTime[s].value === t.key ? (replaceTime[s].num = t.value) : ''
+                                replaceTime[s].value === t.key ? (replaceTime[s].tmdStudent = t.value) : ''
                             }
                         })
                         replaceTime.forEach((e) => {
@@ -1581,6 +1588,7 @@ export default {
                     totalArea.value.pie1 = dataBasics
                     totalArea.value.pie2 = dataStandard
                     totalArea.value.pie3 = dataMajor
+                    loading.value.versions = false
                 }
             }).catch((error) => {
                 ElMessage.error('各版本获取异常')
@@ -1639,6 +1647,7 @@ export default {
                 })
                 console.log(dataArr, '饼图数据统计')
                 totalArea.value.sizePie.series[0].data = dataArr.various
+                loading.value.sizeType = false
                 // let ss = proxy.$common.convertSize(res.typeStics.video)
                 // console.log(ss, '大小')
             })