diff --git a/rest/project.http b/rest/project.http
index e3c6bac..1a820a5 100644
--- a/rest/project.http
+++ b/rest/project.http
@@ -1,7 +1,7 @@
# @tall = {{url}}/tall/v1.0
@tall = http://test.tall.wiki/gateway/tall/v1.0
-@bin = https://test.tall.wiki/gateway/wisdomcar/debug/record
@greenvalley = http://www.sxwikionline.com/gateway/greenvalley
+@record = https://test.tall.wiki/gateway/wisdomcar
@type = content-type: application/json;charset=utf-8
### login
@@ -58,15 +58,15 @@ Authorization: Bearer {{login.response.body.$.data.token}}
### 根据团队id查看研发团队相关信息
-POST {{bin}}
+POST {{record}}/debug/record
{{type}}
-Authorization: Bearer {{login.response.body.$.data.token}}
+# Authorization: Bearer {{login.response.body.$.data.token}}
{
- "param": {
- "carNumber":"001",
- "type":"1",
+ "param":{
+ "carNumber": "001",
+ "type": "1",
"value":"70000",
- "time":"1607937529000",
+ "time":"1607937529000"
}
}
diff --git a/src/App.vue b/src/App.vue
index a3a66ce..aa264f0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,9 +19,9 @@ export default {
computed: mapState('home', ['anyringToken']),
created() {
- const userId = '1338747522436435968';
- const params = { userId };
- this.getUserId(params);
+ // const userId = '1338747522436435968';
+ // const params = { userId };
+ // this.getUserId(params);
},
methods: mapActions('home', ['getUserId']),
diff --git a/src/components/LoadCells/LoadCells.vue b/src/components/LoadCells/LoadCells.vue
index cc7a415..c394212 100644
--- a/src/components/LoadCells/LoadCells.vue
+++ b/src/components/LoadCells/LoadCells.vue
@@ -8,63 +8,100 @@
>
{{ item.name }}
+
+ {{ item.number[a-1] ? item.number[a-1] : 0 }}
+
+
+
diff --git a/src/mixins/socket.js b/src/mixins/socket.js
index 537c569..64d95a1 100644
--- a/src/mixins/socket.js
+++ b/src/mixins/socket.js
@@ -19,6 +19,7 @@ const mixin = {
...mapMutations('messages', [
'messagesAdd',
'messagesAddWeight',
+ 'setStartMessages',
'messagesAddRfid',
'messagesAddWeighSensor1',
'messagesAddWeighSensor2',
@@ -55,30 +56,34 @@ const mixin = {
*/
handleMessagesData(item) {
const data = JSON.parse(item.data);
- console.log('data: ', 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);
+ this.messagesAddWeight(data.data.value);
break;
case 2: // RFID
this.messagesAddRfid(data.data);
break;
case 3: // 称重传感器一
- this.messagesAddWeighSensor1(data.data);
+ this.messagesAddWeighSensor1(data.data.value);
break;
case 4: // 称重传感器二
- this.messagesAddWeighSensor2(data.data);
+ this.messagesAddWeighSensor2(data.data.value);
break;
case 5: // 称重传感器三
- this.messagesAddWeighSensor3(data.data);
+ this.messagesAddWeighSensor3(data.data.value);
break;
case 6: // 称重传感器四
- this.messagesAddWeighSensor4(data.data);
+ this.messagesAddWeighSensor4(data.data.value);
break;
case 7: // 震动传感器
this.messagesAddVibrationSensor(data.data);
diff --git a/src/store/modules/messages/mutations.js b/src/store/modules/messages/mutations.js
index 2ba1ebe..e7edf41 100644
--- a/src/store/modules/messages/mutations.js
+++ b/src/store/modules/messages/mutations.js
@@ -104,6 +104,7 @@ const mutations = {
* @param {*} data
*/
messagesAddWeighSensor1(state, data) {
+ console.log('weighSensor1: ', data);
state.weighSensor1 = data;
},
@@ -169,5 +170,13 @@ const mutations = {
messagesAddMaintenanceDose(state, data) {
state.maintenanceDose = data;
},
+ /**
+ * 重新开始
+ * @param {*} state
+ * @param {*} data
+ */
+ setStartMessages(state, data) {
+ state.startMessages = data;
+ },
};
export default mutations;
diff --git a/src/store/modules/messages/state.js b/src/store/modules/messages/state.js
index 09c828e..edabc45 100644
--- a/src/store/modules/messages/state.js
+++ b/src/store/modules/messages/state.js
@@ -1,11 +1,12 @@
const state = {
+ startMessages: false, // 是否重新开始 true为开始
syncMessages: [], // 同步消息
weightMessage: 0, // 体重
rfidMessage: null, // RFID
- weighSensor1: null, // 称重传感器一
- weighSensor2: null, // 称重传感器二
- weighSensor3: null, // 称重传感器三
- weighSensor4: null, // 称重传感器四
+ weighSensor1: 0, // 称重传感器一
+ weighSensor2: 0, // 称重传感器二
+ weighSensor3: 0, // 称重传感器三
+ weighSensor4: 0, // 称重传感器四
vibrationSensor: null, // 震动传感器
thrombolyticDose: 0, // 溶栓剂量(总量)
bolusDose: 0, // 团注剂量