diff --git a/api/examinationapi/add.js b/api/examinationapi/add.js
index 5fb0768..ac068e9 100644
--- a/api/examinationapi/add.js
+++ b/api/examinationapi/add.js
@@ -93,3 +93,37 @@ export function recordlast(identity) {
}
})
}
+
+//设备列表
+export function bound(identity) {
+ return request({
+ url: `/fd/device/bound/${identity}`,
+ method: 'get',
+ header: {
+ Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+ }
+ })
+}
+//解绑
+export function unbind(data) {
+ return request({
+ url: `/fd/device/unbind`,
+ method: 'post',
+ data,
+ header: {
+ Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+ }
+ })
+}
+
+//添加设备
+export function binding(data) {
+ return request({
+ url: `/fd/device/binding`,
+ method: 'post',
+ data,
+ header: {
+ Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+ }
+ })
+}
\ No newline at end of file
diff --git a/components/BMI/BMI.vue b/components/BMI/BMI.vue
index 729b383..2292912 100644
--- a/components/BMI/BMI.vue
+++ b/components/BMI/BMI.vue
@@ -249,7 +249,7 @@
}
},
scoket() {
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
const that = this
uni.closeSocket()
this.socketOpen = false
@@ -302,7 +302,7 @@
// 心跳响应
reset() {
let that = this
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
clearInterval(that.timer);
that.timer = setInterval(() => {
uni.sendSocketMessage({
diff --git a/components/BloodFat/BloodFat.vue b/components/BloodFat/BloodFat.vue
index cbb8f7a..59430c7 100644
--- a/components/BloodFat/BloodFat.vue
+++ b/components/BloodFat/BloodFat.vue
@@ -221,7 +221,7 @@
}
},
scoket() {
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
const that = this
uni.closeSocket()
this.socketOpen = false
diff --git a/components/BloodOxygen/BloodOxygen.vue b/components/BloodOxygen/BloodOxygen.vue
index 2eca5e3..16d6e14 100644
--- a/components/BloodOxygen/BloodOxygen.vue
+++ b/components/BloodOxygen/BloodOxygen.vue
@@ -221,7 +221,7 @@
}
},
scoket() {
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
const that = this
uni.closeSocket()
this.socketOpen = false
@@ -274,7 +274,7 @@
// 心跳响应
reset() {
let that = this
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
clearInterval(that.timer);
that.timer = setInterval(() => {
uni.sendSocketMessage({
diff --git a/components/BloodPressure/BloodPressure.vue b/components/BloodPressure/BloodPressure.vue
index 045e4da..f7c3c67 100644
--- a/components/BloodPressure/BloodPressure.vue
+++ b/components/BloodPressure/BloodPressure.vue
@@ -241,7 +241,7 @@
}
},
scoket() {
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
const that = this
uni.closeSocket()
this.socketOpen = false
@@ -294,7 +294,7 @@
// 心跳响应
reset() {
let that = this
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
clearInterval(that.timer);
that.timer = setInterval(() => {
uni.sendSocketMessage({
diff --git a/components/BloodSugar/BloodSugar.vue b/components/BloodSugar/BloodSugar.vue
index e2bf93c..ef04598 100644
--- a/components/BloodSugar/BloodSugar.vue
+++ b/components/BloodSugar/BloodSugar.vue
@@ -234,7 +234,7 @@
}
},
scoket() {
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
const that = this
uni.closeSocket()
this.socketOpen = false
@@ -287,7 +287,7 @@
// 心跳响应
reset() {
let that = this
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
clearInterval(that.timer);
that.timer = setInterval(() => {
uni.sendSocketMessage({
diff --git a/components/HeartRate/HeartRate.vue b/components/HeartRate/HeartRate.vue
index 536f82a..6d15599 100644
--- a/components/HeartRate/HeartRate.vue
+++ b/components/HeartRate/HeartRate.vue
@@ -221,7 +221,7 @@
}
},
scoket() {
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
const that = this
uni.closeSocket()
this.socketOpen = false
@@ -274,7 +274,7 @@
// 心跳响应
reset() {
let that = this
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
clearInterval(that.timer);
that.timer = setInterval(() => {
uni.sendSocketMessage({
diff --git a/components/Temperature/Temperature.vue b/components/Temperature/Temperature.vue
index c1711b2..db688a5 100644
--- a/components/Temperature/Temperature.vue
+++ b/components/Temperature/Temperature.vue
@@ -221,7 +221,7 @@
}
},
scoket() {
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
const that = this
uni.closeSocket()
this.socketOpen = false
@@ -274,7 +274,7 @@
// 心跳响应
reset() {
let that = this
- var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+ var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
clearInterval(that.timer);
that.timer = setInterval(() => {
uni.sendSocketMessage({
diff --git a/pages.json b/pages.json
index 1efc208..d6eceda 100644
--- a/pages.json
+++ b/pages.json
@@ -32,7 +32,7 @@
}
},
-
+
{
"path": "pages/medicalservice/medicalservice",
"style": {
@@ -67,7 +67,7 @@
"enablePullDownRefresh": false
// "navigationBarBackgroundColor": "#ffffff"
}
-
+
}
],
"subPackages": [{
@@ -611,6 +611,12 @@
"navigationBarTitleText": "记录心率",
"enablePullDownRefresh": false
}
+ }, {
+ "path": "devicelist/devicelist",
+ "style": {
+ "navigationBarTitleText": "设备列表",
+ "enablePullDownRefresh": false
+ }
}
]
}],
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 600c2e4..fd5fdc1 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -14,7 +14,7 @@
请选择城市
-
+
@@ -93,9 +93,7 @@
}
},
onLoad() {
-
- // this.getAddress()
- this.login()
+ // this.login()
},
onShow() {
this.address = uni.getStorageSync('location')
@@ -111,7 +109,6 @@
this.userinfo = uni.getStorageSync('userinfo');
if (this.userinfo) {
this.patientName = this.userinfo.patientName
- console.log(this.patientName, '000')
checkSignApply(this.userinfo.cardNo).then(res => {
if (res.data.code != 0) {
this.checkSign = true
@@ -119,8 +116,8 @@
this.checkSign = false
}
})
- } else {
- this.patientName = ''
+ }else{
+ this.patientName=''
}
},
@@ -282,4 +279,4 @@
\ No newline at end of file
+
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index bfd11e9..1bfa172 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -435,7 +435,7 @@
// 切换家庭成员
homeshow() {
// this.getSetting()
- // this.listquery.bindingCity = uni.getStorageSync('userInfo').bindingCity
+ // this.listquery.bindingCity = uni.getStorageSync('userinfo').bindingCity
var patientCode = this.userinfo.patientCode
var openid = uni.getStorageSync('openid')
diff --git a/pagesC/Physicalexamination/Physicalexamination.scss b/pagesC/Physicalexamination/Physicalexamination.scss
index 28b269e..f922d13 100644
--- a/pagesC/Physicalexamination/Physicalexamination.scss
+++ b/pagesC/Physicalexamination/Physicalexamination.scss
@@ -1,8 +1,8 @@
.app {
- height: 100vh;
+ width:99.5%;
+ margin: 0 auto;
background-color: #F7F5F5;
- padding: 15rpx 0 0 0;
- overflow: scroll;
+ padding: 15rpx 0;
.top {
width: 95%;
diff --git a/pagesC/Physicalexamination/Physicalexamination.vue b/pagesC/Physicalexamination/Physicalexamination.vue
index aa634ff..10592a7 100644
--- a/pagesC/Physicalexamination/Physicalexamination.vue
+++ b/pagesC/Physicalexamination/Physicalexamination.vue
@@ -26,7 +26,7 @@
快来测量吧~
- 您30天未测量
+ 您暂时未测量
@@ -61,7 +61,7 @@
快来测量吧~
- 您30天未测量
+ 您暂时未测量
@@ -128,7 +128,7 @@
快来测量吧~
- 您30天未测量
+ 您暂时未测量
@@ -241,7 +241,7 @@
快来测量吧~
- 您30天未测量
+ 您暂时未测量
@@ -272,7 +272,7 @@
快来测量吧~
- 您30天未测量
+ 您暂时未测量
@@ -297,7 +297,7 @@
快来测量吧~
- 您30天未测量
+ 您暂时未测量
@@ -324,7 +324,7 @@
快来测量吧~
- 您30天未测量
+ 您暂时未测量
@@ -387,7 +387,7 @@
},
goaddequipment() {
uni.navigateTo({
- url: "/pagesC/addequipment/addequipment"
+ url: "/pagesC/devicelist/devicelist"
})
},
gohealthdata(index) {
diff --git a/pagesC/addequipment/addequipment.vue b/pagesC/addequipment/addequipment.vue
index 4da696d..ca82717 100644
--- a/pagesC/addequipment/addequipment.vue
+++ b/pagesC/addequipment/addequipment.vue
@@ -19,29 +19,37 @@
- 血压计
- 血糖仪
+ 血压计
+ 血糖仪
+ 动态血压仪
保存
+
+
+
\ No newline at end of file