From 4edee0728c955605769a5098e39d416fd1759e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 21 Feb 2024 17:05:58 +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/pagesC/healthdata/index.js         | 11 ++++
 pages.json                             |  2 +-
 pagesC/BMI/BMI.vue                     | 10 +++-
 pagesC/BloodFat/BloodFat.vue           | 10 +++-
 pagesC/BloodOxygen/BloodOxygen.vue     | 10 +++-
 pagesC/BloodPressure/BloodPressure.vue | 10 +++-
 pagesC/BloodSugar/BloodSugar.vue       | 10 +++-
 pagesC/HeartRate/HeartRate.vue         | 10 +++-
 pagesC/Temperature/Temperature.vue     | 10 +++-
 pagesC/healthdata/healthdata.vue       | 76 +++++++++++++++++++++++---
 10 files changed, 129 insertions(+), 30 deletions(-)

diff --git a/api/pagesC/healthdata/index.js b/api/pagesC/healthdata/index.js
index ba57abd..7209a6e 100644
--- a/api/pagesC/healthdata/index.js
+++ b/api/pagesC/healthdata/index.js
@@ -10,4 +10,15 @@ export function record(data) {
 			// region: uni.getStorageSync('region'),
 		}
 	})
+}
+// 分页查询体征检测记录列表
+export function getList(data) {
+	return request({
+		url: `/fd/ps/getList`,
+		method: 'get',
+		data,
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		}
+	})
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 954135a..8ad3cd0 100644
--- a/pages.json
+++ b/pages.json
@@ -574,7 +574,7 @@
 					"path": "healthdata/healthdata",
 					"style": {
 						"navigationBarTitleText": "体征检测",
-						"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
+						"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
 						"enablePullDownRefresh": true //设置参数为true
 					}
 
diff --git a/pagesC/BMI/BMI.vue b/pagesC/BMI/BMI.vue
index 2ff57fd..fcd0771 100644
--- a/pagesC/BMI/BMI.vue
+++ b/pagesC/BMI/BMI.vue
@@ -83,20 +83,20 @@
 		<view class="charts-box">
 			<qiun-data-charts type="pie" :opts="pie_opts" :chartData="datalisttwo" />
 		</view>
-		<!-- <uni-table border stripe emptyText="暂无更多数据">
+		<uni-table border stripe emptyText="暂无更多数据">
 			<uni-tr>
 				<uni-th align="center" width='150'>记录时间</uni-th>
 				<uni-th align="center" width='70'>身高</uni-th>
 				<uni-th align="center" width='70'>体重</uni-th>
 				<uni-th align="center" width='70'>BMI</uni-th>
 			</uni-tr>
-			<uni-tr v-for="item in echartData.list">
+			<uni-tr v-for="item in tablelist">
 				<uni-td width='150' align="center">{{item.measureTime}}</uni-td>
 				<uni-td width='70' align="center">{{item.height}}</uni-td>
 				<uni-td width='70' align="center">{{item.weight}}</uni-td>
 				<uni-td width='70' align="center">{{item.bmi}}</uni-td>
 			</uni-tr>
-		</uni-table> -->
+		</uni-table>
 	</view>
 </template>
 
@@ -110,6 +110,10 @@
 			echartData: {
 				type: Object,
 				require: true
+			},
+			tablelist: {
+				type: Object,
+				require: true
 			}
 		},
 		computed: {},
diff --git a/pagesC/BloodFat/BloodFat.vue b/pagesC/BloodFat/BloodFat.vue
index 79dd8b4..57b2e7d 100644
--- a/pagesC/BloodFat/BloodFat.vue
+++ b/pagesC/BloodFat/BloodFat.vue
@@ -56,7 +56,7 @@
 		<view class="charts-box">
 			<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true" :chartData="datalist" />
 		</view>
-		<!-- <uni-table border stripe emptyText="暂无更多数据">
+		<uni-table border stripe emptyText="暂无更多数据">
 			<uni-tr>
 				<uni-th align="center" width='70'>记录时间</uni-th>
 				<uni-th align="center" width='70'>血清总胆固醇</uni-th>
@@ -64,14 +64,14 @@
 				<uni-th align="center" width='70'>高密度脂蛋白胆固醇</uni-th>
 				<uni-th align="center" width='70'>低密度脂蛋白胆固醇</uni-th>
 			</uni-tr>
