TV版本增加当日排名内容√

pc/src/views/courseEdit.vue

@@ -228,22 +228,24 @@
                                 </el-button>
                             </em>
                         </div>
-                        <div v-if="FinishClass != 2 && scope.row.IsTmpUser == 1">
-                            <el-button type="danger" round v-if="scope.row.Status == 3 "
+                        <div v-if=" scope.row.IsTmpUser == 1">
+                            <el-button type="danger" round v-if="scope.row.Status == 3 && scope.row.HrSubmitFlag != 1 "
                                        size="mini"
                                        @click="getClassOverTempDel(scope.row)">
                                 删除
                             </el-button>
+                            &nbsp;
+                            <span v-if="FinishClass != 3 && scope.row.IsTmpUser == 1">
+                                <el-button type="warning" round
+                                           v-if="scope.row.Status == 1 || scope.row.Status == 3 && FinishClass == 2 "
+                                           size="mini"
+                                           :disabled="scope.row.HrSubmitFlag == 1"
+                                           @click="getClassDetailAndSnAdd(scope.row)">
+                                    提交
+                                </el-button>
+                            </span>
                         </div>
-                        <div v-if="FinishClass != 3 && scope.row.IsTmpUser == 1">
-                            <el-button type="warning" round
-                                       v-if="scope.row.Status == 1 || scope.row.Status == 3 && FinishClass == 2 "
-                                       size="mini"
-                                       :disabled="scope.row.HrSubmitFlag == 1"
-                                       @click="getClassDetailAndSnAdd(scope.row)">
-                                提交
-                            </el-button>
-                        </div>
+
                     </template>
                 </el-table-column>
             </el-table>
@@ -571,8 +573,50 @@
                     });
                 });
             },
