Changpeng Duan 4 лет назад
Родитель
Сommit
7ebc73f1e5

+ 1 - 1
pc/src/views/Lesson.vue

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

+ 1 - 5
pc/src/views/Member.vue

@@ -628,7 +628,6 @@
                 this.form.Id = row.UserInfo.Id;
                 this.dialogMemberVisible = true;
                 this.dialogTitle = '编辑会员'
-
             },
             // 禁用
             pauseRow(row) {
@@ -834,7 +833,6 @@
                 if (that.form.classlist) {
                     curClasslist = that.form.classlist.toString();
                 }
-
                 let param = {
                     token: localStorage.token,
                     shopId: localStorage.shopId,
@@ -1182,7 +1180,7 @@
                     name: that.panel.name,//
                     expDay: that.panel.expDay,//
                     start: that.start,//
-                    tableMax: 20,//
+                    tableMax: 10,//
                 };
                 that.allTableData = [];
                 that.recordsTotal = 0;
@@ -1240,8 +1238,6 @@
                     this.tableData = tables;
                 }
                 that.start = index * that.draw;
-                console.log(index);
-                console.log(that.draw);
                 that.getTableQuery();
             },
             // 过滤时间

+ 1 - 2
pc/src/views/appoint.vue

@@ -385,7 +385,7 @@
                 },
                 multipleSelection: [],
                 pageination: {
-                    pageItem: 10,
+                    pageItem: 100,
                     pageoptions: pageOptions(),
                     total: 100,
                     pageIndex: 1,
@@ -1184,7 +1184,6 @@
                             that.allTableData = [];
                             that.recordsTotal = 0;
                         }
-
                         // 设置分页数据
                         that.setPaginations();
                     } else {

+ 2 - 2
pc/src/views/cost.vue

@@ -13,7 +13,7 @@
                             <em>手机号:</em>
                             <el-input v-model="panel.phone" placeholder="请输入手机号" type="number"></el-input>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :span="7">
                             <em>日期:</em>
                             <el-date-picker
                                     v-model="panel.timeScope"
@@ -45,7 +45,7 @@
                                 </el-option>
                             </el-select>
                         </el-col>
-                        <el-col :span="4">
+                        <el-col :span="2">
                             <el-button size="" type="primary" @click="query" plain :disabled="serachBtnStatus">查询
                             </el-button>
                         </el-col>

+ 5 - 1
pc/src/views/courses.vue

@@ -10,7 +10,7 @@
             <div class="panel-body">
                 <div class="panel_control">
                     <el-row :gutter="20">
-                        <el-col :span="6">
+                        <el-col :span="7">
                         <el-date-picker
                                 v-model="panel.timeScope"
                                 type="daterange"
@@ -154,6 +154,7 @@
                     :total="pageination.total"
                     :page-size="pageination.pageItem"
                     @current-change="pageChange"
+                    :current-page.sync="cur_page"
             ></el-pagination>
         </div>
         <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" width="650px">
@@ -626,6 +627,8 @@
             // 查询按钮
             query() {
                 let that = this;
+                that.start = 0;
+                that.cur_page = 1;
                 that.serachBtnStatus = true;
                 let totalTime = 2;
                 let clock = window.setInterval(() => {
@@ -636,6 +639,7 @@
                     }
                 }, 1000);
                 this.getTableQuery();
+
                 this.$message.success('查询完毕');
             },
             // 页面数据查询

+ 6 - 4
pc/src/views/coursesHistory.vue

@@ -4,8 +4,8 @@
             <h5>课程管理
             </h5>
             <div class="likeTab">
-                <el-button type="" @click="goType('courses')">当前课程</el-button>
-                <el-button type="primary" @click="goType('coursesHistory')">历史记录</el-button>
+                <el-button type="" @click="goType('courses')"  size="mini">当前课程</el-button>
+                <el-button type="primary" @click="goType('coursesHistory')"  size="mini">历史记录</el-button>
             </div>
             <div class="panel-body">
                 <div class="panel_control">
@@ -35,7 +35,7 @@
                 </el-table-column>
                 <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="课程" width="110" sortable>
                     <template slot-scope="scope">
                         <span class="lessonSpan"
                             :style="{background:scope.row.ClassColor}">{{scope.row.ClassName}}</span>
@@ -94,7 +94,7 @@
             </el-table>
             <br>
             <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
-                @current-change="pageChange"></el-pagination>
+                @current-change="pageChange"     :current-page.sync="cur_page"></el-pagination>
         </div>
         <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" width="650px">
             <div class="dialogContent">