-			<uni-tr v-for="item in echartData.list">
+			<uni-tr v-for="item in tablelist">
 				<uni-td width='70' align="center">{{item.measureTime}}</uni-td>
 				<uni-td width='70' align="center">{{item.tc}}</uni-td>
 				<uni-td width='70' align="center">{{item.tg}}</uni-td>
 				<uni-td width='70' align="center">{{item.hdl}}</uni-td>
 				<uni-td width='70' align="center">{{item.ldl}}</uni-td>
 			</uni-tr>
-		</uni-table> -->
+		</uni-table>
 	</view>
 </template>
 
@@ -85,6 +85,10 @@
 			echartData: {
 				type: Object,
 				require: true
+			},
+			tablelist: {
+				type: Object,
+				require: true
 			}
 		},
 		computed: {},
diff --git a/pagesC/BloodOxygen/BloodOxygen.vue b/pagesC/BloodOxygen/BloodOxygen.vue
index ed9ccd7..11c93b2 100644
--- a/pagesC/BloodOxygen/BloodOxygen.vue
+++ b/pagesC/BloodOxygen/BloodOxygen.vue
@@ -59,18 +59,18 @@
 		<view class="charts-box">
 			<qiun-data-charts type="pie" :opts="pie_opts" :chartData="datalisttwo" />
 		</view>
-		<!-- <uni-table border stripe emptyText="暂无更多数据">
+		<uni-table border stripe emptyText="暂无更多数据">
 			<uni-tr>
 				<uni-th align="center" width='150'>记录时间</uni-th>
 				<uni-th align="center" width='100'>脉搏</uni-th>
 				<uni-th align="center" width='100'>血氧</uni-th>
 			</uni-tr>
-			<uni-tr v-for="item in echartData.list">
+			<uni-tr v-for="item in tablelist">
 				<uni-td width='150' align="center">{{item.measureTime}}</uni-td>
 				<uni-td width='100' align="center">{{item.pulse}}</uni-td>
 				<uni-td width='100' align="center">{{item.spo2}}</uni-td>
 			</uni-tr>
-		</uni-table> -->
+		</uni-table>
 	</view>
 </template>
 
@@ -84,6 +84,10 @@
 			echartData: {
 				type: Object,
 				require: true
+			},
+			tablelist: {
+				type: Object,
+				require: true
 			}
 		},
 		computed: {},
diff --git a/pagesC/BloodPressure/BloodPressure.vue b/pagesC/BloodPressure/BloodPressure.vue
index eb417ac..e23f638 100644
--- a/pagesC/BloodPressure/BloodPressure.vue
+++ b/pagesC/BloodPressure/BloodPressure.vue
@@ -73,18 +73,18 @@
 		<view class="charts-box">
 			<qiun-data-charts type="pie" :opts="pie_opts" :chartData="datalisttwo" />
 		</view>
-		<!-- <uni-table border stripe emptyText="暂无更多数据">
+		<uni-table border stripe emptyText="暂无更多数据">
 			<uni-tr>
 				<uni-th align="center" width='150'>记录时间</uni-th>
 				<uni-th align="center" width='70'>收缩压</uni-th>
 				<uni-th align="center" width='70'>舒张压</uni-th>
 			</uni-tr>
-			<uni-tr v-for="item in echartData.list">
+			<uni-tr v-for="item in tablelist">
 				<uni-td align="center" width='150'>{{item.measureTime}}</uni-td>
 				<uni-td align="center" width='70'>{{item.sbp}}</uni-td>
 				<uni-td align="center" width='70'>{{item.dbp}}</uni-td>
 			</uni-tr>
-		</uni-table> -->
+		</uni-table>
 	</view>
 </template>
 
@@ -98,6 +98,10 @@
 			echartData: {
 				type: Object,
 				require: true
+			},
+			tablelist: {
+				type: Object,
+				require: true
 			}
 		},
 		computed: {},
diff --git a/pagesC/BloodSugar/BloodSugar.vue b/pagesC/BloodSugar/BloodSugar.vue
index f01a508..d7bcba8 100644
--- a/pagesC/BloodSugar/BloodSugar.vue
+++ b/pagesC/BloodSugar/BloodSugar.vue
@@ -59,18 +59,18 @@
 		<view class="charts-box">
 			<qiun-data-charts type="pie" :opts="pie_opts" :chartData="datalisttwo" />
 		</view>
