首页 发现 帮助
登录
CocoRoboLabs
/
pbl-teacher-table
3
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

update

lsc 1 年之前
父节点
7d45860cbf
当前提交
029e3cd1e7
共有 9 个文件被更改，包括 73 次插入 和 50 次删除
合并视图 显示文件统计
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css
  3. 0 0
      dist/static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css.map
  4. 0 0
      dist/static/js/app.faf25f48644049cb70ad.js
  5. 0 0
      dist/static/js/app.faf25f48644049cb70ad.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 30 30
      src/components/pages/course.vue
  8. 13 7
      src/components/pages/sz/dataBoardCity/dataCenter/chartList/schoolRank/index.vue
  9. 29 12
      src/components/pages/sz/dataBoardCity/dataCenter/index.vue

+ 1 - 1
dist/index.html
查看文件 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: 'Source Han Sans SC', sans-serif;
 
       font-family: 'Source Han Sans SC', sans-serif;
 
-    }</style><link href=./static/css/app.ef0a337560764736fc54f5f57b86fae7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.11d8a4dfbebdec332b5f.js></script><script type=text/javascript src=./static/js/app.eecf136bf64d17f8809c.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.11d8a4dfbebdec332b5f.js></script><script type=text/javascript src=./static/js/app.faf25f48644049cb70ad.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.6b8cb93c8e5e452d66cbd9177401862c.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.faf25f48644049cb70ad.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.faf25f48644049cb70ad.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 30 - 30
src/components/pages/course.vue
查看文件 

@@ -30,8 +30,8 @@
 
             <div v-show="btnDisplay" class="buttonBox">
 
             <div v-show="btnDisplay" class="buttonBox">
 
               <div type="primary" @click="goToCourse3()">极简式课程</div>
 
               <div type="primary" @click="goToCourse3()">极简式课程</div>
 
               <!-- <div type="primary" @click="goToCourse2()">任务式课程</div> -->
 
               <!-- <div type="primary" @click="goToCourse2()">任务式课程</div> -->
 
-              <div type="primary" @click="goToCourse()">阶段式课程</div>
 
-              <div type="primary" @click="goToCourse4()">高级模式</div>
 
+              <!-- <div type="primary" @click="goToCourse()">阶段式课程</div> -->
 
+              <div type="primary" @click="goToCourse4()">阶段式课程</div>
 
             </div>
 
             </div>
 
           </button>
 
           </button>
 
         </div>
 
         </div>
 
