From d2627a74aad97bbe42db982ae76665181e92de68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 21 Feb 2024 11:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E5=BE=81=E6=A3=80=E6=B5=8B=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/examinationapi/add.js | 11 ++++++
pages.json | 5 ++-
pagesC/BMI/BMI.vue | 17 +++++++-
pagesC/BloodFat/BloodFat.vue | 30 +++++++++++++-
pagesC/BloodOxygen/BloodOxygen.vue | 16 +++++++-
pagesC/BloodPressure/BloodPressure.vue | 18 +++++++--
pagesC/BloodSugar/BloodSugar.vue | 28 ++++++-------
pagesC/HeartRate/HeartRate.vue | 14 ++++++-
pagesC/Temperature/Temperature.vue | 14 ++++++-
pagesC/addHeartRate/addHeartRate.vue | 50 +++++++++++++++---------
pagesC/addPressure/addPressure.vue | 54 +++++++++++++++++---------
pagesC/addsugar/addsugar.vue | 51 +++++++++++++++---------
pagesC/healthdata/healthdata.vue | 19 ++++++++-
13 files changed, 242 insertions(+), 85 deletions(-)
diff --git a/api/examinationapi/add.js b/api/examinationapi/add.js
index ac068e9..2259cfa 100644
--- a/api/examinationapi/add.js
+++ b/api/examinationapi/add.js
@@ -126,4 +126,15 @@ export function binding(data) {
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
}
})
+}
+
+//获取血糖、血压、心率最后一次体征记录
+export function recordlastV2(identity) {
+ return request({
+ url: `/fd/ps/record/lastV2/${identity}`,
+ method: 'get',
+ header: {
+ Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+ }
+ })
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 42c7c19..954135a 100644
--- a/pages.json
+++ b/pages.json
@@ -44,7 +44,7 @@
"navigationBarTitleText": "注册",
"enablePullDownRefresh": false
}
- },{
+ }, {
"path": "login/login",
"style": {
"navigationBarTitleText": "登录",
@@ -574,7 +574,8 @@
"path": "healthdata/healthdata",
"style": {
"navigationBarTitleText": "体征检测",
- "enablePullDownRefresh": false
+ "onReachBottomDistance": 20, //距离底部多远时触发 单位为px
+ "enablePullDownRefresh": true //设置参数为true
}
}, {
diff --git a/pagesC/BMI/BMI.vue b/pagesC/BMI/BMI.vue
index fc25c86..2ff57fd 100644
--- a/pagesC/BMI/BMI.vue
+++ b/pagesC/BMI/BMI.vue
@@ -83,6 +83,20 @@
+
@@ -332,12 +346,13 @@
.app {
width: 96%;
margin: 0 auto;
- padding-bottom: 60rpx;
+ padding-bottom: 20rpx;
/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
.charts-box {
width: 100%;
background-color: #fff;
+ margin-bottom: 20rpx;
}
.bottomtexts {
diff --git a/pagesC/BloodFat/BloodFat.vue b/pagesC/BloodFat/BloodFat.vue
index 43c54f9..79dd8b4 100644
--- a/pagesC/BloodFat/BloodFat.vue
+++ b/pagesC/BloodFat/BloodFat.vue
@@ -52,8 +52,26 @@
注:全部视图主要展示全部血脂数值的趋势曲线 单位:mmol/L
+
+
+
@@ -304,13 +322,21 @@
.app {
width: 96%;
margin: 0 auto;
- padding-bottom: 60rpx;
+ padding-bottom: 20rpx;
+
+ /* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
+ .charts-box {
+ width: 100%;
+ background-color: #fff;
+ margin-bottom: 20rpx;
+ }
.bottomlist {
width: 100%;
background-color: #fff;
margin-top: 17rpx;
padding-bottom: 100rpx;
+
.text {
width: 90%;
margin: 20rpx auto 30rpx;
@@ -405,4 +431,4 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/pagesC/BloodOxygen/BloodOxygen.vue b/pagesC/BloodOxygen/BloodOxygen.vue
index 13d58a4..ed9ccd7 100644
--- a/pagesC/BloodOxygen/BloodOxygen.vue
+++ b/pagesC/BloodOxygen/BloodOxygen.vue
@@ -59,7 +59,18 @@
-
+
@@ -304,12 +315,13 @@
.app {
width: 96%;
margin: 0 auto;
- padding-bottom: 60rpx;
+ padding-bottom: 20rpx;
/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
.charts-box {
width: 100%;
background-color: #fff;
+ margin-bottom: 20rpx;
}
.bottomtexts {
diff --git a/pagesC/BloodPressure/BloodPressure.vue b/pagesC/BloodPressure/BloodPressure.vue
index 242325c..eb417ac 100644
--- a/pagesC/BloodPressure/BloodPressure.vue
+++ b/pagesC/BloodPressure/BloodPressure.vue
@@ -73,7 +73,18 @@
-
+
@@ -324,12 +335,13 @@
.app {
width: 96%;
margin: 0 auto;
- padding-bottom: 60rpx;
+ padding-bottom: 20rpx;
/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
.charts-box {
width: 100%;
background-color: #fff;
+ margin-bottom: 20rpx;
}
.bottomtexts {
@@ -442,4 +454,4 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/pagesC/BloodSugar/BloodSugar.vue b/pagesC/BloodSugar/BloodSugar.vue
index 2f5b793..f01a508 100644
--- a/pagesC/BloodSugar/BloodSugar.vue
+++ b/pagesC/BloodSugar/BloodSugar.vue
@@ -59,7 +59,18 @@
-
+
@@ -175,16 +186,6 @@
getServerData() {
if (this.echartData) {
setTimeout(() => {
- this.echartData.list.forEach(e => {
- e.bucket == '1' ? e.timename = '凌晨' : ''
- e.bucket == '2' ? e.timename = '早餐前' : ''
- e.bucket == '3' ? e.timename = '早晨后' : ''
- e.bucket == '4' ? e.timename = '午餐前' : ''
- e.bucket == '5' ? e.timename = '午餐后' : ''
- e.bucket == '6' ? e.timename = '晚餐前' : ''
- e.bucket == '7' ? e.timename = '晚餐后' : ''
- e.bucket == '8' ? e.timename = '睡前' : ''
- })
let res = {
categories: [],
series: [{
@@ -225,12 +226,13 @@
.app {
width: 96%;
margin: 0 auto;
- padding-bottom: 60rpx;
+ padding-bottom: 20rpx;
/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
.charts-box {
width: 100%;
background-color: #fff;
+ margin-bottom: 20rpx;
}
.bottomtexts {
@@ -343,4 +345,4 @@
}
}
}
-
+
\ No newline at end of file
diff --git a/pagesC/HeartRate/HeartRate.vue b/pagesC/HeartRate/HeartRate.vue
index b09b899..df2d2fa 100644
--- a/pagesC/HeartRate/HeartRate.vue
+++ b/pagesC/HeartRate/HeartRate.vue
@@ -59,7 +59,16 @@
-
+
@@ -304,12 +313,13 @@
.app {
width: 96%;
margin: 0 auto;
- padding-bottom: 60rpx;
+ padding-bottom: 20rpx;
/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
.charts-box {
width: 100%;
background-color: #fff;
+ margin-bottom: 20rpx;
}
.bottomtexts {
diff --git a/pagesC/Temperature/Temperature.vue b/pagesC/Temperature/Temperature.vue
index df47285..5eba5c0 100644
--- a/pagesC/Temperature/Temperature.vue
+++ b/pagesC/Temperature/Temperature.vue
@@ -59,7 +59,16 @@
-
+
@@ -304,12 +313,13 @@
.app {
width: 96%;
margin: 0 auto;
- padding-bottom: 60rpx;
+ padding-bottom: 20rpx;
/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
.charts-box {
width: 100%;
background-color: #fff;
+ margin-bottom: 20rpx;
}
.bottomtexts {
diff --git a/pagesC/addHeartRate/addHeartRate.vue b/pagesC/addHeartRate/addHeartRate.vue
index 671f201..6e54a25 100644
--- a/pagesC/addHeartRate/addHeartRate.vue
+++ b/pagesC/addHeartRate/addHeartRate.vue
@@ -19,18 +19,17 @@
-
+