@@ -462,6 +462,8 @@
             // 查询按钮
             query() {
                 let that = this;
+                that.start = 0;
+                that.cur_page = 1;
                 that.serachBtnStatus = true;
                 let totalTime = 2;
                 let clock = window.setInterval(() => {

+ 728 - 763
pc/src/views/heartEquip.vue

@@ -35,25 +35,13 @@
         <div class="change">
             <el-button @click="addMember" type="primary" size="mini">新增心率设备</el-button>
             <el-button @click="editList" size="mini">编辑心率设备</el-button>
-            <el-button
-                type="success"
-                @click="getAllPower"
-                :loading="BtnGetAllPower"
-                size="mini"
-            >全部设备电量</el-button>
+            <el-button type="success" @click="getAllPower" :loading="BtnGetAllPower" size="mini">全部设备电量</el-button>
             <!--<el-button @click="delList" type="danger">删除心率设备</el-button>-->
         </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"
-                @current-change="clickChange"
-            >
+            <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" @current-change="clickChange">
                 >
                 <el-table-column label="选择" width="55">
                     <template slot-scope="scope">
@@ -92,35 +80,19 @@
                         <!--<el-button @click="takeBack(scope.row)" type="danger" v-if="!scope.row.BindUserId">{{scope.row.UserName}} 设备收回</el-button>-->
                     </template>
                 </el-table-column>
-                <el-table-column
-                    prop="PowerPercent"
-                    label="电量"
-                    align="center"
-                    width="80px"
-                    sortable
-                >
+                <el-table-column prop="PowerPercent" label="电量" align="center" width="80px" sortable>
                     <template slot-scope="scope">
-                        <span
-                            style="color: red"
-                            v-if="parseInt(scope.row.PowerPercent) <= 20"
-                        >{{ scope.row.PowerPercent }}</span>
-                        <span
-                            style="color: gold"
-                            v-if="parseInt(scope.row.PowerPercent) > 20 && parseInt(scope.row.PowerPercent) < 80"
-                        >{{ scope.row.PowerPercent }}</span>
-                        <span
-                            style="color: #67C23A"
-                            v-if="parseInt(scope.row.PowerPercent) >= 80"
-                        >{{ scope.row.PowerPercent }}</span>
+                        <span style="color: red" v-if="parseInt(scope.row.PowerPercent) <= 20">{{ scope.row.PowerPercent
+                            }}</span>
+                        <span style="color: gold"
+                            v-if="parseInt(scope.row.PowerPercent) > 20 && parseInt(scope.row.PowerPercent) < 80">{{
+                            scope.row.PowerPercent }}</span>
+                        <span style="color: #67C23A" v-if="parseInt(scope.row.PowerPercent) >= 80">{{
+                            scope.row.PowerPercent }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column
-                    prop="PowerUpdateAt"
-                    label="电量更新时间"
-                    align="center"
-                    width="150px"
-                    :formatter="filterFmtDate"
-                ></el-table-column>
+                <el-table-column prop="PowerUpdateAt" label="电量更新时间" align="center" width="150px"
+                    :formatter="filterFmtDate"></el-table-column>
 
                 <!--<el-table-column-->
                 <!--prop="Status"-->
@@ -154,12 +126,10 @@
                 </el-table-column>
             </el-table>
             <br />
-            <el-pagination
-                background
-                :total="pageination.total"
-                :page-size="pageination.pageItem"
+            <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
                 @current-change="pageChange"
-            ></el-pagination>
+                :current-page.sync="cur_page"
+                ></el-pagination>
         </div>
         <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" width="650px">
             <div class="dialogContent">
@@ -175,18 +145,9 @@
                 </div>
             </div>
             <div class="dialogFooter">
-                <el-button
-                    type="primary"
-                    size="small"
-                    v-if="form.btnType == 0"
-                    @click="confirmMember"
-                >确定</el-button>
-                <el-button
-                    type="primary"
-                    size="small"
-                    v-if="form.btnType == 1"
-                    @click="confirmEditMember"
-                >确定</el-button>
+                <el-button type="primary" size="small" v-if="form.btnType == 0" @click="confirmMember">确定</el-button>
+                <el-button type="primary" size="small" v-if="form.btnType == 1" @click="confirmEditMember">确定
+                </el-button>
                 <el-button size="small" @click="dialogMemberVisible = false">取消</el-button>
             </div>
         </el-dialog>
@@ -194,141 +155,234 @@
 </template>
 
 <script>
-import Global from '../Global.js'
-import {
-    testTable,
-    testSelect,
-    ShopManagerStatusEdit,
-    ClassDetailOne,
-    QueryHrSensors,
-    AddHrSensors,
-    HrSensorsStatusEdit,
-    EditHrSensors,
-    UnBindHrSensorsToUser,
-    GetHrSensorsPowerPercent,
-    ShopVenueEquipEditStatus,
-} from "../api/getApiRes";
-
-let qs = require('qs');
-export default {
-    data() {
-        return {
-            activeName: 'comm',
-            dialogVisible: false,//其他dialog
-            BtnGetAllPower: false,//
-            dialogMemberVisible: false,//新增心率设备dialog
-            dialogLesson: false,//课时调整
-            dialogGift: false,//赠送课时调整
-            dialogExpTime: false,//有效期调整
-            dialogLessonTable: false,//心率设备课程
-            dialogTitle: '新增心率设备',
-            dialogValue: [],
-            tableRadio: [],
-            // panel 配置项目
-            panel: {
-                str: '',
-                phone: '',
-                compname: '',
-                keyword: '',
-                USERCODE: '',
-                endType: '',
-                taskstatus: 99,
-                status: "",
-                draw: 1,
-                start: 0,
-                recordsTotal: 0,
-                tableData: [],
-                allTableData: [],
-                limit: '10',
-                multipleSort: false,
-                loading: false,
-                fileList: [],
+    import Global from '../Global.js'
+    import {
+        testTable,
+        testSelect,
+        ShopManagerStatusEdit,
+        ClassDetailOne,
+        QueryHrSensors,
+        AddHrSensors,
+        HrSensorsStatusEdit,
+        EditHrSensors,
+        UnBindHrSensorsToUser,
+        GetHrSensorsPowerPercent,
+        ShopVenueEquipEditStatus,
+    } from "../api/getApiRes";
+
+    let qs = require('qs');
+    export default {
+        data() {
+            return {
+                activeName: 'comm',
+                dialogVisible: false,//其他dialog
+                BtnGetAllPower: false,//
+                dialogMemberVisible: false,//新增心率设备dialog
+                dialogLesson: false,//课时调整
+                dialogGift: false,//赠送课时调整
+                dialogExpTime: false,//有效期调整
+                dialogLessonTable: false,//心率设备课程
+                dialogTitle: '新增心率设备',
+                dialogValue: [],
+                tableRadio: [],
+                // panel 配置项目
+                panel: {
+                    str: '',
+                    phone: '',
+                    compname: '',
+                    keyword: '',
+                    USERCODE: '',
+                    endType: '',
+                    taskstatus: 99,
+                    status: "",
+                    draw: 1,
+                    start: 0,
+                    recordsTotal: 0,
+                    tableData: [],
+                    allTableData: [],
+                    limit: '10',
+                    multipleSort: false,
+                    loading: false,
+                    fileList: [],
+                    multipleSelection: [],
+                    detectedmac: '',
+                    statusOptions: [
+                        { value: "", label: '全部' },
+                        { value: 1, label: '启用' },
+                        { value: 8, label: '暂停' },
+                        { value: 9, label: '删除' },
+                    ], options: [
+                        { value: 99, label: '全部' },
+                        { value: 1, label: '进行中' },
+                        { value: 2, label: '已完成' },
+                    ],
+                    endTypeOptions: [
+                        { value: 99, label: '全部' },
+                        { value: 30, label: '近一个月' },
+                        { value: 7, label: '近一周' },
+                        { value: 1, label: '当日' },
+                    ],
+                    time1: globalBt(),
+                },
                 multipleSelection: [],
-                detectedmac: '',
-                statusOptions: [
-                    { value: "", label: '全部' },
-                    { value: 1, label: '启用' },
-                    { value: 8, label: '暂停' },
-                    { value: 9, label: '删除' },
-                ], options: [
-                    { value: 99, label: '全部' },
-                    { value: 1, label: '进行中' },
-                    { value: 2, label: '已完成' },
-                ],
-                endTypeOptions: [
-                    { value: 99, label: '全部' },
-                    { value: 30, label: '近一个月' },
-                    { value: 7, label: '近一周' },
-                    { value: 1, label: '当日' },
+                pageination: {
+                    pageItem: 10,
+                    pageoptions: pageOptions(),
+                    total: 100,
+                    pageIndex: 1,
+                },
+                form: {
+                    name: '',
+                    userCode: '',
+                    sn: '',
+                    venueNo: '',
+                    shopId: '',
+                    teacherId: 0,
+                    memberType: 1,
+                    lesson: 1,
+                    gift: 1,
+                    btnType: 0,//0新建,1编辑编辑
+                    memo: '',
+                    phone: '',
+                    expTime: '',
+                    dialogdata: [],//穿梭待选
+                    dialogValue: [],//穿梭已选
+                },
+                memberTypes: [
+                    { value: 1, label: '年心率设备' },
+                    { value: 2, label: '充值心率设备' },
                 ],
-                time1: globalBt(),
+                tableData: []
+            }
+        },
+        mounted() {
+            this.getTableQuery();
+        },
+        methods: {
+            handleClick(tab, event) {
+                let that = this;
+
+                if (tab.name == "personal") {
+                    // 私有
+                    that.$router.push({ path: '/heartEquipPerson' });
+                } else {
+                    // 公共
+                    that.$router.push({ path: '/heartEquip' });
+                }
             },
-            multipleSelection: [],
-            pageination: {
-                pageItem: 10,
-                pageoptions: pageOptions(),
-                total: 100,
-                pageIndex: 1,
+            // 设备回收
+            takeBack(row) {
+                let that = this;
+                this.$confirm('是否回收用户' + row.name + '的心率设备?', '回收操作', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    let param = {
+                        token: localStorage.token,
+                        Id: row.Id,
+                        status: 0,
+                    };
+                    let postdata = qs.stringify(param);
+                    UnBindHrSensorsToUser(postdata).then(res => {
+                        let json = res;
+                        if (json.Code == 0) {
+                            that.$message({
+                                showClose: true,
+                                message: row.name + '回收成功!',
+                                type: 'success'
+                            });
+                            // table 重载
+                            that.getTableQuery();
+                        } else {
+                            that.$message.error(json.Memo + ' 错误码:' + json.Code);
+                        }
+                    })
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消回收'
+                    });
+                });
             },
-            form: {
-                name: '',
-                userCode: '',
-                sn: '',
-                venueNo: '',
-                shopId: '',
-                teacherId: 0,
-                memberType: 1,
-                lesson: 1,
-                gift: 1,
-                btnType: 0,//0新建,1编辑编辑
-                memo: '',
-                phone: '',
-                expTime: '',
-                dialogdata: [],//穿梭待选
-                dialogValue: [],//穿梭已选
+            goPage(row) {
+                // 查看绑定记录
+                this.$router.push({ path: '/bindRecord', query: { hrId: row.HrId } });
             },
-            memberTypes: [
-                { value: 1, label: '年心率设备' },
-                { value: 2, label: '充值心率设备' },
-            ],
-            tableData: []
-        }
-    },
-    mounted() {
-        this.getTableQuery();
-    },
-    methods: {
-        handleClick(tab, event) {
-            let that = this;
-
-            if (tab.name == "personal") {
-                // 私有
-                that.$router.push({ path: '/heartEquipPerson' });
-            } else {
-                // 公共
-                that.$router.push({ path: '/heartEquip' });
-            }
-        },
-        // 设备回收
-        takeBack(row) {
-            let that = this;
-            this.$confirm('是否回收用户' + row.name + '的心率设备?', '回收操作', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
+            goType(url) {
+                this.$router.push({ path: '/' + url });
+            },
+            // 编辑
+            editList() {
+                let that = this;
+                this.clearForm();
+                console.log(this.tableRadio);
+                if (this.tableRadio.length == 0) {
+                    this.$message.error("请先选中一条记录");
+                    return false
+                }
+                let row = this.tableRadio;
+                this.form.shopid = row.ShopId;
+                this.form.userId = row.Id;
+                this.form.name = row.Name;
+                this.form.userCode = row.Usercode;
+                this.form.password = '';
+                this.form.hrId = row.HrId;
+                this.form.sn = row.Sn;
+                this.form.venueNo = row.InVenueNo;
+                this.dialogVisible = true;
+                this.dialogTitle = '编辑心率设备';
+                this.form.btnType = 1;
+                this.dialogMemberVisible = true
+            },
+            clickChange(item) {
+                this.tableRadio = item
+            },
+            // 选择课程后,获取当前课程的建议上课人数和课时消耗
+            getRowTop(row) {
+                let that = this;
+                console.log(row);
+                let param = {
+                    token: localStorage.token,
+                    classId: row.ClassId,
+                };
+                let postdata = qs.stringify(param);
+                ClassDetailOne(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        row.TopLimit = json.Rs.TopLimit;
+                        row.ConsumeHour = json.Rs.ConsumeHour;
+                    } else {
+                        that.$message.error(json.Memo + ' 错误码:' + json.Code);
+                    }
+                })
+            },
+            // 编辑
+            editMember(row) {
+                this.clearForm();
+                this.form.name = row.Name;
+                this.form.phone = row.Phone;
+                this.form.shopId = row.ShopId;
+                this.form.teacherId = row.TeacherId;
+                this.form.btnType = 1;
+                this.dialogMemberVisible = true
+                this.dialogTitle = '编辑心率设备'
+            },
+            // 禁用
+            pauseRow(row, status) {
+                let that = this;
                 let param = {
                     token: localStorage.token,
-                    Id: row.Id,
-                    status: 0,
+                    hrId: row.HrId,
+                    status: status,//1:启用 8:暂停 9:删除
                 };
                 let postdata = qs.stringify(param);
-                UnBindHrSensorsToUser(postdata).then(res => {
+                HrSensorsStatusEdit(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
                         that.$message({
                             showClose: true,
-                            message: row.name + '回收成功!',
+                            message: '执行成功!',
                             type: 'success'
                         });
                         // table 重载
@@ -337,636 +391,547 @@ export default {
                         that.$message.error(json.Memo + ' 错误码:' + json.Code);
                     }
                 })
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '已取消回收'
-                });
-            });
-        },
-        goPage(row) {
-            // 查看绑定记录
-            this.$router.push({ path: '/bindRecord', query: { hrId: row.HrId } });
-        },
-        goType(url) {
-            this.$router.push({ path: '/' + url });
-        },
-        // 编辑
-        editList() {
-            let that = this;
-            this.clearForm();
-            console.log(this.tableRadio);
-            if (this.tableRadio.length == 0) {
-                this.$message.error("请先选中一条记录");
-                return false
-            }
-            let row = this.tableRadio;
-            this.form.shopid = row.ShopId;
-            this.form.userId = row.Id;
-            this.form.name = row.Name;
-            this.form.userCode = row.Usercode;
-            this.form.password = '';
-            this.form.hrId = row.HrId;
-            this.form.sn = row.Sn;
-            this.form.venueNo = row.InVenueNo;
-            this.dialogVisible = true;
-            this.dialogTitle = '编辑心率设备';
-            this.form.btnType = 1;
-            this.dialogMemberVisible = true
-        },
-        clickChange(item) {
-            this.tableRadio = item
-        },
-        // 选择课程后,获取当前课程的建议上课人数和课时消耗
-        getRowTop(row) {
-            let that = this;
-            console.log(row);
-            let param = {
-                token: localStorage.token,
-                classId: row.ClassId,
-            };
-            let postdata = qs.stringify(param);
-            ClassDetailOne(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    row.TopLimit = json.Rs.TopLimit;
-                    row.ConsumeHour = json.Rs.ConsumeHour;
-                } else {
-                    that.$message.error(json.Memo + ' 错误码:' + json.Code);
-                }
-            })
-        },
-        // 编辑
-        editMember(row) {
-            this.clearForm();
-            this.form.name = row.Name;
-            this.form.phone = row.Phone;
-            this.form.shopId = row.ShopId;
-            this.form.teacherId = row.TeacherId;
-            this.form.btnType = 1;
-            this.dialogMemberVisible = true
-            this.dialogTitle = '编辑心率设备'
-        },
-        // 禁用
-        pauseRow(row, status) {
-            let that = this;
-            let param = {
-                token: localStorage.token,
-                hrId: row.HrId,
-                status: status,//1:启用 8:暂停 9:删除
-            };
-            let postdata = qs.stringify(param);
-            HrSensorsStatusEdit(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    that.$message({
-                        showClose: true,
-                        message: '执行成功!',
-                        type: 'success'
+            },
+            // pauseRow(row) {
+            //     let that = this;
+            //     this.$confirm('是否禁用心率设备' + row.Sn + '?', '禁用操作', {
+            //         confirmButtonText: '确定',
+            //         cancelButtonText: '取消',
+            //         type: 'warning'
+            //     }).then(() => {
+            //         let param = {
+            //             token: localStorage.token,
+            //             shopId : localStorage.token,
+            //             status: 8,
+            //         };
+            //         let postdata = qs.stringify(param);
+            //         ShopVenueEquipEditStatus(postdata).then(res => {
+            //             let json = res;
+            //             if (json.Code == 0) {
+            //                 that.$message({
+            //                     showClose: true,
+            //                     message: row.name + '禁用成功!',
+            //                     type: 'success'
+            //                 });
+            //                 // table 重载
+            //                 that.getTableQuery();
+            //             } else {
+            //                 that.$message.error(json.Memo + ' 错误码:' + json.Code);
+            //             }
+            //         })
+            //     }).catch(() => {
+            //         this.$message({
+            //             type: 'info',
+            //             message: '已取消禁用'
+            //         });
+            //     });
+            // },
+            // 启用
+            runRow(row) {
+                let that = this;
+                this.$confirm('是否启用心率设备' + row.Sn + '?', '启用操作', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    let param = {
+                        token: localStorage.token,
+                        Id: row.Id,
+                        status: 1,
+                    };
+                    let postdata = qs.stringify(param);
+                    testTable(postdata).then(res => {
+                        let json = res;
+                        if (json.Code == 0) {
+                            that.$message({
+                                showClose: true,
+                                message: row.name + '启用成功!',
+                                type: 'success'
+                            });
+                            // table 重载
+                            that.getTableQuery();
+                        } else {
+                            that.$message.error(json.Memo + ' 错误码:' + json.Code);
+                        }
+                    })
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消启用'
                     });
-                    // table 重载
-                    that.getTableQuery();
-                } else {
-                    that.$message.error(json.Memo + ' 错误码:' + json.Code);
-                }
-            })
-        },
-        // pauseRow(row) {
-        //     let that = this;
-        //     this.$confirm('是否禁用心率设备' + row.Sn + '?', '禁用操作', {
-        //         confirmButtonText: '确定',
-        //         cancelButtonText: '取消',
-        //         type: 'warning'
-        //     }).then(() => {
-        //         let param = {
-        //             token: localStorage.token,
-        //             shopId : localStorage.token,
-        //             status: 8,
-        //         };
-        //         let postdata = qs.stringify(param);
-        //         ShopVenueEquipEditStatus(postdata).then(res => {
-        //             let json = res;
-        //             if (json.Code == 0) {
-        //                 that.$message({
-        //                     showClose: true,
-        //                     message: row.name + '禁用成功!',
-        //                     type: 'success'
-        //                 });
-        //                 // table 重载
-        //                 that.getTableQuery();
-        //             } else {
-        //                 that.$message.error(json.Memo + ' 错误码:' + json.Code);
-        //             }
-        //         })
-        //     }).catch(() => {
-        //         this.$message({
-        //             type: 'info',
-        //             message: '已取消禁用'
-        //         });
-        //     });
-        // },
-        // 启用
-        runRow(row) {
-            let that = this;
-            this.$confirm('是否启用心率设备' + row.Sn + '?', '启用操作', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
+                });
+            },
+            // 获取电量
+            getPower(row) {
+                let that = this;
                 let param = {
                     token: localStorage.token,
-                    Id: row.Id,
-                    status: 1,
+                    shopId: row.ShopId,
+                    hrId: row.HrId,
                 };
                 let postdata = qs.stringify(param);
-                testTable(postdata).then(res => {
+                GetHrSensorsPowerPercent(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
+                        console.log(json);
                         that.$message({
                             showClose: true,
-                            message: row.name + '启用成功!',
+                            message: '电量获取成功!',
                             type: 'success'
                         });
+                    } else {
+                        that.$message.error(json.Memo);
+                    }
+                })
+            },
+            getAllPower() {
+                let that = this;
+                that.BtnGetAllPower = true;
+                let param = {
+                    token: localStorage.token,
+                    shopId: localStorage.ShopId,
+                };
+                let postdata = qs.stringify(param);
+                GetHrSensorsPowerPercent(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
                         // table 重载
                         that.getTableQuery();
+                        that.$message({
+                            showClose: true,
+                            message: '电量获取成功!',
+                            type: 'success'
+                        });
                     } else {
-                        that.$message.error(json.Memo + ' 错误码:' + json.Code);
+                        that.$message.error(json.Memo);
                     }
+                    that.BtnGetAllPower = false;
                 })
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '已取消启用'
-                });
-            });
-        },
-        // 获取电量
-        getPower(row) {
-            let that = this;
-            let param = {
-                token: localStorage.token,
-                shopId: row.ShopId,
-                hrId: row.HrId,
-            };
-            let postdata = qs.stringify(param);
-            GetHrSensorsPowerPercent(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    console.log(json);
-                    that.$message({
-                        showClose: true,
-                        message: '电量获取成功!',
-                        type: 'success'
+            },
+            // 删除
+            pauseRowDel(row) {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                    hrId: row.HrId,
+                    status: 9,//1:启用,8:暂停,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);
+                        }
                     });
-                } else {
-                    that.$message.error(json.Memo);
-                }
-            })
-        },
-        getAllPower() {
-            let that = this;
-            that.BtnGetAllPower = true;
-            let param = {
-                token: localStorage.token,
-                shopId: localStorage.ShopId,
-            };
-            let postdata = qs.stringify(param);
-            GetHrSensorsPowerPercent(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    // table 重载
-                    that.getTableQuery();
-                    that.$message({
-                        showClose: true,
-                        message: '电量获取成功!',
-                        type: 'success'
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
                     });
-                } else {
-                    that.$message.error(json.Memo);
+                });
+            },
+            // 关闭所有
+            allDialogClose() {
+                this.dialogVisible = false;
+                this.dialogGift = false;
+                this.dialogLesson = false;
+                this.dialogExpTime = false;
+                this.dialogLessonTable = false;
+            },
+            // 确认提交新增心率设备
+            confirmMember() {
+                let that = this;
+                // checkNum
+                if (!that.form.sn) {
+                    this.$message.error('错了哦,编号不能为空');
+                    return false
                 }
-                that.BtnGetAllPower = false;
-            })
-        },
-        // 删除
-        pauseRowDel(row) {
-            let that = this;
-            let param = {
-                token: localStorage.token,
-                hrId: row.HrId,
-                status: 9,//1:启用,8:暂停,9:删除
-            };
-            let postdata = qs.stringify(param);
-            this.$confirm('此操作将永久删除该心率设备, 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                HrSensorsStatusEdit(postdata).then(res => {
+                if (that.form.sn.length > 20) {
+                    this.$message.error('错了哦,编号不能超过20个字符');
+                    return false
+                }
+                // if (!that.form.venueNo) {
+                //     this.$message.error('错了哦,实体序列号不能为空');
+                //     return false
+                // }
+                // if (that.form.venueNo.length > 30) {
+                //     this.$message.error('错了哦,实体序列号不能超过30个字符');
+                //     return false
+                // }
+
+                let param = {
+                    token: localStorage.token,
+                    shopId: localStorage.shopId,
+                    sn: that.form.sn,
+                    venueNo: that.form.venueNo,
+                };
+                let postdata = qs.stringify(param);
+                AddHrSensors(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
+                        // 关闭弹窗
+                        that.dialogMemberVisible = false;
+                        // 重载列表
+                        that.getTableQuery();
                         that.$message({
                             showClose: true,
-                            message: '选中的心率设备已删除!',
+                            message: '心率设备添加成功!',
                             type: 'success'
                         });
-                        // 重载列表
-                        that.getTableQuery();
                     } else {
                         that.$message.error(json.Memo + ' 错误码:' + json.Code);
                     }
-                });
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '已取消删除'
-                });
-            });
-        },
-        // 关闭所有
-        allDialogClose() {
-            this.dialogVisible = false;
-            this.dialogGift = false;
-            this.dialogLesson = false;
-            this.dialogExpTime = false;
-            this.dialogLessonTable = false;
-        },
-        // 确认提交新增心率设备
-        confirmMember() {
-            let that = this;
-            // checkNum
-            if (!that.form.sn) {
-                this.$message.error('错了哦,编号不能为空');
-                return false
-            }
-            if (that.form.sn.length > 20) {
-                this.$message.error('错了哦,编号不能超过20个字符');
-                return false
-            }
-            // if (!that.form.venueNo) {
-            //     this.$message.error('错了哦,实体序列号不能为空');
-            //     return false
-            // }
-            // if (that.form.venueNo.length > 30) {
-            //     this.$message.error('错了哦,实体序列号不能超过30个字符');
-            //     return false
-            // }
-
-            let param = {
-                token: localStorage.token,
-                shopId: localStorage.shopId,
-                sn: that.form.sn,
-                venueNo: that.form.venueNo,
-            };
-            let postdata = qs.stringify(param);
-            AddHrSensors(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    // 关闭弹窗
-                    that.dialogMemberVisible = false;
-                    // 重载列表
-                    that.getTableQuery();
-                    that.$message({
-                        showClose: true,
-                        message: '心率设备添加成功!',
-                        type: 'success'
-                    });
-                } else {
-                    that.$message.error(json.Memo + ' 错误码:' + json.Code);
+                })
+            },
+            confirmEditMember() {
+                let that = this;
+                // checkNum
+                if (!that.form.sn) {
+                    this.$message.error('错了哦,编号不能为空');
+                    return false
                 }
-            })
-        },
-        confirmEditMember() {
-            let that = this;
-            // checkNum
-            if (!that.form.sn) {
-                this.$message.error('错了哦,编号不能为空');
-                return false
-            }
-            if (that.form.sn.length > 20) {
-                this.$message.error('错了哦,编号不能超过20个字符');
-                return false
-            }
-            // if (!that.form.venueNo) {
-            //     this.$message.error('错了哦,实体序列号不能为空');
-            //     return false
-            // }
-            // if (that.form.venueNo.length > 30) {
-            //     this.$message.error('错了哦,实体序列号不能超过30个字符');
-            //     return false
-            // }
-
-            let param = {
-                token: localStorage.token,
-                shopId: localStorage.shopId,
-                hrId: that.form.hrId,
-                sn: that.form.sn,
-                venueNo: that.form.venueNo,
-            };
-            let postdata = qs.stringify(param);
-            EditHrSensors(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    // 关闭弹窗
-                    that.dialogMemberVisible = false;
-                    // 重载列表
-                    that.getTableQuery();
-                    that.$message({
-                        showClose: true,
-                        message: '心率设备信息编辑成功!',
-                        type: 'success'
-                    });
-                } else {
-                    that.$message.error(json.Memo + ' 错误码:' + json.Code);
+                if (that.form.sn.length > 20) {
+                    this.$message.error('错了哦,编号不能超过20个字符');
+                    return false
                 }
-            })
-        },
-        // 确认提交课时
-        confirmLesson() {
-            let that = this;
-            // checkNum
-
-            let param = {
-                token: localStorage.token,
-                userCode: that.form.userCode,
-                lesson: that.form.lesson,
-            };
-            let postdata = qs.stringify(param);
-            testSelect(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    // 关闭弹窗
-                    that.dialogVisible = false;
-                    // 重载列表
-                    that.getTableQuery();
-                    that.$message({
-                        showClose: true,
-                        message: '课时调整成功!',
-                        type: 'success'
-                    });
-                } else {
-                    that.$message.error(json.Memo + ' 错误码:' + json.Code);
-                }
-            })
-        },
-        // 新增心率设备
-        addMember() {
-            this.clearForm();
-            this.dialogMemberVisible = true;
-            this.form.btnType = 0;
-            this.dialogTitle = '新增心率设备'
-        },
-        // 删除
-        delList() {
-            let that = this;
-            if (this.tableRadio.length == 0) {
-                this.$message.error("请先选中一条记录");
-                return false
-            }
-            let hrId = this.tableRadio.HrId;
-
-            let param = {
-                token: localStorage.token,
-                hrId: hrId,
-                status: 9,//1:启用,8:暂停,9:删除
-            };
-            let postdata = qs.stringify(param);
-
-            this.$confirm('此操作将永久删除该心率设备, 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                HrSensorsStatusEdit(postdata).then(res => {
+                // if (!that.form.venueNo) {
+                //     this.$message.error('错了哦,实体序列号不能为空');
+                //     return false
+                // }
+                // if (that.form.venueNo.length > 30) {
+                //     this.$message.error('错了哦,实体序列号不能超过30个字符');
+                //     return false
+                // }
+
+                let param = {
+                    token: localStorage.token,
+                    shopId: localStorage.shopId,
+                    hrId: that.form.hrId,
+                    sn: that.form.sn,
+                    venueNo: that.form.venueNo,
+                };
+                let postdata = qs.stringify(param);
+                EditHrSensors(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
+                        // 关闭弹窗
+                        that.dialogMemberVisible = false;
+                        // 重载列表
+                        that.getTableQuery();
                         that.$message({
                             showClose: true,
-                            message: '选中的心率设备已删除!',
+                            message: '心率设备信息编辑成功!',
                             type: 'success'
                         });
+                    } else {
+                        that.$message.error(json.Memo + ' 错误码:' + json.Code);
+                    }
+                })
+            },
+            // 确认提交课时
+            confirmLesson() {
+                let that = this;
+                // checkNum
+
+                let param = {
+                    token: localStorage.token,
+                    userCode: that.form.userCode,
+                    lesson: that.form.lesson,
+                };
+                let postdata = qs.stringify(param);
+                testSelect(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        // 关闭弹窗
+                        that.dialogVisible = false;
                         // 重载列表
                         that.getTableQuery();
+                        that.$message({
+                            showClose: true,
+                            message: '课时调整成功!',
+                            type: 'success'
+                        });
                     } else {
                         that.$message.error(json.Memo + ' 错误码:' + json.Code);
                     }
+                })
+            },
+            // 新增心率设备
+            addMember() {
+                this.clearForm();
+                this.dialogMemberVisible = true;
+                this.form.btnType = 0;
+                this.dialogTitle = '新增心率设备'
+            },
+            // 删除
+            delList() {
+                let that = this;
+                if (this.tableRadio.length == 0) {
+                    this.$message.error("请先选中一条记录");
+                    return false
+                }
+                let hrId = this.tableRadio.HrId;
+
+                let param = {
+                    token: localStorage.token,
+                    hrId: hrId,
+                    status: 9,//1:启用,8:暂停,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: '已取消删除'
+                    });
                 });
