From 2415e0f03c33bfbe85fb89b2497b674b3dc6a9d8 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Dec 2020 15:59:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=A0=E6=84=9F=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sensor/Sensor.js | 8 +++++--- src/mixins/socket.js | 10 +++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/components/Sensor/Sensor.js b/src/components/Sensor/Sensor.js index 8691980..1e5c5e1 100644 --- a/src/components/Sensor/Sensor.js +++ b/src/components/Sensor/Sensor.js @@ -2,9 +2,9 @@ import { mapState } from 'vuex'; const mixin = { data() { return { - series1: [10, 20, 30, 10, 20, 30, 10, 20, 30], // 传感器1 - series2: [20, 30, 10, 20, 30, 10, 20, 30, 10], // 传感器2 - series3: [30, 10, 20, 30, 10, 20, 30, 10, 20], // 传感器3 + series1: [10, 20, 30, 10, 20, 30, 10, 20, 30, 10, 20, 30, 10, 20, 30, 10, 20, 30], // 传感器1 + series2: [20, 30, 10, 20, 30, 10, 20, 30, 10, 20, 30, 10, 20, 30, 10, 20, 30, 10], // 传感器2 + series3: [30, 10, 20, 30, 10, 20, 30, 10, 20, 30, 10, 20, 30, 10, 20, 30, 10, 20], // 传感器3 }; }, computed: { @@ -23,6 +23,8 @@ const mixin = { xAxis: { type: 'category', boundaryGap: false, + max: this.series1.length >= 6 ? this.series1.length - 1 : 6, + min: this.series1.length >= 6 ? this.series1.length - 6 : 0, axisLine: { //y轴 show: false, diff --git a/src/mixins/socket.js b/src/mixins/socket.js index 64d95a1..0ca89b3 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -101,7 +101,15 @@ const mixin = { break; } }, - + /** + * + * data:{ + * data: { + * value: '' + * }, + * type: '', + * } + */ /** * 收到ws 消息 * @param {object} res 收到的消息数据 From d01e486b7a6fa8d598e08bf44f0795695b146398 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Dec 2020 18:06:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Panel/Panel.vue | 28 +++++++++++++++++++++++----- src/mixins/socket.js | 3 +++ src/views/BtnPage/BtnPage.vue | 2 +- src/views/Index/Index.vue | 7 ++----- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/components/Panel/Panel.vue b/src/components/Panel/Panel.vue index d59f645..3b4e8b1 100644 --- a/src/components/Panel/Panel.vue +++ b/src/components/Panel/Panel.vue @@ -4,21 +4,21 @@
患者体重（kg） - {{ weightMessage }} + {{ weight }}
药物剂量（mg） - {{ thrombolyticDose }} + {{ thrombolytic }}
团注剂量（mg） - {{ bolusDose }} + {{ bolus }}
维持剂量（mg） - {{ maintenanceDose }} + {{ maintenance }}
@@ -71,9 +71,27 @@ export default { '解脱', '结束', ], + weight: 0, + thrombolytic: 0, + bolus: 0, + maintenance: 0, }; }, - computed: mapState('messages', ['weightMessage', 'bolusDose', 'maintenanceDose', 'thrombolyticDose']), + computed: mapState('messages', ['weightMessage', 'bolusDose', 'maintenanceDose', 'thrombolyticDose', 'startMessages']), + watch: { + weightMessage(val) { + this.weight = val; + }, + bolusDose(val) { + this.bolus = bolusDose; + }, + maintenanceDose(val) { + this.maintenance = val; + }, + thrombolyticDose(val) { + this.thrombolytic = val; + }, + }, mounted() { const that = this; var add = setInterval(function() { diff --git a/src/mixins/socket.js b/src/mixins/socket.js index 0ca89b3..276419f 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -45,6 +45,7 @@ const mixin = { socket.onclose = this.websocketClose; socket.onerror = this.websocketError; } else { + // @ts-ignore this.$message.error('当前浏览器不支持 websocket'); } lockSocket = false; @@ -68,7 +69,9 @@ const mixin = { case 1: // 体重 // 收到同步消息 // 把消息添加到store 的消息栈中 + this.setStartMessages(true); this.messagesAddWeight(data.data.value); + console.log(data.data.value); break; case 2: // RFID this.messagesAddRfid(data.data); diff --git a/src/views/BtnPage/BtnPage.vue b/src/views/BtnPage/BtnPage.vue index b055f4e..4d62181 100644 --- a/src/views/BtnPage/BtnPage.vue +++ b/src/views/BtnPage/BtnPage.vue @@ -1,6 +1,6 @@