排名跳转

tv/src/Mock/index.js

@@ -1,4 +1,5 @@
 import Mock from 'mockjs'
+import global from '../Global'
 
 let Random = Mock.Random;
 
@@ -182,20 +183,26 @@ let getNewUser = function (code) {
 };
 
 
-let t = 1;
+let t = 0;
 if (t == 0) {
     // 列表测试
     Mock.mock('/api/testTable', 'post', testTable());
 
     Mock.mock('/api/getUserList', 'post', getUserList());
     // 学生列表
-    Mock.mock('http://192.168.0.10:8080/UserListInfo', 'post', testStudent(12));
+    Mock.mock(headapi + 'UserListInfo', 'post', testStudent(12));
     // 下课排名
-    Mock.mock('http://192.168.0.10:8080/ClassUserRank', 'post', testStudent(24));
+    Mock.mock(headapi + 'ClassUserRank', 'post', testStudent(1));
+    // 英雄榜
+    Mock.mock(headapi + 'HerosRankingQuery', 'post', testStudent(1));
+    // 卡路里排行榜
+    Mock.mock(headapi + 'CalorieStatsQuery', 'post', testStudent(1));
+    // 用户排行榜
+    Mock.mock(headapi + 'UserRankingQuery', 'post', testStudent(1));
     // 上课状态
-    Mock.mock('http://192.168.0.10:8080/ClassStatQuery', 'post', getClassStat());
+    Mock.mock(headapi + 'ClassStatQuery', 'post', getClassStat());
     // 新同学 0 999
-    Mock.mock('http://192.168.0.10:8080/getNewUser', 'post', getNewUser(0));
+    Mock.mock(headapi + 'getNewUser', 'post', getNewUser(999));
 
 
 }

tv/src/views/2pkRank.vue

@@ -1,6 +1,9 @@
 <template>
     <div :class="pageStyle">
         <Headside></Headside>
+        <div class="tips">
+            {{totalTime}}
+        </div>
         <div class="rankContainer">
             <div class="sumScore">
                 <div class="sumlt">
@@ -40,11 +43,11 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-<!--                                <em>Cal</em>-->
+                                <!--                                <em>Cal</em>-->
                                 <em>胜率</em>
                                 <span v-if="redSum >= blueSum">100%</span>
                                 <span v-else>0%</span>
-<!--                                {{s.Cle|fmtInt}}-->
+                                <!--                                {{s.Cle|fmtInt}}-->
                             </div>
                             <div class="CKscore">
                                 <em>CK</em>
@@ -71,9 +74,9 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-                              <em>胜率</em>
-                              <span v-if="redSum <= blueSum">100%</span>
-                              <span v-else>0%</span>
+                                <em>胜率</em>
+                                <span v-if="redSum <= blueSum">100%</span>
+                                <span v-else>0%</span>
                             </div>
                             <div class="CKscore">
                                 <em>CK</em>
@@ -112,18 +115,15 @@
                 rankTimer: null,
                 redSum: 0,
                 blueSum: 0,
-                totalTime:60
+                totalTime: ''
             }
         },
         mounted() {
             let that = this;
             if (this.trueDate) {
                 that.init();
-                // this.rankTimer = setInterval(() => {
-                //     this.getClassUserRank();
-                // }, 5000);
             } else {
-                let Rs = fakeNews(18,2);
+                let Rs = fakeNews(18, 2);
                 that.UniteBreak(Rs);
             }
         },
