From 02f675c30c99d1e7c5d58ddfc5522851565e3fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Tue, 14 Nov 2023 17:15:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesC/addHeartRate/addHeartRate.vue |  6 ++++--
 pagesC/addPressure/addPressure.vue   | 15 ++++++++++-----
 pagesC/addsugar/addsugar.vue         |  7 +++++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pagesC/addHeartRate/addHeartRate.vue b/pagesC/addHeartRate/addHeartRate.vue
index d7ec791..55cffde 100644
--- a/pagesC/addHeartRate/addHeartRate.vue
+++ b/pagesC/addHeartRate/addHeartRate.vue
@@ -114,7 +114,9 @@
 					uni.onSocketMessage(res => {
 						console.log("webScoket监听收到的信息", res);
 						this.uploadType = 2
-						this.hr = JSON.parse(res.data).pulse
+						let resdata = JSON.parse(res.data)
+						let message = JSON.parse(resdata.message)
+						this.hr = message.pulse
 						this.$forceUpdate()
 					})
 				} catch (e) {
@@ -303,4 +305,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesC/addPressure/addPressure.vue b/pagesC/addPressure/addPressure.vue
index 4eb2664..a370a74 100644
--- a/pagesC/addPressure/addPressure.vue
+++ b/pagesC/addPressure/addPressure.vue
@@ -77,10 +77,13 @@
 						if (e.deviceType == 1) {
 							this.SOCKETURL = `ws://112.6.122.71:8009/fd/webSocket/${e.sn}`
 							this.scoket();
+							// 德州的用：ws://112.6.122.71:8009/fd/webSocket/{sn}
+							// 东营的用：ws://218.58.213.15:8009/fd/webSocket/{sn}
 						}
 					})
 				}
 			})
+
 		},
 		methods: {
 			formatDate(timestamp) {
@@ -135,11 +138,13 @@
 						}
 					})
 					uni.onSocketMessage(res => {
-						console.log("webScoket监听收到的信息", res);
+						let resdata = JSON.parse(res.data)
+						let message = JSON.parse(resdata.message)
+						console.log("webScoket监听收到的信息", resdata, message);
 						this.uploadType = 2
-						this.dbp = JSON.parse(res.data).dbp
-						this.sbp = JSON.parse(res.data).sbp
-						this.hr = JSON.parse(res.data).pulse
+						this.dbp = message.dbp
+						this.sbp = message.sbp
+						this.hr = message.pulse
 						this.$forceUpdate()
 					})
 				} catch (e) {
@@ -325,4 +330,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesC/addsugar/addsugar.vue b/pagesC/addsugar/addsugar.vue
index 69fbd0e..8d23565 100644
--- a/pagesC/addsugar/addsugar.vue
+++ b/pagesC/addsugar/addsugar.vue
@@ -162,7 +162,10 @@
 					})
 					uni.onSocketMessage(res => {
 						this.uploadType = 2
-						this.number = JSON.parse(res.data).fbg
+						let resdata = JSON.parse(res.data)
+						let message = JSON.parse(resdata.message)
+						console.log("webScoket监听收到的信息", resdata, message);
+						this.number = message.fbg
 						this.$forceUpdate()
 					})
 				} catch (e) {
@@ -319,4 +322,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>