618submit

tv/src/api/Navs.js

@@ -1,223 +0,0 @@
-let navs = [
-    {
-        "clmid": "1",
-        "clmcode": "index",
-        "clmname": "系统首页",
-        "clmurl": "/",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-house",
-    }, {
-        "clmid": "2",
-        "clmcode": "member",
-        "clmname": "会员管理",
-        "clmurl": "/member",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-user",
-    }, {
-        "clmid": "3",
-        "clmcode": "lesson",
-        "clmname": "课程管理",
-        "clmurl": "/lesson",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-s-cooperation",
-    }, {
-        "clmid": "4",
-        "clmcode": "lessonTable",
-        "clmname": "课程表模板",
-        "clmurl": "/lessonTable",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-tickets",
-    }, {
-        "clmid": "5",
-        "clmcode": "lessonManage",
-        "clmname": "课程表管理",
-        "clmurl": "/lessonManage",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-date",
-    }, {
-        "clmid": "6",
-        "clmcode": "coach",
-        "clmname": "教练管理",
-        "clmurl": "/coach",
-        "prname": "",
-        "show": 999,
-        "grouplist": "2,5",
-        "icon": "el-icon-medal-1",
-    }, {
-        "clmid": "7",
-        "clmcode": "appoint",
-        "clmname": "预约管理",
-        "clmurl": "/appoint",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-time",
-    }, {
-        "clmid": "8",
-        "clmcode": "record",
-        "clmname": "预约记录",
-        "clmurl": "/record",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-document-copy",
-    }, {
-        "clmid": "9",
-        "clmcode": "cost",
-        "clmname": "消费记录",
-        "clmurl": "/cost",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-bank-card",
-    }, {
-        "clmid": "10",
-        "clmcode": "finish",
-        "clmname": "下课管理",
-        "clmurl": "/finish",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-bell",
-    }, {
-        "clmid": "11",
-        "clmcode": "setting",
-        "clmname": "系统设置",
-        "clmurl": "/setting",
-        "prname": "",
-        "show": 3,
-        "grouplist": "2,5",
-        "icon": "el-icon-setting",
-    }, {
-        "clmid": "12",
-        "clmcode": "shop",
-        "clmname": "店面管理",
-        "clmurl": "/shopManage",
-        "prname": "",
-        "show": 2,
-        "grouplist": "2,5",
-        "icon": "el-icon-s-shop",
-    }, {
-        "clmid": "13",
-        "clmcode": "adminManage",
-        "clmname": "管理员管理",
-        "clmurl": "/adminManage",
-        "prname": "",
-        "show": 2,
-        "grouplist": "2,5",
-        "icon": "el-icon-user",
-    }, {
-        "clmid": "14",
-        "clmcode": "log",
-        "clmname": "操作日志",
-        "clmurl": "/log",
-        "prname": "",
-        "show": 2,
-        "grouplist": "2,5",
-        "icon": "el-icon-s-claim",
-    }, {
-        "clmid": "15",
-        "clmcode": "setting",
-        "clmname": "系统设置",
-        "clmurl": "/adminSetting",
-        "prname": "",
-        "show": 2,
-        "grouplist": "2,5",
-        "icon": "el-icon-setting",
-    },
-    {
-        "clmid": "1",
-        "clmcode": "index",
-        "clmname": "系统首页",
-        "clmurl": "/",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-house",
-    }, {
-        "clmid": "2",
-        "clmcode": "member",
-        "clmname": "会员管理",
-        "clmurl": "/member",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-user",
-    }, {
-        "clmid": "3",
-        "clmcode": "lesson",
-        "clmname": "课程管理",
-        "clmurl": "/lesson",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-s-cooperation",
-    }, {
-        "clmid": "5",
-        "clmcode": "lessonManage",
-        "clmname": "课程表管理",
-        "clmurl": "/lessonManage",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-date",
-    }, {
-        "clmid": "7",
-        "clmcode": "appoint",
-        "clmname": "预约管理",
-        "clmurl": "/appoint",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-time",
-    }, {
-        "clmid": "8",
-        "clmcode": "record",
-        "clmname": "预约记录",
-        "clmurl": "/record",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-document-copy",
-    }, {
-        "clmid": "9",
-        "clmcode": "cost",
-        "clmname": "消费记录",
-        "clmurl": "/cost",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-bank-card",
-    }, {
-        "clmid": "10",
-        "clmcode": "finish",
-        "clmname": "下课管理",
-        "clmurl": "/finish",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-bell",
-    },
-    {
-        "clmid": "15",
-        "clmcode": "setting",
-        "clmname": "系统设置",
-        "clmurl": "/adminSetting",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-setting",
-    },
-];
-
-export default navs;

