Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 1 year ago
parent
a9ed1b26a6
commit
6b330fb5a0
16 changed files with 39 additions and 35 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.0153f6e6e4ac2ead1c8cc34082d89962.css
  3. 0 0
      dist/static/css/app.0153f6e6e4ac2ead1c8cc34082d89962.css.map
  4. 0 0
      dist/static/js/app.153cdaf44c86b96eb21e.js
  5. 0 0
      dist/static/js/app.153cdaf44c86b96eb21e.js.map
  6. 0 0
      dist/static/js/app.81caecc2ad6fe3c55e65.js
  7. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  8. 1 1
      src/components/pages/dataBoardNew/course/chartList/courseNum.vue
  9. 6 6
      src/components/pages/dataBoardNew/course/index.vue
  10. 1 1
      src/components/pages/dataBoardNew/index.vue
  11. 1 1
      src/components/pages/dataBoardNew/project/chartList/courseNum.vue
  12. 4 4
      src/components/pages/dataBoardNew/project/index.vue
  13. 1 1
      src/components/pages/dataBoardNew/school/courseNum/index.vue
  14. 6 6
      src/components/pages/dataBoardNew/school/index.vue
  15. 11 7
      src/components/pages/dataBoardNew/student/index.vue
  16. 7 7
      src/components/pages/dataBoardNew/teacher/index.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.4c78fff43ba57d1a2ff3db28e7892e2b.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.81caecc2ad6fe3c55e65.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.0153f6e6e4ac2ead1c8cc34082d89962.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.153cdaf44c86b96eb21e.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.0153f6e6e4ac2ead1c8cc34082d89962.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.0153f6e6e4ac2ead1c8cc34082d89962.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.153cdaf44c86b96eb21e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.153cdaf44c86b96eb21e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.81caecc2ad6fe3c55e65.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/courseNum.vue
View File 

@@ -79,7 +79,7 @@ export default {
 
                   employeePercentage = ((optimizedEmployee - employee) / optimizedEmployee) * 100
 
                 }
 
                 if (this.series.name === '本周课程总数') {
 
-                  return  employeePercentage.toFixed(2) + '%';
 
+                  return  employeePercentage.toFixed(1) + '%';
 
                 } else {
 
                   return '';
 
                 }

+ 6 - 6
src/components/pages/dataBoardNew/course/index.vue
View File 

@@ -18,14 +18,14 @@
 
             </div>
 
             <div class="info blueBG">
 
               <span>本月新增课程环比</span>
 
-              <span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].course) > 0 ? (((loginCountMonthArray[loginCountMonthArray.length - 1].course) / allCourse) * 100).toFixed(2) + '%' : 0 }}</span>
 
+              <span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].course) > 0 ? (((loginCountMonthArray[loginCountMonthArray.length - 1].course) / allCourse) * 100).toFixed(0) + '%' : 0 }}</span>
 
               <!-- <span>{{ weekCount }}</span> -->
 
               <!-- <span v-if="loginCountMonthArray.length">{{
 
                 loginCountMonthArray[loginCountMonthArray.length - 1].course -
 
                 loginCountMonthArray[loginCountMonthArray.length - 2].course < 0 ? 0 : (
 
                   ((loginCountMonthArray[loginCountMonthArray.length - 1].course -
 
                     loginCountMonthArray[loginCountMonthArray.length - 2].course) / (allCourse -
 
-                      loginCountMonthArray[loginCountMonthArray.length - 1].course)) * 100).toFixed(2) + "%" }}</span> -->
 
+                      loginCountMonthArray[loginCountMonthArray.length - 1].course)) * 100).toFixed(0) + "%" }}</span> -->
 
             </div>
 
             <div class="info blueBG">
 
               <span>模板课程总数</span>
 
@@ -92,7 +92,7 @@
 
               <span>{{ courseLength }}</span>
 
             </div>
 
             <div class="info blueBG" style="width: calc(100% / 3 - 10px)">
 
-              <span>课程平均时长</span>
 
