Merge branch 'cmy/develop-bi' into develop

TEAMModelBI/ClientApp/src/view/areamanage/statistics.vue

@@ -10,7 +10,7 @@
             </svg>
           </div>
           <div class="right-top-text">
-            <p class="right-top-num">{{item.num}}<span v-if="item.classname ==='size'">GB</span></p>
+            <p class="right-top-num">{{item.num}}<span v-if="item.classname ==='size'">{{unit.all}}</span></p>
             <div class="right-top-bottombox">
               <div :class="[item.classname ==='months' || item.classname ==='teach' || item.classname ==='datas'? 'all-top-box':'right-all','right-top-bottombox-title']">
                 <p class="right-top-title">{{item.title}}</p>
@@ -120,7 +120,7 @@
             </svg>
           </div>
           <div class="right-top-text">
-            <p class="right-top-num">{{item.num}}<span v-if="item.classname ==='size'">GB</span></p>
+            <p class="right-top-num">{{item.num}}<span v-if="item.classname ==='size'">{{unit.oneself}}</span></p>
             <!-- <p class="right-top-title">{{item.title}}</p> -->
             <div class="right-top-bottombox" :class="[item.classname ==='school' || item.classname ==='teach' || item.classname ==='datas' || item.classname ==='student'? 'area-top-box':'right-all','right-top-bottombox-title']">
               <div class="right-top-bottombox-title" :class="[item.classname ==='school' || item.classname ==='teach' || item.classname ==='datas'? 'all-top-box':'' ]">
@@ -303,6 +303,10 @@ export default {
         { id: 8, title: '累计活动', num: 0, type: 'total' },
       ],
     })
