lsc hace 1 año
padre
commit
b0880a5dd1
Se han modificado 80 ficheros con 436 adiciones y 158 borrados
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.e55cb618299a6b6cbcb2059a61510667.css
  3. 0 0
      dist/static/css/app.e55cb618299a6b6cbcb2059a61510667.css.map
  4. BIN
      dist/static/img/data_title.04e28c7.png
  5. 0 0
      dist/static/js/app.a99e082cebb8fb524656.js
  6. 0 0
      dist/static/js/app.a99e082cebb8fb524656.js.map
  7. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  8. BIN
      src/assets/icon/test/data_title.png
  9. 7 1
      src/components/pages/components/loading.vue
  10. 1 1
      src/components/pages/dataBoardNew/course/chartList/bar.vue
  11. 1 1
      src/components/pages/dataBoardNew/course/chartList/bar2.vue
  12. 22 1
      src/components/pages/dataBoardNew/course/chartList/cateRank.vue
  13. 1 1
      src/components/pages/dataBoardNew/course/chartList/courseAna.vue
  14. 3 2
      src/components/pages/dataBoardNew/course/chartList/courseNum.vue
  15. 1 1
      src/components/pages/dataBoardNew/course/chartList/courseTime.vue
  16. 4 1
      src/components/pages/dataBoardNew/course/chartList/subjuect.vue
  17. 1 1
      src/components/pages/dataBoardNew/course/chartList/teaFre.vue
  18. 1 1
      src/components/pages/dataBoardNew/course/chartList/toolChart.vue
  19. 2 2
      src/components/pages/dataBoardNew/course/chartList/toolUse.vue
  20. 2 2
      src/components/pages/dataBoardNew/course/chartList/toolUse2.vue
  21. 1 1
      src/components/pages/dataBoardNew/course/chartList/workNum.vue
  22. 1 1
      src/components/pages/dataBoardNew/course/chartList/workTime.vue
  23. 25 7
      src/components/pages/dataBoardNew/course/index.vue
  24. 84 40
      src/components/pages/dataBoardNew/index.vue
  25. 1 1
      src/components/pages/dataBoardNew/project/chartList/bar.vue
  26. 1 1
      src/components/pages/dataBoardNew/project/chartList/bar/cCourse.vue
  27. 1 1
      src/components/pages/dataBoardNew/project/chartList/bar/finish.vue
  28. 1 1
      src/components/pages/dataBoardNew/project/chartList/bar/teacherStudent.vue
  29. 1 1
      src/components/pages/dataBoardNew/project/chartList/bar/time.vue
  30. 23 1
      src/components/pages/dataBoardNew/project/chartList/cateRank.vue
  31. 1 1
      src/components/pages/dataBoardNew/project/chartList/courseAna.vue
  32. 3 2
      src/components/pages/dataBoardNew/project/chartList/courseNum.vue
  33. 1 1
      src/components/pages/dataBoardNew/project/chartList/courseTime.vue
  34. 4 1
      src/components/pages/dataBoardNew/project/chartList/subjuect.vue
  35. 1 1
      src/components/pages/dataBoardNew/project/chartList/teaFre.vue
  36. 1 1
      src/components/pages/dataBoardNew/project/chartList/toolChart.vue
  37. 2 2
      src/components/pages/dataBoardNew/project/chartList/toolUse.vue
  38. 1 1
      src/components/pages/dataBoardNew/project/chartList/workNum.vue
  39. 1 1
      src/components/pages/dataBoardNew/project/chartList/workTime.vue
  40. 25 7
      src/components/pages/dataBoardNew/project/index.vue
  41. 1 1
      src/components/pages/dataBoardNew/school/bar/index.vue
  42. 1 1
      src/components/pages/dataBoardNew/school/barToolUser/index.vue
  43. 4 1
      src/components/pages/dataBoardNew/school/cateRank/index.vue
  44. 1 1
      src/components/pages/dataBoardNew/school/courseInfo/index.vue
  45. 3 2
      src/components/pages/dataBoardNew/school/courseNum/index.vue
  46. 25 7
      src/components/pages/dataBoardNew/school/index.vue
  47. 1 1
      src/components/pages/dataBoardNew/school/loginCount/index.vue
  48. 1 1
      src/components/pages/dataBoardNew/school/loginTime/index.vue
  49. 22 1
      src/components/pages/dataBoardNew/school/teacherInfo/index.vue
  50. 2 2
      src/components/pages/dataBoardNew/school/toolUser/index.vue
  51. 1 1
      src/components/pages/dataBoardNew/school/toolUserBar/index.vue
  52. 1 1
      src/components/pages/dataBoardNew/school/workNum/index.vue
  53. 1 1
      src/components/pages/dataBoardNew/student/bar/index.vue
  54. 1 1
      src/components/pages/dataBoardNew/student/bar2/index.vue
  55. 21 1
      src/components/pages/dataBoardNew/student/cateRank/index.vue
  56. 1 1
      src/components/pages/dataBoardNew/student/courseNum/index.vue
  57. 24 6
      src/components/pages/dataBoardNew/student/index.vue
  58. 1 1
      src/components/pages/dataBoardNew/student/loginCount/index.vue
  59. 1 1
      src/components/pages/dataBoardNew/student/loginTime/index.vue
  60. 1 1
      src/components/pages/dataBoardNew/student/stuAct/index.vue
  61. 1 1
      src/components/pages/dataBoardNew/student/stuAct2/index.vue
  62. 1 1
      src/components/pages/dataBoardNew/student/studentInfo/index.vue
  63. 1 1
      src/components/pages/dataBoardNew/student/studentInfo2/index.vue
  64. 1 1
      src/components/pages/dataBoardNew/student/studentInfo3/index.vue
  65. 1 1
      src/components/pages/dataBoardNew/student/studentInfo4/index.vue
  66. 2 2
      src/components/pages/dataBoardNew/student/toolUser/index.vue
  67. 1 1
      src/components/pages/dataBoardNew/student/toolUser2/index.vue
  68. 1 1
      src/components/pages/dataBoardNew/teacher/chartList/bar.vue
  69. 21 1
      src/components/pages/dataBoardNew/teacher/chartList/cateRank.vue
  70. 1 1
      src/components/pages/dataBoardNew/teacher/chartList/funPlot.vue
  71. 1 1
      src/components/pages/dataBoardNew/teacher/chartList/teaAct.vue
  72. 1 1
      src/components/pages/dataBoardNew/teacher/chartList/teaActSecond.vue
  73. 23 1
      src/components/pages/dataBoardNew/teacher/chartList/teaData.vue
  74. 1 1
      src/components/pages/dataBoardNew/teacher/chartList/teaFre.vue
  75. 2 2
      src/components/pages/dataBoardNew/teacher/chartList/toolUse.vue
  76. 1 1
      src/components/pages/dataBoardNew/teacher/chartList/workNum.vue
  77. 1 1
      src/components/pages/dataBoardNew/teacher/chartList/workTime.vue
  78. 26 8
      src/components/pages/dataBoardNew/teacher/index.vue
  79. 2 2
      src/components/pages/dataBoardTest/course/index.vue
  80. 7 7
      src/components/pages/test/check/index.vue

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.af3f52b4e32e4e1e61cd61f6b19f3204.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.920758910306febc0621.js></script><script type=text/javascript src=./static/js/app.ea442bde6b03e5acd5cf.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.e55cb618299a6b6cbcb2059a61510667.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.920758910306febc0621.js></script><script type=text/javascript src=./static/js/app.a99e082cebb8fb524656.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/css/app.e55cb618299a6b6cbcb2059a61510667.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/css/app.e55cb618299a6b6cbcb2059a61510667.css.map


