Browse Source

心跳横线的时候,电量要隐藏√

Changpeng Duan 5 năm trước cách đây
mục cha
commit
580cc796dc

+ 5 - 3
tv/src/Mock/index.js

@@ -151,6 +151,7 @@ let testStudent = function (num, team) {
             UserMd5: "55661a861f8fae20dd505b2b4575dc0e",
             Weight: 50,
             activePercent: "@integer(1, 200)",
+            // activePercent: 0,
             bmrMSjRmrcb: 66.00000000000001,
             formatCk: "@integer(1, 999)",
             isAlive: true,
@@ -161,6 +162,7 @@ let testStudent = function (num, team) {
             lastUpdateTime: 1608188945184,
             queuePushData: [],
             realHr: "@integer(1, 200)",
+            // realHr: 0,
             vo2Max: "@float(1,9999,0,1)"
         })
     }
@@ -350,7 +352,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());
@@ -360,7 +362,7 @@ if (t == 0) {
     let curheadapi = 'http://192.168.0.63:8080/';
 
     // 0: 下课 团课/私教/PK 的排名
-    let LessonClass = 3;
+    let LessonClass = 1;
     // 1:团课/私教
     // 2:竞技课2PK
     // 3:竞技课threepk
@@ -370,7 +372,7 @@ if (t == 0) {
     if (LessonClass == 1) {
         // 上团课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 1));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(12, 1));
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(20, 1));
     } else if (LessonClass == 2) {
         // 上2队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 2));

+ 7 - 2
tv/src/components/power.vue

@@ -3,7 +3,9 @@
         <img src="../static/img/power/power_full.svg" alt="" v-if="parseInt(curPower) >= 81">
         <img src="../static/img/power/power_half.svg" alt="" v-if="parseInt(curPower) >= 41 && parseInt(curPower) < 81">
         <img src="../static/img/power/power_low.svg" alt="" v-if="parseInt(curPower) <= 40">
-        <span>{{curPower}}%</span>
+        <span>{{curPower}}
+        <em>%</em>
+        </span>
     </div>
 </template>
 
@@ -23,11 +25,14 @@
         overflow: hidden;
     }
     .powerContainer img {
-        width: 0.3rem;
+        width: 0.33rem;
         line-height: 0.3rem;
     }
     .powerContainer span {
         display: inline-block;
         line-height: 0.2rem;
     }
+    .powerContainer em {
+        font-size: 0.15rem;
+    }
 </style>

+ 1 - 1
tv/src/views/Main.vue

@@ -15,7 +15,7 @@
                                         <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                     </div>
                                     <div class="nameMd">{{ s.Name }}</div>
-                                    <div class="namert">
+                                    <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">-->
                                     </div>

+ 2 - 2
tv/src/views/pk.vue

@@ -22,7 +22,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert">
+                                <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">-->
                                 </div>
@@ -123,7 +123,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert">
+                                <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">-->
                                 </div>

+ 3 - 3
tv/src/views/threepk.vue

@@ -61,7 +61,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert">
+                                <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">-->
                                 </div>
@@ -127,7 +127,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert">
+                                <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">-->
                                 </div>
@@ -193,7 +193,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert">
+                                <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">-->
                                 </div>

+ 9 - 5
tv/需求修改和debug.md

@@ -113,14 +113,18 @@ let url = '';
 3.关联手机号左侧选中的栏不对√  
 4.关联手机号增加用户名√  
 6.TV PK的间距调整回以前那种√ 
-  8. app 预约界面的上边距问题√ 
-   9.心率带电量显示√ 
- 1.临时会员管理-添加/删除√  
- 
+8. app 预约界面的上边距问题√ 
+9.心率带电量显示√ 
+1.临时会员管理-添加/删除√  
+小电池里百分号字小一点√  
+  心跳横线的时候,电量要隐藏√
+  
  
  2.课程管理 单独添加,绑定,删除访客
  *downloadwgt下的还是旧的包是为什么?
  7.上课学生分组,改由后台进行第一次分组,每次改队上传后台处理
 
- 
+ ck往右移动
+
+