-		<!-- <uni-table border stripe emptyText="暂无更多数据">
+		<uni-table border stripe emptyText="暂无更多数据">
 			<uni-tr>
 				<uni-th align="center" width='140'>记录时间</uni-th>
 				<uni-th align="center" width='90'>测量场景</uni-th>
 				<uni-th align="center" width='90'>血糖值</uni-th>
 			</uni-tr>
-			<uni-tr v-for="item in echartData.list">
+			<uni-tr v-for="item in tablelist">
 				<uni-td width='140' align="center">{{item.measureTime}}</uni-td>
 				<uni-td width='90' align="center">{{item.timename}}</uni-td>
 				<uni-td width='90' align="center">{{item.bg}}</uni-td>
 			</uni-tr>
-		</uni-table> -->
+		</uni-table>
 	</view>
 </template>
 
@@ -84,6 +84,10 @@
 			echartData: {
 				type: Object,
 				require: true
+			},
+			tablelist: {
+				type: Object,
+				require: true
 			}
 		},
 		computed: {},
diff --git a/pagesC/HeartRate/HeartRate.vue b/pagesC/HeartRate/HeartRate.vue
index df2d2fa..c31697f 100644
--- a/pagesC/HeartRate/HeartRate.vue
+++ b/pagesC/HeartRate/HeartRate.vue
@@ -59,16 +59,16 @@
 		<view class="charts-box">
 			<qiun-data-charts type="pie" :opts="pie_opts" :chartData="datalisttwo" />
 		</view>
-		<!-- <uni-table border stripe emptyText="暂无更多数据">
+		<uni-table border stripe emptyText="暂无更多数据">
 			<uni-tr>
 				<uni-th align="center" width='150'>记录时间</uni-th>
 				<uni-th align="center" width='150'>心率</uni-th>
 			</uni-tr>
-			<uni-tr v-for="item in echartData.list">
+			<uni-tr v-for="item in tablelist">
 				<uni-td width='150' align="center">{{item.measureTime}}</uni-td>
 				<uni-td width='150' align="center">{{item.hr}}</uni-td>
 			</uni-tr>
-		</uni-table> -->
+		</uni-table>
 	</view>
 </template>
 
@@ -82,6 +82,10 @@
 			echartData: {
 				type: Object,
 				require: true
+			},
+			tablelist: {
+				type: Object,
+				require: true
 			}
 		},
 		computed: {},
diff --git a/pagesC/Temperature/Temperature.vue b/pagesC/Temperature/Temperature.vue
index 5eba5c0..3fd23fb 100644
--- a/pagesC/Temperature/Temperature.vue
+++ b/pagesC/Temperature/Temperature.vue
@@ -59,16 +59,16 @@
 		<view class="charts-box">
 			<qiun-data-charts type="pie" :opts="pie_opts" :chartData="datalisttwo" />
 		</view>
-		<!-- <uni-table border stripe emptyText="暂无更多数据">
+		<uni-table border stripe emptyText="暂无更多数据">
 			<uni-tr>
 				<uni-th align="center" width='150'>记录时间</uni-th>
 				<uni-th align="center" width='150'>体温</uni-th>
 			</uni-tr>
-			<uni-tr v-for="item in echartData.list">
+			<uni-tr v-for="item in tablelist">
 				<uni-td width='150' align="center">{{item.measureTime}}</uni-td>
 				<uni-td width='150' align="center">{{item.temp}}</uni-td>
 			</uni-tr>
-		</uni-table> -->
+		</uni-table>
 	</view>
 </template>
 
@@ -82,6 +82,10 @@
 			echartData: {
 				type: Object,
 				require: true
+			},
+			tablelist: {
+				type: Object,
+				require: true
 			}
 		},
 		computed: {},
diff --git a/pagesC/healthdata/healthdata.vue b/pagesC/healthdata/healthdata.vue
index ea9e28c..5e120ee 100644
--- a/pagesC/healthdata/healthdata.vue
+++ b/pagesC/healthdata/healthdata.vue
@@ -4,31 +4,31 @@
 			:show-bar='false'></u-tabs>
 		<view class="content">
 			<view v-if="tabindex == 0">
-				<blood-sugar :current="tabindex" :echartData="list" @taptimeindex='taptimeindex'
+				<blood-sugar :current="tabindex" :echartData="list" @taptimeindex='taptimeindex' :tablelist='tablelist'
 					v-on:websocket-message="handleWebSocketMessage"></blood-sugar>
 			</view>
 			<view v-if="tabindex == 1">
 				<blood-pressure :current="tabindex" :echartData="list" @taptimeindex='taptimeindex'