BIN
dist/static/img/data_title.04e28c7.png


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/app.a99e082cebb8fb524656.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/app.a99e082cebb8fb524656.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


BIN
src/assets/icon/test/data_title.png


+ 7 - 1
src/components/pages/components/loading.vue

@@ -95,8 +95,10 @@ export default {
   position: absolute;
   top: 0;
   left: 0;
-  background: #8d8d8d8f;
+  /* background: #8d8d8d8f; */
   z-index: 999;
+  border-radius: 8px;
+  overflow: hidden;
 }
 .loading {
   width: 100px;
@@ -106,4 +108,8 @@ export default {
   width: 100%;
   height: 100%;
 }
+
+.loadingBox >>> .el-loading-mask {
+
+}
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/bar.vue

@@ -160,6 +160,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/bar2.vue

@@ -160,6 +160,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 22 - 1
src/components/pages/dataBoardNew/course/chartList/cateRank.vue

@@ -278,8 +278,29 @@ export default {
     box-sizing: border-box;
     padding: 0;
     width: 95%;
-    background: #fff;
+    /* background: #fff; */
     overflow: auto;
+    overflow-y: hidden;
+}
+
+.data_body::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 6px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 6px;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+.data_body::-webkit-scrollbar-track {
+    border-radius: 10px;
+    background-color: #fff;
+}
+
+/*定义滑块 内阴影+圆角*/
+.data_body::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px #AECCFE;
+    background-color: #AECCFE;
 }
 </style>
   

