From d670b4d8b779d26ac7848c2f59d0a527c3f9cfad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 16 May 2024 12:53:58 +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

---
 pagesB/Healthindex/Healthindex.vue            | 56 +++++++++++++------
 .../threeHundredAndSixty.vue                  |  5 +-
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/pagesB/Healthindex/Healthindex.vue b/pagesB/Healthindex/Healthindex.vue
index 653bb2d..3bbf42c 100644
--- a/pagesB/Healthindex/Healthindex.vue
+++ b/pagesB/Healthindex/Healthindex.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="app">
+		<!-- <img src="../images/beijing.png" alt="" class="background-image" /> -->
 		<view class="health" v-if="healthdata">
 			<view class="health_top">
 				<image v-if="healthdata.hiEva < 650" :src="require('../images/red.png')" />
@@ -13,19 +14,19 @@
 			</view>
 			<view class="health_body">
 				<view class="healthitem">
-					血压（mmHg)：{{healthdata.physicalSign.bp.sbp?healthdata.physicalSign.bp.sbp:''}}/{{healthdata.physicalSign.bp.dbp?healthdata.physicalSign.bp.dbp:''}}
+					血压(mmHg)：{{healthdata.physicalSign.bp.sbp?healthdata.physicalSign.bp.sbp:''}}/{{healthdata.physicalSign.bp.dbp?healthdata.physicalSign.bp.dbp:''}}
 				</view>
 				<view class="healthitem">
-					空腹血糖（mmol/L)：{{healthdata.physicalSign.bg.bg?healthdata.physicalSign.bg.bg:''}}
+					空腹血糖(mmol/L)：{{healthdata.physicalSign.bg.bg?healthdata.physicalSign.bg.bg:''}}
 				</view>
 				<view class="healthitem">
-					血脂（TC/LDL-C)：{{healthdata.physicalSign.bf.tc?healthdata.physicalSign.bf.tc:''}}/{{healthdata.physicalSign.bf.ldlc?healthdata.physicalSign.bf.ldlc:''}}
+					血脂(TC/LDL-C)：{{healthdata.physicalSign.bf.tc?healthdata.physicalSign.bf.tc:''}}/{{healthdata.physicalSign.bf.ldlc?healthdata.physicalSign.bf.ldlc:''}}
 				</view>
 				<view class="healthitem">
-					体质指数（BMI)：{{healthdata.physicalSign.bmi.bmi?healthdata.physicalSign.bmi.bmi:''}}
+					体质指数(BMI)：{{healthdata.physicalSign.bmi.bmi?healthdata.physicalSign.bmi.bmi:''}}
 				</view>
 				<view class="healthitem">
-					腰围（cm）：{{healthdata.physicalSign.waist.waist?healthdata.physicalSign.waist.waist:''}}
+					腰围(cm)：{{healthdata.physicalSign.waist.waist?healthdata.physicalSign.waist.waist:''}}
 				</view>
 			</view>
 			<!-- 折线图 -->
@@ -43,18 +44,18 @@
 				<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true"
 					:chartData="bloodsugar" />
 			</view>
-			<view class="zx">
-				<view class="title">
-					体质指数变化趋势
-				</view>
-				<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true" :chartData="BMIdata" />
-			</view>
 			<view class="zx">
 				<view class="title">
 					血脂变化趋势
 				</view>
 				<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true" :chartData="datalist" />
 			</view>
+			<view class="zx">
+				<view class="title">
+					BMI变化趋势
+				</view>
+				<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true" :chartData="BMIdata" />
+			</view>
 		</view>
 	</view>
 </template>
@@ -74,9 +75,11 @@
 				cardNo: '',
 				healthdata: {},
 				line_opts: {
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+					color: ["#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
 						"#ea7ccc"
 					],
+					// fontColor: '#fff',
+					// background: 'rgba(0, 22, 58, 1)',
 					dataLabel: true,
 					enableScroll: true,
 					touchMoveLimit: 24,
@@ -85,16 +88,22 @@
 						lineHeight: 40,
 						disableGrid: true,
 						boundaryGap: "center",
-						fontSize: 10,
+						fontSize: 12,
 						type: 'grid',
 						gridType: 'dash',
+						color: '#fff',
 						itemCount: 3, //x轴单屏显示数据的数量，默认为5个
 						scrollShow: true, //新增是否显示滚动条，默认false
 						scrollAlign: 'left', //滚动条初始位置
+						// fontColor: '#fff',
+						// background: 'rgba(0, 22, 58, 1)',
 					},
 					yAxis: {
 						gridType: "dash",
-						dashLength: 2
+						dashLength: 2,
+						fontColor: '#fff',
+						fontSize: 14,
+						// background: 'rgba(0, 22, 58, 1)',
 					},
 					extra: {
 						line: {
@@ -213,10 +222,22 @@
 
 <style lang="scss">
 	.app {
-		height: 100%;
+		height: 100vh;
+		overflow: scroll;
 		// padding: 100rpx 40rpx;
 		text-align: center;
 		font-size: 36rpx;
+		// color: #fff;
+		padding: 0;
+
+		.background-image {
+			width: 100%;
+			height: 100vh;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: -1;
+		}
 
 		// 健康
 		.health {
@@ -264,8 +285,11 @@
 
 				.healthitem {
 					text-align: left;
-					padding: 0 0 40rpx 62rpx;
+					padding: 20rpx 0 20rpx 62rpx;
 					font-size: 29rpx;
+					color: #26A888;
+					margin: 10rpx auto;
+					background-color: RGBA(38, 168, 136, 0.1);
 				}
 			}
 
diff --git a/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue b/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
index 317f85c..3d6e1b7 100644
--- a/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
+++ b/pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
@@ -440,11 +440,12 @@
 		background-repeat: no-repeat;
 		text-align: center;
 		font-size: 36rpx;
-		padding-top: 0;
+		padding: 0;
 
 		.top {
-			width: 100%;
 			height: 100rpx;
+			width: 104%;
+			transform: translateX(-2%);
 
 			::v-deep .u-tabs {
 				width: 100%;