diff --git a/src/components/RFID/RFID.vue b/src/components/RFID/RFID.vue index 426c116..2103275 100644 --- a/src/components/RFID/RFID.vue +++ b/src/components/RFID/RFID.vue @@ -53,10 +53,16 @@ export default { this.timer = null; } this.setLight(value.step); - } else { + } else if (value && !value.step) { if (!this.timer && this.num === null) { this.setTime(); } + } else { + if (this.timer) { + clearInterval(this.timer); + this.timer = null; + } + this.setTime(); } }, }, diff --git a/src/mixins/socket.js b/src/mixins/socket.js index 12783a0..aaa1678 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -66,8 +66,8 @@ const mixin = { switch (data.data.type) { case 0: // 开始 // 收到开始消息 - console.log('0'); this.setStartMessages(true); + this.messagesAddRfid(null); break; case 1: // 体重 // 收到同步消息 diff --git a/src/views/BtnPage/BtnPage.vue b/src/views/BtnPage/BtnPage.vue index e68b4c2..a739fe0 100644 --- a/src/views/BtnPage/BtnPage.vue +++ b/src/views/BtnPage/BtnPage.vue @@ -24,63 +24,63 @@ export default { nameList: [ { name: '分诊区', - value: '18', + value: '1', }, { name: '急救护士', - value: '1', + value: '11', }, { name: '急救医生', - value: '1', + value: '11', }, { name: '采血车', - value: '3', + value: '12', }, { name: 'CT室', - value: '4', + value: '3', }, { name: '介入室', - value: '8', + value: '5', }, { name: '平车停放点', - value: '19', + value: '32', }, { name: '卒中中心', - value: '20', + value: '33', }, { name: '急救大楼门', - value: '21', + value: '34', }, { name: '抢救室', - value: '22', + value: '35', }, { name: '走廊', - value: '23', + value: '36', }, { name: '心电图室', - value: '24', + value: '37', }, { name: '专用电梯口(一楼)', - value: '25', + value: '38', }, { name: '专用电梯口(四楼)', - value: '26', + value: '39', }, { name: 'CCU导管室门口', - value: '27', + value: '40', }, ], };