From 9f42ada723cfc4dcaa0e34291b1b003a2ef38ce5 Mon Sep 17 00:00:00 2001 From: lucky Date: Wed, 16 Dec 2020 19:22:05 +0800 Subject: [PATCH] =?UTF-8?q?rfid=E6=B6=88=E6=81=AF=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rest/project.http | 4 +- src/components/LoadCells/LoadCells.vue | 3 +- src/components/RFID/RFID.vue | 87 +++++++++++++------------ src/mixins/socket.js | 1 - src/store/modules/messages/mutations.js | 2 - 5 files changed, 49 insertions(+), 48 deletions(-) diff --git a/rest/project.http b/rest/project.http index df929c2..1da3414 100644 --- a/rest/project.http +++ b/rest/project.http @@ -65,8 +65,8 @@ POST {{record}}/debug/record { "param":{ "authId": "1", - "type": "10", - "value":"3000", + "type": "2", + "value":"24", "time":"1607937529000" } } diff --git a/src/components/LoadCells/LoadCells.vue b/src/components/LoadCells/LoadCells.vue index ffd3c45..21b949b 100644 --- a/src/components/LoadCells/LoadCells.vue +++ b/src/components/LoadCells/LoadCells.vue @@ -56,8 +56,7 @@ export default { watch: { weighSensor1: { - handle(value) { - console.log('weighSensor1: ', value); + handler(value) { this.lists[0].number = value.split(''); }, deep: true, diff --git a/src/components/RFID/RFID.vue b/src/components/RFID/RFID.vue index b3d135b..c0f0e1c 100644 --- a/src/components/RFID/RFID.vue +++ b/src/components/RFID/RFID.vue @@ -20,24 +20,25 @@ export default { data() { return { lists: [ - { code: 1, active: false, name: '急救护士到场' }, - { code: 1, active: false, name: '急救医生到场' }, - { code: 3, active: false, name: '护士采血' }, - { code: 3, active: false, name: '采血车到场' }, - { code: 4, active: false, name: 'CT室' }, - { code: 8, active: false, name: '介入室' }, - { code: 17, active: false, name: '分诊区' }, - { code: 18, active: false, name: '平车停放点' }, - { code: 19, active: false, name: '卒中中心' }, - { code: 20, active: false, name: '急诊' }, - { code: 21, active: false, name: '抢救室' }, - { code: 22, active: false, name: '走廊' }, - { code: 23, active: false, name: '心电图' }, - { code: 24, active: false, name: '专用电梯（一楼）' }, - { code: 25, active: false, name: '专用电梯（四楼）' }, - { code: 26, active: false, name: 'CCU导管室' }, + { code: '1', active: false, name: '急救护士到场' }, + { code: '1', active: false, name: '急救医生到场' }, + { code: '3', active: false, name: '护士采血' }, + { code: '3', active: false, name: '采血车到场' }, + { code: '4', active: false, name: 'CT室' }, + { code: '8', active: false, name: '介入室' }, + { code: '17', active: false, name: '分诊区' }, + { code: '18', active: false, name: '平车停放点' }, + { code: '19', active: false, name: '卒中中心' }, + { code: '20', active: false, name: '急诊' }, + { code: '21', active: false, name: '抢救室' }, + { code: '22', active: false, name: '走廊' }, + { code: '23', active: false, name: '心电图' }, + { code: '24', active: false, name: '专用电梯（一楼）' }, + { code: '25', active: false, name: '专用电梯（四楼）' }, + { code: '26', active: false, name: 'CCU导管室' }, ], num: 0, //当前正在展示的div + t: null, }; }, @@ -50,20 +51,20 @@ export default { }, watch: { - weighSensor1: { - handle(value) { - // console.log('value: ', value); - // this.lists[0].number = value.split(''); - // console.log('this.lists: ', this.lists); + rfidMessage: { + handler(value) { + this.setLight(value.step); }, deep: true, }, }, - mounted() { - console.log('收到消息rfid', this.rfidMessage); - // this.setLight(); - this.setTime(); + created() { + if (this.rfidMessage && this.rfidMessage.step) { + this.setLight(this.rfidMessage.step); + } else { + this.setLight(); + } // this.changePage(); }, @@ -81,7 +82,7 @@ export default { // 定时高亮 setTime() { let i = 0; - setInterval(() => { + this.t = setInterval(() => { this.lists.forEach((element, j) => { if (j === i) { element.active = true; @@ -116,23 +117,27 @@ export default { }, // 收到消息高亮 - setLight(code) { - // debugger; - this.lists.forEach((element, j) => { - if (element.code === code) { - element.active = true; - // 翻页 - for (let a = 0; a < this.newArr.length; a++) { - const arr = this.newArr[a]; - const item = arr.find(item => item.name === element.name); - if (item) { - this.num = a; + setLight(step) { + if (step) { + clearInterval(this.t); + this.lists.forEach((element, j) => { + if (element.code === step) { + element.active = true; + // 翻页 + for (let a = 0; a < this.newArr.length; a++) { + const arr = this.newArr[a]; + const item = arr.find(item => item.name === element.name); + if (item) { + this.num = a; + } } + } else { + element.active = false; } - } else { - element.active = false; - } - }); + }); + } else { + this.setTime(); + } }, }, }; diff --git a/src/mixins/socket.js b/src/mixins/socket.js index b4815bf..53dc649 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -89,7 +89,6 @@ const mixin = { break; case 7: // 震动传感器 this.messagesAddVibrationSensor(data.data); - console.log('RFID.data: ', data.data); break; case 8: // 溶栓剂量（总量） this.messagesAddThrombolyticDose(data.data.value); diff --git a/src/store/modules/messages/mutations.js b/src/store/modules/messages/mutations.js index 4ec7c20..6cdf7e8 100644 --- a/src/store/modules/messages/mutations.js +++ b/src/store/modules/messages/mutations.js @@ -95,7 +95,6 @@ const mutations = { * @param {*} data */ messagesAddRfid(state, data) { - console.log('RFID: ', data); state.rfidMessage = data; }, @@ -105,7 +104,6 @@ const mutations = { * @param {*} data */ messagesAddWeighSensor1(state, data) { - console.log('weighSensor1: ', data); state.weighSensor1 = data; },