From 23d70e3f3a5e985bc93202462831429d1439146d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 20 Oct 2023 17:14:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Physicalexamination/Physicalexamination.scss | 6 +++--- pagesC/Physicalexamination/Physicalexamination.vue | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) 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..bd81073 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天未测量 + 您暂时未测量 From 7bfad8624efcdb9fd082fe757502954930640aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 23 Oct 2023 09:53:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/examinationapi/add.js | 34 ++++ pages.json | 19 +- pages/homepage/homepage.vue | 8 +- .../Physicalexamination.vue | 2 +- pagesC/addequipment/addequipment.vue | 79 ++++++--- pagesC/devicelist/devicelist.vue | 165 ++++++++++++++++++ 6 files changed, 272 insertions(+), 35 deletions(-) create mode 100644 pagesC/devicelist/devicelist.vue 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/pages.json b/pages.json index a2865ca..94b98d3 100644 --- a/pages.json +++ b/pages.json @@ -4,6 +4,12 @@ }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { + "path": "pages/homepage/homepage", + "style": { + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, { "path": "pages/myinformation/myinformation", "style": { "enablePullDownRefresh": false, @@ -17,14 +23,7 @@ "enablePullDownRefresh": false } }, - { - "path": "pages/homepage/homepage", - "style": { - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, { "path": "pages/startup/startup", "style": { "navigationStyle": "custom", @@ -599,6 +598,12 @@ "navigationBarTitleText": "记录心率", "enablePullDownRefresh": false } + }, { + "path": "devicelist/devicelist", + "style": { + "navigationBarTitleText": "设备列表", + "enablePullDownRefresh": false + } } ] }], diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index a366f0a..4b1fe7b 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -86,11 +86,8 @@ onShow() { uni.setStorageSync("region", 1) 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 @@ -98,9 +95,8 @@ this.checkSign = false } }) - }else{ - this.patientName='' - + } else { + this.patientName = '' } }, methods: { diff --git a/pagesC/Physicalexamination/Physicalexamination.vue b/pagesC/Physicalexamination/Physicalexamination.vue index bd81073..10592a7 100644 --- a/pagesC/Physicalexamination/Physicalexamination.vue +++ b/pagesC/Physicalexamination/Physicalexamination.vue @@ -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 From 89d5c69198514bcccf13000f2ba365e069cfe9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 23 Oct 2023 09:58:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/BMI/BMI.vue | 4 ++-- components/BloodFat/BloodFat.vue | 2 +- components/BloodOxygen/BloodOxygen.vue | 4 ++-- components/BloodPressure/BloodPressure.vue | 4 ++-- components/BloodSugar/BloodSugar.vue | 4 ++-- components/HeartRate/HeartRate.vue | 4 ++-- components/Temperature/Temperature.vue | 4 ++-- pages/myinformation/myinformation.vue | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) 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/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')