@@ -131,13 +131,9 @@
             '$route': function (val) {
                 if (val.path == '/2pkRank') {
                     if (this.trueDate) {
-                        that.init();
-                        // this.rankTimer = setInterval(() => {
-                        //     this.getClassUserRank();
-                        // }, 5000);
-
+                        this.init();
                     } else {
-                        let Rs = fakeNews(18,2);
+                        let Rs = fakeNews(18, 2);
                         this.UniteBreak(Rs);
                     }
 
@@ -151,7 +147,7 @@
             this.rankTimer = null;
         },
         methods: {
-            init(){
+            init() {
                 this.getClassUserRank();
             },
             // 分队展示
@@ -181,10 +177,11 @@
             jumpWait(totalTime) {
                 // 倒计时60秒自动关闭
                 let that = this;
+                clearInterval(clock);
                 let clock = window.setInterval(() => {
                     totalTime--;
-                    console.log(totalTime--);
-                    if (parseInt(totalTime) < 0) {
+                    that.totalTime = totalTime;
+                    if (parseInt(totalTime) <= 0) {
                         // 前往等待页面
                         that.$router.push({path: '/'});
                         // 计时器回收
@@ -218,9 +215,11 @@
                     that.students.blueUnite = [];
                     if (json.Code == 0) {
                         that.UniteBreak(json.Rs);
-
-                        let Studenlength = json.Rs.length;
-                        let totalTime = 0;
+                        let totalTime = 40;
+                        let Studenlength = 0;
+                        if (json.Rs) {
+                            Studenlength = json.Rs.length;
+                        }
                         // 根据人数多少显示停留时间
                         if (Studenlength > 3) {
                             totalTime = 60
@@ -494,9 +493,10 @@
     li .CLEscore em {
         font-size: 0.3rem;
     }
+
     li .CLEscore span {
-      padding-left: 0.1rem;
-      font-size: 0.7rem;
+        padding-left: 0.1rem;
+        font-size: 0.7rem;
     }
 
     li .CKscore {
@@ -563,4 +563,12 @@
     li.mvpli .head img.king {
         top: -1rem;
     }
+
+    .tips {
+        position: absolute;
+        right: 3%;
+        top: 1rem;
+        font-size: 0.4rem;
+        color: #fff;
+    }
 </style>

tv/src/views/3pkRank.vue

@@ -1,6 +1,9 @@
 <template>
     <div :class="pageStyle">
         <Headside></Headside>
+        <div class="tips">
+            {{totalTime}}
+        </div>
         <div class="rankContainer">
             <div class="sumScore">
                 <div class="sumlt">
@@ -65,11 +68,11 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-<!--                                <em>Cal</em>-->
-<!--                                {{s.Cle|fmtInt}}-->
-                              <em>胜率</em>
-                              <span v-if="red.rank == 1">100%</span>
-                              <span v-else>0%</span>
+                                <!--                                <em>Cal</em>-->
+                                <!--                                {{s.Cle|fmtInt}}-->
+                                <em>胜率</em>
+                                <span v-if="red.rank == 1">100%</span>
+                                <span v-else>0%</span>
                             </div>
                             <div class="CKscore">
                                 <em>CK</em>
@@ -94,9 +97,9 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-                              <em>胜率</em>
-                              <span v-if="blue.rank == 1">100%</span>
-                              <span v-else>0%</span>
+                                <em>胜率</em>
+                                <span v-if="blue.rank == 1">100%</span>
+                                <span v-else>0%</span>
                             </div>
                             <div class="CKscore">
                                 <em>CK</em>
@@ -121,9 +124,9 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-                              <em>胜率</em>
-                              <span v-if="yellow.rank == 1">100%</span>
-                              <span v-else>0%</span>
+                                <em>胜率</em>
+                                <span v-if="yellow.rank == 1">100%</span>
+                                <span v-else>0%</span>
                             </div>
                             <div class="CKscore">
                                 <em>CK</em>
@@ -176,7 +179,7 @@
                 redSum: 0,
                 blueSum: 0,
                 yellowSum: 0,
-                totalTime: 60
+                totalTime: ''
             }
         },
         mounted() {
@@ -213,27 +216,14 @@
         methods: {
             init() {
                 this.getClassUserRank();
-                // 倒计时60秒自动关闭
-                let that = this;
-                this.totalTime = 60;
-                let clock = window.setInterval(() => {
-                    this.totalTime--;
-                    console.log(this.totalTime);
-                    if (parseInt(this.totalTime) < 0) {
-                        // 前往等待页面
-                        that.$router.push({path: '/'});
-                        // 计时器回收
-                        clearInterval(clock);
-                    }
-                }, 1000)
             },
             jumpWait(totalTime) {
                 // 倒计时60秒自动关闭
                 let that = this;
                 let clock = window.setInterval(() => {
                     totalTime--;
-                    console.log(totalTime--);
-                    if (parseInt(totalTime) < 0) {
+                    that.totalTime = totalTime;
+                    if (parseInt(totalTime) <= 0) {
                         // 前往等待页面
                         that.$router.push({path: '/'});
                         // 计时器回收
@@ -326,12 +316,14 @@
                     that.students.redUnite = [];
                     that.students.blueUnite = [];
                     that.students.yellowUnite = [];
-                    console.log(json.Rs);
                     if (json.Code == 0) {
                         that.UniteBreak(json.Rs);
 
-                        let Studenlength = json.Rs.length;
-                        let totalTime = 0;
+                        let totalTime = 40;
+                        let Studenlength = 0;
+                        if (json.Rs) {
+                            Studenlength = json.Rs.length;
+                        }
                         // 根据人数多少显示停留时间
                         if (Studenlength > 3) {
                             totalTime = 60
@@ -650,9 +642,10 @@
     li .CLEscore em {
         font-size: 0.3rem;
     }
+
     li .CLEscore span {
-      padding-left: 0.1rem;
-      font-size: 0.3rem;
+        padding-left: 0.1rem;
+        font-size: 0.3rem;
     }
 
     li .CKscore {
@@ -712,4 +705,12 @@
     li.mvpli .head img.king {
         top: -1rem;
     }
+
+    .tips {
+        position: absolute;
+        right: 3%;
+        top: 1rem;
+        font-size: 0.4rem;
+        color: #fff;
+    }
 </style>

tv/src/views/Rank.vue

@@ -1,6 +1,9 @@
 <template>
     <div :class="pageStyle">
         <Headside></Headside>
+        <div class="tips">
+            {{totalTime}}
+        </div>
         <div class="rankContainer">
             <el-row :gutter="20">
                 <!--卡路里-->
@@ -78,14 +81,13 @@
                     CalSort: [],
                 },
                 rankTimer: null,
-                totalTime: 60
+                totalTime: ''
             }
         },
         mounted() {
             if (this.trueDate) {
                 this.init();
             } else {
-                // this.rankTimer  = setInterval(() => {
                 this.students.CkSort = fakeNews(5);
                 this.students.CalSort = fakeNews(5);
                 this.students.CkSort = this.students.CkSort.sort(function (a, b) {
@@ -94,8 +96,6 @@
                 this.students.CalSort = this.students.CalSort.sort(function (a, b) {
                     return b.Cle - a.Cle;
                 });
-
-                // }, 5000);
             }
         },
         watch: {
@@ -128,8 +128,8 @@
                 let that = this;
                 let clock = window.setInterval(() => {
                     totalTime--;
-                    console.log(totalTime--);
-                    if (parseInt(totalTime) < 0) {
+                    that.totalTime = totalTime;
+                    if (parseInt(totalTime) <= 0) {
                         // 前往等待页面
                         that.$router.push({path: '/'});
                         // 计时器回收
@@ -146,8 +146,11 @@
                 ClassUserRank(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                        let Studenlength = json.Rs.length;
-                        let totalTime = 0;
+                        let totalTime = 40;
+                        let Studenlength = 0;
+                        if(json.Rs){
+                             Studenlength = json.Rs.length;
+                        }
                         // 根据人数多少显示停留时间
                         if (Studenlength > 3) {
                             totalTime = 60
@@ -360,5 +363,12 @@
         background: rgba(4, 209, 252, 0.75);
     }
 
+    .tips {
+        position: absolute;
+        right: 3%;
+        top: 1rem;
+        font-size: 0.4rem;
+        color: #fff;
+    }
 
 </style>