1.修改字段名 √

    isPrivate->IsPrivate
    formatCk->FormatCk
    realHr->RealHr
    activePercent->ActivePercent

tv/src/Mock/index.js

@@ -96,7 +96,7 @@ let getUserList = function () {
     for (var i = 0; i < 16; i++) {
         item.push({
             "name": nameList[i].name,
-            "activePercent": "@integer(0, 54)",
+            "ActivePercent": "@integer(0, 54)",
             "heartRate": "@integer(70, 150)",
             "calorie": "@integer(200, 1000)",
             "ck": "23.2",
@@ -150,19 +150,19 @@ let testStudent = function (num, team) {
             UserId: 104,
             UserMd5: "55661a861f8fae20dd505b2b4575dc0e",
             Weight: 50,
-            activePercent: "@integer(1, 200)",
-            // activePercent: 0,
+            ActivePercent: "@integer(1, 200)",
+            // ActivePercent: 0,
             bmrMSjRmrcb: 66.00000000000001,
-            formatCk: "@integer(1, 999)",
+            FormatCk: "@integer(1, 999)",
             isAlive: true,
             isFinish: false,
             isOver: false,
-            isPrivate: 0,
+            IsPrivate: 0,
             lastPushDataTime: 1608188947175,
             lastUpdateTime: 1608188945184,
             queuePushData: [],
-            realHr: "@integer(1, 200)",
-            // realHr: 0,
+            RealHr: "@integer(1, 200)",
+            // RealHr: 0,
             vo2Max: "@float(1,9999,0,1)"
         })
     }
@@ -187,7 +187,6 @@ let testStudent = function (num, team) {
     };
 };
 
-
 let getNewUser = function (code) {
 
     let item = [];
@@ -362,17 +361,17 @@ if (t == 0) {
     let curheadapi = 'http://192.168.0.63:8080/';
 
     // 0: 下课 团课/私教/PK 的排名
-    let LessonClass = 1;
+    let LessonClass = 0;
     // 1：团课/私教
     // 2：竞技课2PK
     // 3：竞技课threepk
-    let LessonDp = 3;
+    let LessonDp = 0;
 
 
     if (LessonClass == 1) {
         // 上团课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 1));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(20, 1));
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(1, 1));
     } else if (LessonClass == 2) {
         // 上2队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 2));

tv/src/views/Main.vue

@@ -15,9 +15,9 @@
                                         <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                     </div>
                                     <div class="nameMd">{{ s.Name }}</div>
-                                    <div class="namert" v-if="s.activePercent != 0 && s.realHr != 0">
+                                    <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
                                         <power :cur-power="s.PowerPercent"></power>
-                                          <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                          <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.IsPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
                                     </div>
                                 </span>
                                 <div class="head">
@@ -31,8 +31,8 @@
                                 </div>
                             </div>
                             <div class="cla">
-                                <em v-if="s.realHr != 0">{{ s.activePercent |max100 }}</em>
-                                <em class="plus" v-if="s.activePercent == 0 && s.realHr == 0">
+                                <em v-if="s.RealHr != 0">{{ s.ActivePercent |max100 }}</em>
+                                <em class="plus" v-if="s.ActivePercent == 0 && s.RealHr == 0">
                                     ---
                                 </em>
                             </div>
@@ -44,14 +44,14 @@
                             <div>
                                 <div class="lhj">
                                     <div :class="[{'heartJump':true}]">
-                                        <span class="fastJump" v-if="s.realHr != 0"
-                                              v-show="parseInt(s.activePercent) > 90">{{ s.realHr }}</span>
-                                        <span class="normalJump" v-if="s.realHr != 0"
-                                              v-show="parseInt(s.activePercent) <= 90 && parseInt(s.activePercent) > 30">
-                                            {{s.realHr}}</span>
-                                        <span class="slowJump" v-if="s.realHr != 0"
-                                              v-show="parseInt(s.activePercent) <= 30">{{ s.realHr }}</span>
-                                        <span class="plus" v-if="s.realHr == 0">
+                                        <span class="fastJump" v-if="s.RealHr != 0"
+                                              v-show="parseInt(s.ActivePercent) > 90">{{ s.RealHr }}</span>
+                                        <span class="normalJump" v-if="s.RealHr != 0"
+                                              v-show="parseInt(s.ActivePercent) <= 90 && parseInt(s.ActivePercent) > 30">
+                                            {{s.RealHr}}</span>
+                                        <span class="slowJump" v-if="s.RealHr != 0"
+                                              v-show="parseInt(s.ActivePercent) <= 30">{{ s.RealHr }}</span>
+                                        <span class="plus" v-if="s.RealHr == 0">
                                         ---
                                     </span>
                                     </div>
@@ -402,7 +402,7 @@
                             break;
                     }
 
-                    let per = parseInt(res[i].activePercent);
+                    let per = parseInt(res[i].ActivePercent);
                     switch (true) {
                         case per >= 90:
                             colorClass = 'red';

tv/src/views/Wait.vue

@@ -273,7 +273,7 @@
                             "UserName": "杨东艳",
                             "name": "杨东艳",
                             "updateTime": 1604568915582,
-                            "activePercent": i * 5,
+                            "ActivePercent": i * 5,
                             "ck": 115.9 - i,
                             "head": 'flyhead.png'
                         }
@@ -295,7 +295,7 @@
                             "userNmae": "杨东艳",
                             "name": "杨东艳",
                             "updateTime": 1604568915582,
-                            "activePercent": i * 5,
+                            "ActivePercent": i * 5,
                             "ck": i + 115.1,
                             "sex": 1,
                             "head": 'flyhead.png'

tv/src/views/pk.vue

@@ -22,16 +22,16 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.activePercent != 0 && s.realHr != 0">
+                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
-                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.IsPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
                                 </div>
                             </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.realHr != 0">{{ s.activePercent |max100}}</div>
-                                        <div class="plus" v-if="s.activePercent == 0 && s.realHr == 0">---</div>
+                                        <div v-if="s.RealHr != 0">{{ s.ActivePercent |max100}}</div>
+                                        <div class="plus" v-if="s.ActivePercent == 0 && s.RealHr == 0">---</div>
                                         <s>%</s>
                                     </em>
                                 </div>
@@ -48,11 +48,11 @@
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) > 90">{{
-                                        s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) <= 90">{{
-                                        s.realHr }}</em>
-                                    <em class="plus" v-if="s.realHr == 0"> --- </em>
+                                    <em class="fastJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) > 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="slowJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) <= 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="plus" v-if="s.RealHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
                                 </div>
                             </div>
