@@ -38,7 +38,7 @@
diff --git a/src/components/RFID/RFID.styl b/src/components/RFID/RFID.styl
index b8adf7d..b3baa53 100644
--- a/src/components/RFID/RFID.styl
+++ b/src/components/RFID/RFID.styl
@@ -84,15 +84,15 @@
.list {
width: 4rem;
height: 3.4rem;
- line-height: 3.4rem;
- font-size: 12px;
+}
+
+.list span {
+ width: 90%;
}
.active {
width: 4rem;
height: 4rem;
- line-height: 4rem;
- font-size: 12px;
}
.list1 {
diff --git a/src/components/RFID/RFID.vue b/src/components/RFID/RFID.vue
index 46bc9a9..b3d135b 100644
--- a/src/components/RFID/RFID.vue
+++ b/src/components/RFID/RFID.vue
@@ -42,7 +42,7 @@ export default {
},
computed: {
- ...mapState('home', ['rfidMessage']),
+ ...mapState('messages', ['rfidMessage']),
newArr() {
const arr = this.group(this.lists, 10);
return arr;
@@ -50,12 +50,13 @@ export default {
},
watch: {
- weighSensor1(value) {
- // console.log('value: ', value);
- // if (value) {
- // this.lists[0].number = value.split('');
- // console.log('this.lists: ', this.lists);
- // }
+ weighSensor1: {
+ handle(value) {
+ // console.log('value: ', value);
+ // this.lists[0].number = value.split('');
+ // console.log('this.lists: ', this.lists);
+ },
+ deep: true,
},
},
diff --git a/src/components/Sensor/Sensor.js b/src/components/Sensor/Sensor.js
index 1e5c5e1..27f4cfc 100644
--- a/src/components/Sensor/Sensor.js
+++ b/src/components/Sensor/Sensor.js
@@ -153,15 +153,7 @@ const mixin = {
};
},
},
- watch: {
- vibrationSensor(val) {
- var vibList = val.split(',');
- this.series1 = this.series1.concat(parseInt(vibList[0]));
- this.series2 = this.series1.concat(parseInt(vibList[1]));
- this.series3 = this.series1.concat(parseInt(vibList[2]));
- console.log('vibrationSensor:', val);
- },
- },
+ watch: {},
};
export default mixin;
diff --git a/src/components/Sensor/Sensor.vue b/src/components/Sensor/Sensor.vue
index 93c13a0..b843e7e 100644
--- a/src/components/Sensor/Sensor.vue
+++ b/src/components/Sensor/Sensor.vue
@@ -16,6 +16,19 @@ export default {
height: '',
};
},
+ watch: {
+ vibrationSensor(val) {
+ console.log(val.value);
+ if (val.type === 7) {
+ var vibList = val.value.split(',');
+ this.series1 = this.series1.concat(parseInt(vibList[0]));
+ this.series2 = this.series2.concat(parseInt(vibList[1]));
+ this.series3 = this.series3.concat(parseInt(vibList[2]));
+ this.drawLine();
+ }
+ console.log(this.series1, this.series2, this.series3);
+ },
+ },
mounted() {
this.drawLine();
let wh = window.innerWidth;
diff --git a/src/mixins/socket.js b/src/mixins/socket.js
index 276419f..20092e8 100644
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -57,49 +57,57 @@ const mixin = {
*/
handleMessagesData(item) {
const data = JSON.parse(item.data);
- console.log('data: ', data.data);
switch (data.type) {
case 'ChannelStatus': // 认证消息
this.handleAuthMessage(data);
break;
- case 0: // 开始
- // 收到开始消息
- this.setStartMessages(true);
- break;
- case 1: // 体重
- // 收到同步消息
- // 把消息添加到store 的消息栈中
- this.setStartMessages(true);
- this.messagesAddWeight(data.data.value);
- console.log(data.data.value);
- break;
- case 2: // RFID
- this.messagesAddRfid(data.data);
- break;
- case 3: // 称重传感器一
- this.messagesAddWeighSensor1(data.data.value);
- break;
- case 4: // 称重传感器二
- this.messagesAddWeighSensor2(data.data.value);
- break;
- case 5: // 称重传感器三
- this.messagesAddWeighSensor3(data.data.value);
- break;
- case 6: // 称重传感器四
- this.messagesAddWeighSensor4(data.data.value);
- break;
- case 7: // 震动传感器
- this.messagesAddVibrationSensor(data.data);
- break;
- case 8: // 溶栓剂量（总量）
- this.messagesAddThrombolyticDose(data.data);
- break;
- case 9: // 团注剂量
- this.messagesAddBolusDose(data.data);
- break;
- case 10: // 维持剂量
- this.messagesAddMaintenanceDose(data.data);
+ case 'CarRecord': // 平车
+ if (!data.data.type) return;
+ switch (data.data.type) {
+ case 0: // 开始
+ // 收到开始消息
+ this.setStartMessages(true);
+ break;
+ case 1: // 体重
+ // 收到同步消息
+ // 把消息添加到store 的消息栈中
+ this.setStartMessages(true);
+ this.messagesAddWeight(data.data.value);
+ break;
+ case 2: // RFID
+ this.messagesAddRfid(data.data);
+ break;
+ case 3: // 称重传感器一
+ this.messagesAddWeighSensor1(data.data.value);
+ break;
+ case 4: // 称重传感器二
+ this.messagesAddWeighSensor2(data.data.value);
+ break;
+ case 5: // 称重传感器三
+ this.messagesAddWeighSensor3(data.data.value);
+ break;
+ case 6: // 称重传感器四
+ this.messagesAddWeighSensor4(data.data.value);
+ break;
+ case 7: // 震动传感器
+ this.messagesAddVibrationSensor(data.data);
+ console.log('RFID.data: ', data.data);
+ break;
+ case 8: // 溶栓剂量（总量）
+ this.messagesAddThrombolyticDose(data.data.value);
+ break;
+ case 9: // 团注剂量
+ this.messagesAddBolusDose(data.data.value);
+ break;
+ case 10: // 维持剂量
+ this.messagesAddMaintenanceDose(data.data.value);
+ break;
+ default:
+ break;
+ }
+
break;
+
default:
break;
}
diff --git a/src/views/BtnPage/BtnPage.vue b/src/views/BtnPage/BtnPage.vue
index 4d62181..4a7dd15 100644
--- a/src/views/BtnPage/BtnPage.vue
+++ b/src/views/BtnPage/BtnPage.vue
@@ -107,7 +107,7 @@ export default {
param: {
authId: '1',
type: '7',
- value: '10,20,10',
+ value: '10,20,30',
time: new Date().getTime(),
},
};