-            }).catch(() => {
-                this.$message({
-                    type: 'info',
-                    message: '已取消删除'
-                });
-            });
-        },
+            },
 
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        // 查询按钮
-        query() {
-            this.getTableQuery();
-            this.$message.success('查询完毕');
-        },
-        clearForm() {
-            // clear
-            this.form.name = '';
-            this.form.sn = '';
-            this.form.venueNo = '';
-            this.form.phone = '';
-            this.form.userCode = '';
-            this.form.shopId = '';
-        },
-        // 页面数据查询
-        getTableQuery() {
-            let that = this;
-            that.loading = true;
-            let param = {
-                token: localStorage.token,
-                str: this.panel.str,//
-                status: this.panel.status,//
-                shopId: localStorage.shopId,//
-            };
-            let postdata = qs.stringify(param);
-            QueryHrSensors(postdata).then(res => {
-                let json = res;
-                if (json.Code == 0) {
-                    that.loading = false;
-                    if (json.Rs) {
-                        that.allTableData = json.Rs;
-                        that.recordsTotal = json.Rs.length;
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
+            // 查询按钮
+            query() {
+                let that = this;
+                that.start = 0;
+                that.cur_page = 1;
+                this.getTableQuery();
+                this.$message.success('查询完毕');
+            },
+            clearForm() {
+                // clear
+                this.form.name = '';
+                this.form.sn = '';
+                this.form.venueNo = '';
+                this.form.phone = '';
+                this.form.userCode = '';
+                this.form.shopId = '';
+            },
+            // 页面数据查询
+            getTableQuery() {
+                let that = this;
+                that.loading = true;
+                let param = {
+                    token: localStorage.token,
+                    str: this.panel.str,//
+                    status: this.panel.status,//
+                    shopId: localStorage.shopId,//
+                };
+                let postdata = qs.stringify(param);
+                QueryHrSensors(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.loading = false;
+                        if (json.Rs) {
+                            that.allTableData = json.Rs;
+                            that.recordsTotal = json.Rs.length;
+                        } else {
+                            that.allTableData = [];
+                            that.recordsTotal = 0;
+                        }
+
+                        // 设置分页数据
+                        that.setPaginations();
                     } else {
-                        that.allTableData = [];
-                        that.recordsTotal = 0;
+                        that.$message.error(json.Memo + ' 错误码:' + json.Code);
                     }
-
-                    // 设置分页数据
-                    that.setPaginations();
-                } else {
-                    that.$message.error(json.Memo + ' 错误码:' + json.Code);
+                })
+            },
+            // 设置分页数据
+            setPaginations() {
+                // 分页属性
+                let that = this;
+                that.pageination.total = that.recordsTotal;
+
+                // 默认分页
+                that.tableData = that.allTableData.filter((item, index) => {
+                    return index < that.pageination.pageItem;
+                });
+            },
+            // 每页显示数量
+            handleSizeChange() {
+                let that = this;
+                that.tableData = that.allTableData.filter((item, index) => {
+                    return index < that.pageination.pageItem;
+                });
+                that.draw = that.pageination.pageItem;
+                // that.getTableQuery();
+            },
+            // 翻页
+            pageChange(pageIndex) {
+                let that = this;
+                // 获取当前页
+                let index = that.pageination.pageItem * (pageIndex - 1);
+                // 数据总数
+                let nums = that.pageination.pageItem * pageIndex;
+                // 容器
+                let tables = [];
+                for (var i = index; i < nums; i++) {
+                    if (that.allTableData[i]) {
+                        tables.push(that.allTableData[i])
+                    }
+                    this.tableData = tables;
                 }
-            })
-        },
-        // 设置分页数据
-        setPaginations() {
-            // 分页属性
-            let that = this;
-            that.pageination.total = that.recordsTotal;
-
-            // 默认分页
-            that.tableData = that.allTableData.filter((item, index) => {
-                return index < that.pageination.pageItem;
-            });
-        },
-        // 每页显示数量
-        handleSizeChange() {
-            let that = this;
-            that.tableData = that.allTableData.filter((item, index) => {
-                return index < that.pageination.pageItem;
-            });
-            that.draw = that.pageination.pageItem;
-            // that.getTableQuery();
-        },
-        // 翻页
-        pageChange(pageIndex) {
-            let that = this;
-            // 获取当前页
-            let index = that.pageination.pageItem * (pageIndex - 1);
-            // 数据总数
-            let nums = that.pageination.pageItem * pageIndex;
-            // 容器
-            let tables = [];
-            for (var i = index; i < nums; i++) {
-                if (that.allTableData[i]) {
-                    tables.push(that.allTableData[i])
+                that.start = index * that.draw;
+                // that.getTableQuery();
+            },
+            // 自动排序
+            sortChange(params) {
+                console.log(params)
+            },
+            //            过滤时间
+            filterFmtDate(value, row, column) {
+                let that = this;
+                if (column == 0) {
+                    return '未获得'
+                } else {
+                    return nonTfmtDatetoLength(new Date(column * 1000), 16);
                 }
-                this.tableData = tables;
-            }
-            that.start = index * that.draw;
-            // that.getTableQuery();
-        },
-        // 自动排序
-        sortChange(params) {
-            console.log(params)
-        },
-        //            过滤时间
-        filterFmtDate(value, row, column) {
-            let that = this;
-            if (column == 0) {
-                return '未获得'
-            } else {
-                return nonTfmtDatetoLength(new Date(column * 1000), 16);
-            }
+            },
         },
-    },
-}
+    }
 </script>
 
 <style scoped>