@@ -123,18 +123,18 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.activePercent != 0 && s.realHr != 0">
+                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
-                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.IsPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
                                 </div>
                             </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.realHr != 0">
-                                            {{ s.activePercent |max100 }}
+                                        <div v-if="s.RealHr != 0">
+                                            {{ s.ActivePercent |max100 }}
                                         </div>
-                                        <div class="plus" v-if="s.activePercent == 0&& s.realHr == 0">
+                                        <div class="plus" v-if="s.ActivePercent == 0&& s.RealHr == 0">
                                             ---
                                         </div>
                                         <s>%</s>
@@ -153,11 +153,11 @@
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) > 90">{{
-                                        s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) <= 90">{{
-                                        s.realHr }}</em>
-                                    <em class="plus" v-if="s.realHr == 0"> --- </em>
+                                    <em class="fastJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) > 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="slowJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) <= 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="plus" v-if="s.RealHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
                                 </div>
                             </div>
@@ -431,7 +431,7 @@
                     that.students.blueUnite = [];
                 } else {
                     Rs.map(function (item, t) {
-                        item.sportLevel = sportLevel(item.activePercent);
+                        item.sportLevel = sportLevel(item.ActivePercent);
                         if (item.GroupNo == 1) {
                             that.students.redUnite.push(item);
                         }
@@ -462,14 +462,14 @@
                 // that.redSum = redSum;
                 // that.blueSum = blueSum;
 
-                // 进度条 formatCk
+                // 进度条 FormatCk
                 let redFmtSum = 0;
                 let blueFmtSum = 0;
                 Rs.redUnite.map(function (item, t) {
-                    redFmtSum += item.formatCk
+                    redFmtSum += item.FormatCk
                 });
                 Rs.blueUnite.map(function (item, t) {
-                    blueFmtSum += item.formatCk
+                    blueFmtSum += item.FormatCk
                 });
 
                 // pkVal

tv/src/views/threepk.vue

@@ -61,18 +61,18 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.activePercent != 0 && s.realHr != 0">
+                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
-                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.IsPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
                                 </div>
                             </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.realHr != 0">
-                                            {{ s.activePercent | max100}}
+                                        <div v-if="s.RealHr != 0">
+                                            {{ s.ActivePercent | max100}}
                                         </div>
-                                        <div class="plus" v-if="s.activePercent == 0&& s.realHr == 0">
+                                        <div class="plus" v-if="s.ActivePercent == 0&& s.RealHr == 0">
                                             ---
                                         </div>
                                         <s>%</s>
@@ -91,11 +91,11 @@
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) > 90">{{
-                                        s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) <= 90">{{
-                                        s.realHr }}</em>
-                                    <em class="plus" v-if="s.realHr == 0"> --- </em>
+                                    <em class="fastJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) > 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="slowJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) <= 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="plus" v-if="s.RealHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
                                 </div>
                             </div>
