Browse Source

修复了因为提交新的私有心率带中带有旧的信息的问题

Changpeng Duan 5 years ago
parent
commit
e5f4b4fbcc
6 changed files with 31 additions and 26 deletions
  1. 12 12
      pc/src/views/heartEquip.vue
  2. 13 12
      pc/src/views/heartEquipPerson.vue
  3. 1 0
      tv/package.json
  4. 1 0
      tv/src/main.js
  5. 1 1
      tv/src/router/index.js
  6. 3 1
      tv/src/views/Wait.vue

+ 12 - 12
pc/src/views/heartEquip.vue

@@ -13,18 +13,18 @@
                             <em>心率设备:</em>
                             <el-input v-model="panel.str" placeholder="请输入编号" type="number"></el-input>
                         </el-col>
-                        <el-col :span="4">
-                            <em>设备状态:</em>
-                            <!--status-->
-                            <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="4">-->
+                            <!--<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="4">
                             <el-button size="" type="primary" @click="query" plain>查询</el-button>
                         </el-col>

+ 13 - 12
pc/src/views/heartEquipPerson.vue

@@ -13,18 +13,18 @@
                             <em>心率设备:</em>
                             <el-input v-model="panel.str" placeholder="请输入编号" type="number"></el-input>
                         </el-col>
-                        <el-col :span="5">
-                            <em>设备状态:</em>
-                            <!--status-->
-                            <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="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>-->
+                        <!--</el-col>-->
                         <el-col :span="4">
                             <el-button size="" type="primary" @click="query" plain>查询</el-button>
                         </el-col>
@@ -696,6 +696,7 @@
                 this.form.phone = '';
                 this.form.userCode = '';
                 this.form.shopId = '';
+                this.form.userId = '';
             },
             // 页面数据查询
             getTableQuery() {

+ 1 - 0
tv/package.json

@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "core-js": "^3.6.5",
+    "default-passive-events": "^2.0.0",
     "echarts": "^4.8.0",
     "element-ui": "^2.13.2",
     "mockjs": "^1.1.0",

+ 1 - 0
tv/src/main.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import './plugins/axios'
 import App from './App.vue'
 import router from './router'
+import 'default-passive-events'
 // import store from './store'
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';

+ 1 - 1
tv/src/router/index.js

@@ -22,7 +22,7 @@ const routes = [
         children: [
             {
                 path: '/',
-                name: 'Main',
+                name: 'Wait',
                 component: () => import('@/views/Wait.vue'),
                 meta: {
                     title: "等待",

+ 3 - 1
tv/src/views/Wait.vue

@@ -306,7 +306,9 @@
                         that.students = json.Rs;
                         that.$message.error(json.Memo);
                     }
-                })
+                }).catch(function(err){
+                        console.log(err);
+                    });
             },
             GetHerosRankingQuery() {
                 let that = this;