From 43250d5c6d6c9e1782296fc7abd2f1596111f961 Mon Sep 17 00:00:00 2001 From: lucky Date: Wed, 16 Dec 2020 18:05:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rest/project.http | 4 +- src/components/LoadCells/LoadCells.vue | 37 +++--------- src/components/Map/Map.js | 7 ++- src/components/Panel/Panel.vue | 15 ++++- src/components/RFID/RFID.styl | 8 +-- src/components/RFID/RFID.vue | 15 ++--- src/components/Sensor/Sensor.js | 3 + src/mixins/socket.js | 81 ++++++++++++++------------ 8 files changed, 86 insertions(+), 84 deletions(-) diff --git a/rest/project.http b/rest/project.http index 92caa52..df929c2 100644 --- a/rest/project.http +++ b/rest/project.http @@ -65,8 +65,8 @@ POST {{record}}/debug/record { "param":{ "authId": "1", - "type": "2", - "value":"70000", + "type": "10", + "value":"3000", "time":"1607937529000" } } diff --git a/src/components/LoadCells/LoadCells.vue b/src/components/LoadCells/LoadCells.vue index c394212..ffd3c45 100644 --- a/src/components/LoadCells/LoadCells.vue +++ b/src/components/LoadCells/LoadCells.vue @@ -17,29 +17,6 @@ {{ item.number[a-1] ? item.number[a-1] : 0 }} - @@ -64,7 +41,7 @@ export default { { id: 3, name: '称重传感器3', - number: ['0', '0', '.', '0', '0', '0', '0'], + number: ['0', '.', '0'], }, { id: 4, @@ -75,15 +52,15 @@ export default { }; }, - computed: mapState('home', ['weighSensor1', 'weighSensor2', 'weighSensor3', 'weighSensor4']), + computed: mapState('messages', ['weighSensor1', 'weighSensor2', 'weighSensor3', 'weighSensor4']), watch: { - weighSensor1(value) { - console.log('value: ', value); - if (value) { + weighSensor1: { + handle(value) { + console.log('weighSensor1: ', value); this.lists[0].number = value.split(''); - console.log('this.lists: ', this.lists); - } + }, + deep: true, }, weighSensor2(value) { if (value) { diff --git a/src/components/Map/Map.js b/src/components/Map/Map.js index 3572831..938d0c2 100644 --- a/src/components/Map/Map.js +++ b/src/components/Map/Map.js @@ -8,7 +8,7 @@ var option = { regionHeight: 6, //地图高度 map: '山西', viewControl: { - distance: 350, //地图视角 控制初始大小 + distance: 300, //地图视角 控制初始大小 rotateSensitivity: 1, //禁止旋转 zoomSensitivity: 1, //禁止缩放 }, @@ -44,10 +44,11 @@ var option = { // regions: [ // { // name: '运城', + // selected: true, // itemStyle: { // borderWidth: 3, - // areaColor: 'red', - // color: 'red', + // areaColor: '#f00', + // color: '#f00', // }, // }, // ], diff --git a/src/components/Panel/Panel.vue b/src/components/Panel/Panel.vue index d59f645..f025708 100644 --- a/src/components/Panel/Panel.vue +++ b/src/components/Panel/Panel.vue @@ -28,9 +28,20 @@ - +
-
{{ item }}
+
{{ item }}
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 8691980..96871a3 100644 --- a/src/components/Sensor/Sensor.js +++ b/src/components/Sensor/Sensor.js @@ -10,6 +10,8 @@ const mixin = { computed: { ...mapState('messages', ['vibrationSensor']), option() { + // const that = this; + console.log('series1', this.series1, this.vibrationSensor); return { legend: { x: 'center', @@ -49,6 +51,7 @@ const mixin = { show: false, }, }, + series: [ { name: '传感器1', diff --git a/src/mixins/socket.js b/src/mixins/socket.js index 64d95a1..b4815bf 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -56,47 +56,56 @@ 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.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); - 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.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; }