Merge branch 'DEV' of http://82.157.76.162:3000/Big-Data-Lab/CET-vue-3.0 into DEV

src/components/Scrollbar/src/Scrollbar.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="scrollbar">
-    <div ref="wrap" :class="[wrapClass, 'scrollbar__wrap', native ? '' : 'scrollbar__wrap--hidden-default']" :style="style" @scroll="handleScroll">
+    <div ref="wrap" :class="[wrapClass, 'scrollbar__wrap', native ? '' : 'scrollbar__wrap--hidden-default']"
+      :style="style" @scroll="handleScroll">
       <div style="display: flex; justify-content: center; align-items: center">
-        <span
-          style="
+        <span style="
             font-size: 18px;
             font-weight: 700;
             transition: all 0.5s;
             line-height: normal;
-            
-          "
-        >
+            padding: 5px;
+          ">
           英语四六级综合管理平台
         </span>
+
       </div>
 
       <component :is="tag" ref="resize" :class="['scrollbar__view', viewClass]" :style="viewStyle">
@@ -182,7 +182,7 @@ export default defineComponent({
       top: 2px;
       width: 6px;
 
-      & > div {
+      &>div {
         width: 100%;
       }
     }
@@ -191,16 +191,16 @@ export default defineComponent({
       left: 2px;
       height: 6px;
 
-      & > div {
+      &>div {
         height: 100%;
       }
     }
   }
 }
 
-.scrollbar:active > .scrollbar__bar,
-.scrollbar:focus > .scrollbar__bar,
-.scrollbar:hover > .scrollbar__bar {
+.scrollbar:active>.scrollbar__bar,
+.scrollbar:focus>.scrollbar__bar,
+.scrollbar:hover>.scrollbar__bar {
   opacity: 1;
   transition: opacity 340ms ease-out;
 }

src/views/cet/cet-ana-1.vue

@@ -675,7 +675,7 @@ export default {
       // const college1 = this.college;
       let option = {
         title: {
-          text: '本批次学院通过率排名',
+          text: '本年级学院通过率排名',
         },
         tooltip: {
           trigger: 'axis',
@@ -714,12 +714,12 @@ export default {
           },
         },
         toolbox: {
-          show: true,
-          feature: {
-            magicType: { show: true, type: ['line', 'bar'] },
-            restore: { show: true },
-            saveAsImage: { show: true },
-          },
+          // show: true,
+          // feature: {
+          //   magicType: { show: true, type: ['line', 'bar'] },
+          //   restore: { show: true },
+          //   saveAsImage: { show: true },
+          // },
         },
         grid: {
           left: '3%',

src/views/cet/cet-ana-3.vue

@@ -102,12 +102,12 @@ export default {
           }
         },
         toolbox: {
-          show: true,
-          feature: {
-            magicType: { show: true, type: ['line', 'bar'] },
-            restore: { show: true },
-            saveAsImage: { show: true },
-          },
+          // show: true,
+          // feature: {
+          //   magicType: { show: true, type: ['line', 'bar'] },
+          //   restore: { show: true },
+          //   saveAsImage: { show: true },
+          // },
         },
         //网格
         grid: {

src/views/cet/cet-ana-college.vue

@@ -511,7 +511,7 @@ export default {
       // 指定图表的配置项和数据
       let option = {
         title: {
-          text: '本批次学院通过率排名',
+          text: '学院通过率对比',
         },
         legend: {},
         tooltip: {

src/views/cet/cet-ana-major.vue

@@ -512,7 +512,7 @@ export default {
       // 指定图表的配置项和数据
       let option = {
         title: {
-          text: '本批次学院通过率排名',
+          text: '专业通过率对比',
         },
         legend: {},
         tooltip: {