+    let unit = ref({
+      all: 'GB',
+      oneself: 'GB'
+    })
     let eachSchool = ref({
       color: ['#f53b57', '#0fbcf9', '#0be881', '#575fcf', '#ffd32a'],
       data: [
@@ -1396,7 +1400,9 @@ export default {
             areaAspectsData.value[1].num = res.scCount
             areaAspectsData.value[2].num = res.tecCount
             areaAspectsData.value[3].num = parseInt(res.allLess) + parseInt(res.allActivity)
-            areaAspectsData.value[4].num = res.allSize
+            res.allSize > 1024 ? unit.value.all = 'TB' : unit.value.all = 'GB'
+            areaAspectsData.value[4].num = res.allSize > 1024 ? (res.allSize / 1024).toFixed(1) : res.allSize
+
             //新增
             areaAspectsData.value[1].addweek = res.weekScCnt
             areaAspectsData.value[1].addmonth = res.monthScCnt
@@ -1701,7 +1707,8 @@ export default {
         .then((res) => {
           console.log(res, '空间大小返回')
           if (res.state === 200) {
-            aspectsData.value[4].num = res.areaSize
+            res.areaSize > 1024 ? unit.value.oneself = 'TB' : unit.value.oneself = 'GB'
+            aspectsData.value[4].num = res.areaSize > 1024 ? (res.areaSize / 1024).toFixed(1) : res.areaSize
             activityData.value.oneself[6].num = res.recCount
             let employInfo = []
             let result = (proxy.$common.convertSize(res.useSize) / res.areaSize).toFixed(2)
@@ -1857,7 +1864,8 @@ export default {
       areaSearchValue,
       timer,
       personnelSearch,
-      originalSchool
+      originalSchool,
+      unit
     }
   },
 }
@@ -1928,8 +1936,9 @@ export default {
   color: #515a6e;
 }
 .right-top-num span {
-  color: #ccc;
+  color: #636e72;
   font-size: 20px;
+  margin-left: 5px;
 }
 .right-top-bottombox {
   width: 100%;

TEAMModelBI/ClientApp/src/view/schoolServe/school.vue

@@ -806,7 +806,7 @@ export default {
       let data = { contToken: tableNexttoken.value }
       if (tableNexttoken.value === null) {
         ElMessage.success('已经到最底了')
-        loading.value = false
+        setTimeout(function () { loading.value = false }, 500);
         return
       }
       proxy.$api.getSchooldata(data).then((res) => {
@@ -836,7 +836,7 @@ export default {
       }).catch((error) => {
         ElMessage.error('API异常，获取更多学校数据失败')
       })
-      loading.value = false
+      setTimeout(function () { loading.value = false }, 800);
     }
     function debounce (fn, wait) {
       if (timer.value !== null) {

TEAMModelBI/ClientApp/src/view/schoolmanage/schoolAnalyse.vue

@@ -1627,7 +1627,7 @@ export default {
           headerbasics.value[0].num === 0 ? centerbasics.value[1].subheadNum = '0%' : ''
 
           //互动
-          centerbasics.value[2].num = res.interAll
+          centerbasics.value[2].num = parseInt(res.interAll)
           centerbasics.value[2].todayNum = res.interCnt
           centerbasics.value[2].subheadingNum = res.interCnt === 0 && res.lastDayInterCnt === 0 ? '0%' : res.lastDayInterCnt === 0 ? '100%' : ((res.interCnt - res.lastDayInterCnt) / res.lastDayInterCnt).toFixed(2) * 100 + '%'
           centerbasics.value[2].subheadingState = res.interCnt - res.lastDayInterCnt >= 0 ? 'up' : 'down'
@@ -1635,14 +1635,14 @@ export default {
           centerbasics.value[2].subheadState = aspectsData.value.interacts[aspectsData.value.interacts.length - 1] - aspectsData.value.interacts[aspectsData.value.interacts.length - 2] >= 0 ? 'up' : 'down'
           headerbasics.value[0].num === 0 ? centerbasics.value[2].subheadNum = '0%' : ''
           //总数据
-          centerbasics.value[3].num = res.lessAll + res.actAllCnt + res.interAll
-          headerbasics.value[0].subnum = res.lessAll + res.actAllCnt + res.interAll
+          centerbasics.value[3].num = res.lessAll + res.actAllCnt + parseInt(res.interAll)
+          headerbasics.value[0].subnum = res.lessAll + res.actAllCnt + parseInt(res.interAll)
           centerbasics.value[3].todayNum = res.lessDayCnt + res.actCnt + res.interCnt
           let nowMonth = aspectsData.value.activitys[aspectsData.value.activitys.length - 1] + aspectsData.value.classed[aspectsData.value.classed.length - 1] + aspectsData.value.interacts[aspectsData.value.interacts.length - 1]
           let lastMonth = aspectsData.value.activitys[aspectsData.value.activitys.length - 2] + aspectsData.value.classed[aspectsData.value.classed.length - 2] + aspectsData.value.interacts[aspectsData.value.interacts.length - 2]
           centerbasics.value[3].subheadingNum = nowMonth === 0 && lastMonth === 0 ? '0%' : lastMonth === 0 ? '100%' : ((nowMonth - lastMonth) / lastMonth * 100).toFixed(2) + '%'
           centerbasics.value[3].subheadingState = nowMonth - lastMonth >= 0 ? 'up' : 'down'
-          let nowYear = res.lessYearCnt + res.yearActCnt + res.yearInterCnt
+          let nowYear = res.lessYearCnt + res.yearActCnt + parseInt(res.yearInterCnt)
           let lastYear = res.lessLastYearCnt + res.lastYearInterCnt + res.lastYearActCnt
           console.log(nowYear, lastYear, '今年和去年数据')
           centerbasics.value[3].subheadNum = nowYear === 0 && lastYear === 0 ? '0%' : lastYear === 0 ? '100%' : ((nowYear - lastYear) / lastYear * 100).toFixed(2) + '%'
@@ -1851,20 +1851,20 @@ export default {
       detailsbasics.value[1].subheadNum = anSchool.value.activitys[anSchool.value.activitys.length - 2] === 0 && anSchool.value.activitys[anSchool.value.activitys.length - 1] === 0 ? '0%' : anSchool.value.activitys[anSchool.value.activitys.length - 2] === 0 ? '100%' : ((anSchool.value.activitys[anSchool.value.activitys.length - 1] - anSchool.value.activitys[anSchool.value.activitys.length - 2]) / anSchool.value.activitys[anSchool.value.activitys.length - 2] * 100).toFixed(2) + '%'
       detailsbasics.value[1].subheadState = anSchool.value.activitys[anSchool.value.activitys.length - 1] - anSchool.value.activitys[anSchool.value.activitys.length - 2] >= 0 ? 'up' : 'down'
 
-      detailsbasics.value[2].num = res.allInterCnt
+      detailsbasics.value[2].num = parseInt(res.allInterCnt)
       detailsbasics.value[2].todayNum = res.interCnt
       detailsbasics.value[2].subheadingNum = res.lastDayInterCnt === 0 && res.interCnt === 0 ? '0%' : res.lastDayInterCnt === 0 ? '100%' : ((res.interCnt - res.lastDayInterCnt) / res.lastDayInterCnt).toFixed(2) * 100 + '%'
       detailsbasics.value[2].subheadingState = res.interCnt - res.lastDayInterCnt >= 0 ? 'up' : 'down'
       detailsbasics.value[2].subheadNum = anSchool.value.interacts[anSchool.value.interacts.length - 2] === 0 && anSchool.value.interacts[anSchool.value.interacts.length - 1] === 0 ? '0%' : anSchool.value.interacts[anSchool.value.interacts.length - 2] === 0 ? '100%' : ((anSchool.value.interacts[anSchool.value.interacts.length - 1] - anSchool.value.interacts[anSchool.value.interacts.length - 2]) / anSchool.value.interacts[anSchool.value.interacts.length - 2] * 100).toFixed(2) + '%'
       detailsbasics.value[2].subheadState = anSchool.value.interacts[anSchool.value.interacts.length - 1] - anSchool.value.interacts[anSchool.value.interacts.length - 2] >= 0 ? 'up' : 'down'
 
-      detailsbasics.value[3].num = res.lessAllCant + res.allInterCnt + res.allActCnt
+      detailsbasics.value[3].num = res.lessAllCant + parseInt(res.allInterCnt) + res.allActCnt
       detailsbasics.value[3].todayNum = res.lessDayCnt + res.actCnt + res.interCnt
       let nowMonth = anSchool.value.activitys[anSchool.value.activitys.length - 1] + anSchool.value.classed[anSchool.value.classed.length - 1] + anSchool.value.interacts[anSchool.value.interacts.length - 1]
       let lastMonth = anSchool.value.activitys[anSchool.value.activitys.length - 2] + anSchool.value.classed[anSchool.value.classed.length - 2] + anSchool.value.interacts[anSchool.value.interacts.length - 2]
       detailsbasics.value[3].subheadingNum = nowMonth === 0 && lastMonth === 0 ? '0%' : lastMonth === 0 ? '100%' : ((nowMonth - lastMonth) / lastMonth).toFixed(2) * 100 + '%'
       detailsbasics.value[3].subheadingState = nowMonth - lastMonth >= 0 ? 'up' : 'down'
-      let nowYear = res.lessYearCnt + res.yearActCnt + res.yearInterCnt
+      let nowYear = res.lessYearCnt + res.yearActCnt + parseInt(res.yearInterCnt)
       let lastYear = res.lessLastYearCnt + res.lastYearActCnt + res.lastYearInterCnt
       detailsbasics.value[3].subheadNum = nowYear === 0 && lastYear === 0 ? '0%' : lastYear === 0 ? '100%' : (((nowYear - lastYear) / lastYear) * 100).toFixed(2) + '%'
       detailsbasics.value[3].subheadState = nowYear - lastYear >= 0 ? 'up' : 'down'