tv/src/api/test.js

@@ -1,393 +0,0 @@
-新增 - 课堂记录排名
-/ ClassUserRank
-下课后查询当堂课程人员排名
-{
-    "Code"
-:
-    "0", "Memo"
-:
-    "Success", "Rs"
-:
-    {
-        "CkSort"
-    :
-        [{
-            "DuId": 178,
-            "HrId": 11,
-            "PlanId": 9,
-            "UserId": 16,
-            "SvId": 1,
-            "EqSn": "",
-            "Sn": "22731",
-            "UserMd5": "郑伟",
-            "GroupNo": 0,
-            "AvgHr": 75,
-            "MaxHr": 138,
-            "realHr": 73,
-            "Steps": 0,
-            "Cle": 465.31564306429306,
-            "Ck": 50.436683654785156,
-            "BeginTime": 1605503891,
-            "EndTime": 1605768133,
-            "Name": "郑伟",
-            "Age": 26,
-            "Height": 172,
-            "Weight": 76.7,
-            "Sex": 1,
-            "StaticHr": 60,
-            "Head": "http://192.168.0.2/zw.png",
-            "vo2Max": 0.0,
-            "PureCalorieNoVo2": 259.01474862971804,
-            "activePercent": 10,
-            "bmrMSjRmrcb": 78.69583333333334,
-            "lastUpdateTime": 1605775599442,
-            "lastPushDataTime": 1605775599515,
-            "isOver": false,
-            "isAlive": true,
-            "queuePushData": [],
-            "queueHeartRate": [{"heartRate": 73, "rcvTime": 1605775599442}]
-        }, {
-            "DuId": 175,
-            "HrId": 15,
-            "PlanId": 16,
-            "UserId": 13,
-            "SvId": 1,
-            "EqSn": "",
-            "Sn": "88888",
-            "UserMd5": "高超",
-            "GroupNo": 0,
-            "AvgHr": 0,
-            "MaxHr": 0,
-            "realHr": 0,
-            "Steps": 0,
-            "Cle": 12.341233,
-            "Ck": 45.646767,
-            "BeginTime": 1605503891,
-            "EndTime": 0,
-            "Name": "高超",
-            "Age": 30,
-            "Height": 172,
-            "Weight": 80.0,
-            "Sex": 1,
-            "StaticHr": 60,
-            "Head": "http://192.168.0.2/gc.png",
-            "vo2Max": 0.0,
-            "PureCalorieNoVo2": 0.0,
-            "activePercent": 0,
-            "bmrMSjRmrcb": 0.0,
-            "lastUpdateTime": 0,
-            "lastPushDataTime": 0,
-            "isOver": false,
-            "isAlive": true,
-            "queuePushData": [],
-            "queueHeartRate": []
-        }, {
-            "DuId": 179,
-            "HrId": 17,
-            "PlanId": 9,
-            "UserId": 17,
-            "SvId": 1,
-            "EqSn": "",
-            "Sn": "22732",
-            "UserMd5": "大华",
-            "GroupNo": 0,
-            "AvgHr": 0,
-            "MaxHr": 0,
-            "realHr": 0,
-            "Steps": 0,
-            "Cle": 42.34231,
-            "Ck": 34.53451,
-            "BeginTime": 1605503891,
-            "EndTime": 0,
-            "Name": "大华",
-            "Age": 26,
-            "Height": 172,
-            "Weight": 76.7,
-            "Sex": 1,
-            "StaticHr": 65,
-            "Head": "http://192.168.0.2/zw.png",
-            "vo2Max": 0.0,
-            "PureCalorieNoVo2": 0.0,
-            "activePercent": 0,
-            "bmrMSjRmrcb": 0.0,
-            "lastUpdateTime": 0,
-            "lastPushDataTime": 0,
-            "isOver": false,
-            "isAlive": true,
-            "queuePushData": [],
-            "queueHeartRate": []
-        }]
-    }
-,
-    "CalSort"
-:
-    [{
-        "DuId": 178,
-        "HrId": 11,
-        "PlanId": 9,
-        "UserId": 16,
-        "SvId": 1,
-        "EqSn": "",
-        "Sn": "22731",
-        "UserMd5": "郑伟",
-        "GroupNo": 0,
-        "AvgHr": 75,
-        "MaxHr": 138,
-        "realHr": 73,
-        "Steps": 0,
-        "Cle": 465.31564306429306,
-        "Ck": 50.436683654785156,
-        "BeginTime": 1605503891,
-        "EndTime": 1605768133,
-        "Name": "郑伟",
-        "Age": 26,
-        "Height": 172,
-        "Weight": 76.7,
-        "Sex": 1,
-        "StaticHr": 60,
-        "Head": "http://192.168.0.2/zw.png",
-        "vo2Max": 0.0,
-        "PureCalorieNoVo2": 259.01474862971804,
-        "activePercent": 10,
-        "bmrMSjRmrcb": 78.69583333333334,
-        "lastUpdateTime": 1605775599442,
-        "lastPushDataTime": 1605775599515,
-        "isOver": false,
-        "isAlive": true,
-        "queuePushData": [],
-        "queueHeartRate": [{"heartRate": 73, "rcvTime": 1605775599442}]
-    }, {
-        "DuId": 179,
-        "HrId": 17,
-        "PlanId": 9,
-        "UserId": 17,
-        "SvId": 1,
-        "EqSn": "",
-        "Sn": "22732",
-        "UserMd5": "大华",
-        "GroupNo": 0,
-        "AvgHr": 0,
-        "MaxHr": 0,
-        "realHr": 0,
-        "Steps": 0,
-        "Cle": 42.34231,
-        "Ck": 34.53451,
-        "BeginTime": 1605503891,
-        "EndTime": 0,
-        "Name": "大华",
-        "Age": 26,
-        "Height": 172,
-        "Weight": 76.7,
-        "Sex": 1,
-        "StaticHr": 65,
-        "Head": "http://192.168.0.2/zw.png",
-        "vo2Max": 0.0,
-        "PureCalorieNoVo2": 0.0,
-        "activePercent": 0,
-        "bmrMSjRmrcb": 0.0,
-        "lastUpdateTime": 0,
-        "lastPushDataTime": 0,
-        "isOver": false,
-        "isAlive": true,
-        "queuePushData": [],
-        "queueHeartRate": []
-    }, {
-        "DuId": 175,
-        "HrId": 15,
-        "PlanId": 16,
-        "UserId": 13,
-        "SvId": 1,
-        "EqSn": "",
-        "Sn": "88888",
-        "UserMd5": "高超",
-        "GroupNo": 0,
-        "AvgHr": 0,
-        "MaxHr": 0,
-        "realHr": 0,
-        "Steps": 0,
-        "Cle": 12.341233,
-        "Ck": 45.646767,
-        "BeginTime": 1605503891,
-        "EndTime": 0,
-        "Name": "高超",
-        "Age": 30,
-        "Height": 172,
-        "Weight": 80.0,
-        "Sex": 1,
-        "StaticHr": 60,
-        "Head": "http://192.168.0.2/gc.png",
-        "vo2Max": 0.0,
-        "PureCalorieNoVo2": 0.0,
-        "activePercent": 0,
-        "bmrMSjRmrcb": 0.0,
-        "lastUpdateTime": 0,
-        "lastPushDataTime": 0,
-        "isOver": false,
-        "isAlive": true,
-        "queuePushData": [],
-        "queueHeartRate": []
-    }]
-}
-
-修改接口名getUserListInfo为UserListInfo
-竞技课用GroupNo来分组
-返回值不变
-{
-    "Code"
-:
-    "0", "Memo"
-:
-    "Success", "Rs"
-:
-    [{
-        "DuId": 178,
-        "HrId": 11,
-        "PlanId": 9,
-        "UserId": 16,
-        "SvId": 1,
-        "EqSn": "",
-        "Sn": "22731",
-        "UserMd5": "郑伟",
-        "GroupNo": 0,
-        "AvgHr": 75,
-        "MaxHr": 138,
-        "realHr": 78,
-        "Steps": 0,
-        "Cle": 470.7780018836046,
-        "Ck": 50.507904052734375,
-        "BeginTime": 1605503891,
-        "EndTime": 1605768133,
-        "Name": "郑伟",
-        "Age": 26,
-        "Height": 172,
-        "Weight": 76.7,
-        "Sex": 1,
-        "StaticHr": 60,
-        "Head": "http://192.168.0.2/zw.png",
-        "vo2Max": 0.0,
-        "PureCalorieNoVo2": 262.4222718008815,
-        "activePercent": 13,
-        "bmrMSjRmrcb": 78.69583333333334,
-        "lastUpdateTime": 1605775732977,
-        "lastPushDataTime": 1605775732028,
-        "isOver": false,
-        "isAlive": true,
-        "queuePushData": [{
-            "heartRate": 78,
-            "rcvTime": 1605775731927,
-            "lastRcvTime": 0,
-            "calories": 0.0
-        }, {"heartRate": 78, "rcvTime": 1605775732674, "lastRcvTime": 0, "calories": 0.0}],
-        "queueHeartRate": [{"heartRate": 78, "rcvTime": 1605775732977}]
-    }, {
-        "DuId": 179,
-        "HrId": 17,
-        "PlanId": 9,
-        "UserId": 17,
-        "SvId": 1,
-        "EqSn": "",
-        "Sn": "22732",
-        "UserMd5": "大华",
-        "GroupNo": 0,
-        "AvgHr": 0,
-        "MaxHr": 0,
-        "realHr": 0,
-        "Steps": 0,
-        "Cle": 42.34231,
-        "Ck": 34.53451,
-        "BeginTime": 1605503891,
-        "EndTime": 0,
-        "Name": "大华",
-        "Age": 26,
-        "Height": 172,
-        "Weight": 76.7,
-        "Sex": 1,
-        "StaticHr": 65,
-        "Head": "http://192.168.0.2/zw.png",
-        "vo2Max": 0.0,
-        "PureCalorieNoVo2": 0.0,
-        "activePercent": 0,
-        "bmrMSjRmrcb": 0.0,
-        "lastUpdateTime": 0,
-        "lastPushDataTime": 0,
-        "isOver": false,
-        "isAlive": true,
-        "queuePushData": [],
-        "queueHeartRate": []
-    }, {
-        "DuId": 175,
-        "HrId": 15,
-        "PlanId": 16,
-        "UserId": 13,
-        "SvId": 1,
-        "EqSn": "",
-        "Sn": "88888",
-        "UserMd5": "高超",
-        "GroupNo": 0,
-        "AvgHr": 0,
-        "MaxHr": 0,
-        "realHr": 0,
-        "Steps": 0,
-        "Cle": 12.341233,
-        "Ck": 45.646767,
-        "BeginTime": 1605503891,
-        "EndTime": 0,
-        "Name": "高超",
-        "Age": 30,
-        "Height": 172,
-        "Weight": 80.0,
-        "Sex": 1,
-        "StaticHr": 60,
-        "Head": "http://192.168.0.2/gc.png",
-        "vo2Max": 0.0,
-        "PureCalorieNoVo2": 0.0,
-        "activePercent": 0,
-        "bmrMSjRmrcb": 0.0,
-        "lastUpdateTime": 0,
-        "lastPushDataTime": 0,
-        "isOver": false,
-        "isAlive": true,
-        "queuePushData": [],
-        "queueHeartRate": []
-    }]
-}
-
-修改接口查询当前课程状态
-/ ClassStatQuery
-增加了课程返回类型，其中ClassType为课程类型
-1：团课
-2：竞技课PK
-3：私教课
-{
-    "Code"
-:
-    "0", "Memo"
-:
-    "Success", "Rs"
-:
-    [
-        {
-            "PlanId": 9,
-            "ShopId": 1,
-            "SvId": 1,
-            "PlanName": "2",
-            "Status": 2,
-            "BeginTime": 1605749000,
-            "EndTime": 0,
-            "ClassType": 1,
-            "DuMd5": "1a2fecd549d319af88dad82f15311b5f"
-        },
-        {
-            "PlanId": 16,
-            "ShopId": 1,
-            "SvId": 1,
-            "PlanName": "3",
-            "Status": 3,
-            "BeginTime": 1605749000,
-            "EndTime": 0,
-            "ClassType": 1,
-            "DuMd5": "3aaeceb9581a0ec33c2ae36fef37d09b"
-        }
-    ]
-}
-

tv/src/views/Index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="[{'IndexContainer':true}]" :style="{height:ClentHeight}">
+  <div :class="[{'IndexContainer':true}]" :style="{height:clientHeight}">
     <keep-alive>
       <router-view></router-view>
     </keep-alive>
@@ -8,10 +8,7 @@
 
 <script>
 import {
-  QueryVueFramework,
-  DownloadVueFramework,
-  getCheckUpdate,
-  getUserList
+  QueryVueFramework
 } from '@/api/getApiRes'
 
 import "../../public/mui.js"
@@ -23,19 +20,15 @@ export default {
   name: 'Home',
   data() {
     return {
-      autoUpdate: false,//自动升级
-      aSideState: false,
-      thisClick: 0,
-      tabwildState: 1,
       handleTabsList: [{
         title: '系统首页',
         name: '1',
         clmurl: '/',
       }],
-      editableTabsValue: '1',
+      autoUpdate: false,
       curVersion: '1.0.1',
-      isPad: true,// pad 展示版本
-      ClentHeight: document.documentElement.clientHeight +'px'
+      isPad: true,//pad 展示版本
+      clientHeight: document.documentElement.clientHeight + 'px'
     }
   },
   mounted() {
@@ -45,13 +38,12 @@ export default {
     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';
 
@@ -61,26 +53,25 @@ export default {
         console.log('mui is not ready');
         // 调试时候关闭
         this.getServeIpAddress(localStorage.eqSn);
-        // plusReady();
         document.addEventListener('plusready', plusReady, false);
       }
 
       function plusReady() {
         if (typeof plus == 'undefined') return false;
-        // 获取本地应用资源版本号
+
+        //获取本地应用资源版本号
         plus.runtime.getProperty(plus.runtime.appid, function (inf) {
           localStorage.version = inf.version;
           that.curVersion = inf.version;
         });
 
-        //   获取手机UUID
+        //获取手机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);
-            console.log('getDeviceInfo success: ' + JSON.stringify(e.uuid));
+            console.log('===== uuid =====:' + uuid + '\ngetDeviceInfo success: ' + JSON.stringify(e.uuid));
             // 正式版打开
             // 获取转发端口地址
             that.getServeIpAddress(e.uuid);
@@ -113,10 +104,10 @@ export default {
               // 正式版
               //开启自动升级
               // 教室版本自动升级，户外版禁用自动升级
-              if(runVersion == 'outDoor'){
+              if (runVersion == 'outDoor') {
                 console.log('户外版禁用自动升级');
                 return false
-              }else{
+              } else {
                 that.checkUpdate();
               }
 
@@ -133,7 +124,7 @@ export default {
       let that = this;
       let param = {};
       let postdata = qs.stringify(param);
-      const h = this.$createElement;
+      const h = that.$createElement;
       QueryVueFramework(postdata).then(res => {
         let json = res;
         if (json.Code == 0) {
@@ -203,15 +194,15 @@ export default {
         let json = data.data;
         if (json.Code == 0) {
           // 户外版使用HotsPotDataServiceIP
-          if(runVersion == 'outDoor'){
+          if (runVersion == 'outDoor') {
             headapi = json.Rs.HotsPotDataServiceIP;
             // 内网测试版
             // headapi = 'http://192.168.0.3:19096/v1/Sensors/';
-            if(!json.Rs.HotsPotDataServiceIP){
+            if (!json.Rs.HotsPotDataServiceIP) {
               that.$message.error("未获取到HotsPotDataServiceIP");
               return false
             }
-          }else{
+          } else {
             headapi = json.Rs.DataServiceIP;
           }
 
@@ -224,7 +215,6 @@ export default {
         console.info(response);
       })
     }
-
   },
   components: {}
 }
@@ -375,9 +365,11 @@ ul, li {
     padding-bottom: 15px;
   }
 }
+
 #__vconsole {
   display: none;
 }
+
 #__vconsole.show {
   display: block;
 }

tv/vue.config.js

@@ -19,13 +19,8 @@ module.exports = {
         port: 8083, // 端口
         proxy: {
             '/api': {
-                // target: 'http://192.168.0.105:8080/',//小飞龙的
-                // target: 'http://192.168.0.162:9000/',//PC的
-                // target: 'http://192.168.0.110:8080',//公司公用的
-                // target: 'http://192.168.0.196:8080',//树莓派
-                target: 'http://192.168.0.74:8080',//郑伟机器的2
-                // target: 'http://192.168.0.243:9000/',//刘海生机器的
-                // target: ' http://192.168.0.222:9000/',//redmi的
+                // target: 'http://192.168.0.105:8080/',
+                target: 'http://192.168.0.61:9000',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/api': '',
@@ -33,7 +28,7 @@ module.exports = {
             },
             // 用查询最新wgt 般本
             '/bpi': {
-                target: 'http://192.168.0.3:19096',//公司公用的
+                target: 'http://192.168.0.3:19096',//公司用
                 changeOrigin: true,
                 pathRewrite: {
                     '^/bpi': '',
@@ -42,6 +37,6 @@ module.exports = {
         }
     },
     // 输出文件目录
-    outputDir: 'D:\\wwwroot\\flyLong\\hbuild\\GoAllOutTv\\build',
+    outputDir: '/Users/macbook/Working/vueBuild/flyLong/GoAllOutTv',
     publicPath:'./',
 };