-					v-on:websocket-message="handleWebSocketMessage"></blood-pressure>
+					:tablelist='tablelist' v-on:websocket-message="handleWebSocketMessage"></blood-pressure>
 			</view>
 			<view v-if="tabindex == 2">
-				<BloodFat :current="tabindex" :echartData="list" @taptimeindex='taptimeindex'
+				<BloodFat :current="tabindex" :echartData="list" @taptimeindex='taptimeindex' :tablelist='tablelist'
 					v-on:websocket-message="handleWebSocketMessage"></BloodFat>
 			</view>
 			<view v-if="tabindex == 3">
-				<BMI :current="tabindex" :echartData="list" @taptimeindex='taptimeindex'
+				<BMI :current="tabindex" :echartData="list" @taptimeindex='taptimeindex' :tablelist='tablelist'
 					v-on:websocket-message="handleWebSocketMessage"></BMI>
 			</view>
 			<view v-if="tabindex == 4">
-				<Blood-oxygen :current="tabindex" :echartData="list" @taptimeindex='taptimeindex'
+				<Blood-oxygen :current="tabindex" :echartData="list" @taptimeindex='taptimeindex' :tablelist='tablelist'
 					v-on:websocket-message="handleWebSocketMessage"></Blood-oxygen>
 			</view>
 			<view v-if="tabindex == 5">
-				<Heart-rate :current="tabindex" :echartData="list" @taptimeindex='taptimeindex'
+				<Heart-rate :current="tabindex" :echartData="list" @taptimeindex='taptimeindex' :tablelist='tablelist'
 					v-on:websocket-message="handleWebSocketMessage"></Heart-rate>
 			</view>
 			<view v-if="tabindex == 6">
-				<Temperature :current="tabindex" :echartData="list" @taptimeindex='taptimeindex'
+				<Temperature :current="tabindex" :echartData="list" @taptimeindex='taptimeindex' :tablelist='tablelist'
 					v-on:websocket-message="handleWebSocketMessage"></Temperature>
 			</view>
 		</view>
@@ -37,7 +37,8 @@
 
 <script>
 	import {
-		record
+		record,
+		getList
 	} from '@/api/pagesC/healthdata/index.js'
 	import BloodPressure from '../BloodPressure/BloodPressure.vue'
 	import BloodSugar from '../BloodSugar/BloodSugar.vue'
@@ -76,6 +77,9 @@
 				}, ],
 				list: null,
 				type: 0,
+				tabletotal: 0,
+				tablelist: [],
+				pageNum: 1,
 			};
 		},
 		onLoad(options) {
@@ -83,11 +87,13 @@
 		},
 		onShow() {
 			this.info();
+			this.getinfo();
 		},
 		methods: {
 			taptimeindex(e) {
 				this.type = e
 				this.info()
+				this.getinfo();
 			},
 			info() {
 				let userinfo = uni.getStorageSync('userinfo');
@@ -110,17 +116,71 @@
 					})
 				})
 			},
+			getinfo() {
+				this.tablelist = []
+				this.tabletotal = 0
+				this.pageNum = 1
+				let userinfo = uni.getStorageSync('userinfo');
+				var obj = {
+					label: Number(this.tabindex) + 1,
+					identity: userinfo.cardNo,
+					type: this.type,
+					pageNum: this.pageNum,
+					pageSize: 15,
+				}
+				getList(obj).then(res => {
+					this.tablelist = res.data.list.list
+					this.tabletotal = res.data.list.total
+					this.tablelist.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 = '睡前' : ''
+					})
+				})
+			},
 			tabchange(e) {
 				this.list = null
 				this.tabindex = e
 				setTimeout(() => {
 					this.info();
+					this.getinfo();
 				}, 1000)
 			},
 		},
 		onReachBottom() { //下滑加载
+			if (this.tablelist.length >= this.tabletotal) {} else {
+				this.pageNum++;
+				let userinfo = uni.getStorageSync('userinfo');
+				var obj = {
+					label: Number(this.tabindex) + 1,
+					identity: userinfo.cardNo,
+					type: this.type,
+					pageNum: this.pageNum,
+					pageSize: 15,
+				}
+				getList(obj).then(res => {
+					res.data.list.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 = '睡前' : ''
+						this.tablelist.push(e)
+					})
+					this.tabletotal = res.data.list.total
+				})
+			}
 		},
 		onPullDownRefresh() { //下拉刷新
+			this.getinfo();
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);