update--hk

src/components/pages/dataBoard/course/chartList/cateRank.vue

@@ -4,8 +4,9 @@
       <el-table
         :data="tableData"
         style="width: 100%"
-        :header-cell-style="{ background: '#E0EAFB' }"
+        :header-cell-style="{ background: '#E0EAFB', color: '#000' }"
         :row-class-name="tableRowClassName"
+        class="tableClass"
       >
         <el-table-column prop="rank" label="排行" min-width="50" align="center">
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -101,4 +102,8 @@ export default {
   width: 95%;
   background: #fff;
 }
+
+.tableClass >>> td, .tableClass >>> th{
+  padding: 5px 0;
+}
 </style>

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

@@ -45,7 +45,7 @@
             <div class="teafre">
               <div class="teaMiddle cNum">
                 <div>课程总数</div>
-                <div>{{ cCount }}</div>
+                <div>{{ typeCourseCount }}</div>
               </div>
               <div class="teaMiddle tNum">
                 <div>类别总数</div>
@@ -53,7 +53,7 @@
               </div>
               <div class="teaMiddle tSum">
                 <div>类别平均</div>
-                <div>{{ (cCount / typeCount).toFixed(0) }}</div>
+                <div>{{ (typeCourseCount / typeCount).toFixed(0) }}</div>
               </div>
             </div>
             <CateRank
@@ -62,7 +62,7 @@
                 margin-top: 10px;
                 overflow: auto;
               "
-              :courseNumberArray="courseNumberArray"
+              :courseNumberArray="courseNumberArray2"
             ></CateRank>
           </div>
           <div class="halfBox middleBox" style="align-items: flex-start">
@@ -173,7 +173,9 @@ export default {
       subjectList: [],
       themeList: [],
       typeCount: 0,
+      typeCourseCount: 0,
       courseNumberArray: [],
+      courseNumberArray2: [],
       gradeArray: [],
       subjectArray: [],
       themeArray: [],
@@ -233,15 +235,30 @@ export default {
         "*"
       );
     },
+    typeCourseCountCalu(){
+      this.courseNumberArray2 = this.allArray
+      this.typeCount = this.courseNumberArray2.length
+      let course = []
+      for(var i = 0;i<this.courseNumberArray2.length;i++){
+        let _array = this.courseNumberArray2[i].array
+        for(var j = 0; j <_array.length;j++){
+          console.log(_array[j]);
+          if(course.indexOf(_array[j]) == -1){
+            course.push(_array[j])
+          }
+        }
+      }
+      this.typeCourseCount = course.length
+    },
     typeChange() {
       if (this.cType === "") {
         this.courseNumberArray = this.allArray;
       } else if (this.cType === "grade") {
         this.courseNumberArray = this.gradeArray;
       } else if (this.cType === "theme") {
-        this.courseNumberArray = this.subjectArray;
-      } else if (this.cType === "subject") {
         this.courseNumberArray = this.themeArray;
+      } else if (this.cType === "subject") {
+        this.courseNumberArray = this.subjectArray;
       }
       this.$forceUpdate();
     },
@@ -448,10 +465,12 @@ export default {
               name: _grade[i].name,
               typeid: _grade[i].id,
               course: 0,
+              array:[]
             });
             for (var z = 0; z < _course.length; z++) {
               if (_course[z].typeid == _grade[i].id) {
                 _gradeArray[i].course++;
+                _gradeArray[i].array.push(_course[z].courseid);
               }
             }
           }
@@ -461,10 +480,12 @@ export default {
               name: _subject[i].name,
               typeid: _subject[i].id,
               course: 0,
+              array:[]
             });
             for (var z = 0; z < _course.length; z++) {
               if (_course[z].typeid == _subject[i].id) {
                 _subjectArray[i].course++;
+                _subjectArray[i].array.push(_course[z].courseid);
               }
             }
           }
@@ -474,10 +495,12 @@ export default {
               name: themeList[i].name,
               typeid: themeList[i].id,
               course: 0,
+              array: []
             });
             for (var z = 0; z < _course.length; z++) {
               if (_course[z].typeid == themeList[i].id) {
                 _themeArray[i].course++;
+                _themeArray[i].array.push(_course[z].courseid);
               }
             }
           }