+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/courseAna.vue

@@ -128,6 +128,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 3 - 2
src/components/pages/dataBoardNew/course/chartList/courseNum.vue

@@ -31,7 +31,8 @@ export default {
       },
       option: {
         chart: {
-          type: 'column'
+          type: 'column',
+          backgroundColor: 'rgba(0,0,0,0)'
         },
         title: {
           text: null
@@ -173,6 +174,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/courseTime.vue

@@ -130,6 +130,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 4 - 1
src/components/pages/dataBoardNew/course/chartList/subjuect.vue

@@ -32,6 +32,9 @@ export default {
         data: [],
       },
       option: {
+        chart: {
+          backgroundColor: 'rgba(0,0,0,0)'
+        },
         title: {
           text: null,
         },
@@ -168,6 +171,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/teaFre.vue

@@ -135,6 +135,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/toolChart.vue

@@ -117,6 +117,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 2 - 2
src/components/pages/dataBoardNew/course/chartList/toolUse.vue

@@ -220,7 +220,7 @@ export default {
   height: 170px;
   /* height: 500px; */
   /* margin: 15px 5px 0 0; */
-  background: #fff;
+  /* background: #fff; */
   overflow: hidden;
   flex-shrink: 0;
   position: relative;
@@ -234,6 +234,6 @@ export default {
   width: 100%;
   height: 100%;
   z-index: 999;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 2 - 2
src/components/pages/dataBoardNew/course/chartList/toolUse2.vue

@@ -195,7 +195,7 @@ export default {
   height: 170px;
   /* height: 500px; */
   /* margin: 15px 5px 0 0; */
-  background: #fff;
+  /* background: #fff; */
   overflow: hidden;
   flex-shrink: 0;
   position: relative;
@@ -209,6 +209,6 @@ export default {
   width: 100%;
   height: 100%;
   z-index: 999;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/workNum.vue

@@ -141,6 +141,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/workTime.vue

@@ -117,6 +117,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 25 - 7
src/components/pages/dataBoardNew/course/index.vue

@@ -217,7 +217,7 @@
         <div class="dataBox">
           <CateRank
             v-if="courseType == 0"
-            style="height: calc(100%)"
+            style="height: calc(100% - 10px)"
             :courseArray="courseArray"
           ></CateRank>
           <CourseNum
@@ -1797,16 +1797,22 @@ export default {
 .left > .top {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .left > .bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center {
@@ -1818,16 +1824,22 @@ export default {
 .center > .top {
   width: 100%;
   height: calc(100% / 5 * 3 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center > .bottom {
   width: 100%;
   height: calc(100% / 5 * 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right {
@@ -1838,16 +1850,22 @@ export default {
 .right > .top {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 16px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right > .bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .courseCenterTop {

+ 84 - 40
src/components/pages/dataBoardNew/index.vue

@@ -1,29 +1,31 @@
 <template>
   <div class="body">
-    <div class="db_header">
-      <!-- <div class="logoTop">Logo</div> -->
-      <div class="db_header_title">
-        <div v-if="type == 1">综合数据中心</div>
-        <div v-if="type == 2">课程数据中心</div>
-        <div v-if="type == 3">学生数据中心</div>
-        <div v-if="type == 5">项目数据中心</div>
-        <div v-if="type == 4">教师数据中心</div>
+    <div class="db_bg">
+      <div class="db_header">
+        <!-- <div class="logoTop">Logo</div> -->
+        <div class="db_header_title">
+          <!-- <div v-if="type == 1">综合数据中心</div>
+          <div v-if="type == 2">课程数据中心</div>
+          <div v-if="type == 3">学生数据中心</div>
+          <div v-if="type == 5">项目数据中心</div>
+          <div v-if="type == 4">教师数据中心</div> -->
+        </div>
+        <div class="db_check">
+          <div :class="{ active: type == 1 }" @click="setType(1)">综合数据</div>
+          <div :class="{ active: type == 2 }" @click="setType(2)">课程数据</div>
+          <div :class="{ active: type == 5 }" @click="setType(5)" v-if="scourseLength > 0">项目数据</div>
+          <div :class="{ active: type == 3 }" @click="setType(3)">学生数据</div>
+          <div :class="{ active: type == 4 }" @click="setType(4)">教师数据</div>
+        </div>
       </div>
-      <div class="db_check">
-        <div :class="{ active: type == 1 }" @click="setType(1)">综合数据</div>
-        <div :class="{ active: type == 2 }" @click="setType(2)">课程数据</div>
-        <div :class="{ active: type == 5 }" @click="setType(5)" v-if="scourseLength > 0">项目数据</div>
-        <div :class="{ active: type == 3 }" @click="setType(3)">学生数据</div>
-        <div :class="{ active: type == 4 }" @click="setType(4)">教师数据</div>
+      <div class="db_body">
+        <school v-if="type == 1" :oid="oid" :org="org"></school>
+        <course v-if="type == 2" :oid="oid" :org="org"></course>
+        <project v-if="type == 5" :oid="oid" :org="org"></project>
+        <student v-if="type == 3" :oid="oid" :org="org"></student>
+        <teacher v-if="type == 4" :oid="oid" :org="org"></teacher>
       </div>
     </div>
-    <div class="db_body">
-      <school v-if="type == 1" :oid="oid" :org="org"></school>
-      <course v-if="type == 2" :oid="oid" :org="org"></course>
-      <project v-if="type == 5" :oid="oid" :org="org"></project>
-      <student v-if="type == 3" :oid="oid" :org="org"></student>
-      <teacher v-if="type == 4" :oid="oid" :org="org"></teacher>
-    </div>
   </div>
 </template>
 
@@ -65,7 +67,7 @@ export default {
         .post(this.$store.state.api + "getCourseLength", params)
         .then((res) => {
           this.isLoading = false;
-         
+
           this.scourseLength = res.data[0][0].count;
           this.$forceUpdate();
         })
@@ -75,7 +77,7 @@ export default {
         });
     },
   },
-  mounted () {
+  mounted() {
     this.getData();
   },
 };
@@ -87,6 +89,20 @@ export default {
   width: 100%;
   min-width: 1550px;
   min-height: 750px;
+  background: #e7f3fe;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.db_bg {
+  width: calc(100% - 30px);
+  height: calc(100% - 30px);
+  /* padding: 10px; */
+  border-radius: 8px;
+  box-sizing: border-box;
+  border: 2px solid #3681FC3D;
+  box-shadow: 20px 20px 80px 0px #3681FC3D inset;
 }
 
 .db_header {
@@ -95,7 +111,7 @@ export default {
   display: flex;
   justify-content: center;
   position: relative;
-  background: #fff;
+  /* background: #fff; */
   align-items: center;
 }
 
@@ -105,14 +121,22 @@ export default {
 }
 
 .db_header_title {
-  font-weight: bold;
-  font-size: 20px;
+  background-image: url("../../../assets/icon/test/data_title.png");
+  width: 290px;
+  height: 100%;
+  background-size: 100% 100%;
+  position: absolute;
+  left: 0;
+  /* font-weight: bold;
+  font-size: 20px; */
 }
-.db_header_title > div {
+
+/* .db_header_title>div {
   position: relative;
   z-index: 9;
-}
-.db_header_title > div:after {
+} */
+
+/* .db_header_title > div:after {
   content: "";
   position: absolute;
   width: 250px;
@@ -125,31 +149,51 @@ export default {
   -webkit-transform: skew(20deg);
   transform: skew(359deg);
   z-index: 1;
+} */
+
+.db_header:after {
+  content: "";
+    position: absolute;
+    width: calc(100% - 300px);
+    height: 2px;
+    bottom: 0.5px;
+    left: 264px;
+    z-index: 1;
+    background: linear-gradient(90deg, #9ac1fd 0%, rgba(134, 179, 253, 0) 91.13%);
 }
 
 .db_check {
   display: flex;
   align-items: center;
   position: absolute;
-  right: 30px;
-  height: 100%;
+  left: 320px;
+  height: calc(100% - 12px);
+  top: 0;
 }
 
-.db_check > div {
-  padding: 14px 20px;
+.db_check>div {
+  padding: 10px 20px;
   cursor: pointer;
+  font-weight: 700;
+  font-style: italic;
+  color: #00000099;
 }
 
-.db_check > div:hover {
-  background: #edf4ff;
+.db_check>div:hover {
+  /* background: #edf4ff; */
+  background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.6) 44.48%, rgba(255, 255, 255, 0) 99.69%);
+  color: #000000;
 }
 
-.db_check > div.active {
-  font-weight: 700;
-  color: #297bff;
+.db_check>div.active {
+  /* font-weight: 700; */
+  /* color: #297bff; */
+  color: #000000;
   background: #edf4ff;
-  border-top: 2px solid #297bff;
+  /* border-top: 2px solid #297bff; */
+  border-bottom: 3px solid #3681FC;
   box-sizing: border-box;
+  background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.6) 44.48%, rgba(255, 255, 255, 0) 99.69%);
 }
 
 /* .db_check > div + div {
@@ -160,6 +204,6 @@ export default {
   height: calc(100% - 50px);
   width: 100%;
   overflow: auto;
-  background: rgb(231, 242, 252);
+  /* background: rgb(231, 242, 252); */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/bar.vue

@@ -88,6 +88,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/bar/cCourse.vue

@@ -136,6 +136,6 @@ export default {
     box-sizing: border-box;
     padding: 0;
     width: 95%;
-    background: #fff;
+    /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/bar/finish.vue

@@ -136,6 +136,6 @@ export default {
     box-sizing: border-box;
     padding: 0;
     width: 95%;
-    background: #fff;
+    /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/bar/teacherStudent.vue

@@ -136,6 +136,6 @@ export default {
     box-sizing: border-box;
     padding: 0;
     width: 95%;
-    background: #fff;
+    /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/bar/time.vue

@@ -139,6 +139,6 @@ export default {
     box-sizing: border-box;
     padding: 0;
     width: 95%;
-    background: #fff;
+    /* background: #fff; */
 }
 </style>

+ 23 - 1
src/components/pages/dataBoardNew/project/chartList/cateRank.vue

@@ -282,8 +282,10 @@ export default {
     box-sizing: border-box;
     padding: 0;
     width: 95%;
-    background: #fff;
+    /* background: #fff; */
     overflow: auto;
+    overflow-y: hidden;
+
 }
 
 .box{
@@ -292,5 +294,25 @@ export default {
     justify-content: center;
     align-items: center;
 }
+
+.data_body::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 6px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 6px;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+.data_body::-webkit-scrollbar-track {
+    border-radius: 10px;
+    background-color: #fff;
+}
+
+/*定义滑块 内阴影+圆角*/
+.data_body::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px #AECCFE;
+    background-color: #AECCFE;
+}
 </style>
   

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/courseAna.vue

@@ -135,6 +135,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 3 - 2
src/components/pages/dataBoardNew/project/chartList/courseNum.vue

@@ -31,7 +31,8 @@ export default {
       },
       option: {
         chart: {
-          type: 'column'
+          type: 'column',
+          backgroundColor: 'rgba(0,0,0,0)'
         },
         title: {
           text: null
@@ -189,6 +190,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/courseTime.vue

@@ -131,6 +131,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 4 - 1
src/components/pages/dataBoardNew/project/chartList/subjuect.vue

@@ -32,6 +32,9 @@ export default {
         data: [],
       },
       option: {
+        chart: {
+          backgroundColor: 'rgba(0,0,0,0)'
+        },
         title: {
           text: null,
         },
@@ -168,6 +171,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/teaFre.vue

@@ -135,6 +135,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/toolChart.vue

@@ -117,6 +117,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 2 - 2
src/components/pages/dataBoardNew/project/chartList/toolUse.vue

@@ -195,7 +195,7 @@ export default {
   height: 170px;
   /* height: 500px; */
   /* margin: 15px 5px 0 0; */
-  background: #fff;
+  /* background: #fff; */
   overflow: hidden;
   flex-shrink: 0;
   position: relative;
@@ -209,6 +209,6 @@ export default {
   width: 100%;
   height: 100%;
   z-index: 999;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/workNum.vue

@@ -141,6 +141,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/workTime.vue

@@ -117,6 +117,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 25 - 7
src/components/pages/dataBoardNew/project/index.vue

@@ -123,7 +123,7 @@
           </div>
         </div>
         <div class="dataBox">
-          <CateRank v-if="courseType == 0" style="height: calc(100%)" :courseArray="courseArray"></CateRank>
+          <CateRank v-if="courseType == 0" style="height: calc(100% - 10px)" :courseArray="courseArray"></CateRank>
           <CourseNum v-if="courseType == 1" style="height: calc(100%)" :weekCourse2="weekCourse"></CourseNum>
         </div>
       </div>
@@ -920,16 +920,22 @@ export default {
 .left>.top {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .left>.bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center {
@@ -941,16 +947,22 @@ export default {
 .center>.top {
   width: 100%;
   height: calc(100% / 5 * 3 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center>.bottom {
   width: 100%;
   height: calc(100% / 5 * 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right {
@@ -961,16 +973,22 @@ export default {
 .right>.top {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 16px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right>.bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .titleBox {

+ 1 - 1
src/components/pages/dataBoardNew/school/bar/index.vue

@@ -115,6 +115,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/school/barToolUser/index.vue

@@ -209,6 +209,6 @@ export default {
   width: 100%;
   height: 100%;
   z-index: 999;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 4 - 1
src/components/pages/dataBoardNew/school/cateRank/index.vue

@@ -35,6 +35,9 @@ export default {
         title: {
           text: null,
         },
+        chart: {
+          backgroundColor: 'rgba(0,0,0,0)'
+        },
         credits: {
             enabled: false//不显示LOGO
         },
@@ -168,6 +171,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/school/courseInfo/index.vue

@@ -135,6 +135,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 3 - 2
src/components/pages/dataBoardNew/school/courseNum/index.vue

@@ -31,7 +31,8 @@ export default {
       },
       option: {
         chart: {
-          type: 'column'
+          type: 'column',
+          backgroundColor: 'rgba(0,0,0,0)'
         },
         title: {
           text: null
@@ -173,6 +174,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 25 - 7
src/components/pages/dataBoardNew/school/index.vue

@@ -208,7 +208,7 @@
         <div class="dataBox">
           <teacherInfo
             v-if="courseType == 0"
-            style="height: calc(100%)"
+            style="height: calc(100% - 10px)"
             :courseArray="courseArray"
           ></teacherInfo>
           <courseNum
@@ -1242,16 +1242,22 @@ export default {
 .left > .top {
   width: 100%;
   height: calc(100% / 5 * 2.8 - 20px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .left > .bottom {
   width: 100%;
   height: calc(100% / 5 * 2.2);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center {
@@ -1263,16 +1269,22 @@ export default {
 .center > .top {
   width: 100%;
   height: calc(100% / 5 * 2.8 - 20px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center > .bottom {
   width: 100%;
   height: calc(100% / 5 * 2.2);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right {
@@ -1283,16 +1295,22 @@ export default {
 .right > .top {
   width: 100%;
   height: calc(100% / 5 * 2.8 - 20px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right > .bottom {
   width: 100%;
   height: calc(100% / 5 * 2.2);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .titleBox {

+ 1 - 1
src/components/pages/dataBoardNew/school/loginCount/index.vue

@@ -146,6 +146,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/school/loginTime/index.vue

@@ -161,7 +161,7 @@ export default {
     box-sizing: border-box;
     padding: 0;
     width: 95%;
-    background: #fff;
+    /* background: #fff; */
 }
 </style>
   

+ 22 - 1
src/components/pages/dataBoardNew/school/teacherInfo/index.vue

@@ -278,8 +278,29 @@ export default {
     box-sizing: border-box;
     padding: 0;
     width: 95%;
-    background: #fff;
+    /* background: #fff; */
     overflow: auto;
+    overflow-y: hidden;
+}
+
+.data_body::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 6px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 6px;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+.data_body::-webkit-scrollbar-track {
+    border-radius: 10px;
+    background-color: #fff;
+}
+
+/*定义滑块 内阴影+圆角*/
+.data_body::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px #AECCFE;
+    background-color: #AECCFE;
 }
 </style>
   

+ 2 - 2
src/components/pages/dataBoardNew/school/toolUser/index.vue

@@ -196,7 +196,7 @@ export default {
   height: 170px;
   /* height: 500px; */
   /* margin: 15px 5px 0 0; */
-  background: #fff;
+  /* background: #fff; */
   overflow: hidden;
   flex-shrink: 0;
   position: relative;
@@ -210,6 +210,6 @@ export default {
   width: 100%;
   height: 100%;
   z-index: 999;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/school/toolUserBar/index.vue

@@ -115,6 +115,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/school/workNum/index.vue

@@ -141,6 +141,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/bar/index.vue

@@ -150,6 +150,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/bar2/index.vue

@@ -150,6 +150,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 21 - 1
src/components/pages/dataBoardNew/student/cateRank/index.vue

@@ -91,10 +91,30 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 
 .tableClass >>> td, .tableClass >>> th{
   padding: 5px 0;
 }
+
+.data_body div::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 6px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 6px;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+.data_body div::-webkit-scrollbar-track {
+    border-radius: 10px;
+    background-color: #fff;
+}
+
+/*定义滑块 内阴影+圆角*/
+.data_body div::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px #AECCFE;
+    background-color: #AECCFE;
+}
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/courseNum/index.vue

@@ -80,6 +80,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 24 - 6
src/components/pages/dataBoardNew/student/index.vue

@@ -1145,16 +1145,22 @@ export default {
 .left > .top {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .left > .bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center {
@@ -1166,16 +1172,22 @@ export default {
 .center > .top {
   width: 100%;
   height: calc(100% / 6 * 4 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center > .bottom {
   width: 100%;
   height: calc(100% / 6 * 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right {
@@ -1186,16 +1198,22 @@ export default {
 .right > .top {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right > .bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .dataBox {

+ 1 - 1
src/components/pages/dataBoardNew/student/loginCount/index.vue

@@ -145,6 +145,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/loginTime/index.vue

@@ -139,6 +139,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/stuAct/index.vue

@@ -130,6 +130,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/stuAct2/index.vue

@@ -130,6 +130,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/studentInfo/index.vue

@@ -154,6 +154,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/studentInfo2/index.vue

@@ -122,6 +122,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/studentInfo3/index.vue

@@ -154,6 +154,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/studentInfo4/index.vue

@@ -122,6 +122,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 2 - 2
src/components/pages/dataBoardNew/student/toolUser/index.vue

@@ -195,7 +195,7 @@ export default {
   height: 170px;
   /* height: 500px; */
   /* margin: 15px 5px 0 0; */
-  background: #fff;
+  /* background: #fff; */
   overflow: hidden;
   flex-shrink: 0;
   position: relative;
@@ -209,6 +209,6 @@ export default {
   width: 100%;
   height: 100%;
   z-index: 999;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/student/toolUser2/index.vue

@@ -209,6 +209,6 @@ export default {
   width: 100%;
   height: 100%;
   z-index: 999;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/teacher/chartList/bar.vue

@@ -150,6 +150,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 21 - 1
src/components/pages/dataBoardNew/teacher/chartList/cateRank.vue

@@ -93,10 +93,30 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 
 .tableClass >>> td, .tableClass >>> th{
   padding: 5px 0;
 }
+
+.data_body div::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 6px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 6px;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+.data_body div::-webkit-scrollbar-track {
+    border-radius: 10px;
+    background-color: #fff;
+}
+
+/*定义滑块 内阴影+圆角*/
+.data_body div::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px #AECCFE;
+    background-color: #AECCFE;
+}
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/teacher/chartList/funPlot.vue

@@ -80,6 +80,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/teacher/chartList/teaAct.vue

@@ -130,6 +130,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/teacher/chartList/teaActSecond.vue

@@ -130,6 +130,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 23 - 1
src/components/pages/dataBoardNew/teacher/chartList/teaData.vue

@@ -329,8 +329,30 @@ export default {
     box-sizing: border-box;
     padding: 0;
     width: 95%;
-    background: #fff;
+    /* background: #fff; */
     overflow: auto;
+    overflow-y: hidden;
+}
+
+
+.data_body::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 6px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 6px;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+.data_body::-webkit-scrollbar-track {
+    border-radius: 10px;
+    background-color: #fff;
+}
+
+/*定义滑块 内阴影+圆角*/
+.data_body::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px #AECCFE;
+    background-color: #AECCFE;
 }
 </style>
   

+ 1 - 1
src/components/pages/dataBoardNew/teacher/chartList/teaFre.vue

@@ -135,6 +135,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 2 - 2
src/components/pages/dataBoardNew/teacher/chartList/toolUse.vue

@@ -195,7 +195,7 @@ export default {
   height: 170px;
   /* height: 500px; */
   /* margin: 15px 5px 0 0; */
-  background: #fff;
+  /* background: #fff; */
   overflow: hidden;
   flex-shrink: 0;
   position: relative;
@@ -209,6 +209,6 @@ export default {
   width: 100%;
   height: 100%;
   z-index: 999;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/teacher/chartList/workNum.vue

@@ -127,6 +127,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 1 - 1
src/components/pages/dataBoardNew/teacher/chartList/workTime.vue

@@ -135,6 +135,6 @@ export default {
   box-sizing: border-box;
   padding: 0;
   width: 95%;
-  background: #fff;
+  /* background: #fff; */
 }
 </style>

+ 26 - 8
src/components/pages/dataBoardNew/teacher/index.vue

@@ -238,7 +238,7 @@
         <div class="dataBox" v-loading="rankLoading">
           <TeaData
             v-if="courseType == 0"
-            style="height: calc(100%)"
+            style="height: calc(100% - 10px)"
             :courseArray="courseArray"
             :cType="cType"
           >
@@ -1218,6 +1218,7 @@ export default {
         });
     },
     checkRank() {
+          this.courseType = 1;
       this.rankLoading = true;
       let params = [
         {
@@ -1230,7 +1231,6 @@ export default {
         .post(this.$store.state.api + "selectDataboardTeacherRank", params)
         .then((res) => {
           this.rankLoading = false;
-          this.courseType = 1;
           let rankData = [];
           let teachers = res.data[0]; //教师总数
           let loginTimeAll = res.data[1]; //教师总登录时长
@@ -1339,16 +1339,22 @@ export default {
 .left > .top {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .left > .bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center {
@@ -1360,16 +1366,22 @@ export default {
 .center > .top {
   width: 100%;
   height: calc(100% / 5 * 3 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .center > .bottom {
   width: 100%;
   height: calc(100% / 5 * 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right {
@@ -1380,16 +1392,22 @@ export default {
 .right > .top {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
   margin: 0 0 20px 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .right > .bottom {
   width: 100%;
   height: calc(100% / 2 - 10px);
-  background: #fff;
+  /* background: #fff; */
   border-radius: 5px;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, rgba(224, 234, 251, 0.8) 100%);
+  border: 2px solid #fff;
+  box-sizing: border-box;
 }
 
 .titleBox {

+ 2 - 2
src/components/pages/dataBoardTest/course/index.vue

@@ -563,8 +563,8 @@ export default {
 
 
           let shejiJson = JSON.parse(shejiArray[0].chapters)
-          let shejiTimeArray = shejiJson[1].json.array
-          let shejiXuanArray = shejiJson[2].json.array
+          let shejiTimeArray = shejiJson[0].array[1].json.array
+          let shejiXuanArray = shejiJson[0].array[2].json.array
           let shejiTime = []
           let shejiXuan = []
           shejiTimeArray.forEach(el => {

+ 7 - 7
src/components/pages/test/check/index.vue

@@ -440,16 +440,16 @@ export default {
               })
             }
           }
-          for (var i = 0; i < chapters.length; i++) {
-            let el = chapters[i]
+          for (var i = 0; i < this.chapters.length; i++) {
+            let el = this.chapters[i]
             let topic = {
               type: el.type,
-              title: el.json.title,
-              detail: el.json.detail,
-              atype: el.json.type,
-              choice: el.json.array,
+              title: el.json ? el.json.title : '',
+              detail: el.json ? el.json.detail : '',
+              atype: el.json ? el.json.type : '',
+              choice: el.json ? el.json.array : '',
               array: [],
-              answer: el.json.answer,
+              answer: el.json ? el.json.answer : '',
               count: 0
             }
             if (topic.type == 1) {

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio