table 最多十条

pc/src/components/Headside.vue

@@ -18,665 +18,719 @@
                 </el-badge>
             </div>
 
-            <ul class="user-info-menu right-links list-inline list-unstyled">
-                <li class="dropdown user-profile">
-                    <!--                        <img class="lteHead" src="../assets/img/header/lteHead.png" height="26" width="26"/>-->
-                    <span class="el-dropdown-link customer_serve shopinfo">
-                        <span>{{ ShopName }}</span>
-                        <span>{{ userLevelText }}</span>
-                    </span>
-                    <span class="el-dropdown-link customer_serve">{{ user.name }}</span>
-                    <span @click="logoutClick">退出</span>
-                </li>
+            <ul class="user-info-menu pull-right  list-unstyled">
+                <!--                        <img class="lteHead" src="../assets/img/header/lteHead.png" height="26" width="26"/>-->
+
+                <span class="customer_serve" @click="logoutClick"> <i class="el-icon-switch-button"></i> 退出</span>
+                <span class="scrren customer_serve" @click="full_screen" v-if="!screen_full"><i
+                        class="el-icon-full-screen"></i>全屏</span>
+                <span class="scrren customer_serve" @click="cancle_screen" v-if="screen_full"><i
+                        class="el-icon-full-screen"></i>缩小</span>
+                <span class="el-dropdown-link customer_serve">{{ user.name }}</span>
+                <span class="el-dropdown-link customer_serve shopinfo">
+                    <span>{{ ShopName }}</span>
+                    <span>{{ userLevelText }}</span>
+                </span>
             </ul>
         </nav>
     </div>
 </template>
 <script>
 
-import axios from 'axios';
-import Global from '../Global.js'
-import { SignOut, ManagerSelfQuery, ShopListQuery } from '../api/getApiRes.js'
-let qs = require('qs');
-export default {
-    data() {
-        return {
-            isCollapse: document.body.clientWidth < 1367,
-            user: {
-                name: 'admin',
-            },
-            time: '8:30-17:30',
-            tel: '0000-0079-000',
-            qq: '0000079000',
-            newnum: '',
-            newnumState: false,
-            left_panel_state: true,
-            ShopName: '',
-            userLevelText: '',
-            current: globalcurrentWeek()
-        }
-    },
-    mounted() {
-        this.readNewNum();
-        this.getManagerSelfQuery();
-        //            定时轮询news
-        //设置10s刷新一次数据
-        // if (this.timer) {
-        //     clearInterval(this.timer);
-        // }else{
-        //     this.timer = setInterval(() => {
-        //         this.readNewNum();
-        //     },10000)
-        // }
-    },
-    methods: {
-        //            隐藏左侧和显示
-        left_hide: function() {
-            let that = this;
-            that.left_panel_state = !that.left_panel_state;
-            this.$emit('lefthide');
-            // if (!that.left_panel_state) {
-            //     this.$emit('left_hide_func');
-            // } else {
-            //     this.$emit('right_hide_func');
+    import axios from 'axios';
+    import Global from '../Global.js'
+    import { SignOut, ManagerSelfQuery, ShopListQuery } from '../api/getApiRes.js'
+    let qs = require('qs');
+    export default {
+        data() {
+            return {
+                isCollapse: document.body.clientWidth < 1367,
+                user: {
+                    name: 'admin',
+                },
+                time: '8:30-17:30',
+                tel: '0000-0079-000',
+                qq: '0000079000',
+                newnum: '',
+                newnumState: false,
+                left_panel_state: true,
+                screen_full: false,
+                ShopName: '',
+                userLevelText: '',
+                current: globalcurrentWeek()
+            }
+        },
+        mounted() {
+            this.readNewNum();
+            this.getManagerSelfQuery();
+            //            定时轮询news
+            //设置10s刷新一次数据
+            // if (this.timer) {
+            //     clearInterval(this.timer);
+            // }else{
+            //     this.timer = setInterval(() => {
+            //         this.readNewNum();
+            //     },10000)
             // }
         },
-        getManagerSelfQuery() {
-            let that = this;
-            let param = {
-                token: localStorage.token,
-            };
-            let postdata = qs.stringify(param);
-            ManagerSelfQuery(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    that.user.name = json.Rs.Name;
-                    localStorage.shopId = json.Rs.ShopId;
-                    localStorage.userLevel = json.Rs.Role.Id;
-                    localStorage.ServiceId = json.Rs.Shop.ServiceId;
-                    localStorage.ServiceKey = json.Rs.Shop.ServiceKey;
-
-                    that.userLevelText = json.Rs.Role.Name;
-                    // 1 会员 2 系统 3 店铺 4 教练
-                    switch (parseInt(json.Rs.Role.Id)) {
-                        case 1:
-                            that.userLevel = 1;
-                            break;
-                        case 2:
-                            that.userLevel = 2;
-                            break;
-                        case 3:
-                            that.userLevel = 3;
-                            break;
-                        case 4:
-                            that.userLevel = 4;
-                            break;
-                    }
-                    localStorage.shopId = json.Rs.ShopId;
-                    this.panelSelect(json.Rs.ShopId);
+        methods: {
+            //            隐藏左侧和显示
+            left_hide: function () {
+                let that = this;
+                that.left_panel_state = !that.left_panel_state;
+                this.$emit('lefthide');
+                // if (!that.left_panel_state) {
+                //     this.$emit('left_hide_func');
+                // } else {
+                //     this.$emit('right_hide_func');
+                // }
+            },
+            getManagerSelfQuery() {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                ManagerSelfQuery(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.user.name = json.Rs.Name;
+                        localStorage.shopId = json.Rs.ShopId;
+                        localStorage.userLevel = json.Rs.Role.Id;
+                        localStorage.ServiceId = json.Rs.Shop.ServiceId;
+                        localStorage.ServiceKey = json.Rs.Shop.ServiceKey;
+
+                        that.userLevelText = json.Rs.Role.Name;
+                        // 1 会员 2 系统 3 店铺 4 教练
+                        switch (parseInt(json.Rs.Role.Id)) {
+                            case 1:
+                                that.userLevel = 1;
+                                break;
+                            case 2:
+                                that.userLevel = 2;
+                                break;
+                            case 3:
+                                that.userLevel = 3;
+                                break;
+                            case 4:
+                                that.userLevel = 4;
+                                break;
+                        }
+                        localStorage.shopId = json.Rs.ShopId;
+                        this.panelSelect(json.Rs.ShopId);
 
-                } else {
-                    if (json.Code == 1010) {
-                        that.$message.error(json.Memo + ' 错误码：' + json.Code);
-                        that.$router.push({ path: '/login', query: { status: 1 } });
-                        return false
                     } else {
-                        that.$message.error(json.Memo + ' 错误码：' + json.Code);
-                    }
-                }
-            })
-        },
-        // 获取所属店铺
-        panelSelect(ShopId) {
-            let that = this;
-            let param = {
-                token: localStorage.token,
-            };
-            let postdata = qs.stringify(param);
-            ShopListQuery(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    json.Rs.map(function(item) {
-                        if (item.ShopID == ShopId) {
-                            that.ShopName = item.ShopName;
+                        if (json.Code == 1010) {
+                            that.$message.error(json.Memo + ' 错误码：' + json.Code);
+                            that.$router.push({ path: '/login', query: { status: 1 } });
+                            return false
+                        } else {
+                            that.$message.error(json.Memo + ' 错误码：' + json.Code);
                         }
-                    })
-                } else {
-                    that.$message.error(json.Memo + ' 错误码：' + json.Code);
-                }
-            })
-        },
-        //            打开消息提示
-        checkNews: function() {
-            let that = this;
-            const h = this.$createElement;
-            this.$notify({
-                title: '标题名称',
-                position: 'top-left',
-                message: h('i', { style: 'color: teal' }, '这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案'),
-                onClose: function() {
-                    //关闭时调用已读接口
-                },
-                onClick: function() {
-                    //关闭时调用已读接口
-                    this.close();//关闭notify
-                    let thisdata = { name: 'message', link: '/#/message' };
-                    that.$emit('navOpen', thisdata);//跳转新的message
-                }
-            });
-        },
-        //            读取消息提示数量
-        readNewNum: function() {
-            this.newnum = 0;
-            this.newnumState = false;
-            //                ajax todo
-        },
-        // 退出登录
-        logoutClick: function() {
-            let that = this;
-            that.$confirm('此操作将退出当前账号, 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
+                    }
+                })
+            },
+            // 获取所属店铺
+            panelSelect(ShopId) {
                 let that = this;
-                that.$router.push({ path: '/login', query: { status: 1 } });
                 let param = {
                     token: localStorage.token,
                 };
                 let postdata = qs.stringify(param);
-                SignOut(postdata).then(res => {
+                ShopListQuery(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                        localStorage.clear();
-                        // that.$router.push({path: '/login', query: {status: 1}});
-                        that.$message({
-                            showClose: true,
-                            message: '当前用户已退出登陆！',
-                            type: 'success'
-                        });
+                        json.Rs.map(function (item) {
+                            if (item.ShopID == ShopId) {
+                                that.ShopName = item.ShopName;
+                            }
+                        })
                     } else {
                         that.$message.error(json.Memo + ' 错误码：' + json.Code);
                     }
                 })
-            }).catch(() => {
+            },
+            //            打开消息提示
+            checkNews: function () {
+                let that = this;
+                const h = this.$createElement;
+                this.$notify({
+                    title: '标题名称',
+                    position: 'top-left',
+                    message: h('i', { style: 'color: teal' }, '这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案'),
+                    onClose: function () {
+                        //关闭时调用已读接口
+                    },
+                    onClick: function () {
+                        //关闭时调用已读接口
+                        this.close();//关闭notify
+                        let thisdata = { name: 'message', link: '/#/message' };
+                        that.$emit('navOpen', thisdata);//跳转新的message
+                    }
+                });
+            },
+            //            读取消息提示数量
+            readNewNum: function () {
+                this.newnum = 0;
+                this.newnumState = false;
+                //                ajax todo
+            },
+            // 退出登录
+            logoutClick: function () {
+                let that = this;
+                that.$confirm('此操作将退出当前账号, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    let that = this;
+                    that.$router.push({ path: '/login', query: { status: 1 } });
+                    let param = {
+                        token: localStorage.token,
+                    };
+                    let postdata = qs.stringify(param);
+                    SignOut(postdata).then(res => {
+                        let json = res;
+                        if (json.Code == 0) {
+                            localStorage.clear();
+                            // that.$router.push({path: '/login', query: {status: 1}});
+                            that.$message({
+                                showClose: true,
+                                message: '当前用户已退出登陆！',
+                                type: 'success'
+                            });
+                        } else {
+                            that.$message.error(json.Memo + ' 错误码：' + json.Code);
+                        }
+                    })
+                }).catch(() => {
 
-            });
+                });
+            },
+            // 全屏显示
+            full_screen() {
+                let that = this;
+                this.screen_full = true;
+                let elem = document.getElementById("app");
+                this.full_state = true;
+                if (elem.webkitRequestFullScreen) {
+                    elem.webkitRequestFullScreen();
+                    that.full_rule();
+                } else if (elem.mozRequestFullScreen) {
+                    elem.mozRequestFullScreen();
+                    that.full_rule();
+                } else if (elem.requestFullScreen) {
+                    elem.requestFullscreen();
+                    that.full_rule();
+                } else {
+                    this.screen_full = false;
+                    that.$message.error("浏览器不支持全屏API或已被禁用", null, null, null, true, true);
+                }
+            },
+            // 取消全屏
+            cancle_screen() {
+                let that = this;
+                this.screen_full = false;
+                this.full_state = false;
+                var elem = document;
+                if (elem.webkitCancelFullScreen) {
+                    elem.webkitCancelFullScreen();
+                    that.cancle_full_rule();
+                } else if (elem.mozCancelFullScreen) {
+                    elem.mozCancelFullScreen();
+                    that.cancle_full_rule();
+                } else if (elem.cancelFullScreen) {
+                    elem.cancelFullScreen();
+                    that.cancle_full_rule();
+                } else if (elem.exitFullscreen) {
+                    elem.exitFullscreen();
+                    that.cancle_full_rule();
+                } else {
+                    this.screen_full = true;
+                    that.$message.error("浏览器不支持全屏API或已被禁用", null, null, null, true, true);
+                }
+            },
         },
-    },
-    components: {}
-}
+        components: {}
+    }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
-ul,
-li {
-    list-style: none;
-    padding: 0;
-    margin: 0;
-}
-
-#headside {
-    width: 100%;
-    height: 72px;
-    overflow: hidden;
-    float: right;
-    z-index: 1111;
-    background-color: #0063c9;
-}
-
-.user-info-navbar {
-    width: 100%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    min-height: 72px;
-    height: 72px;
-    border: 0;
-    padding: 0;
-    margin-bottom: 0px;
-}
-
-.user-info-navbar .user-info-menu > li > a {
-    position: relative;
-    display: block;
-    padding: 12px 20px;
-    color: #979898;
-    border-bottom: 1px solid #ffffff;
-    top: 1px;
-    z-index: 5;
-}
-
-.user-info-navbar .user-info-menu > li > a .badge {
-    font-size: 9px;
-    position: absolute;
-    top: 3px;
-    right: 10px;
-    padding: 4px;
-    min-width: 18px;
-    line-height: 1;
-}
-
-.user-info-navbar .user-info-menu > li > form {
-    position: relative;
-    display: block;
-    padding: 12px 20px;
-    padding-bottom: 5px;
-    margin: 0;
-    border-bottom: 1px solid #ffffff;
-}
-
-.user-info-navbar .user-info-menu > li.search-form .search-field,
-.navbar.horizontal-menu .navbar-inner > .nav > li.search-form .search-field {
-    position: absolute;
-    top: 25%;
-    right: 15px;
-    margin-top: 0px;
-    line-height: 1;
-    height: 25px;
-    border: 1px solid #dddddd;
-    border: 0;
-    padding: 0 10px;
-    width: 170px;
-    padding-right: 30px;
-    font-size: 12px;
-    z-index: 1;
-    visibility: hidden;
-    background: #f3f3f3;
-    zoom: 1;
-    filter: alpha(opacity=0);
-    -webkit-opacity: 0;
-    -moz-opacity: 0;
-    opacity: 0;
-}
-
-.frm-body {
-    background-color: #eeeeee;
-}
-
-.sidebar-menu {
-    display: table-cell;
-    position: relative;
-    width: 230px;
-    background: #2c2e2f;
-    z-index: 1;
-}
-
-footer.main-footer {
-    padding: 8px 20px 0px 20px;
-    border-top: 1px solid #dddddd;
-    font-size: 12px;
-    margin-left: -30px;
-    margin-right: -30px;
-    margin-top: 10px;
-    margin-bottom: -10px;
-    background-color: #eeeeee;
-}
-
-.panel {
-    position: relative;
-    background: #ffffff;
-    padding: 10px 10px;
-    border: 0;
-    margin-top: 5px;
-    margin-bottom: 0px;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-}
-
-.panel .panel-body {
-    padding: 0;
-    padding-top: 20px;
-    color: #000000;
-}
-
-.panel-title {
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-
-.panel .panel-heading {
-    position: relative;
-    padding: 0;
-    margin: 0;
-    background: none;
-    font-size: 17px;
-    padding-bottom: 0px;
-    border-bottom: 2px solid #f5f5f5;
-}
-
-.panel.panel-color .panel-heading {
-    margin-top: -10px;
-    margin-left: -10px;
-    margin-right: -10px;
-    padding: 10px 10px;
-    border-bottom: 0;
-}
-
-.panel.panel-color.collapsed > .panel-heading {
-    margin-bottom: -10px;
-}
-
-.xe-widget.xe-progress-counter.xe-progress-counter-huise {
-    background-color: #d7d7d7;
-}
-
-.xe-widget.xe-progress-counter.xe-progress-counter-huise .xe-background {
-    color: #fff;
-}
-
-.xe-widget.xe-progress-counter.xe-progress-counter-huise .xe-upper {
-    background-color: transparent;
-}
-
-.table > thead > tr > td,
-.table > tbody > tr > td,
-.table > tfood > tr > td,
-.table > thead > tr > th,
-.table > tbody > tr > th,
-.table > tfood > tr > th {
-    padding: 5px 5px 5px 5px;
-}
-
-.input-sm {
-    height: 26px;
-    padding: 5px 10px;
-    font-size: 12px;
-    line-height: 1.5;
-    border-radius: 0;
-}
-
-.col-xs-1,
-.col-sm-1,
-.col-md-1,
-.col-lg-1,
-.col-xs-2,
-.col-sm-2,
-.col-md-2,
-.col-lg-2,
-.col-xs-3,
-.col-sm-3,
-.col-md-3,
-.col-lg-3,
-.col-xs-4,
-.col-sm-4,
-.col-md-4,
-.col-lg-4,
-.col-xs-5,
-.col-sm-5,
-.col-md-5,
-.col-lg-5,
-.col-xs-6,
-.col-sm-6,
-.col-md-6,
-.col-lg-6,
-.col-xs-7,
-.col-sm-7,
-.col-md-7,
-.col-lg-7,
-.col-xs-8,
-.col-sm-8,
-.col-md-8,
-.col-lg-8,
-.col-xs-9,
-.col-sm-9,
-.col-md-9,
-.col-lg-9,
-.col-xs-10,
-.col-sm-10,
-.col-md-10,
-.col-lg-10,
-.col-xs-11,
-.col-sm-11,
-.col-md-11,
-.col-lg-11,
-.col-xs-12,
-.col-sm-12,
-.col-md-12,
-.col-lg-12 {
-    position: relative;
-    min-height: 1px;
-    padding-left: 5px;
-    padding-right: 5px;
-}
-
-.form-horizontal .form-group {
-    margin-left: 0px;
-    margin-right: 0px;
-}
-
-.btn-sm,
-.btn-group-sm > .btn {
-    font-size: 14px;
-    line-height: 1.5;
-    padding: 2px 6px;
-    border-radius: 0px;
-}
-
-.dataTables_wrapper .dataTables_info,
-.dataTables_wrapper .dataTables_paginate {
-    padding-top: 10px;
-    padding-left: 5px;
-    padding-right: 5px;
-}
-
-.dataTables_wrapper .dataTables_length,
-.dataTables_wrapper .dataTables_filter {
-    padding-bottom: 5px;
-    padding-left: 5px;
-    padding-right: 5px;
-}
-
-.comm_style {
-    max-width: 200px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    margin: 0 auto;
-}
-
-.img_style {
-    width: 40px;
-    /*height: 40px;*/
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-}
-
-#modal_img {
-    width: 300px;
-    height: 300px;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-}
-
-.modal-content {
-    margin: 0 auto;
-    /*width: 50%;*/
-    /*20170623 mefisto*/
-}
-
-.customer_serve {
-    float: right;
-    margin-right: 20px;
-    font-size: 12px;
-    color: #585858;
-    line-height: 72px;
-    text-align: right;
-}
-
-#about_us {
-    color: #03b1ff;
-    cursor: pointer;
-}
-
-.dropdown-menu-list a img {
-    width: 30px;
-    height: 30px;
-}
-
-.user-info-navbar
-    .user-info-menu
-    > li
-    .dropdown-menu
-    .dropdown-menu-list
-    li
-    a
-    .line.desc,
-.navbar.horizontal-menu
-    .navbar-inner
-    > .nav
-    > li
-    .dropdown-menu
-    .dropdown-menu-list
-    li
-    a
-    .line.desc {
-    margin-right: 0;
-}
-
-.user-info-navbar .user-info-menu > li .dropdown-menu .dropdown-menu-list li,
-.navbar.horizontal-menu
-    .navbar-inner
-    > .nav
-    > li
-    .dropdown-menu
-    .dropdown-menu-list
+    ul,
     li {
-    min-height: 50px;
-}
-
-.empty_li_noti {
-    text-align: center;
-    line-height: 50px !important;
-}
-
-.disagree_invite {
-    background-color: #ff0000;
-}
-
-.agree_invite {
-    background-color: #25cc42;
-}
-
-.disagree_invite:hover {
-    background-color: #d20000;
-}
-
-.agree_invite:hover {
-    background-color: #25cc42;
-}
-
-.invite_msg {
-    width: 95%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    margin-top: 34px;
-    margin-top: 10px;
-}
-
-.invite_time {
-    width: 95%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    margin-top: 10px;
-}
-
-.left_hide_icon {
-    width: 20px;
-    height: 20px;
-    margin-top: 8px;
-    float: left;
-    margin-left: 15px;
-    cursor: pointer;
-    color: #badcff;
-    font-size: 22px;
-    /*background: url("../assets/img/header/right.png")top center no-repeat;*/
-}
-
-/*.left_hide_icon:hover {*/
-/*    background: #ccc;*/
-/*    color: #fff;*/
-/*}*/
-
-.left_show_icon {
-    width: 20px;
-    height: 20px;
-    margin-top: 8px;
-    float: left;
-    margin-left: 15px;
-    cursor: pointer;
-    color: #badcff;
-    font-size: 22px;
-    /*background: url("../assets/img/header/left.png")top center no-repeat;*/
-}
-
-.item {
-    float: left;
-    margin-left: 10px;
-    margin-top: 10px;
-}
-
-.el-button--small,
-.el-button--small.is-round {
-    padding: 4px 8px;
-}
-
-.user-profile {
-    float: right;
-    cursor: pointer;
-    margin-right: 29px;
-}
-
-.el-dropdown-menu__item {
-    padding: 5px;
-}
-.title {
-    float: left;
-    color: #badcff;
-    font-size: 19px;
-    line-height: 72px;
-    margin-left: 23px;
-}
-.title em {
-    font-style: normal;
-    font-size: 14px;
-    margin-left: 10px;
-    font-size: 14px;
-}
-.lteHead {
-    margin-top: 25px;
-    margin-right: 10px;
-    float: left;
-}
-.user-profile span {
-    float: left;
-    color: #fff;
-    font-size: 14px;
-    line-height: 72px;
-}
-.shopinfo span {
-    padding-left: 10px;
-}
-
-@media (min-width: 960px) and (max-width: 1367px) {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+    }
+
     #headside {
