ZhangBin
/
salt-lake-hospital
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

消息接口

master
lucky 5 years ago
parent
2b0ee6a0d8
commit
43250d5c6d
8 changed files with 86 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      rest/project.http
  2. 37
      src/components/LoadCells/LoadCells.vue
  3. 7
      src/components/Map/Map.js
  4. 15
      src/components/Panel/Panel.vue
  5. 8
      src/components/RFID/RFID.styl
  6. 15
      src/components/RFID/RFID.vue
  7. 3
      src/components/Sensor/Sensor.js
  8. 81
      src/mixins/socket.js

4
rest/project.http
View File

@ -65,8 +65,8 @@ POST {{record}}/debug/record
{
"param":{
"authId": "1",
"type": "2",
"value":"70000",
"type": "10",
"value":"3000",
"time":"1607937529000"
}
}

37
src/components/LoadCells/LoadCells.vue
View File

@ -17,29 +17,6 @@
<span>{{ item.number[a-1] ? item.number[a-1] : 0 }}</span>
</div>
</div>
<!-- <div class="number flex-1">
<div class="num_item">
<span>{{ item.number.split('')[0] }}</span>
</div>
<div class="num_item">
<span>{{ item.number.split('')[1] }}</span>
</div>
<div :style="item.number.split('')[2] === '.' ? 'padding-right:5%' : '' " class="num_item">
<span>{{ item.number.split('')[2] }}</span>
</div>
<div class="num_item">
<span>{{ item.number.split('')[3] }}</span>
</div>
<div class="num_item">
<span>{{ item.number.split('')[4] }}</span>
</div>
<div class="num_item">
<span>{{ item.number.split('')[5] }}</span>
</div>
<div class="num_item">
<span>{{ item.number.split('')[6] }}</span>
</div>
</div>-->
</div>
</div>
</template>
@ -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) {

7
src/components/Map/Map.js
View File

@ -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',
// },
// },
// ],

15
src/components/Panel/Panel.vue
View File

@ -28,9 +28,20 @@
<a-icon class="down-icon" type="caret-down" />
</span>
</div>
<a-progress :percent="percent" :show-info="false" :stroke-color="strokeColor" :stroke-width="strokeWidth" status="active" />
<a-progress
:percent="percent"
:show-info="false"
:stroke-color="strokeColor"
:stroke-width="strokeWidth"
status="active"
/>
<div class="flex-1" style="width: 106%; margin-left: -3%">
<div class="flex-1" style="justify-content: center" v-for="(item, index) in lists" :key="index">{{ item }}</div>
<div
:key="index"
class="flex-1"
style="justify-content: center"
v-for="(item, index) in lists"
>{{ item }}</div>
</div>
</div>
</div>

8
src/components/RFID/RFID.styl
View File

@ -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 {

15
src/components/RFID/RFID.vue
View File

@ -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,
},
},

3
src/components/Sensor/Sensor.js
View File

@ -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',

81
src/mixins/socket.js
View File

@ -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;
}

Write Preview
Loading…
Cancel
Save