@@ -459,35 +459,35 @@ export default {
 
       this.getCourse();
 
       this.getCourse();
 
     },
 
     },
 
     goToCourse(courseId) {
 
     goToCourse(courseId) {
 
-      if(this.org !== '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
-        if (courseId) {
 
-          this.$router.push(
 
-            "/course/addCourse?cid=" +
 
-            courseId +
 
-            "&userid=" +
 
-            this.userid +
 
-            "&oid=" +
 
-            this.oid +
 
-            "&org=" +
 
-            this.org +
 
-            "&role=" +
 
-            this.role
 
-          );
 
-        } else {
 
-          this.$router.push(
 
-            "/course/addCourse?userid=" +
 
-            this.userid +
 
-            "&oid=" +
 
-            this.oid +
 
-            "&org=" +
 
-            this.org +
 
-            "&role=" +
 
-            this.role
 
-          );
 
-        }
 
-      }else{
 
+      // if(this.org !== '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
+      //   if (courseId) {
 
+      //     this.$router.push(
 
+      //       "/course/addCourse?cid=" +
 
+      //       courseId +
 
+      //       "&userid=" +
 
+      //       this.userid +
 
+      //       "&oid=" +
 
+      //       this.oid +
 
+      //       "&org=" +
 
+      //       this.org +
 
+      //       "&role=" +
 
+      //       this.role
 
+      //     );
 
+      //   } else {
 
+      //     this.$router.push(
 
+      //       "/course/addCourse?userid=" +
 
+      //       this.userid +
 
+      //       "&oid=" +
 
+      //       this.oid +
 
+      //       "&org=" +
 
+      //       this.org +
 
+      //       "&role=" +
 
+      //       this.role
 
+      //     );
 
+      //   }
 
+      // }else{
 
          this.goToCourse4(courseId)
 
          this.goToCourse4(courseId)
 
-      }
 
+      // }
 
       // this.$router.push(path);
 
       // this.$router.push(path);
 
     },
 
     },
 
     goToCourse4(courseId) {
 
     goToCourse4(courseId) {

+ 13 - 7
src/components/pages/sz/dataBoardCity/dataCenter/chartList/schoolRank/index.vue
查看文件 

@@ -6,19 +6,22 @@
 
         <el-table-column label="排名" min-width="50" align="center">
 
         <el-table-column label="排名" min-width="50" align="center">
 
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>
 
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>
 
         </el-table-column>
 
         </el-table-column>
 
-        <el-table-column prop="schoolName" label="学校名称" min-width="80" align="center">
 
+        <el-table-column prop="name" label="学校名称" min-width="80" align="center">
 
         </el-table-column>
 
         </el-table-column>
 
-        <el-table-column prop="area" label="区域" min-width="90" align="center">
 
+        <el-table-column prop="dest" label="区域" min-width="90" align="center">
 
         </el-table-column>
 
         </el-table-column>
 
-        <el-table-column prop="teacherLogin" label="教师登录" min-width="90" align="center">
 
+        <el-table-column prop="teacherCount" label="教师数量" min-width="90" align="center">
 
         </el-table-column>
 
         </el-table-column>
 
-				<el-table-column prop="studentLogin" label="学生登录" min-width="90" align="center">
 
+				<el-table-column prop="studentCount" label="学生数量" min-width="90" align="center">
 
         </el-table-column>
 
         </el-table-column>
 
-        <el-table-column prop="teaching" label="授课次数" min-width="90" align="center">
 
+        <el-table-column prop="courseCount" label="课程数量" min-width="90" align="center">
 
         </el-table-column>
 
         </el-table-column>
 
-        <el-table-column prop="submitJob" label="提交作业" min-width="80" align="center">
 
+        <el-table-column prop="workcount" label="提交作业" min-width="80" align="center">
 
         </el-table-column>
 
         </el-table-column>
 
-        <el-table-column prop="score" label="综合得分" min-width="80" align="center">
 
+        <el-table-column label="综合得分" min-width="80" align="center">
 
+          <template slot-scope="{ row }">
 
+            {{ row.score}}
 
+          </template>
 
         </el-table-column>
 
         </el-table-column>
 
       </el-table>
 
       </el-table>
 
     </div>
 
     </div>
 
@@ -47,6 +50,9 @@ export default {
 
     },
 
     },
 
     setArray(array){
 
     setArray(array){
 
       this.tableData = JSON.parse(JSON.stringify(array))
 
       this.tableData = JSON.parse(JSON.stringify(array))
 
+      this.tableData.forEach(item => {
 
+        item.score = item.teacherCount + item.studentCount + item.courseCount + item.workcount
 
+      })
 
       this.tableData = this.tableData.sort(function(a,b){
 
       this.tableData = this.tableData.sort(function(a,b){
 
         return b.score - a.score;
 
         return b.score - a.score;
 
       })
 
       })

+ 29 - 12
src/components/pages/sz/dataBoardCity/dataCenter/index.vue
查看文件 

@@ -63,6 +63,7 @@
 
           <el-select v-model="selectArea2" @change="typeChangeArea2" class="selectBox">
 
           <el-select v-model="selectArea2" @change="typeChangeArea2" class="selectBox">
 
             <el-option label="全部" value=""></el-option>
 
             <el-option label="全部" value=""></el-option>
 
             <!-- <el-option label="南山区" :value="0"></el-option> -->
 
             <!-- <el-option label="南山区" :value="0"></el-option> -->
 
+            <el-option :label="item.dest" :value="item.dest" v-for="(item,index) in areaArray" :key="index"></el-option>    
           </el-select>
 
           </el-select>
 
         </div>
 
         </div>
 
 				<div class="dataBox">
 
 				<div class="dataBox">
 
@@ -96,9 +97,10 @@
 
       <div class="bottom">
 
       <div class="bottom">
 
 				<div class="titleBox">
 
 				<div class="titleBox">
 
           <div class="title">课程排行榜</div>
 
           <div class="title">课程排行榜</div>
 
-          <el-select v-model="selectArea3" @change="typeChangeArea2" class="selectBox">
 
+          <el-select v-model="selectArea3" @change="typeChangeArea3" class="selectBox">
 
             <el-option label="全部" value=""></el-option>
 
             <el-option label="全部" value=""></el-option>
 
             <!-- <el-option label="南山区" :value="0"></el-option> -->
 
             <!-- <el-option label="南山区" :value="0"></el-option> -->
 
+            <el-option :label="item.dest" :value="item.dest" v-for="(item,index) in areaArray" :key="index"></el-option>    
           </el-select>
 
           </el-select>
 
         </div>
 
         </div>
 
 				<div class="dataBox">
 
 				<div class="dataBox">
 
@@ -155,21 +157,25 @@ export default {
 
 			loginCountYearArray:{},
 
 			loginCountYearArray:{},
 
 			monthArray:[],
 
 			monthArray:[],
 
 			schoolRankData:[
 
 			schoolRankData:[
 
-				{schoolName:"深圳市南山实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"海滨实验小学逾...",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
-				{schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市南山实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"海滨实验小学逾...",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
+				// {schoolName:"深圳市海滨实验小学",area:"南山区",teacherLogin:0,studentLogin:0,teaching:0,submitJob:0,score:0},
 
 			],
 
 			],
 
+      schoolRankData2: [],
 
 			courseRankData:[
 
 			courseRankData:[
 
 			],
 
 			],
 
+      courseRankData2:[
 
+			],
 
 			weekCourse2:[
 
 			weekCourse2:[
 
 			],
 
 			],
 
       selectArea2:"",
 
       selectArea2:"",
 
       selectArea3:"",
 
       selectArea3:"",
 
+      areaArray: []
 
     };
 
     };
 
   },
 
   },
 
   mounted() {
 
   mounted() {
 
@@ -231,6 +237,16 @@ export default {
 
         toWeek: currentMonthDates, //本月
 
         toWeek: currentMonthDates, //本月
 
       };
 
       };
 
     },
 
     },
 
+    typeChangeArea2(){
 
+      this.schoolRankData = this.schoolRankData2.filter(el => {
 
+        return  this.selectArea2 == '' ? el : el.dest == this.selectArea2
 
+      })
 
+    },
 
+    typeChangeArea3(){
 
+      this.courseRankData = this.courseRankData2.filter(el => {
 
+        return  this.selectArea3 == '' ? el : el.dest == this.selectArea3
 
+      })
 
+    },
 
     getData() {
 
     getData() {
 
       this.isLoading = true;
 
       this.isLoading = true;
 
       let params = [
 
       let params = [
 
@@ -297,7 +313,7 @@ export default {
 
           let _courseNow = []
 
           let _courseNow = []
 
           for (var i = 0; i < _courseRank.length; i++) {
 
           for (var i = 0; i < _courseRank.length; i++) {
 
             _courseLastWeek.push({courseId:_courseRank[i].courseId,title:_courseRank[i].title,total:_courseRank[i].lastweek})
 
             _courseLastWeek.push({courseId:_courseRank[i].courseId,title:_courseRank[i].title,total:_courseRank[i].lastweek})
 
-            _courseNow.push({courseId:_courseRank[i].courseId,title:_courseRank[i].title,total:_courseRank[i].week,compare:0})
 
+            _courseNow.push({courseId:_courseRank[i].courseId,title:_courseRank[i].title,total:_courseRank[i].week,compare:0, dest: _courseRank[i].dest})
 
           }
 
           }
 
           _courseLastWeek = _courseLastWeek.sort((a,b)=>b.total - a.total)
 
           _courseLastWeek = _courseLastWeek.sort((a,b)=>b.total - a.total)
 
 
 
@@ -309,7 +325,7 @@ export default {
 
             })
 
             })
 
             return item
 
             return item
 
           })
 
           })
 
-          this.courseRankData = _courseNow
 
+          this.courseRankData = this.courseRankData2 = _courseNow
 
 
 
           let _userOnlineTime = (res.data[7][0].time / 60 / 60).toFixed(0); //在线时间
 
           let _userOnlineTime = (res.data[7][0].time / 60 / 60).toFixed(0); //在线时间
 
           this.yearArray = this.OnlineDuration[0] = _userOnlineTime
 
           this.yearArray = this.OnlineDuration[0] = _userOnlineTime
 
@@ -390,7 +406,8 @@ export default {
 
           }
 
           }
 
           this.weekCourse2 = weekCourse2;
 
           this.weekCourse2 = weekCourse2;
 
 
 
-
 
+          this.areaArray = res.data[12]
 
+          this.schoolRankData = this.schoolRankData2 = res.data[13]
 
           this.$forceUpdate();
 
           this.$forceUpdate();
 
         })
 
         })
 
         .catch((err) => {
 
         .catch((err) => {

部分文件因为文件数量过多而无法显示