+              <span>课均时长</span>
 
               <!-- <span>{{ weekCount }}</span> -->
 
               <span>{{
 
                 allTime == 0 ? 0 : (allTime / courseLength).toFixed(0)
 
@@ -339,7 +339,7 @@ export default {
 
       courseType: 0,
 
       sType: 0,
 
       oType: false,
 
-      shType: false,
 
+      shType: true,
 
       xtType: false,
 
       allCourse: 0,
 
       courseTemplate: 0,
 
@@ -673,7 +673,7 @@ export default {
 
             }, {})
 
           ).map(function (obj) {
 
             var totalTime = parseInt(obj.text);
 
-            obj.text = (totalTime / (60 * 60)).toFixed(2);
 
+            obj.text = (totalTime / (60 * 60)).toFixed(0);
 
             return obj;
 
           });
 
 
@@ -1477,7 +1477,7 @@ export default {
 
 .info_box>.info2>span:nth-child(1),
 
 .info_box>.info3>span:nth-child(1),
 
 .info_box>.info>span:nth-child(1) {
 
-  font-size: 14px;
 
+  font-size: 12px;
 
   /* margin: 0 0 0 20px; */
 
   color: #565e6a;
 
   width: 60px;

+ 1 - 1
src/components/pages/dataBoardNew/index.vue
View File 

@@ -59,7 +59,7 @@ export default {
 
 .body {
 
   height: 100%;
 
   width: 100%;
 
-  min-width: 1200px;
 
+  min-width: 1550px;
 
   min-height: 750px;
 
 }

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/courseNum.vue
View File 

@@ -79,7 +79,7 @@ export default {
 
                   employeePercentage = ((optimizedEmployee - employee) / optimizedEmployee) * 100
 
                 }
 
                 if (this.series.name === '本周课程总数') {
 
-                  return  employeePercentage.toFixed(2) + '%';
 
+                  return  employeePercentage.toFixed(1) + '%';
 
                 } else {
 
                   return '';
 
                 }

+ 4 - 4
src/components/pages/dataBoardNew/project/index.vue
View File 

@@ -17,13 +17,13 @@
 
             </div>
 
             <div class="info blueBG">
 
               <span>本月新增项目环比</span>
 
-              <span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].course) > 0 ? (((loginCountMonthArray[loginCountMonthArray.length - 1].course) / allCourse) * 100).toFixed(2) + '%' : 0 }}</span>
 
+              <span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].course) > 0 ? (((loginCountMonthArray[loginCountMonthArray.length - 1].course) / allCourse) * 100).toFixed(0) + '%' : 0 }}</span>
 
               <!-- <span v-if="loginCountMonthArray.length">{{
 
                 loginCountMonthArray[loginCountMonthArray.length - 1].course -
 
                 loginCountMonthArray[loginCountMonthArray.length - 2].course < 0 ? 0 : (
 
                   (loginCountMonthArray[loginCountMonthArray.length - 1].course -
 
                     loginCountMonthArray[loginCountMonthArray.length - 2].course) / (allCourse -
 
-                      loginCountMonthArray[loginCountMonthArray.length - 1].course) * 100).toFixed(2) + "%" }}</span> -->
 
+                      loginCountMonthArray[loginCountMonthArray.length - 1].course) * 100).toFixed(0) + "%" }}</span> -->
 
                   <span v-else>0</span>
 
             </div>
 
             <div class="info blueBG">
 
@@ -322,7 +322,7 @@ export default {
 
       courseType: 0,
 
       sType: 0,
 
       oType: false,
 
-      shType: false,
 
+      shType: true,
 
       xtType: false,
 
       allCourse: 0,
 
       courseTemplate: 0,
 
@@ -903,7 +903,7 @@ export default {
 
 .info_box>.info2>span:nth-child(1),
 
 .info_box>.info3>span:nth-child(1),
 
 .info_box>.info>span:nth-child(1) {
 
-  font-size: 14px;
 
+  font-size: 12px;
 
   /* margin: 0 0 0 20px; */
 
   color: #565e6a;
 
   width: 60px;

+ 1 - 1
src/components/pages/dataBoardNew/school/courseNum/index.vue
View File 

@@ -79,7 +79,7 @@ export default {
 
                   employeePercentage = ((optimizedEmployee - employee) / optimizedEmployee) * 100
 
                 }
 
                 if (this.series.name === '本周课程总数') {
 
-                  return  employeePercentage.toFixed(2) + '%';
 
+                  return  employeePercentage.toFixed(1) + '%';
 
                 } else {
 
                   return '';
 
                 }

+ 6 - 6
src/components/pages/dataBoardNew/school/index.vue
View File 

@@ -28,13 +28,13 @@
 
               }}</span>
 
             </div>
 
             <div class="info blueBG">
 
-              <span>本月登录用户环比</span>
 
-              <span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].user) > 0 ? (((loginCountMonthArray[loginCountMonthArray.length - 1].user) / allUser) * 100).toFixed(2) + '%' : 0 }}</span>
 