-        height: 40px;
+        width: 100%;
+        height: 72px;
+        overflow: hidden;
+        float: right;
+        z-index: 1111;
+        background-color: #0063c9;
     }
+
     .user-info-navbar {
-        min-height: 40px;
-        height: 40px;
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        min-height: 72px;
+        height: 72px;
+        border: 0;
+        padding: 0;
+        margin-bottom: 0px;
+    }
+
+    .user-info-navbar .user-info-menu>li>a {
+        position: relative;
+        display: block;
+        padding: 12px 20px;
+        color: #979898;
+        border-bottom: 1px solid #ffffff;
+        top: 1px;
+        z-index: 5;
+    }
+
+    .user-info-navbar .user-info-menu>li>a .badge {
+        font-size: 9px;
+        position: absolute;
+        top: 3px;
+        right: 10px;
+        padding: 4px;
+        min-width: 18px;
+        line-height: 1;
+    }
+
+    .user-info-navbar .user-info-menu>li>form {
+        position: relative;
+        display: block;
+        padding: 12px 20px;
+        padding-bottom: 5px;
+        margin: 0;
+        border-bottom: 1px solid #ffffff;
+    }
+
+    .user-info-navbar .user-info-menu>li.search-form .search-field,
+    .navbar.horizontal-menu .navbar-inner>.nav>li.search-form .search-field {
+        position: absolute;
+        top: 25%;
+        right: 15px;
+        margin-top: 0px;
+        line-height: 1;
+        height: 25px;
+        border: 1px solid #dddddd;
+        border: 0;
+        padding: 0 10px;
+        width: 170px;
+        padding-right: 30px;
+        font-size: 12px;
+        z-index: 1;
+        visibility: hidden;
+        background: #f3f3f3;
+        zoom: 1;
+        filter: alpha(opacity=0);
+        -webkit-opacity: 0;
+        -moz-opacity: 0;
+        opacity: 0;
+    }
+
+    .frm-body {
+        background-color: #eeeeee;
+    }
+
+    .sidebar-menu {
+        display: table-cell;
+        position: relative;
+        width: 230px;
+        background: #2c2e2f;
+        z-index: 1;
+    }
+
+    footer.main-footer {
+        padding: 8px 20px 0px 20px;
+        border-top: 1px solid #dddddd;
+        font-size: 12px;
+        margin-left: -30px;
+        margin-right: -30px;
+        margin-top: 10px;
+        margin-bottom: -10px;
+        background-color: #eeeeee;
+    }
+
+    .panel {
+        position: relative;
+        background: #ffffff;
+        padding: 10px 10px;
+        border: 0;
+        margin-top: 5px;
+        margin-bottom: 0px;
+        -webkit-box-shadow: none;
+        -moz-box-shadow: none;
+        box-shadow: none;
+    }
+
+    .panel .panel-body {
+        padding: 0;
+        padding-top: 20px;
+        color: #000000;
+    }
+
+    .panel-title {
+        margin-top: 5px;
+        margin-bottom: 5px;
+    }
+
+    .panel .panel-heading {
+        position: relative;
+        padding: 0;
+        margin: 0;
+        background: none;
+        font-size: 17px;
+        padding-bottom: 0px;
+        border-bottom: 2px solid #f5f5f5;
+    }
+
+    .panel.panel-color .panel-heading {
+        margin-top: -10px;
+        margin-left: -10px;
+        margin-right: -10px;
+        padding: 10px 10px;
+        border-bottom: 0;
+    }
+
+    .panel.panel-color.collapsed>.panel-heading {
+        margin-bottom: -10px;
+    }
+
+    .xe-widget.xe-progress-counter.xe-progress-counter-huise {
+        background-color: #d7d7d7;
+    }
+
+    .xe-widget.xe-progress-counter.xe-progress-counter-huise .xe-background {
+        color: #fff;
     }