@@ -127,18 +127,18 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.activePercent != 0 && s.realHr != 0">
+                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
-                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.IsPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
                                 </div>
                             </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.realHr != 0">
-                                            {{ s.activePercent | max100}}
+                                        <div v-if="s.RealHr != 0">
+                                            {{ s.ActivePercent | max100}}
                                         </div>
-                                        <div class="plus" v-if="s.activePercent == 0&& s.realHr == 0">
+                                        <div class="plus" v-if="s.ActivePercent == 0&& s.RealHr == 0">
                                             ---
                                         </div>
                                         <s>%</s>
@@ -157,11 +157,11 @@
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) > 90">{{
-                                        s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) <= 90">{{
-                                        s.realHr }}</em>
-                                    <em class="plus" v-if="s.realHr == 0"> --- </em>
+                                    <em class="fastJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) > 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="slowJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) <= 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="plus" v-if="s.RealHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
                                 </div>
                             </div>
@@ -193,18 +193,18 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.activePercent != 0 && s.realHr != 0">
+                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
-                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.IsPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
                                 </div>
                             </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.realHr != 0">
-                                            {{ s.activePercent | max100}}
+                                        <div v-if="s.RealHr != 0">
+                                            {{ s.ActivePercent | max100}}
                                         </div>
-                                        <div class="plus" v-if="s.activePercent == 0&& s.realHr == 0">
+                                        <div class="plus" v-if="s.ActivePercent == 0&& s.RealHr == 0">
                                             ---
                                         </div>
                                         <s>%</s>
@@ -224,11 +224,11 @@
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) > 90">{{
-                                        s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.activePercent) <= 90">{{
-                                        s.realHr }}</em>
-                                    <em class="plus" v-if="s.realHr == 0"> --- </em>
+                                    <em class="fastJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) > 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="slowJump" v-if="s.RealHr != 0" v-show="parseInt(s.ActivePercent) <= 90">{{
+                                        s.RealHr }}</em>
+                                    <em class="plus" v-if="s.RealHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
                                 </div>
                             </div>
@@ -423,7 +423,7 @@
                     that.students.yellowUnite = [];
                 } else {
                     Rs.map(function (item, t) {
-                        item.sportLevel = sportLevel(item.activePercent);
+                        item.sportLevel = sportLevel(item.ActivePercent);
                         if (item.GroupNo == 1) {
                             that.students.redUnite.push(item);
                         }
@@ -462,18 +462,18 @@
                 that.yellowSum = yellowSum.toFixed(1);
 
 
-                // 进度条 formatCk
+                // 进度条 FormatCk
                 let redFmtSum = 0;
                 let blueFmtSum = 0;
                 let yellowFmtSum = 0;
                 Rs.redUnite.map(function (item, t) {
-                    redFmtSum += item.formatCk
+                    redFmtSum += item.FormatCk
                 });
                 Rs.blueUnite.map(function (item, t) {
-                    blueFmtSum += item.formatCk
+                    blueFmtSum += item.FormatCk
                 });
                 Rs.yellowUnite.map(function (item, t) {
-                    yellowFmtSum += item.formatCk
+                    yellowFmtSum += item.FormatCk
                 });
 
                 // pkVal

tv/需求修改和debug.md

@@ -117,14 +117,27 @@ let url = '';
 9.心率带电量显示√ 
 1.临时会员管理-添加/删除√  
 小电池里百分号字小一点√  
-  心跳横线的时候，电量要隐藏√
+心跳横线的时候，电量要隐藏√
+
+============
+12/22
+1.修改字段名 √  
+    isPrivate->IsPrivate
+    formatCk->FormatCk
+    realHr->RealHr
+    activePercent->ActivePercent
+
   
  
- 2.课程管理 单独添加,绑定,删除访客
+ 2.课程管理 单独添加,绑定,删除临时会员  （临时会员，单条增加
  *downloadwgt下的还是旧的包是为什么?
  7.上课学生分组,改由后台进行第一次分组,每次改队上传后台处理
 
  ck往右移动
+ 
+ 当日排名
+ 
+ 欢迎私有心率带同学来上课