+              <span>月登录环比</span>
 
+              <span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].user) > 0 ? (((loginCountMonthArray[loginCountMonthArray.length - 1].user) / allUser) * 100).toFixed(0) + '%' : 0 }}</span>
 
               <!-- <span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].user -
 
                 loginCountMonthArray[loginCountMonthArray.length - 2].user) < 0 ? 0 :
 
                 (((loginCountMonthArray[loginCountMonthArray.length - 1].user -
 
                   loginCountMonthArray[loginCountMonthArray.length - 2].user) /
 
-                  loginCountMonthArray[loginCountMonthArray.length - 2].user) * 100).toFixed(2) + '%' }}</span> -->
 
+                  loginCountMonthArray[loginCountMonthArray.length - 2].user) * 100).toFixed(0) + '%' }}</span> -->
 
             </div>
 
           </div>
 
           <loginCount style="height: calc(100% - 140px)" :monthArray="loginCountMonthArray"></loginCount>
 
@@ -300,9 +300,9 @@
 
       <div class="bottom">
 
         <div class="titleBox" style="justify-content: space-between">
 
           <div class="title">跨学科教学情况</div>
 
-          <el-select v-model="cType6" class="selectBox" style="width: 110px">
 
+          <!-- <el-select v-model="cType6" class="selectBox" style="width: 110px">
 
             <el-option label="全部" value="全部"></el-option>
 
-          </el-select>
 
+          </el-select> -->
 
         </div>
 
         <div class="dataBox">
 
           <cateRank style="height: calc(100%)"></cateRank>
 
@@ -1049,7 +1049,7 @@ export default {
 
 .info_box>.info2>span:nth-child(1),
 
 .info_box>.info3>span:nth-child(1),
 
 .info_box>.info>span:nth-child(1) {
 
-  font-size: 14px;
 
+  font-size: 12px;
 
   /* margin: 0 0 0 20px; */
 
   color: #565e6a;
 
   width: 60px;

+ 11 - 7
src/components/pages/dataBoardNew/student/index.vue
View File 

@@ -13,8 +13,8 @@
 
               <span>{{ studentCount }}</span>
 
             </div>
 
             <div class="info blueBG">
 
-              <span>本月登录学生用户环比</span>
 
-              <span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].user) > 0 ? (((loginCountMonthArray[loginCountMonthArray.length - 1].user) / studentCount) * 100).toFixed(2) + '%' : 0 }}</span>
 
+              <span>本月登录学生环比</span>
 
+              <span v-if="loginCountMonthArray.length">{{ (loginCountMonthArray[loginCountMonthArray.length - 1].user) > 0 ? (((loginCountMonthArray[loginCountMonthArray.length - 1].user) / studentCount) * 100).toFixed(0) + '%' : 0 }}</span>
 
               <!-- <span v-if="loginCountMonthArray.length">{{
 
                 loginCountMonthArray[loginCountMonthArray.length - 1].user -
 
                   loginCountMonthArray[loginCountMonthArray.length - 2].user <
 
@@ -26,7 +26,7 @@
 
                         .user) /
 
                       loginCountMonthArray[loginCountMonthArray.length - 2]
 
                         .user) *
 
-                      100).toFixed(2) +
 
+                      100).toFixed(0) +
 
                     "%"
 
               }}</span> -->
 
             </div>
 
@@ -715,9 +715,11 @@ export default {
 
               _EloginTimeArray[i].loginTime /
 
               60 /
 
               60
 
-            ).toFixed(2); //换算成小时
 
+            ).toFixed(0); //换算成小时
 
           }
 
-          this.EloginTimeArray = _EloginTimeArray;
 