+
+    .xe-widget.xe-progress-counter.xe-progress-counter-huise .xe-upper {
+        background-color: transparent;
+    }
+
+    .table>thead>tr>td,
+    .table>tbody>tr>td,
+    .table>tfood>tr>td,
+    .table>thead>tr>th,
+    .table>tbody>tr>th,
+    .table>tfood>tr>th {
+        padding: 5px 5px 5px 5px;
+    }
+
+    .input-sm {
+        height: 26px;
+        padding: 5px 10px;
+        font-size: 12px;
+        line-height: 1.5;
+        border-radius: 0;
+    }
+
+    .col-xs-1,
+    .col-sm-1,
+    .col-md-1,
+    .col-lg-1,
+    .col-xs-2,
+    .col-sm-2,
+    .col-md-2,
+    .col-lg-2,
+    .col-xs-3,
+    .col-sm-3,
+    .col-md-3,
+    .col-lg-3,
+    .col-xs-4,
+    .col-sm-4,
+    .col-md-4,
+    .col-lg-4,
+    .col-xs-5,
+    .col-sm-5,
+    .col-md-5,
+    .col-lg-5,
+    .col-xs-6,
+    .col-sm-6,
+    .col-md-6,
+    .col-lg-6,
+    .col-xs-7,
+    .col-sm-7,
+    .col-md-7,
+    .col-lg-7,
+    .col-xs-8,
+    .col-sm-8,
+    .col-md-8,
+    .col-lg-8,
+    .col-xs-9,
+    .col-sm-9,
+    .col-md-9,
+    .col-lg-9,
+    .col-xs-10,
+    .col-sm-10,
+    .col-md-10,
+    .col-lg-10,
+    .col-xs-11,
+    .col-sm-11,
+    .col-md-11,
+    .col-lg-11,
+    .col-xs-12,
+    .col-sm-12,
+    .col-md-12,
+    .col-lg-12 {
+        position: relative;
+        min-height: 1px;
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+
+    .form-horizontal .form-group {
+        margin-left: 0px;
+        margin-right: 0px;
+    }
+
+    .btn-sm,
+    .btn-group-sm>.btn {
+        font-size: 14px;
+        line-height: 1.5;
+        padding: 2px 6px;
+        border-radius: 0px;
+    }
+
+    .dataTables_wrapper .dataTables_info,
+    .dataTables_wrapper .dataTables_paginate {
+        padding-top: 10px;
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+
+    .dataTables_wrapper .dataTables_length,
+    .dataTables_wrapper .dataTables_filter {
+        padding-bottom: 5px;
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+
+    .comm_style {
+        max-width: 200px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        margin: 0 auto;
+    }
+
+    .img_style {
+        width: 40px;
+        /*height: 40px;*/
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    #modal_img {
+        width: 300px;
+        height: 300px;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .modal-content {
+        margin: 0 auto;
+        /*width: 50%;*/
+        /*20170623 mefisto*/
+    }
+
+    .customer_serve {
+        float: right;
+        margin-right: 20px;
+        font-size: 14px;
+        color: #fff;
+        text-align: right;
+        line-height: 72px;
+    }
+
+    #about_us {
+        color: #03b1ff;
+        cursor: pointer;
+    }
+
+    .dropdown-menu-list a img {
+        width: 30px;
+        height: 30px;
+    }
+
+    .user-info-navbar .user-info-menu>li .dropdown-menu .dropdown-menu-list li a .line.desc,
+    .navbar.horizontal-menu .navbar-inner>.nav>li .dropdown-menu .dropdown-menu-list li a .line.desc {
+        margin-right: 0;
+    }
+
+    .user-info-navbar .user-info-menu>li .dropdown-menu .dropdown-menu-list li,
+    .navbar.horizontal-menu .navbar-inner>.nav>li .dropdown-menu .dropdown-menu-list li {
+        min-height: 50px;
+    }
+
+    .empty_li_noti {
+        text-align: center;
+        line-height: 50px !important;
+    }
+
+    .disagree_invite {
+        background-color: #ff0000;
+    }
+
+    .agree_invite {
+        background-color: #25cc42;
+    }
+
+    .disagree_invite:hover {
+        background-color: #d20000;
+    }
+
+    .agree_invite:hover {
+        background-color: #25cc42;
+    }
+
+    .invite_msg {
+        width: 95%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 34px;
+        margin-top: 10px;
+    }
+
+    .invite_time {
+        width: 95%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 10px;
+    }
+
+    .left_hide_icon {
+        width: 20px;
+        height: 20px;
+        margin-top: 8px;
+        float: left;
+        margin-left: 15px;
+        cursor: pointer;
+        color: #badcff;
+        font-size: 22px;
+        /*background: url("../assets/img/header/right.png")top center no-repeat;*/
+    }
+
+    /*.left_hide_icon:hover {*/
+    /*    background: #ccc;*/
+    /*    color: #fff;*/
+    /*}*/
+
+    .left_show_icon {
+        width: 20px;
+        height: 20px;
+        margin-top: 8px;
+        float: left;
+        margin-left: 15px;
+        cursor: pointer;
+        color: #badcff;
+        font-size: 22px;
+        /*background: url("../assets/img/header/left.png")top center no-repeat;*/
+    }
+
+    .item {
+        float: left;
+        margin-left: 10px;
+        margin-top: 10px;
+    }
+
+    .el-button--small,
+    .el-button--small.is-round {
+        padding: 4px 8px;
+    }
+
+    .user-profile {
+        float: right;
+        cursor: pointer;
+        margin-right: 29px;
+    }
+
+    .el-dropdown-menu__item {
+        padding: 5px;
+    }
+
     .title {
-        line-height: 40px;
+        float: left;
+        color: #badcff;
+        font-size: 19px;
+        line-height: 72px;
+        margin-left: 23px;
+    }
+
+    .title em {
+        font-style: normal;
+        font-size: 14px;
+        margin-left: 10px;
+        font-size: 14px;
     }
+
+    .lteHead {
+        margin-top: 25px;
+        margin-right: 10px;
+        float: left;
+    }
+
     .user-profile span {
+        float: left;
+        color: #fff;
+        font-size: 14px;
+        line-height: 72px;
+    }
+
+    .shopinfo span {
+        padding-left: 10px;
+    }
+
+    .pull-right {
+        float: right;
+        height: 40px;
         line-height: 40px;
+        color: #fff;
+    }
+    .scrren {
+        cursor: pointer;
+    }
+
+    @media (min-width: 960px) and (max-width: 1367px) {
+        #headside {
+            height: 40px;
+        }
+
+        .user-info-navbar {
+            min-height: 40px;
+            height: 40px;
+        }
+
+        .title {
+            line-height: 40px;
+        }
+
+        .user-profile span {
+            line-height: 40px;
+        }
+
+        .customer_serve {
+            float: right;
+            margin-right: 20px;
+            font-size: 12px;
+            color: #fff;
+            text-align: right;
+            line-height: 45px;
+        }
+
     }
-}
-</style>
+</style>

pc/src/components/Navside.vue

@@ -332,16 +332,13 @@
         left: 60px;
     }
 
