Changpeng Duan пре 5 година
родитељ
комит
820cc95dfd
2 измењених фајлова са 36 додато и 21 уклоњено
  1. 2 2
      tv/src/Mock/index.js
  2. 34 19
      tv/src/views/3pkRank.vue

+ 2 - 2
tv/src/Mock/index.js

@@ -349,7 +349,7 @@ let getClassStat = function (ClassOn, dp) {
     };
 };
 
-let t = 1;//0 is on 1 is off
+let t = 0;//0 is on 1 is off
 if (t == 0) {
     // 列表测试
     Mock.mock('/api/testTable', 'post', testTable());
@@ -392,7 +392,7 @@ if (t == 0) {
         } else if (LessonDp == 3) {
             Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(0, 3));
             // 下课排名
-            Mock.mock(curheadapi + 'ClassUserRank', 'post', testStudent(12, 3));
+            Mock.mock(curheadapi + 'ClassUserRank', 'post', testStudent(1, 3));
         }
     }
 

+ 34 - 19
tv/src/views/3pkRank.vue

@@ -11,14 +11,16 @@
                     <img src="../assets/img/3pkRank/rank2.svg" alt="" class="rankIcon" v-if="red.rank == 2">
                     <img src="../assets/img/3pkRank/rank3.svg" alt="" class="rankIcon" v-if="red.rank == 3">
                     <span class="mineUniteName">
-                        红队
+                          <em>
+                            红队
+                        </em>
                         <span class="sumCK">
                             <em>{{redSum}}</em><i>Ck</i>
                         </span>
-                        <span class="flagContainer">
+                    </span>
+                    <span class="flagContainer">
                             <img src="../assets/img/2pkRank/flag.svg" alt="" v-if="red.rank == 1">
                         </span>
-                    </span>
                 </div>
                 <div class="pkIconContainer">
                     <img src="../assets/img/3pkRank/pk.svg" alt="" class="pkIcon">
@@ -28,14 +30,18 @@
                     <img src="../assets/img/3pkRank/rank2.svg" alt="" class="rankIcon" v-if="blue.rank == 2">
                     <img src="../assets/img/3pkRank/rank3.svg" alt="" class="rankIcon" v-if="blue.rank == 3">
                     <span class="mineUniteName">
-                        蓝队
+
+                         <em>
+                            蓝队
+                        </em>
+
                         <span class="sumCK">
                             <em>{{blueSum}}</em><i>Ck</i>
                         </span>
-                        <span class="flagContainer">
+                    </span>
+                    <span class="flagContainer">
                             <img src="../assets/img/2pkRank/flag.svg" alt="" v-if="blue.rank == 1">
                         </span>
-                    </span>
                 </div>
                 <div class="pkIconContainer">
                     <img src="../assets/img/3pkRank/pk.svg" alt="" class="pkIcon">
@@ -45,14 +51,16 @@
                     <img src="../assets/img/3pkRank/rank2.svg" alt="" class="rankIcon" v-if="yellow.rank == 2">
                     <img src="../assets/img/3pkRank/rank3.svg" alt="" class="rankIcon" v-if="yellow.rank == 3">
                     <span class="mineUniteName">
-                        黄队
+                        <em>
+                            黄队
+                        </em>
                         <span class="sumCK">
                             <em>{{yellowSum}}</em><i>Ck</i>
                         </span>
-                        <span class="flagContainer">
+                    </span>
+                    <span class="flagContainer">
                             <img src="../assets/img/2pkRank/flag.svg" alt="" v-if="yellow.rank == 1">
                         </span>
-                    </span>
                 </div>
             </div>
             <div class="list">
@@ -295,7 +303,7 @@
                     {name: "blue", val: that.blueSum},
                     {name: "yellow", val: that.yellowSum},
                 ];
-                that.getUnitRank(res, PlanId,Rs);
+                that.getUnitRank(res, PlanId, Rs);
             },
             getWhoWin(redUnite, blueUnite, yellowUnite, groupNo) {
                 let that = this;
@@ -332,7 +340,7 @@
                 }
             },
             // 插入胜率结果
-            successCalc(item,Victorl ) {
+            successCalc(item, Victorl) {
                 // item.success = '胜' + (parseInt(item.PkSucessnum) + parseInt(Victorl)) + ' 总:' + (parseInt(item.PkTotalnum) + 1) + '结' + (parseFloat(parseInt(item.PkSucessnum) + parseInt(Victorl)) / (parseInt(item.PkTotalnum) + 1)) * 100
 
                 if (parseInt(item.PkTotalnum + Victorl) == 0) {
@@ -347,7 +355,7 @@
                 }
             },
             // 结果排序
-            getUnitRank(res, PlanId,Rs) {
+            getUnitRank(res, PlanId, Rs) {
                 let that = this;//这个that不要删
                 let sum = res.sort(function (a, b) {
                     return b.val - a.val;
@@ -374,7 +382,7 @@
                 // 上报本场胜率
                 that.PostAddPkInfo(PlanId, groupNo);
                 // 计算本场胜率
-                that.getWhoWin(Rs.redUnite, Rs.blueUnite,Rs.yellowUnite, groupNo);
+                that.getWhoWin(Rs.redUnite, Rs.blueUnite, Rs.yellowUnite, groupNo);
             },
             getClassUserRank() {
                 let that = this;
@@ -399,7 +407,7 @@
                         if (Studenlength > 3) {
                             totalTime = 60
                         } else {
-                            totalTime = 40
+                            totalTime = 40;
                         }
                         this.jumpWait(totalTime);
 
@@ -505,7 +513,7 @@
 
     .sumScore {
         width: 90%;
-        overflow: hidden;
+        overflow: visible;
         display: block;
         margin: 0 auto;
         height: 1.4rem;
@@ -643,31 +651,38 @@
     .sumCK {
         float: right;
         font-size: 0.3rem;
+        text-align: right;
     }
 
     .mineUniteName {
-        width: 67%;
+        width: 69%;
+        height: 0.6rem;
         overflow: visible;
         display: block;
         margin: 0 auto;
         text-align: left;
         font-size: 0.35rem;
     }
+    .mineUniteName em {
+        float: left;
+    }
 
     .sumCK em {
         font-size: 0.35rem;
     }
 
     .sumCK i {
+        float: right;
         font-size: 0.24rem;
+        margin-top: 0.1rem;
     }
 
-    /*todo*/
     .flagContainer {
         position: relative;
         top: -1rem;
-        float: right;
-        right: -0.3rem;
+        float: none;
+        right: -1.6rem;
+        display: inline-block;
     }
 
     .flagContainer img {