-@import "../assets/css/panel.css";
-
-.context {
-    /* height: 770px; */
-    overflow-y: scroll;
-
-    display: block;
-    margin: 0 auto;
-    background-color: #fff !important;
-    padding: 30px;
-}
-
-.panel-body {
-    padding: 20px;
-    background: #f0f2f5;
-}
-
-.change {
-    width: 100%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
-
-.change button {
-    float: left;
-}
-
-.change button.pull-right {
-    float: right;
-}
-
-.likeTab {
-    width: 100%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    padding-top: 10px;
-    padding-bottom: 0;
-    border-bottom: 1px solid #ccc;
-    margin-bottom: 10px;
-}
-
-.likeTab button {
-    float: left;
-    border-radius: 0;
-}
-
-.likeTab button.pull-right {
-    float: right;
-}
-
-.dialogTitle {
-    width: 100%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    color: #000000;
-    font-size: 18px;
-    text-align: center;
-}
-
-.dialogTitle em {
-    float: none;
-    font-style: normal;
-    color: #3799ff;
-    margin: 0;
-}
-
-/deep/ .el-transfer-panel__item .el-checkbox__input {
-    left: 40px;
-}
-
-.dialogFooter {
-    width: 90%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-    margin-top: 10px;
-}
-
-.dialogFooter button {
-    float: right;
-    margin-left: 10px;
-}
-
-.dialogContent {
-    width: 100%;
-    overflow: hidden;
-    display: block;
-    margin: 0 auto;
-}
-
-.dialogContent .pull-left {
-    width: 30%;
-    float: left;
-}
-
-.dialogContent .pull-right {
-    width: 70%;
-    float: right;
-}
-.panel_control /deep/ .el-input {
-    width: 90px;
-    float: left;
-}
-</style>
+    @import "../assets/css/panel.css";
+
+    .context {
+        /* height: 770px; */
+        overflow-y: scroll;
+
+        display: block;
+        margin: 0 auto;
+        background-color: #fff !important;
+        padding: 30px;
+    }
+
+    .panel-body {
+        padding: 20px;
+        background: #f0f2f5;
+    }
+
+    .change {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        padding-top: 10px;
+        padding-bottom: 10px;
+    }
+
+    .change button {
+        float: left;
+    }
+
+    .change button.pull-right {
+        float: right;
+    }
+
+    .likeTab {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        padding-top: 10px;
+        padding-bottom: 0;
+        border-bottom: 1px solid #ccc;
+        margin-bottom: 10px;
+    }
+
+    .likeTab button {
+        float: left;
+        border-radius: 0;
+    }
+
+    .likeTab button.pull-right {
+        float: right;
+    }
+
+    .dialogTitle {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        color: #000000;
+        font-size: 18px;
+        text-align: center;
+    }
+
+    .dialogTitle em {
+        float: none;
+        font-style: normal;
+        color: #3799ff;
+        margin: 0;
+    }
+
+    /deep/ .el-transfer-panel__item .el-checkbox__input {
+        left: 40px;
+    }
+
+    .dialogFooter {
+        width: 90%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 10px;
+    }
+
+    .dialogFooter button {
+        float: right;
+        margin-left: 10px;
+    }
+
+    .dialogContent {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .dialogContent .pull-left {
+        width: 30%;
+        float: left;
+    }
+
+    .dialogContent .pull-right {
+        width: 70%;
+        float: right;
+    }
+
+    .panel_control /deep/ .el-input {
+        width: 90px;
+        float: left;
+    }
+</style>

+ 80 - 111
pc/src/views/heartEquipPerson.vue

@@ -4,7 +4,7 @@
             <h5>心率设备</h5>
             <div class="likeTab">
                 <el-button type="" @click="goType('heartEquip')" size="mini">场馆心率设备</el-button>
-                <el-button type="primary" @click="goType('heartEquipPerson')"  size="mini">私有心率设备</el-button>
+                <el-button type="primary" @click="goType('heartEquipPerson')" size="mini">私有心率设备</el-button>
             </div>
             <div class="panel-body">
                 <div class="panel_control">
@@ -14,16 +14,16 @@
                             <el-input v-model="panel.str" placeholder="请输入编号" type="number"></el-input>
                         </el-col>
                         <!--<el-col :span="5">-->
-                            <!--<em>设备状态:</em>-->
-                            <!--&lt;!&ndash;status&ndash;&gt;-->
-                            <!--<el-select v-model="panel.status" placeholder="请选择">-->
-                                <!--<el-option-->
-                                        <!--v-for="item in panel.statusOptions"-->
-                                        <!--:key="item.value"-->
-                                        <!--:label="item.label"-->
-                                        <!--:value="item.value">-->
-                                <!--</el-option>-->
-                            <!--</el-select>-->
+                        <!--<em>设备状态:</em>-->
+                        <!--&lt;!&ndash;status&ndash;&gt;-->
+                        <!--<el-select v-model="panel.status" placeholder="请选择">-->
+                        <!--<el-option-->
+                        <!--v-for="item in panel.statusOptions"-->
+                        <!--:key="item.value"-->
+                        <!--:label="item.label"-->
+                        <!--:value="item.value">-->
+                        <!--</el-option>-->
+                        <!--</el-select>-->
                         <!--</el-col>-->
                         <el-col :span="2">
                             <el-button size="" type="primary" @click="query" plain>查询</el-button>
@@ -33,21 +33,15 @@
             </div>
         </div>
         <div class="change">
-            <el-button @click="addMember" type="primary"  size="mini">新增心率设备</el-button>
-            <el-button @click="editList"  size="mini">编辑心率设备</el-button>
-            <el-button type="success" @click="getAllPower" :loading="BtnGetAllPower"  size="mini">全部设备电量</el-button>
+            <el-button @click="addMember" type="primary" size="mini">新增心率设备</el-button>
+            <el-button @click="editList" size="mini">编辑心率设备</el-button>
+            <el-button type="success" @click="getAllPower" :loading="BtnGetAllPower" size="mini">全部设备电量</el-button>
             <!--<el-button @click="delList" type="danger">删除心率设备</el-button>-->
         </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" @current-change="clickChange"
-            >
+            <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"
+                @current-change="clickChange">
                 >
                 <el-table-column label="选择" width="55">
                     <template slot-scope="scope">
@@ -61,20 +55,9 @@
 
                 <!--width="50">-->
                 <!--</el-table-column>-->
-                <el-table-column
-                        prop="Sn"
-                        label="序列号"
-                        align="InVenueNo"
-                         width="100px"
-                        sortable
-                >
+                <el-table-column prop="Sn" label="序列号" align="InVenueNo" width="100px" sortable>
                 </el-table-column>
-                <el-table-column
-                        prop="UserName"
-                        label="用户"
-                        align="center"
-                        sortable
-                >
+                <el-table-column prop="UserName" label="用户" align="center" sortable>
 
                     <template slot-scope="scope">
                         {{scope.row.UserName}}
@@ -90,82 +73,63 @@
                         <!--<el-button @click="takeBack(scope.row)" type="danger" v-if="!scope.row.BindUserId">{{scope.row.UserName}} 设备收回</el-button>-->
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="PowerPercent"
-                        label="电量"
-                        align="center"
-                         width="80px"
-                        sortable
-                >
+                <el-table-column prop="PowerPercent" label="电量" align="center" width="80px" sortable>
                     <template slot-scope="scope">
-                        <span style="color: red" v-if="parseInt(scope.row.PowerPercent) <= 20">{{scope.row.PowerPercent}}</span>
-                        <span style="color: gold" v-if="parseInt(scope.row.PowerPercent) > 20 && parseInt(scope.row.PowerPercent) < 80">{{scope.row.PowerPercent}}</span>
-                        <span style="color: #67C23A" v-if="parseInt(scope.row.PowerPercent) >= 80">{{scope.row.PowerPercent}}</span>
+                        <span style="color: red"
+                            v-if="parseInt(scope.row.PowerPercent) <= 20">{{scope.row.PowerPercent}}</span>
+                        <span style="color: gold"
+                            v-if="parseInt(scope.row.PowerPercent) > 20 && parseInt(scope.row.PowerPercent) < 80">{{scope.row.PowerPercent}}</span>
+                        <span style="color: #67C23A"
+                            v-if="parseInt(scope.row.PowerPercent) >= 80">{{scope.row.PowerPercent}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column
-                        prop="PowerUpdateAt"
-                        label="电量更新时间"
-                        align="center"
-                         width="140px"
-                        :formatter="filterFmtDate"
-                >
+                <el-table-column prop="PowerUpdateAt" label="电量更新时间" align="center" width="140px"
+                    :formatter="filterFmtDate">
                 </el-table-column>
                 <!--<el-table-column-->
-                        <!--prop="Status"-->
-                        <!--label="状态"-->
-                        <!--align="center"-->
-                        <!--width="90"-->
+                <!--prop="Status"-->
+                <!--label="状态"-->
+                <!--align="center"-->
+                <!--width="90"-->
                 <!--&gt;-->
-                    <!--<template slot-scope="scope">-->
-                        <!--&lt;!&ndash;1:启用  8:暂停  9:删除&ndash;&gt;-->
-                        <!--<span v-if="scope.row.Status == 1" style="color: #67c23a">已启用</span>-->
-                        <!--<span v-if="scope.row.Status == 8" style="color: #E6A23C">已暂停</span>-->
-                        <!--<span v-if="scope.row.Status == 9" style="color: red">已删除</span>-->
-                    <!--</template>-->
+                <!--<template slot-scope="scope">-->
+                <!--&lt;!&ndash;1:启用  8:暂停  9:删除&ndash;&gt;-->
+                <!--<span v-if="scope.row.Status == 1" style="color: #67c23a">已启用</span>-->
+                <!--<span v-if="scope.row.Status == 8" style="color: #E6A23C">已暂停</span>-->
+                <!--<span v-if="scope.row.Status == 9" style="color: red">已删除</span>-->
+                <!--</template>-->
                 <!--</el-table-column>-->
-                <el-table-column
-                        prop="id"
-                        label="操作"
-                >
+                <el-table-column prop="id" label="操作">
                     <template slot-scope="scope">
                         <!--<el-button type="success" v-if="scope.row.Status == 8" size="mini"-->
-                                   <!--@click="pauseRow(scope.row,1)">-->
-                            <!--启用-->
+                        <!--@click="pauseRow(scope.row,1)">-->
+                        <!--启用-->
                         <!--</el-button>-->
                         <!--<el-button type="warning" v-if="scope.row.Status == 1" size="mini"-->
-                                   <!--@click="pauseRow(scope.row,8)">-->
-                            <!--暂停-->
+                        <!--@click="pauseRow(scope.row,8)">-->
+                        <!--暂停-->
                         <!--</el-button>-->
-                        <el-button type="danger"  size="mini"
-                                   @click="pauseRowDel(scope.row)">
+                        <el-button type="danger" size="mini" @click="pauseRowDel(scope.row)">
                             删除
                         </el-button>
-                        <el-button type="primary" size="mini"  @click="goPage(scope.row)">记录</el-button>
+                        <el-button type="primary" size="mini" @click="goPage(scope.row)">记录</el-button>
                         <el-button type="success" size="mini" @click="getPower(scope.row)">获取电量</el-button>
                     </template>
                 </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" :current-page.sync="cur_page"></el-pagination>
         </div>
         <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" width="650px">
             <div class="dialogContent">
                 <div class="">
                     <el-form ref="form" :model="form" label-width="160px">
-                        <el-form-item label="会员账号" :required="true"  >
+                        <el-form-item label="会员账号" :required="true">
                             <!--userId-->
-                            <el-select v-model="form.userId" placeholder="请选择" :disabled ="form.btnType == 1" filterable>
-                                <el-option
-                                        v-for="item in form.userList"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value">
+                            <el-select v-model="form.userId" placeholder="请选择" :disabled="form.btnType == 1" filterable>
+                                <el-option v-for="item in form.userList" :key="item.value" :label="item.label"
+                                    :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -238,20 +202,20 @@
                     multipleSelection: [],
                     detectedmac: '',
                     statusOptions: [
-                        {value: "", label: '全部'},
-                        {value: 1, label: '启用'},
-                        {value: 8, label: '暂停'},
-                        {value: 9, label: '删除'},
+                        { value: "", label: '全部' },
+                        { value: 1, label: '启用' },
+                        { value: 8, label: '暂停' },
+                        { value: 9, label: '删除' },
                     ], 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(),
                 },
@@ -282,8 +246,8 @@
                     dialogValue: [],//穿梭已选
                 },
                 memberTypes: [
-                    {value: 1, label: '年心率设备'},
-                    {value: 2, label: '充值心率设备'},
+                    { value: 1, label: '年心率设备' },
+                    { value: 2, label: '充值心率设备' },
                 ],
                 tableData: []
             }
