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

src/App.vue

@@ -7,7 +7,11 @@
         $route.path == '/note' ||
         $route.path == '/works',
       appNoHeight: $route.path == '/liveRoom',
-      GMBg:this.$route.query.org=='eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217' && ( $route.path != '/courseGM' &&  $route.path != '/course/addCourseGM'&&  $route.path != '/dataGM')
+      GMBg:
+        this.$route.query.org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f0217' &&
+        $route.path != '/courseGM' &&
+        $route.path != '/course/addCourseGM' &&
+        $route.path != '/dataGM',
     }"
   >
     <!-- <div class="app_head" :class="{stuWidth:$route.path == '/student'}"> -->
@@ -34,7 +38,10 @@
     </div>-->
     <!-- </div> -->
     <div
-      :class="{ gHeight: $route.path == '/Grid' }"
+      :class="{
+        gHeight: $route.path == '/Grid',
+        getOverView: $route.path == '/myReport',
+      }"
       style="width: 100%; height: 100%"
       :style="{ overflow: $route.path == '/liveRoom' ? 'hidden' : '' }"
     >
@@ -376,12 +383,13 @@ html::-webkit-scrollbar-thumb {
   border-color: #8681b7 !important;
 }
 
-.btnClassGM:focus, .btnClassGM:hover{
+.btnClassGM:focus,
+.btnClassGM:hover {
   background: #8681b7 !important;
   border-color: #8681b7 !important;
 }
 
-.GMBg{
+.GMBg {
   background: rgb(184, 181, 202) !important;
 }
 
@@ -392,7 +400,11 @@ html::-webkit-scrollbar-thumb {
   background-color: #dbd7ff !important;
 }
 
-.text_tooltip{
+.text_tooltip {
   max-width: 350px;
 }
+
+.getOverView{
+  overflow-x: auto;
+}
 </style>

src/components/pages/myReport/myReport.vue

@@ -309,7 +309,6 @@ export default {
   width: 95%;
   margin: 0 auto;
   height: calc(100% - 55px);
-  overflow: auto;
 }
 
 .sr_box {