Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

src/components/pages/dataBoard/course/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="body">
+  <div class="body1">
     <!-- 课程数据 -->
     <div class="left">
       <div class="top">
@@ -185,12 +185,13 @@ export default {
 </script>
 
 <style scoped>
-.body {
+.body1 {
   width: 100%;
   height: 100%;
   display: flex;
   padding: 20px;
   box-sizing: border-box;
+  overflow: hidden;
 }
 
 .left {

src/components/pages/dataBoard/school/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="body" v-loading="isLoading">
+  <div class="body1" v-loading="isLoading">
     <!-- 综合数据 -->
     <div class="left">
       <div class="top">
@@ -230,7 +230,7 @@
             </div>
           </div>
           <cateRank
-            style="height: calc(100% - 216px); overflow: auto"
+            style="height: calc(100% - 200px); overflow: auto"
           ></cateRank>
         </div>
       </div>
@@ -313,12 +313,13 @@ export default {
 
 
 <style scoped>
-.body {
+.body1 {
   width: 100%;
   height: 100%;
   display: flex;
   padding: 20px;
   box-sizing: border-box;
+  overflow: hidden;
 }
 
 .left {

src/components/pages/dataBoard/student/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="body" v-loading="isLoading">
+  <div class="body1" v-loading="isLoading">
     <!-- 学生数据 -->
     <div class="left">
       <div class="top">
@@ -221,12 +221,13 @@ export default {
 
 
 <style scoped>
-.body {
+.body1 {
   width: 100%;
   height: 100%;
   display: flex;
   padding: 20px;
   box-sizing: border-box;
+  overflow: hidden;
 }
 
 .left {

src/components/pages/dataBoard/student/stuAct/index.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="data_body">
-    <div style="width: 100%; height: 100%">
+    <div style="width: 100%; height: 100%;">
       <el-table
         :data="tableData"
-        style="width: 100%; height: 100%; overflow: auto"
+        style="width: 100%;"
         :header-cell-style="{ background: '#E0EAFB' }"
         :row-class-name="tableRowClassName"
       >
-        <el-table-column prop="rank" label="排行" width="100" align="center">
+        <el-table-column prop="rank" label="排行" min-width="50" align="center">
         </el-table-column>
         <el-table-column
           prop="name"
           label="类别名称"
-          width="170"
+          min-width="80"
           align="center"
         >
         </el-table-column>
-        <el-table-column prop="sum" label="授课次数" width="170" align="center">
+        <el-table-column prop="sum" label="授课次数" min-width="80" align="center">
         </el-table-column>
       </el-table>
     </div>
@@ -66,5 +66,6 @@ export default {
   padding: 0;
   width: 95%;
   background: #fff;
+  overflow: auto;
 }
 </style>

src/components/pages/dataBoard/teacher/chartList/funPlot.vue

@@ -16,6 +16,7 @@ export default {
     return {
       chartObj: null,
       option: {
+       
         tooltip: {
           trigger: "item",
           formatter: "{a} <br/>{b} : {c}%",
@@ -29,8 +30,8 @@ export default {
             type: "funnel",
             left: "10%",
             top: 60,
-            bottom: 60,
-            width: "80%",
+            bottom: 20,
+            width: "95%",
             min: 0,
             max: 100,
             minSize: "0%",

src/components/pages/dataBoard/teacher/chartList/teaAct.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="data_body">
-    <div style="width: 100%; height: 100%">
+    <div style="width: 100%; height: 100%; ">
       <el-table
         :data="tableData"
-        style="width: 100%; height: 100%; overflow: auto"
+        style="width: 100%; "
         :header-cell-style="{ background: '#E0EAFB' }"
         :row-class-name="tableRowClassName"
       >
-        <el-table-column prop="rank" label="排行" width="100" align="center">
+        <el-table-column prop="rank" label="排行" min-width="50" align="center">
         </el-table-column>
         <el-table-column
           prop="name"
           label="类别名称"
-          width="170"
+          min-width="80"
           align="center"
         >
         </el-table-column>
-        <el-table-column prop="sum" label="授课次数" width="170" align="center">
+        <el-table-column prop="sum" label="授课次数" min-width="80" align="center">
         </el-table-column>
       </el-table>
     </div>
@@ -66,5 +66,6 @@ export default {
   padding: 0;
   width: 95%;
   background: #fff;
+  overflow: auto;
 }
 </style>

src/components/pages/dataBoard/teacher/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="body">
+  <div class="body1">
     <!-- 教师数据 -->
     <div class="left">
       <div class="top">
@@ -277,12 +277,13 @@ export default {
 
 
 <style scoped>
-.body {
+.body1 {
   width: 100%;
   height: 100%;
   display: flex;
   padding: 20px;
   box-sizing: border-box;
+  overflow: hidden;
 }
 
 .left {