@@ -314,10 +278,10 @@
 
                 if (tab.name == "personal") {
                     // 私有
-                    that.$router.push({path: '/heartEquipPerson'});
+                    that.$router.push({ path: '/heartEquipPerson' });
                 } else {
                     // 公共
-                    that.$router.push({path: '/heartEquip'});
+                    that.$router.push({ path: '/heartEquip' });
                 }
             },
             // 设备回收
@@ -357,10 +321,10 @@
             },
             goPage(row) {
                 // 查看绑定记录
-                this.$router.push({path: '/bindRecord', query: {hrId: row.HrId}});
+                this.$router.push({ path: '/bindRecord', query: { hrId: row.HrId } });
             },
             goType(url) {
-                this.$router.push({path: '/' + url});
+                this.$router.push({ path: '/' + url });
             },
             // 编辑
             editList() {
@@ -759,6 +723,9 @@
             },
             // 查询按钮
             query() {
+                let that = this;
+                that.start = 0;
+                that.cur_page = 1;
                 this.getTableQuery();
                 this.$message.success('查询完毕');
             },
@@ -847,10 +814,10 @@
             //            过滤时间
             filterFmtDate(value, row, column) {
                 let that = this;
-                if(column == 0){
+                if (column == 0) {
                     return '未获得'
-                }else{
-                    return nonTfmtDatetoLength(new Date(column*1000), 16);
+                } else {
+                    return nonTfmtDatetoLength(new Date(column * 1000), 16);
                 }
             },
         }