-            takeTempBack(){
+            takeTempBack(row){
                 this.$message.error('临时会员无法替换心率带，请删除临时会员后重新添加');
+                // let that = this;
+                // let text = "";
+                // if (this.$route.query.FinishClass == 2) {
+                //     text = '当前上课种是否回收用户' + row.Name + '的心率设备？(回收将重置用户的上课成绩)'
+                // } else {
+                //     text = '是否回收用户' + row.Name + '的心率设备？'
+                // }
+                // this.$confirm(text, '回收操作', {
+                //     confirmButtonText: '确定',
+                //     cancelButtonText: '取消',
+                //     type: 'warning'
+                // }).then(() => {
+                //     let param = {
+                //         token: localStorage.token,
+                //         cfId: row.CfId,
+                //         bindId: row.BindId,
+                //         userId: row.UserId,
+                //         sn: row.Sn,
+                //     };
+                //     let postdata = qs.stringify(param);
+                //     UnBindHrSensorsToUser(postdata).then(res => {
+                //         let json = res;
+                //         if (json.Code == 0) {
+                //             that.$message({
+                //                 showClose: true,
+                //                 message: '心率带' + row.Sn + '回收成功！',
+                //                 type: 'success'
+                //             });
+                //             // table 重载
+                //             that.getTableQuery();
+                //             // 重置心率带可选列表
+                //             // that.getSelectHrSensors();
+                //         } else {
+                //             that.$message.error(json.Memo + '错误码：' + json.Code);
+                //         }
+                //     })
+                // }).catch(() => {
+                //     this.$message({
+                //         type: 'info',
+                //         message: '已取消回收'
+                //     });
+                // });
             },
             // 确认下课
             addFinish() {

tv/src/Mock/index.js

@@ -262,10 +262,15 @@ let UserRankingQuery = function (num) {
         {
             Title: '月度卡路里排行版',
             Result: item1,
-        },
-        {
+        }, {
             Title: '月度CK值排行版',
             Result: item2,
+        }, {
+            Title: '本日卡路里排行版',
+            Result: item1,
+        }, {
+            Title: '本日CK值排行版',
+            Result: item2,
         }
     ];
     return {
@@ -361,7 +366,7 @@ if (t == 0) {
     let curheadapi = 'http://192.168.0.63:8080/';
 
     // 0: 下课 团课/私教/PK 的排名
-    let LessonClass = 3;
+    let LessonClass = 0;
     // 1：团课/私教
     // 2：竞技课2PK
     // 3：竞技课threepk

tv/src/views/Wait.vue

@@ -75,12 +75,15 @@
                     <el-carousel-item v-for="Rs in rt">
                         <h5>{{Rs.Title}}</h5>
                         <ul>
-                            <li v-for="s in Rs.Result">
+                            <li v-for="s in Rs.Result" v-if="Rs.Result">
                                 <img :src="s.Head" alt="" v-if="s.Head">
                                 <img v-bind:src="require('../static/img/people/flyhead.png')" alt="" v-if="!s.Head">
                                 <em>{{s.UserName}}</em>
                                 <s>{{s.Values}}</s>
                             </li>
+                            <li v-if="Rs.Result == ''">
+                                <h5>还没有排行记录哟~</h5>
+                            </li>
                         </ul>
                     </el-carousel-item>
                 </el-carousel>

tv/需求修改和debug.md

@@ -57,12 +57,12 @@ https://segmentfault.com/a/1190000021281307
 1. 月、周卡路里总计火焰字体√ 
 31.TV本地字典，针对不同的EQSN给出本店的转发服务器ip地址(定一下字段名的接口)√ *没更新
 getServeIpAddress
-    parame{
-        eqsn:'30:9C:23:0C:8B:1E'//每个电视的eqsn
-    }
-    Responses{
-        IpAdress: 'http://192.168.0.71:8080/';//从店里的转发服务那里获得数据源
-    }
+parame{
+    eqsn:'30:9C:23:0C:8B:1E'//每个电视的eqsn
+}
+Responses{
+    IpAdress: 'http://192.168.0.71:8080/';//从店里的转发服务那里获得数据源
+}
 
 =================================
 12/18
@@ -86,29 +86,29 @@ http://192.168.0.3:19096/v1/docs/index.html
 
 //检查新版本也要用0.3的
 if (eqsn == 'a1f2d679c1624d3a' || eqsn == '30:9C:23:0C:8B:1E') {
-    url = 'http://192.168.0.3:19096/v1/Sensors/QueryVueFramework'
+url = 'http://192.168.0.3:19096/v1/Sensors/QueryVueFramework'
 }else{
-    QueryVueFramework ...
+QueryVueFramework ...
 }
 
 //下载新版本进行安装
 let url = '';
- if (eqsn == 'a1f2d679c1624d3a' || eqsn == '30:9C:23:0C:8B:1E') {
-       url= 'http://192.168.0.3:19096/v1/Sensors/DownloadVueFramework'
- }else{
-       url = 'http://cal.beswell.com:85/v1/Sensors/DownloadVueFramework'
- }
- 
- 
- =============
- 12/19
- 1.app 提交后立即关闭按钮弹窗,防止重复提交√  
- 2.Pc端提交后立即关闭按钮权限,防止多此提交√  
- 
- 
- 
- =========
- 12/21
+if (eqsn == 'a1f2d679c1624d3a' || eqsn == '30:9C:23:0C:8B:1E') {
+   url= 'http://192.168.0.3:19096/v1/Sensors/DownloadVueFramework'
+}else{
+   url = 'http://cal.beswell.com:85/v1/Sensors/DownloadVueFramework'
+}
+
+
+=============
+12/19
+1.app 提交后立即关闭按钮弹窗,防止重复提交√  
+2.Pc端提交后立即关闭按钮权限,防止多此提交√  
+
+
+
+=========
+12/21
 5.管理端增加学生连点问题√  
 3.关联手机号左侧选中的栏不对√  
 4.关联手机号增加用户名√  
@@ -121,30 +121,36 @@ let url = '';
 
 ============
 12/22
+version:1.3.22
 1.修改字段名 √  
-    isPrivate->IsPrivate
-    formatCk->FormatCk
-    realHr->RealHr
-    activePercent->ActivePercent
+isPrivate->IsPrivate
+formatCk->FormatCk
+realHr->RealHr
+activePercent->ActivePercent
 2. app端，修改选课界面样式已上传，已更新 √ 
-   ck往右移动 √ 
+ck往右移动 √ 
 8.duRs里也应该把 is_tmp_user 字段拼接进来。√  
 2.课程管理 单独添加,绑定,删除临时会员  （临时会员，单条增加，定一下怎么加？√  
-    增加手机号字段√  
- 
+增加手机号字段√  
+PK课教练显示√  
 =========
+12/23
+TV版本增加当日排名内容√  
+
 
 测试临时会员系统
- 
+
 *downloadwgt下的还是旧的包是为什么?
- 
+
 7.上课学生分组,改由后台进行第一次分组,每次改队上传后台处理
 
 
- 
-TV版本增加当日排名内容
- 
+
 TODO 欢迎私有心率带同学来上课
 
+私有心率带跟公共心率带颜色不一样
+
+
+