+          this.EloginTimeArray = _EloginTimeArray.filter((el)=>{
 
+            return el.loginTime > 0;
 
+          });
 
 
           this.courseNumArray = res.data[10]; //参与课程数
 
           this.scourseNumArray = res.data[11]; //参与项目数
 
@@ -825,7 +827,9 @@ export default {
 
             }
 
           }
 
 
-          this.EworksNumArray = _EworksNumArray;
 
+          this.EworksNumArray = _EworksNumArray.filter((el)=>{
 
+            return el.works > 0;
 
+          });;
 
 
           this.$forceUpdate();
 
         })
 
@@ -1159,7 +1163,7 @@ export default {
 
 .info_box > .info2 > span:nth-child(1),
 
 .info_box > .info3 > span:nth-child(1),
 
 .info_box > .info > span:nth-child(1) {
 
-  font-size: 14px;
 
+  font-size: 12px;
 
   /* margin: 0 0 0 20px; */
 
   color: #565e6a;
 
   width: 60px;

+ 7 - 7
src/components/pages/dataBoardNew/teacher/index.vue
View File 

@@ -14,9 +14,9 @@
 
               <span>{{ teacherNum }}</span>
 
             </div>
 
             <div class="info blueBG">
 
-              <span>本月登录教师用户环比</span>
 
+              <span>本月登录教师环比</span>
 
               <!-- <span>{{ weekCount }}</span> -->
 
-              <span v-if="teacherLoginCountMonthArray.length">{{ (teacherLoginCountMonthArray[teacherLoginCountMonthArray.length - 1].login) > 0 ? (((teacherLoginCountMonthArray[teacherLoginCountMonthArray.length - 1].login) / teacherNum) * 100).toFixed(2) + '%' : 0 }}</span>
 
+              <span v-if="teacherLoginCountMonthArray.length">{{ (teacherLoginCountMonthArray[teacherLoginCountMonthArray.length - 1].login) > 0 ? (((teacherLoginCountMonthArray[teacherLoginCountMonthArray.length - 1].login) / teacherNum) * 100).toFixed(0) + '%' : 0 }}</span>
 
               <!-- <span v-if="teacherLoginCountMonthArray.length">{{
 
                 teacherLoginCountMonthArray[
 
                   teacherLoginCountMonthArray.length - 1
 
@@ -37,7 +37,7 @@
 
                         teacherLoginCountMonthArray[
 
                           teacherLoginCountMonthArray.length - 1
 
                         ].login)
 
-                    ).toFixed(2) *
 
+                    ).toFixed(0) *
 
                       100 +
 
                     "%"
 
               }}</span> -->
 
@@ -460,7 +460,7 @@
 
         <div class="titleBox" style="justify-content: space-between">
 
           <div class="title">年级占比</div>
 
           <el-select v-model="cType4" @change="typeChange" class="selectBox">
 
-            <el-option label="全部" value=""></el-option>
 
+            <!-- <el-option label="全部" value=""></el-option> -->
 
             <el-option label="年级" value="grade"></el-option>
 
             <el-option label="主题" value="theme"></el-option>
 
             <el-option label="学科" value="subject"></el-option>
 
@@ -541,7 +541,7 @@ export default {
 
       courseType: 0,
 
       bType: 0,
 
       sType: 0,
 
-      cType4: "",
 
+      cType4: "grade",
 
       oType: false,
 
       teacherNum: 0,
 
       allLoginTeacher: 0,
 
@@ -723,7 +723,7 @@ export default {
 
                 mergedArray[i].text += Number(_user.text);
 
               }
 
             }
 
-            mergedArray[i].text = (mergedArray[i].text / 60 / 60).toFixed(2); //换算成小时
 
+            mergedArray[i].text = (mergedArray[i].text / 60 / 60).toFixed(0); //换算成小时
 
           }
 
           this.workTime = mergedArray;
 
 
@@ -1316,7 +1316,7 @@ export default {
 
 .info_box > .info2 > span:nth-child(1),
 
 .info_box > .info3 > span:nth-child(1),
 
 .info_box > .info > span:nth-child(1) {
 
-  font-size: 14px;
 
+  font-size: 12px;
 
   /* margin: 0 0 0 20px; */
 
   color: #565e6a;
 
   width: 60px;

Some files were not shown because too many files changed in this diff