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 @@
@@ -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 @@
-
开始
+
呼叫
{{ item.name }}
震动传感器
药物剂量
diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue
index d88d008..608fe6e 100644
--- a/src/views/Index/Index.vue
+++ b/src/views/Index/Index.vue
@@ -50,11 +50,8 @@
-