@@ -975,11 +942,13 @@
         width: 70%;
         float: right;
     }
+
     /deep/ .el-dialog .el-select {
         width: 100%;
     }
+
     .panel_control /deep/ .el-input {
-    width: 90px;
-    float: left;
-}
-</style>
+        width: 90px;
+        float: left;
+    }
+</style>

+ 1 - 1
pc/src/views/lessonManage.vue

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

+ 7 - 2
pc/src/views/record.vue

@@ -45,7 +45,7 @@
                                 </el-option>
                             </el-select>
                         </el-col>
-                        <el-col :span="4">
+                        <el-col :span="2">
                             <el-button size="" type="primary" @click="query" :disabled="serachBtnStatus" plain>查询
                             </el-button>
                         </el-col>
@@ -149,6 +149,7 @@
                     :total="pageination.total"
                     :page-size="pageination.pageItem"
                     @current-change="pageChange"
+                    :current-page.sync="cur_page"
             ></el-pagination>
         </div>
     </div>
@@ -272,6 +273,8 @@
             // 查询按钮
             query() {
                 let that = this;
+                that.start = 0;
+                that.cur_page = 1;
                 that.serachBtnStatus = true;
                 let totalTime = 2;
                 let clock = window.setInterval(() => {
@@ -525,7 +528,9 @@
     .el-col-7 {
         width: 25%;
     }
-
+    .panel /deep/ .el-date-editor--daterange {
+        width: 260px;
+    }
     /*ipad only*/
     @media only screen and (max-width: 1366px) {
         .panel-body {

+ 6 - 2
pc/src/views/tempUser.vue

@@ -100,7 +100,9 @@
             </el-table>
             <br>
             <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
-                @current-change="pageChange"></el-pagination>
+                @current-change="pageChange"
+                :current-page.sync="cur_page"
+                ></el-pagination>
         </div>
 
         <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" :width="form.btnType == 1 ?'650px':'650px'">
@@ -541,6 +543,8 @@
             // 查询按钮
             query() {
                 let that = this;
+                that.start = 0;
+                that.cur_page = 1;
                 that.serachBtnStatus = true;
                 that.getTableQuery();
                 that.$message.success('查询完毕');
@@ -563,7 +567,7 @@
                     name: that.panel.name,//
                     expDay: that.panel.expDay,//
                     start: that.start,//
-                    tableMax: 20,//
+                    tableMax: 10,//
                 };
                 let postdata = qs.stringify(param);
                 TmpUserQuery(postdata).then(res => {