从线上获取转发接口

pc/src/views/Main.vue

@@ -93,6 +93,8 @@
                             </em>
                             <el-button type="primary" plain @click="goFinish(c)" v-if="c.FinishClass == 0">上课
                             </el-button>
+                            <el-button type="danger" plain @click="goFinish(c)" v-if="c.FinishClass == 0">关课
+                            </el-button>
                             <el-button type="primary" plain @click="checkClassOverPrepare(c)" v-if="c.FinishClass == 2">
                                 管理
                             </el-button>

pc/src/views/courses.vue

@@ -123,6 +123,10 @@
                                    @click="showDialogMemberVisible(scope.row)">
                             上课
                         </el-button>
+                        <el-button type="danger" round size="mini" v-if="scope.row.FinishClass == 0"
+                                   @click="closeLesson(scope.row)">
+                            关课
+                        </el-button>
                         <el-button type="primary" round size="mini"
                                    v-if="scope.row.FinishClass == 3 || scope.row.FinishClass == 2"
                                    @click="seeEdit(scope.row)"
@@ -453,6 +457,43 @@
                     }
                 });
             },
+            // 关课
+            closeLesson(row){
+                that.$message.error('功能未上线，请耐心等候');
+                return false;
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                    hrId: row.HrId,
+                    status: 9,//
+                };
+                let postdata = qs.stringify(param);
+                this.$confirm('此操作将永久关闭当前课程, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    HrSensorsStatusEdit(postdata).then(res => {
+                        let json = res;
+                        if (json.Code == 0) {
+                            that.$message({
+                                showClose: true,
+                                message: '选中的课程已关闭！',
+                                type: 'success'
+                            });
+                            // 重载列表
+                            that.getTableQuery();
+                        } else {
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
+                        }
+                    });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消关课'
+                    });
+                });
+            },
             // 获取select的label
             changeLocationValue(val) {
                 //locations是v-for里面的也是datas里面的值

pc/src/views/heartEquip.vue

@@ -470,7 +470,6 @@
             // 删除
             pauseRowDel(row) {
                 let that = this;
-
                 let param = {
                     token: localStorage.token,
                     hrId: row.HrId,

tv/README.md

@@ -92,7 +92,7 @@ https://segmentfault.com/a/1190000021281307
 6. 彩蛋显示30S√
 10. PK课显示教练√
 29.rank界面无数据的时候停留不走√
-
+========================
 12/16
 7. 测试在线升级√
 24.管理端预约查询，没有按照时间范围搜索√  
@@ -104,19 +104,19 @@ https://segmentfault.com/a/1190000021281307
 5. 小pad样式兼容√
 31.3队PK的样式问题√
 32.上课准备弹窗禁止连点√
+8. 管理端图片裁切√
+29.PC图片上传进行压缩√
 
-
+========================
 
 1. 月、周卡路里总计火焰字体
 2. 私有心率带角标
-8. 管理端图片裁切
 9. 胜率显示从后台取胜率数据
-
-29.PC图片上传进行压缩 todo
-19.等待页面的数字使用图片替换 todo  
 23.彩蛋和新学生接口可以合并 todo  
-
 29.首页界面和内页都给课程增加关课按钮
+
+
+
 31.TV本地字典，针对不同的EQSN给出本店的转发服务器ip地址(定一下字段名的接口)
 getServeIpAddress
     parame{

tv/src/Global.js

@@ -7,8 +7,10 @@ companyInfo = {
 
 // headapi = process.env.NODE_ENV === 'development' ? '/api/' : '../';
 // headapi = 'http://192.168.0.110:8080/';//从郑伟那里获得数据源
-headapi = 'http://192.168.0.71:8080/';//从郑伟那里获得数据源
+headapi = '';//从郑伟那里获得数据源
+// headapi = 'http://192.168.0.71:8080/';//从郑伟那里获得数据源
 // headapi = 'http://192.168.0.10:8080/';//实际场馆
+headTest =  'http://192.168.0.10:8080/';
 
 // 七牛云imgsrc
 imgUrl = "http://qjzpcd34v.hb-bkt.clouddn.com";
@@ -478,3 +480,4 @@ deepClone = function (obj) {
         objClone = JSON.parse(_obj);
     return objClone
 }
+

tv/src/Mock/index.js

@@ -134,7 +134,7 @@ let testStudent = function (num, team) {
             "Ck": "@integer(10, 100)",
             "formatCk": "@integer(10, 100)",
             "Head": "http://192.168.0.2/gc.png",
-            "GroupNo":teams,
+            "GroupNo": teams,
             "Sex": "@integer(1, 2)",
             "IsBirthday": "@integer(1, 1)",
         })
@@ -204,6 +204,24 @@ let getRecordBreak = function (code) {
         Rs: item,
     };
 };
+let CalorieStatsQuery = function(){
+     let Rs = [
+         {
+             Title: '本<s>周</s>场馆卡路里总消耗',
+             Result: [{'Values': "@integer(7654321, 1)", Unite: '千卡'}],
+         },
+         {
+             Title: '本<s>周</s>场馆卡路里总消耗',
+             Result: [{'Values':"@integer(7654321, 1)", Unite: '千卡'}],
+         }
+     ]
+    return {
+        Code: 0,
+        Memo: "Success",
+        Rs: Rs,
+    };
+
+    };
 let testHerosRankingQuery = function (num) {
     let item = [
         {
@@ -274,22 +292,23 @@ if (t == 0) {
     Mock.mock('/api/testTable', 'post', testTable());
 
     Mock.mock('/api/getUserList', 'post', getUserList());
+    let curheadapi = 'http://192.168.0.71:8080/';
     // 学生列表
-    Mock.mock(headapi + 'UserListInfo', 'post', testStudent(5, 1));
+    Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(5, 1));
     // 下课排名
-    Mock.mock(headapi + 'ClassUserRank', 'post', testStudent(1, 2));
+    Mock.mock(curheadapi + 'ClassUserRank', 'post', testStudent(1, 2));
     // 英雄榜
-    Mock.mock(headapi + 'HerosRankingQuery', 'post', testHerosRankingQuery(1));
+    Mock.mock(curheadapi + 'HerosRankingQuery', 'post', testHerosRankingQuery(1));
     // 卡路里排行榜
-    Mock.mock(headapi + 'CalorieStatsQuery', 'post', testStudent(1, 2));
+    Mock.mock(curheadapi + 'CalorieStatsQuery', 'post', CalorieStatsQuery(1, 2));
     // 用户排行榜
-    Mock.mock(headapi + 'UserRankingQuery', 'post', testStudent(1, 2));
+    Mock.mock(curheadapi + 'UserRankingQuery', 'post', testStudent(1, 2));
     // 上课状态
-    Mock.mock(headapi + 'ClassStatQuery', 'post', getClassStat(2));
+    Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(2));
     // 新同学 0 999
-    Mock.mock(headapi + 'getNewUser', 'post', getNewUser(999));
+    Mock.mock(curheadapi + 'getNewUser', 'post', getNewUser(999));
     // 彩蛋 0 999
-    Mock.mock(headapi + 'getRecordBreak', 'post', getRecordBreak(999));
+    Mock.mock(curheadapi + 'getRecordBreak', 'post', getRecordBreak(999));
 }
 
 export default Mock;

tv/src/components/sumNumber.vue

@@ -45,7 +45,8 @@
 
 <style scoped>
     .sumNumberContainer {
-        width: 960px;
+        width: 100%;
+        /*width: 960px;*/
         overflow: hidden;
         display: block;
         margin: 0 auto;
@@ -55,14 +56,27 @@
         overflow: hidden;
         display: flex;
         margin: 0 auto;
+        justify-content: center;
+        text-align: center;
+        align-items:center;
+        flex: 1;
+        border-radius: 33rem;
+        /*background: linear-gradient(#000 0%, rgba(0, 0, 0, 0.1) 100%);*/
+
     }
     .imgContainer span {
-        width: 30px;
-        display: flex;
-        flex: 1;
+        /*width: 30px;*/
+        /*display: flex;*/
+        display: inline-block;
+        float: none;
+        /*justify-content: center;*/
+        /*align-items:center;*/
+        /*flex: 1;*/
     }
-    .imgContainer img {
+    .imgContainer span em img {
         width: 100%;
+        width: 1.1rem;
+        height: 2rem;
         overflow: hidden;
         display: block;
         margin: 0 auto;

tv/src/views/Index.vue

@@ -1,304 +1,327 @@
 <template>
-  <div class="IndexContainer">
-    <keep-alive>
-      <router-view></router-view>
-    </keep-alive>
-  </div>
+    <div class="IndexContainer">
+        <keep-alive>
+            <router-view></router-view>
+        </keep-alive>
+    </div>
 </template>
 <!--<script src="../../public/mui.js"></script>-->
 
 <script>
-import {
-  QueryVueFramework,
-  DownloadVueFramework,
-  getCheckUpdate,
-  getUserList
-} from '@/api/getApiRes'
-
-import "../../public/mui.js"
-
-let qs = require('qs');
-
-export default {
-  name: 'Home',
-  data() {
-    return {
-      autoUpdate: false,//自动升级
-      aSideState: false,
-      thisClick: 0,
-      tabwildState: 1,
-      handleTabsList: [{
-        title: '系统首页',
-        name: '1',
-        clmurl: '/',
-      }],
-      editableTabsValue: '1',
-      curVersion: '1.0.1'
-    }
-  },
-  mounted() {
-    // alert('clientWidth:' + document.documentElement.clientWidth);
-    // alert('devicePixelRatio:' + window.devicePixelRatio);
-    //浏览器默认的
-    localStorage.eqSn = '30:9C:23:0C:8B:1E';
-    localStorage.version = '1.1.0';
-    this.getCurVersion();
-
-    // 测试
-
-
-  },
-  methods: {
-    // 获取当前版本号
-    getCurVersion() {
-      let that = this;
-      //浏览器默认的
-      localStorage.eqSn = '30:9C:23:0C:8B:1E';
-      localStorage.version = '1.1.0';
-
-      function plusReady() {
-        if (typeof plus == 'undefined') return false;
-        // 获取本地应用资源版本号
-        plus.runtime.getProperty(plus.runtime.appid, function (inf) {
-          localStorage.version = inf.version;
-          that.curVersion = inf.version;
-
-          //首发版本 '1.1.0' 在线版不需要自动升级
-          that.checkUpdate(that.curVersion); //开启自动升级
-
-        });
-
-        //   获取手机UUID
-        plus.device.getInfo({
-          success: function (e) {
-            let uuid = JSON.stringify(e.uuid).toString().substr(1);
-            uuid = uuid.substring(0, uuid.length - 1);
-            localStorage.eqSn = uuid;
-            console.log('===== uuid =====:' + uuid);
-            // const h = this.$createElement;
-            // that.$notify({
-            //     title: '获取UUID',
-            //     message: h('i', {style: 'color: teal'}, 'uuid:'+JSON.stringify(e).uuid)
-            // });
-            // 8e501b0bde9ce600
-            // 打印uuid
-            // alert('getDeviceInfo success: ' + JSON.stringify(e.uuid));
+    import {
+        QueryVueFramework,
+        DownloadVueFramework,
+        getCheckUpdate,
+        getUserList
+    } from '@/api/getApiRes'
+
+    import "../../public/mui.js"
+    import '../Global'
+
+    let qs = require('qs');
+
+    export default {
+        name: 'Home',
+        data() {
+            return {
+                autoUpdate: false,//自动升级
+                aSideState: false,
+                thisClick: 0,
+                tabwildState: 1,
+                handleTabsList: [{
+                    title: '系统首页',
+                    name: '1',
+                    clmurl: '/',
+                }],
+                editableTabsValue: '1',
+                curVersion: '1.0.1'
+            }
+        },
+        mounted() {
             // alert('clientWidth:' + document.documentElement.clientWidth);
-            // alert('clientWidth:' + document.documentElement.clientHeight);
             // alert('devicePixelRatio:' + window.devicePixelRatio);
-            console.log('getDeviceInfo success: ' + JSON.stringify(e.uuid));
-          },
-          fail: function (e) {
-            console.log('getDeviceInfo failed: ' + JSON.stringify(e));
-          }
-        });
-
-      }
-
-      if (window.plus) {
-        plusReady();
-      } else {
-        console.log('mui is not ready');
-        // plusReady();
-        document.addEventListener('plusready', plusReady, false);
-      }
-    },
-    // 是否有新版本
-    checkUpdate(version) {
-      let that = this;
-      let param = {};
-      let postdata = qs.stringify(param);
-      const h = this.$createElement;
-      console.log('QueryVueFramework');
-      QueryVueFramework(postdata).then(res => {
-        let json = res;
-        if (json.Code == 0) {
-          if (version != json.Version) {
-            // 正式
-            let url = "http://cal.beswell.com:85/v1/Sensors/DownloadVueFramework";
-            // 测试
-            // let url = "http://192.168.0.162/wgt/H5BB8BEB3.wgt";
-            this.downWgt(url);
-            // that.downWgt(url, json.Version);
-            // that.$notify({
-            //     title: '升级提醒',
-            //     message: h('i', {style: 'color: teal'}, '检测到新的版本，正在下载最新版本')
-            // });
-          }
-        }
-      })
-    },
-    downWgt(url) {
-      let that = this;
-      plus.downloader.createDownload(url, {filename: "_doc/update/"}, function (d, status) {
-        // plus.downloader.createDownload(url, {}, function (d, status) {
-        if (status == 200) {
-          console.log(d);
-          console.log("下载wgt成功：" + d.filename);
-          that.installWgt(d.filename); // 安装wgt包
-        } else {
-          console.log("下载wgt失败！");
-          // plus.nativeUI.alert("下载wgt失败！");
-        }
-        plus.nativeUI.closeWaiting();
-      }).start();
-    },
-    installWgt(path) {
-      // plus.nativeUI.showWaiting("安装wgt文件...");
-      plus.runtime.install(path, {}, function () {
-        plus.nativeUI.closeWaiting();
-        console.log("安装wgt文件成功！");
-        // plus.nativeUI.alert("应用资源更新完成！", function () {
-        plus.runtime.restart();
-        // });
-      }, function (e) {
-        plus.nativeUI.closeWaiting();
-        console.log("安装wgt文件失败[" + e.code + "]：" + e.message);
-        // plus.nativeUI.alert("安装wgt文件失败[" + e.code + "]：" + e.message);
-      });
+            //浏览器默认的
+            localStorage.eqSn = '30:9C:23:0C:8B:1E';
+            localStorage.version = '1.1.0';
+            this.getCurVersion();
+            // test
+
+        },
+        methods: {
+            // 获取当前版本号
+            getCurVersion() {
+                let that = this;
+                //浏览器默认的
+                localStorage.eqSn = '30:9C:23:0C:8B:1E';
+                localStorage.version = '1.1.0';
+
+                function plusReady() {
+                    if (typeof plus == 'undefined') return false;
+                    // 获取本地应用资源版本号
+                    plus.runtime.getProperty(plus.runtime.appid, function (inf) {
+                        localStorage.version = inf.version;
+                        that.curVersion = inf.version;
+
+                        //首发版本 '1.1.0' 在线版不需要自动升级
+                        that.checkUpdate(that.curVersion); //开启自动升级
+
+                    });
+
+                    //   获取手机UUID
+                    plus.device.getInfo({
+                        success: function (e) {
+                            let uuid = JSON.stringify(e.uuid).toString().substr(1);
+                            uuid = uuid.substring(0, uuid.length - 1);
+                            localStorage.eqSn = uuid;
+                            console.log('===== uuid =====:' + uuid);
+                            // const h = this.$createElement;
+                            // that.$notify({
+                            //     title: '获取UUID',
+                            //     message: h('i', {style: 'color: teal'}, 'uuid:'+JSON.stringify(e).uuid)
+                            // });
+                            // 8e501b0bde9ce600
+                            // 打印uuid
+                            // alert('getDeviceInfo success: ' + JSON.stringify(e.uuid));
+                            // alert('clientWidth:' + document.documentElement.clientWidth);
+                            // alert('clientWidth:' + document.documentElement.clientHeight);
+                            // alert('devicePixelRatio:' + window.devicePixelRatio);
+                            console.log('getDeviceInfo success: ' + JSON.stringify(e.uuid));
+                            that.getServeIpAddress(e.uuid);
+                        },
+                        fail: function (e) {
+                            console.log('getDeviceInfo failed: ' + JSON.stringify(e));
+                        }
+                    });
+
+                }
+
+                if (window.plus) {
+                    plusReady();
+                } else {
+                    console.log('mui is not ready');
+                    this.getServeIpAddress(localStorage.eqSn);
+                    // plusReady();
+                    document.addEventListener('plusready', plusReady, false);
+                }
+            },
+            // 是否有新版本
+            checkUpdate(version) {
+                let that = this;
+                let param = {};
+                let postdata = qs.stringify(param);
+                const h = this.$createElement;
+                console.log('QueryVueFramework');
+                QueryVueFramework(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        if (version != json.Version) {
+                            // 正式
+                            let url = "http://cal.beswell.com:85/v1/Sensors/DownloadVueFramework";
+                            // 测试
+                            // let url = "http://192.168.0.162/wgt/H5BB8BEB3.wgt";
+                            this.downWgt(url);
+                            // that.downWgt(url, json.Version);
+                            // that.$notify({
+                            //     title: '升级提醒',
+                            //     message: h('i', {style: 'color: teal'}, '检测到新的版本，正在下载最新版本')
+                            // });
+                        }
+                    }
+                })
+            },
+            downWgt(url) {
+                let that = this;
+                plus.downloader.createDownload(url, {filename: "_doc/update/"}, function (d, status) {
+                    // plus.downloader.createDownload(url, {}, function (d, status) {
+                    if (status == 200) {
+                        console.log(d);
+                        console.log("下载wgt成功：" + d.filename);
+                        that.installWgt(d.filename); // 安装wgt包
+                    } else {
+                        console.log("下载wgt失败！");
+                        // plus.nativeUI.alert("下载wgt失败！");
+                    }
+                    plus.nativeUI.closeWaiting();
+                }).start();
+            },
+            installWgt(path) {
+                // plus.nativeUI.showWaiting("安装wgt文件...");
+                plus.runtime.install(path, {}, function () {
+                    plus.nativeUI.closeWaiting();
+                    console.log("安装wgt文件成功！");
+                    // plus.nativeUI.alert("应用资源更新完成！", function () {
+                    plus.runtime.restart();
+                    // });
+                }, function (e) {
+                    plus.nativeUI.closeWaiting();
+                    console.log("安装wgt文件失败[" + e.code + "]：" + e.message);
+                    // plus.nativeUI.alert("安装wgt文件失败[" + e.code + "]：" + e.message);
+                });
+            },
+            // 获取转发端口地址
+            getServeIpAddress(eqsn) {
+                const that = this;
+                let url = 'http://cal.beswell.com:85/v1/Sensors/GetShopConfigParam';
+                // 测试 todo
+                url = "http://192.168.0.3:19096/v1/Sensors/GetShopConfigParam";
+                let param = {
+                    eqSn : eqsn
+                };
+                let postdata = qs.stringify(param);
+                axios.post(url, postdata).then(function (data) {
+                    let json = data.data;
+                    if (json.Code == 0) {
+                        headapi = json.Rs.DataServiceIP;
+                    } else {
+                        headapi = 'http://192.168.0.10:8080/';
+                        that.$message.error(json.memo);
+                    }
+                }, function (response) {
+                    console.info(response);
+                })
+            }
+
+        },
+        components: {}
     }
-
-  },
-  components: {}
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style>
-ul, li {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-}
-
-.el-header {
-  padding: 0 !important;
-  height: 72px !important;
-}
-
-.shortElaside {
-  width: 140px !important;
-  overflow: hidden;
-  height: 100%;
-  float: left;
-}
-
-.lognElaside {
-  width: 256px !important;
-  overflow: hidden;
-  height: 100%;
-  float: left;
-}
-
-/deep/ .nav {
-  width: 60px;
-}
-
-.IndexContainer {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background: #F0F2F5;
-}
-
-.IndexContainer > .el-container {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-}
-
-.footer {
-  position: absolute;
-  bottom: 0px;
-  width: 100%;
-  padding: 10px;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  text-align: center;
-  text-indent: -30%;
-  font-size: 12px;
-  color: #BDBDBD;
-  background: #F0F2F5;
-  z-index: 222;
-}
-
-.el-main {
-  width: 100%;
-  height: 100%;
-  /*min-height: 800px;*/
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  overflow-y: hidden;
-  padding: 10px 20px;
-}
-
-/*ipad only*/
-@media only screen and (max-width: 1366px) {
-  .lognElaside {
-    width: 70px !important;
-  }
-
-  .logoContainer img {
-    display: none !important;
-  }
-
-  .el-main {
-    padding: 3px !important;
-    overflow-y: scroll;
-  }
-
-  .el-main > .context {
-    /*height: 640px;*/
-    /*overflow-y: scroll;*/
-    padding: 6px !important;
-  }
-
-  .table {
-    /*width: 950px;*/
-    /*overflow-x: scroll;*/
-  }
-
-  .el-dialog {
-    max-width: 960px;
-  }
-
-  .el-dialog__body {
-    padding: 3px;
-  }
-
-  .el-transfer__buttons {
-    width: 60px;
-    padding: 3px;
-  }
-
-  .el-transfer .el-button + .el-button {
-    float: right;
-  }
-
-  .el-container.is-vertical {
-    position: absolute;
-    left: 140px;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    height: 100%;
-  }
-
-  .context {
-    border-radius: 12px;
-    height: 823px !important;
-    overflow-y: scroll;
-  }
-
-  .el-dialog {
-    padding: 5px;
-    padding-bottom: 15px;
-  }
-}
+    ul, li {
+        list-style: none;
+        margin: 0;
+        padding: 0;
+    }
+
+    .el-header {
+        padding: 0 !important;
+        height: 72px !important;
+    }
+
+    .shortElaside {
+        width: 140px !important;
+        overflow: hidden;
+        height: 100%;
+        float: left;
+    }
+
+    .lognElaside {
+        width: 256px !important;
+        overflow: hidden;
+        height: 100%;
+        float: left;
+    }
+
+    /deep/ .nav {
+        width: 60px;
+    }
+
+    .IndexContainer {
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: #F0F2F5;
+    }
+
+    .IndexContainer > .el-container {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .footer {
+        position: absolute;
+        bottom: 0px;
+        width: 100%;
+        padding: 10px;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        text-align: center;
+        text-indent: -30%;
+        font-size: 12px;
+        color: #BDBDBD;
+        background: #F0F2F5;
+        z-index: 222;
+    }
+
+    .el-main {
+        width: 100%;
+        height: 100%;
+        /*min-height: 800px;*/
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        overflow-y: hidden;
+        padding: 10px 20px;
+    }
+
+    /*ipad only*/
+    @media only screen and (max-width: 1366px) {
+        .lognElaside {
+            width: 70px !important;
+        }
+
+        .logoContainer img {
+            display: none !important;
+        }
+
+        .el-main {
+            padding: 3px !important;
+            overflow-y: scroll;
+        }
+
+        .el-main > .context {
+            /*height: 640px;*/
+            /*overflow-y: scroll;*/
+            padding: 6px !important;
+        }
+
+        .table {
+            /*width: 950px;*/
+            /*overflow-x: scroll;*/
+        }
+
+        .el-dialog {
+            max-width: 960px;
+        }
+
+        .el-dialog__body {
+            padding: 3px;
+        }
+
+        .el-transfer__buttons {
+            width: 60px;
+            padding: 3px;
+        }
+
+        .el-transfer .el-button + .el-button {
+            float: right;
+        }
+
+        .el-container.is-vertical {
+            position: absolute;
+            left: 140px;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            height: 100%;
+        }
+
+        .context {
+            border-radius: 12px;
+            height: 823px !important;
+            overflow-y: scroll;
+        }
+
+        .el-dialog {
+            padding: 5px;
+            padding-bottom: 15px;
+        }
+    }
 </style>

tv/src/views/Main.vue

@@ -190,6 +190,7 @@
         },
         methods: {
             init() {
+                console.log(headTest);
                 this.GetgetUserList();
                 this.createEgg();
                 this.createNewStudent();

tv/src/views/Wait.vue

@@ -11,7 +11,7 @@
                                 <div class="sumContainer">
                                     <div class="sum">
                                         <s>{{rs.Result[0].Unite}}</s>
-                                        <em>{{rs.Result[0].Values}}</em>
+                                        <sumNumber :cur-number="rs.Result[0].Values"></sumNumber>
                                     </div>
                                     <span class="sumBg"></span>
                                 </div>
@@ -102,6 +102,7 @@
 
 <script>
     import Headside from '@/components/Headside'
+    import sumNumber from '@/components/sumNumber'
     import {
         getHello,
         getClassStat,
@@ -431,7 +432,7 @@
             },
         },
         components: {
-            Headside
+            Headside,sumNumber
         }
     }
 </script>
@@ -521,13 +522,14 @@
 
     .sumBg {
         position: relative;
-        bottom: 0.8rem;
+        bottom: 2rem;
         width: 100%;
-        height: 2rem;
+        height: 3rem;
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        background: url("../static/img/pingtai.png") bottom center;
+        /*background: url("../static/img/pingtai.png") bottom center;*/
+        background: url("../static/img/black.png") bottom center;
         background-size: 100% 100%;
         background-repeat: no-repeat;
     }
@@ -542,7 +544,8 @@
         text-align: center;
         color: #fff;
         font-style: normal;
-        text-shadow: #E85297 5px 0 0, #E85297 0 5px 0, #E85297 -5px 0 0, #E85297 0 -5px 0;
+        /*text-shadow: #E85297 5px 0 0, #E85297 0 5px 0, #E85297 -5px 0 0, #E85297 0 -5px 0;*/
+        text-shadow: #000 5px 0 0, #000 0 5px 0, #000 -5px 0 0, #000 0 -5px 0;
     }
 
     .sum s {