@@ -485,6 +508,7 @@ export default {
           this.subjectArray = _subjectArray;
           this.themeArray = _themeArray;
           this.allArray = [..._gradeArray, ..._subjectArray, ..._themeArray];
+          this.typeCourseCountCalu()
           this.typeChange();
           var wList = [];
           for (var i = 0; i < _workCourse.length; i++) {

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

@@ -1,8 +1,8 @@
 <template>
   <div class="data_body">
     <div style="width: 100%; height: 100%">
-      <el-table :data="tableData" style="width: 100%" :header-cell-style="{ background: '#E0EAFB' }"
-        :row-class-name="tableRowClassName">
+      <el-table :data="tableData" style="width: 100%" :header-cell-style="{ background: '#E0EAFB',color: '#000' }"
+        :row-class-name="tableRowClassName" class="tableClass">
         <el-table-column label="排行" min-width="50" align="center">
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>
         </el-table-column>
@@ -88,4 +88,8 @@ export default {
   width: 95%;
   background: #fff;
 }
+
+.tableClass >>> td, .tableClass >>> th{
+  padding: 5px 0;
+}
 </style>

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

@@ -172,7 +172,7 @@
             <div class="info_box">
               <div class="info3 blueBG">
                 <span>课程总数</span>
-                <span>{{ courseCount }}</span>
+                <span>{{ typeCourseCount }}</span>
               </div>
               <div class="info3 greenBG">
                 <span>类别总数</span>
@@ -180,7 +180,7 @@
               </div>
               <div class="info3 blueBG">
                 <span>类别平均</span>
-                <span>{{ (courseCount / typeCount).toFixed(0) }}</span>
+                <span>{{ (typeCourseCount / typeCount).toFixed(0) }}</span>
               </div>
             </div>
             <div class="course_box_p">
@@ -251,6 +251,7 @@ export default {
       allArray: [],
       courseNumberArray: [],
       typeCount: 0,
+      typeCourseCount: 0,
       lightJson: {
         users: 0,
         teachers: 0,
@@ -516,11 +517,13 @@ export default {
             _gradeArray.push({
               name: _grade[i].name,
               typeid: _grade[i].id,
-              course: 0
+              course: 0,
+              array:[]
             })
             for (var z = 0; z < _course.length; z++) {
               if (_course[z].typeid == _grade[i].id) {
                 _gradeArray[i].course++
+                _gradeArray[i].array.push(_course[z].courseid)
               }
             }
           }
@@ -529,11 +532,13 @@ export default {
             _subjectArray.push({
               name: _subject[i].name,
               typeid: _subject[i].id,
-              course: 0
+              course: 0,
+              array: []
             })
             for (var z = 0; z < _course.length; z++) {
               if (_course[z].typeid == _subject[i].id) {
                 _subjectArray[i].course++
+                _subjectArray[i].array.push(_course[z].courseid)
               }
             }
           }
@@ -543,11 +548,13 @@ export default {
             _themeArray.push({
               name: _theme[i].name,
               typeid: _theme[i].id,
-              course: 0
+              course: 0,
+              array: []
             })
             for (var z = 0; z < _course.length; z++) {
               if (_course[z].typeid == _theme[i].id) {
                 _themeArray[i].course++
+                _themeArray[i].array.push(_course[z].courseid)
               }
             }
           }
@@ -668,10 +675,22 @@ export default {
       } else if (this.cType === 'grade') {
         this.courseNumberArray = this.gradeArray
       } else if (this.cType === 'theme') {
-        this.courseNumberArray = this.subjectArray
-      } else if (this.cType === 'subject') {
         this.courseNumberArray = this.themeArray
+      } else if (this.cType === 'subject') {
+        this.courseNumberArray = this.subjectArray
+      }
+      let course = []
+      for(var i = 0;i<this.courseNumberArray.length;i++){
+        let _array = this.courseNumberArray[i].array
+        for(var j = 0; j <_array.length;j++){
+          console.log(_array[j]);
+          if(course.indexOf(_array[j]) == -1){
+            course.push(_array[j])
+          }
+        }
       }
+      this.typeCount = this.courseNumberArray.length
+      this.typeCourseCount = course.length
       this.$forceUpdate();
     },
     typeChange2(){

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

@@ -4,8 +4,9 @@
       <el-table
         :data="tableData"
         style="width: 100%;"
-        :header-cell-style="{ background: '#E0EAFB' }"
+        :header-cell-style="{ background: '#E0EAFB', color:'#000' }"
         :row-class-name="tableRowClassName"
+        class="tableClass"
       >
       <el-table-column label="排行" min-width="50" align="center">
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>
@@ -100,4 +101,8 @@ export default {
   background: #fff;
   overflow: auto;
 }
+
+.tableClass >>> td, .tableClass >>> th{
+  padding: 5px 0;
+}
 </style>

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

@@ -4,8 +4,9 @@
       <el-table
         :data="tableData"
         style="width: 100%; "
-        :header-cell-style="{ background: '#E0EAFB' }"
+        :header-cell-style="{ background: '#E0EAFB', color: '#000' }"
         :row-class-name="tableRowClassName"
+        class="tableClass"
       >
         <el-table-column prop="rank" label="排行" min-width="50" align="center">
         </el-table-column>
@@ -68,4 +69,8 @@ export default {
   background: #fff;
   overflow: auto;
 }
+
+.tableClass >>> td, .tableClass >>> th{
+  padding: 5px 0;
+}
 </style>