重绘组件

online/src/page/mainpage.vue

@@ -614,9 +614,9 @@
             ,
             // 活动强度计算公式
             calcActLevel(heartRate) {
-                let sum = 170 - this.age;
-                let actLevel = parseInt((heartRate / sum) * 100) > 100 ? 100 : parseInt((heartRate / sum) * 100);
-                this.activeLevel = actLevel;
+                let actLevel = (heartRate - this.peaceHeart) / (208-0.7*this.age - this.peaceHeart) *100;
+                actLevel = actLevel > 100 ? 100 : actLevel < 0 ? 0 : actLevel;
+                this.activeLevel = parseInt(actLevel);
             },
             // 持续时间
             calcHoldTime(curTime) {

pc/src/views/courseEdit.vue

@@ -841,7 +841,7 @@
                         birthday: row.Birthday,
                         is_tmp_user: row.IsTmpUser,
                         is_private: row.IsPrivate,
-                        IsOnline: row.IsOnline,
+                        isOnline: row.IsOnline,
                     }
                 }
                 // 确认上课

pc/src/views/online.vue

@@ -9,14 +9,18 @@
                 <em>当前时间：{{classInfo.endTime}} </em>
                 <!--拿到eqsn才能获取数据-->
                 <em class="room">区域列表 </em>
-                <el-select v-model="VenueId" placeholder="请选择区域" @change="queryEqsnByVenueId">
-                    <el-option
-                            v-for="item in VenueOption"
-                            :key="item.SvId"
-                            :label="item.Name"
-                            :value="item.SvId">
-                    </el-option>
-                </el-select>
+                <select  id="regionSelect" v-model="VenueId" placeholder="请选择区域" @change="queryEqsnByVenueId">
+                    <option value=""> 请选择区域</option>
+                    <option :value="item.SvId"  v-for="item in VenueOption"> {{item.Name}}</option>
+                </select>
+                <!--<el-select v-model="VenueId" placeholder="请选择区域" @change="queryEqsnByVenueId">-->
+                    <!--<el-option-->
+                            <!--v-for="item in VenueOption"-->
+                            <!--:key="item.SvId"-->
+                            <!--:label="item.Name"-->
+                            <!--:value="item.SvId">-->
+                    <!--</el-option>-->
+                <!--</el-select>-->
             </div>
 
             <el-button @click="full_screen" v-if="!screen_full" icon="el-icon-full-screen" type="primary">全屏</el-button>
@@ -173,13 +177,13 @@
         },
         watch: {
             $route(to) {
-                console.log(to);
                 if (to.name != 'online') {
                     this.clearRem();
                     clearInterval(this.mainTimer);//页面销毁时清除定时器
                 } else {
                     this.setRem();
                     this.getVenueQuery();
+                    this.queryEqsnByVenueId();
                 }
             },
             // EqSn(to){
@@ -336,6 +340,7 @@
                         that.loading = false;
                         if (json.Rs) {
                             that.VenueOption = json.Rs;
+
                         } else {
                             that.VenueOption = [];
                         }
@@ -349,13 +354,17 @@
                 })
             },
             // 获取演示设备eqsn
-            queryEqsnByVenueId(svId) {
+            queryEqsnByVenueId() {
                 let that = this;
                 that.loading = true;
+                if(!that.VenueId){
+                    console.log(123);
+                    return false
+                }
                 let param = {
                     key: localStorage.ServiceKey,
                     shopId: localStorage.ServiceId,
-                    svId: svId,
+                    svId: that.VenueId,
                     eqType: 3//设备类型 1 电视盒子 2 演示对应中间件 3 演示客户端
                 };
                 let postdata = qs.stringify(param);
@@ -377,6 +386,11 @@
                             that.$message.error('当前区域没有设置显示设备');
                             that.students = [];
                             that.rankInfo = [];
+                            this.PlanName = '';
+                            this.BeginTime = '';
+                            this.Teacher = '';
+                            this.Num = '0';
+                            this.classInfo.endTime = "00:00:00";
                             clearInterval(this.mainTimer);//页面销毁时清除定时器
                             return false
                         }
@@ -407,11 +421,15 @@
                         that.students = json.Rs;
                         that.rankInfo = json.Rs;
                         that.giveClassName(json.Rs);
+                        that.ClacClassTime();
                     } else {
                         // 已下课
                         if (json.Code == '999') {
                             that.students = "";
                             that.rankInfo = "";
+                            // this.PlanName = '';
+                            // this.BeginTime = '';
+                            // this.Teacher = '';
                             that.getClassUserRank();
                         } else {
                             // 已出错
@@ -2444,4 +2462,16 @@
     .room {
         margin-left: 10px;
     }
+    #regionSelect {
+        height: 25px;
+        line-height: 25px;
+        background-color: inherit;
+        color: #fff;
+    }
+    #regionSelect option {
+        color: #000;
+    }
+    /deep/ .el-dialog__body .el-col {
+        width: 50%;
+    }
 </style>