-
-
-
     @media (min-width: 960px) and (max-width: 1367px) {
         .left_hide_icon {
             width: 20px;
             height: 20px;
             margin-top: 8px;
             float: left;
-            margin-left: 15px;
+            margin-left: 10px;
             cursor: pointer;
             color: #badcff;
             font-size: 22px;
@@ -358,7 +355,7 @@
             height: 20px;
             margin-top: 8px;
             float: left;
-            margin-left: 15px;
+            margin-left: 10px;
             cursor: pointer;
             color: #badcff;
             font-size: 22px;

pc/src/views/AcrossVip.vue

@@ -222,7 +222,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 20,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/AdminManage.vue

@@ -251,7 +251,7 @@ export default {
       },
       multipleSelection: [],
       pageination: {
-        pageItem: 100,
+        pageItem: 10,
         pageoptions: pageOptions(),
         total: 100,
         pageIndex: 1,

pc/src/views/EditLessonManage.vue

@@ -246,7 +246,7 @@ export default {
             },
             multipleSelection: [],
             pageination: {
-                pageItem: 100,
+                pageItem: 10,
                 pageoptions: pageOptions(),
                 total: 100,
                 pageIndex: 1,

pc/src/views/EditLessonTable.vue

@@ -204,7 +204,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/Index.vue

@@ -123,8 +123,10 @@
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        /* overflow-y: scroll; */
+        overflow-y: scroll;
         padding: 10px 20px;
+        padding-bottom: 60px;
+        margin-bottom: 30px;
     }
 
 
@@ -134,7 +136,7 @@
         }
 
         .shortElaside {
-            width: 60px !important;
+            width: 45px !important;
             overflow: hidden;
             height: 100%;
             float: left;
@@ -188,18 +190,9 @@
         }
 
         .el-main {
-            /*position: absolute;
-        top: 40px;
-        bottom: 20px;
-        width: 960px;
-        padding: 3px;
-        padding-bottom: 60px;
-          height: 780px;
-      */
             position: relative;
             top: 0;
             bottom: 0;
-            /* height: 100%; */
             overflow-y: scroll;
             padding-bottom: 60px;
             margin-bottom: 30px;

pc/src/views/Lesson.vue

@@ -309,7 +309,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/LessonTable.vue

@@ -191,7 +191,7 @@
                 // panel 配置项目
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/Log.vue

@@ -186,7 +186,7 @@ export default {
       },
       multipleSelection: [],
       pageination: {
-        pageItem: 100,
+        pageItem: 10,
         pageoptions: pageOptions(),
         total: 100,
         pageIndex: 1,

pc/src/views/Main.vue

@@ -6,7 +6,7 @@
                     <li @click="goPage('member')">
                         <img src="../assets/img/main/member.png" height="54" width="54" />
                         <div class="liRight">
-                            <h5>会员人数 {{clientWidth}}</h5>
+                            <h5>会员人数</h5>
                             <span>{{ AllCount }}</span>
                         </div>
                         <div class="btLine">

pc/src/views/Member.vue

@@ -484,7 +484,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 20,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/ShopManage.vue

@@ -155,7 +155,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/Yhgl.vue

@@ -109,7 +109,7 @@
                     time1: globalBt(),
                 },
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/appoint.vue

@@ -386,7 +386,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/bindRecord.vue

@@ -163,7 +163,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/classInfoDetail.vue

@@ -147,7 +147,7 @@ export default {
       dialogValue: [],
       allTableData: [],
       pageination: {
-        pageItem: 100,
+        pageItem: 10,
         pageoptions: pageOptions(),
         total: 100,
         pageIndex: 1,

pc/src/views/coach.vue

@@ -132,7 +132,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/cost.vue

@@ -389,7 +389,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/courseEdit.vue

@@ -521,7 +521,7 @@ export default {
         { value: 2, label: "充值会员" },
       ],
       pageination: {
-        pageItem: 100,
+        pageItem: 10,
         pageoptions: pageOptions(),
         total: 100,
         pageIndex: 1,

pc/src/views/courses.vue

@@ -288,7 +288,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/coursesHistory.vue

@@ -10,14 +10,11 @@
             <div class="panel-body">
                 <div class="panel_control">
                     <el-row :gutter="20">
-                        <el-date-picker
-                                v-model="panel.timeScope"
-                                type="daterange"
-                                range-separator="至"
-                                start-placeholder="开始日期"
-                                end-placeholder="结束日期">
-                        </el-date-picker>
-
+                        <el-col :span="7">
+                            <el-date-picker v-model="panel.timeScope" type="daterange" range-separator="至"
+                                start-placeholder="开始日期" end-placeholder="结束日期">
+                            </el-date-picker>
+                        </el-col>
                         <el-col :span="4">
                             <el-button size="" type="primary" @click="query" :disabled="serachBtnStatus" plain>查询
                             </el-button>
@@ -28,67 +25,26 @@
         </div>
 
         <div class="table">
-            <el-table
-                    :data="tableData"
-                    border
-                    is-horizontal-resize
-                    :default-sort="{prop: 'date', order: 'descending'}"
-                    element-loading-background="rgba(0, 0, 0, 0.8)"
-                    class=""
-                    @selection-change="handleSelectionChange"
-            >
+            <el-table :data="tableData" border is-horizontal-resize :default-sort="{prop: 'date', order: 'descending'}"
+                element-loading-background="rgba(0, 0, 0, 0.8)" class="" @selection-change="handleSelectionChange">
                 >
-                <el-table-column
-                        type="index"
-                        label="序号"
-                        align="center"
-
-                        width="50">
+                <el-table-column type="index" label="序号" align="center" width="50">
                 </el-table-column>
-                <el-table-column
-                        prop="BeginTime"
-                        label="上课时间"
-                        :formatter="filterFmtDate"
-                        width="180"
-                >
+                <el-table-column prop="BeginTime" label="上课时间" :formatter="filterFmtDate" width="180">
                 </el-table-column>
-                <el-table-column
-                        prop="ClassName"
-                        label="课程"
-                        sortable
-                >
+                <el-table-column prop="ClassName" label="课程" sortable>
                     <template slot-scope="scope">
                         <span class="lessonSpan"
-                              :style="{background:scope.row.ClassColor}">{{scope.row.ClassName}}</span>
+                            :style="{background:scope.row.ClassColor}">{{scope.row.ClassName}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="ConsumeHour"
-                        label="消耗课时"
-                        width="110"
-                        sortable
-                >
+                <el-table-column prop="ConsumeHour" label="消耗课时" width="110" sortable>
                 </el-table-column>
-                <el-table-column
-                        prop="OrderNum"
-                        label="实际预约人数"
-                        width="130"
-                        sortable
-                >
+                <el-table-column prop="OrderNum" label="实际预约人数" width="130" sortable>
                 </el-table-column>
-                <el-table-column
-                        prop="SvName"
-                        label="区域"
-                        width="110"
-                        sortable
-                >
+                <el-table-column prop="SvName" label="区域" width="110" sortable>
                 </el-table-column>
-                <el-table-column
-                        prop="ClassType"
-                        label="课程类型"
-                        width="110"
-                        sortable
-                >
+                <el-table-column prop="ClassType" label="课程类型" width="110" sortable>
                     <template slot-scope="scope">
                         <span v-if="scope.row.ClassType == 1">团课</span>
                         <span v-if="scope.row.ClassType == 3">私教</span>
@@ -96,13 +52,7 @@
                         <span v-if="scope.row.ClassType == 2 && scope.row.PkNum == 3">三队PK</span>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="FinishClass"
-                        label="当前状态"
-                        width="110"
-
-                        sortable
-                >
+                <el-table-column prop="FinishClass" label="当前状态" width="110" sortable>
                     <template slot-scope="scope">
                         <span v-if="scope.row.FinishClass == 0" style="color: red">未上课</span>
                         <span v-if="scope.row.FinishClass == 1">已下课</span>
@@ -111,36 +61,28 @@
                         <span v-if="scope.row.FinishClass == 4">已完成</span>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="Status"
-                        label="操作"
-                        width="160"
-
-                >
+                <el-table-column prop="Status" label="操作" width="160">
                     <template slot-scope="scope">
                         <!--<el-button type="primary" round size="mini" @click="checkClassOverPrepare(scope.row)">-->
                         <!--下课-->
                         <!--</el-button>-->
-<!--                        <el-button type="primary" round size="mini" v-if="scope.row.FinishClass == 0"-->
-<!--                                   @click="showDialogMemberVisible(scope.row)">-->
-<!--                            上课-->
-<!--                        </el-button>-->
+                        <!--                        <el-button type="primary" round size="mini" v-if="scope.row.FinishClass == 0"-->
+                        <!--                                   @click="showDialogMemberVisible(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)"
-                        >
+                            v-if="scope.row.FinishClass == 3 || scope.row.FinishClass == 2" @click="seeEdit(scope.row)">
                             管理
                         </el-button>
                         <!--修改区域 todo-->
                         <el-button type="primary" round plain size="mini" v-if="scope.row.FinishClass == 3"
-                                   @click="changeShopVenue(scope.row)"
-                        >
+                            @click="changeShopVenue(scope.row)">
                             编辑
                         </el-button>
                         <!--已完成才能看详情-->
-                        <el-button type="primary" round plain size="mini" v-if="scope.row.FinishClass == 1 || scope.row.FinishClass == 4"
-                                   @click="seeDetail(scope.row)"
-                        >
+                        <el-button type="primary" round plain size="mini"
+                            v-if="scope.row.FinishClass == 1 || scope.row.FinishClass == 4"
+                            @click="seeDetail(scope.row)">
                             详情
                         </el-button>
 
@@ -148,12 +90,8 @@
                 </el-table-column>
             </el-table>
             <br>
-            <el-pagination
-                    background
-                    :total="pageination.total"
-                    :page-size="pageination.pageItem"
-                    @current-change="pageChange"
-            ></el-pagination>
+            <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
+                @current-change="pageChange"></el-pagination>
         </div>
         <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" width="650px">
             <div class="dialogContent">
@@ -162,31 +100,22 @@
                     <el-form ref="form" :model="form" label-width="160px">
                         <el-form-item label="区域" :required="true">
                             <el-select v-model="form.svId" filterable placeholder="请选择" @change="changeLocationValue">
-                                <el-option
-                                        v-for="item in form.svList"
-                                        :key="item.SvId"
-                                        :label="item.Name"
-                                        :value="item.SvId">
+                                <el-option v-for="item in form.svList" :key="item.SvId" :label="item.Name"
+                                    :value="item.SvId">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="类型" :required="true">
                             <el-select v-model="form.classType" filterable placeholder="请选择">
-                                <el-option
-                                        v-for="item in form.ClassTypeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
+                                <el-option v-for="item in form.ClassTypeOptions" :key="item.value" :label="item.label"
+                                    :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="组队方式" v-if="form.classType == 2">
                             <el-select v-model="form.pkNum" filterable placeholder="请选择">
-                                <el-option
-                                        v-for="item in form.PKTypeOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
+                                <el-option v-for="item in form.PKTypeOptions" :key="item.value" :label="item.label"
+                                    :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -253,23 +182,23 @@
                     multipleSelection: [],
                     detectedmac: '',
                     options: [
-                        {value: 99, label: '全部'},
-                        {value: 1, label: '进行中'},
-                        {value: 2, label: '已完成'},
+                        { value: 99, label: '全部' },
+                        { value: 1, label: '进行中' },
+                        { value: 2, label: '已完成' },
                     ],
 
                     endTypeOptions: [
-                        {value: 99, label: '全部'},
-                        {value: 30, label: '近一个月'},
-                        {value: 7, label: '近一周'},
-                        {value: 1, label: '当日'},
+                        { value: 99, label: '全部' },
+                        { value: 30, label: '近一个月' },
+                        { value: 7, label: '近一周' },
+                        { value: 1, label: '当日' },
                     ],
                     time1: globalBt(),
                     timeScope: globalBt2(0),
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,
@@ -296,18 +225,18 @@
                     dialogdata: [],//穿梭待选
                     dialogValue: [],//穿梭已选
                     ClassTypeOptions: [
-                        {value: 1, label: '团课'},
+                        { value: 1, label: '团课' },
                         // {value: 2, label: '竞技PK'},
-                        {value: 3, label: '私教'},
+                        { value: 3, label: '私教' },
                     ],
                     PKTypeOptions: [
-                        {value: 2, label: '2队PK'},
-                        {value: 3, label: '3队PK'},
+                        { value: 2, label: '2队PK' },
+                        { value: 3, label: '3队PK' },
                     ],
                 },
                 memberTypes: [
-                    {value: 1, label: '年会员'},
-                    {value: 2, label: '充值会员'},
+                    { value: 1, label: '年会员' },
+                    { value: 2, label: '充值会员' },
                 ],
                 tableData: []
             }
@@ -317,7 +246,7 @@
         },
         methods: {
             goType(url) {
-                this.$router.push({path: '/' + url});
+                this.$router.push({ path: '/' + url });
             },
             // 更改上课区域
             changeShopVenue(row) {
@@ -360,11 +289,11 @@
                         this.$router.push({
                             path: '/courseEdit',
                             query: {
-                                StdId:  that.form.StdId,
-                                ClassName:  that.form.ClassName,
-                                BeginStr:  that.form.BeginStr,
-                                EndStr:  that.form.EndStr,
-                                FinishClass:3,
+                                StdId: that.form.StdId,
+                                ClassName: that.form.ClassName,
+                                BeginStr: that.form.BeginStr,
+                                EndStr: that.form.EndStr,
+                                FinishClass: 3,
                             }
                         });
                     } else {
@@ -439,7 +368,7 @@
                     key: localStorage.ServiceKey,
                     shopId: localStorage.ServiceId,
                 };
-                if(!localStorage.ServiceKey){
+                if (!localStorage.ServiceKey) {
                     that.$message.error('还未与心率系统对接，请联系管理员');
                     return false
                 }
@@ -485,10 +414,10 @@
                 this.form.pkNum = "";
 
                 this.form.StdId = row.StdId;
-                this.form.ClassName= row.ClassName;
-                this.form.BeginStr= row.BeginStr;
-                this.form.EndStr= row.EndStr;
-                this.form.FinishClass= row.FinishClass;
+                this.form.ClassName = row.ClassName;
+                this.form.BeginStr = row.BeginStr;
+                this.form.EndStr = row.EndStr;
+                this.form.FinishClass = row.FinishClass;
 
                 this.className = row.ClassName + ' ' + row.BeginStr + ' - ' + row.EndStr;
                 this.form.StdId = row.StdId;
@@ -768,6 +697,7 @@
     /deep/ .el-date-editor .el-range-separator {
         line-height: 25px;
     }
+
     .likeTab {
         width: 100%;
         overflow: hidden;
@@ -787,4 +717,4 @@
     .likeTab button.pull-right {
         float: right;
     }
-</style>
+</style>

pc/src/views/demoDevice.vue

@@ -139,7 +139,7 @@ export default {
             tableRadio: [],
             ShopList: [],
             pageination: {
-                pageItem: 100,
+                pageItem: 10,
                 pageoptions: pageOptions(),
                 total: 100,
                 pageIndex: 1,

pc/src/views/finish.vue

@@ -128,7 +128,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/finishDetail.vue

@@ -221,7 +221,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/heartEquip.vue

@@ -265,7 +265,7 @@ export default {
             },
             multipleSelection: [],
             pageination: {
-                pageItem: 100,
+                pageItem: 10,
                 pageoptions: pageOptions(),
                 total: 100,
                 pageIndex: 1,

pc/src/views/heartEquipPerson.vue

@@ -257,7 +257,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/heartLog.vue

@@ -145,7 +145,7 @@
                 multipleSelection: [],
                 tableRadio: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/lessonManage.vue

@@ -226,7 +226,7 @@ export default {
       // panel 配置项目
       multipleSelection: [],
       pageination: {
-        pageItem: 100,
+        pageItem: 10,
         pageoptions: pageOptions(),
         total: 100,
         pageIndex: 1,

pc/src/views/record.vue

@@ -216,7 +216,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/region.vue

@@ -163,7 +163,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/regionEquip.vue

@@ -94,7 +94,7 @@ export default {
       },
       multipleSelection: [],
       pageination: {
-        pageItem: 100,
+        pageItem: 10,
         pageoptions: pageOptions(),
         total: 100,
         pageIndex: 1,

pc/src/views/relevancePhone.vue

@@ -124,7 +124,7 @@
                 multipleSelection: [],
                 tableRadio: [],
                 pageination: {
-                    pageItem: 100,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,

pc/src/views/tempUser.vue

@@ -308,7 +308,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 20,
+                    pageItem: 10,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,