diff --git a/src/components/Panel/Panel.vue b/src/components/Panel/Panel.vue index 0f819a6..b610abe 100644 --- a/src/components/Panel/Panel.vue +++ b/src/components/Panel/Panel.vue @@ -28,20 +28,9 @@ - +
-
{{ item }}
+
{{ item }}
diff --git a/src/components/Sensor/Sensor.js b/src/components/Sensor/Sensor.js index dca2a7f..6a6cae2 100644 --- a/src/components/Sensor/Sensor.js +++ b/src/components/Sensor/Sensor.js @@ -2,9 +2,12 @@ import { mapState } from 'vuex'; const mixin = { data() { return { - 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 + // 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 + series1: [], // 传感器1 + series2: [], // 传感器2 + series3: [], // 传感器3 }; }, computed: { diff --git a/src/mixins/socket.js b/src/mixins/socket.js index 3f1cb10..12783a0 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -62,10 +62,11 @@ const mixin = { this.handleAuthMessage(data); break; case 'CarRecord': // 平车 - if (!data.data.type) return; + // if (!data.data.type) return; switch (data.data.type) { case 0: // 开始 // 收到开始消息 + console.log('0'); this.setStartMessages(true); break; case 1: // 体重 diff --git a/src/views/BtnPage/BtnPage.vue b/src/views/BtnPage/BtnPage.vue index 4a7dd15..e0605f0 100644 --- a/src/views/BtnPage/BtnPage.vue +++ b/src/views/BtnPage/BtnPage.vue @@ -19,71 +19,63 @@ export default { nameList: [ { name: '分诊区', - value: '01', + value: '18', + }, + { + name: '急救护士', + value: '1', }, { name: '急救医生', - value: '0B', + value: '1', }, { name: '采血车', - value: '0C', + value: '3', }, { name: 'CT室', - value: '03', + value: '4', }, { name: '介入室', - value: '05', + value: '8', }, { name: '平车停放点', + value: '19', + }, + { + name: '卒中中心', value: '20', }, { - name: '卒中中心门口', + name: '急救大楼门', value: '21', }, { - name: '急救大楼门', + name: '抢救室', value: '22', }, { - name: '抢救室门', + name: '走廊', value: '23', }, { - name: '走廊', + name: '心电图室', value: '24', }, - { - name: '心电图室门口', - value: '25', - }, { name: '专用电梯口(一楼)', - value: '26', + value: '25', }, { name: '专用电梯口(四楼)', - value: '27', + value: '26', }, { name: 'CCU导管室门口', - value: '28', - }, - { - name: '急救护士', - value: '30', - }, - { - name: '专科医生', - value: '31', - }, - { - name: '专科护士', - value: '32', + value: '27', }, ], }; @@ -97,7 +89,7 @@ export default { params = { param: { authId: '1', - type: '1', + type: '0', value: '80000', time: new Date().getTime(), },