chenmy 3 gadi atpakaļ
vecāks
revīzija
a95612d67e

+ 3 - 12
TEAMModeBI/ClientApp/src/view/index/dashboard.vue

@@ -67,7 +67,7 @@
                     <div class="panel-footer"></div>
                 </div>
                 <div class="panel pie1">
-                    <div class="chart">
+                    <div class="chart" v-loading="loading.customPie" element-loading-background="rgba(62,182,250, 0.3)">
                         <CustomPie :mapData="spaceTypsdata"></CustomPie>
                     </div>
                     <div class="panel-footer"></div>
@@ -130,6 +130,7 @@ export default {
             BaseBar: true,
             BasicPie: true,
             map: true,
+            customPie: true,
         })
         //数据综合
         let totalData = ref([
@@ -385,17 +386,6 @@ export default {
                         { value: '', size: 0, name: '其他' },
                     ],
                 }
-                // let dataArr = [
-                //     { value: 0, size: '', name: '教材' },
-                //     { value: 0, size: '', name: '图片' },
-                //     { value: 0, size: '', name: '视频' },
-                //     { value: 0, size: '', name: '音频' },
-                //     { value: 0, size: '', name: '文档' },
-                //     { value: 0, size: '', name: 'HiTeach上传的数据' },
-                //     { value: 0, size: '', name: '应用数据' },
-                //     { value: 0, size: '', name: '平台数据' },
-                //     { value: 0, size: '', name: '其他' },
-                // ]
                 res.state === 200 ? (dataArr.totalSize = res.totalSize) : ''
                 res.stics.forEach((item) => {
                     item.key === 'vote' || item.key === 'survey' || item.key === 'train' || item.key === 'item' || item.key === 'paper' || item.key === 'exam'
@@ -416,6 +406,7 @@ export default {
                 spaceTypsdata.value = dataArr
                 // let ss = proxy.$common.convertSize(res.typeStics.video)
                 // console.log(ss, '大小')
+                loading.value.customPie = false
             })
         }
         //跳转到管理界面

+ 11 - 2
TEAMModeBI/ClientApp/src/view/teachermanage/areamanage.vue

@@ -590,8 +590,9 @@ export default {
 .cuttable {
     width: 98%;
     padding: 1%;
-    height: 60vh;
-    overflow-y: auto;
+    height: 67vh;
+    overflow-y: hidden;
+    position: relative;
 }
 .cuttable-btn {
     width: 16%;
@@ -617,6 +618,14 @@ export default {
 .areamanabox .el-table__header-wrapper {
     line-height: 60px;
 }
+.cuttable .el-table--fit {
+    width: 100%;
+    height: 60vh;
+    overflow: auto;
+}
+.adjustmentDialog .el-dialog {
+    --el-dialog-margin-top: 11vh;
+}
 </style>