From f1bef9915146708023016430233ddece93b45e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 19 Oct 2023 15:49:55 +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

---
 api/examinationapi/add.js                     |  37 ++
 api/pagesC/healthdata/index.js                |  13 +
 components/BloodPressure/BloodPressure.vue    | 445 ++++++++++++++++++
 components/BloodSugar/BloodSugar.vue          | 438 +++++++++++++++++
 .../Bloodtemperature/Bloodtemperature.vue     | 425 +++++++++++++++++
 pages.json                                    |  40 +-
 pages/homepage/homepage.vue                   |  23 +-
 .../Physicalexamination.vue                   |  94 ++--
 pagesC/addPressure/addPressure.vue            | 229 +++++++++
 pagesC/addTemperature/addTemperature.vue      | 206 ++++++++
 pagesC/addequipment/addequipment.vue          | 162 +++++++
 pagesC/addsugar/addsugar.vue                  | 228 +++++++++
 pagesC/healthdata/healthdata.vue              |  99 ++++
 static/pageC/BindDevice.png                   | Bin 0 -> 1705 bytes
 static/pageC/ScanAdd.png                      | Bin 0 -> 1058 bytes
 15 files changed, 2382 insertions(+), 57 deletions(-)
 create mode 100644 api/examinationapi/add.js
 create mode 100644 api/pagesC/healthdata/index.js
 create mode 100644 components/BloodPressure/BloodPressure.vue
 create mode 100644 components/BloodSugar/BloodSugar.vue
 create mode 100644 components/Bloodtemperature/Bloodtemperature.vue
 create mode 100644 pagesC/addPressure/addPressure.vue
 create mode 100644 pagesC/addTemperature/addTemperature.vue
 create mode 100644 pagesC/addequipment/addequipment.vue
 create mode 100644 pagesC/addsugar/addsugar.vue
 create mode 100644 pagesC/healthdata/healthdata.vue
 create mode 100644 static/pageC/BindDevice.png
 create mode 100644 static/pageC/ScanAdd.png

diff --git a/api/examinationapi/add.js b/api/examinationapi/add.js
new file mode 100644
index 0000000..2f1eccf
--- /dev/null
+++ b/api/examinationapi/add.js
@@ -0,0 +1,37 @@
+import request from "../request.js"
+
+//上传血糖
+export function savebg(data) {
+	return request({
+		url: `/fd/ps/bg/save`,
+		method: 'post',
+		data,
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		}
+	})
+}
+
+//上传血压
+export function savebp(data) {
+	return request({
+		url: `/fd/ps/bp/save`,
+		method: 'post',
+		data,
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		}
+	})
+}
+
+//上传体温
+export function savetemp(data) {
+	return request({
+		url: `/fd/ps/temp/save`,
+		method: 'post',
+		data,
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		}
+	})
+}
\ No newline at end of file
diff --git a/api/pagesC/healthdata/index.js b/api/pagesC/healthdata/index.js
new file mode 100644
index 0000000..ba57abd
--- /dev/null
+++ b/api/pagesC/healthdata/index.js
@@ -0,0 +1,13 @@
+import request from "@/api/request.js"
+
+//获取体征记录
+export function record(data) {
+	return request({
+		url: `/fd/ps/record`,
+		data,
+		method: 'get',
+		header: {
+			// region: uni.getStorageSync('region'),
+		}
+	})
+}
\ No newline at end of file
diff --git a/components/BloodPressure/BloodPressure.vue b/components/BloodPressure/BloodPressure.vue
new file mode 100644
index 0000000..a5f6fc0
--- /dev/null
+++ b/components/BloodPressure/BloodPressure.vue
@@ -0,0 +1,445 @@
+<template>
+	<view class="app" v-if="current == 1">
+		<view class="titletexts">
+			<view class="title">
+				— 正常范围 —
+			</view>
+			<view class="add" @click="addPressure">
+				＋ 添加数据
+			</view>
+			<view class="texts">
+				<view class="text">
+					<view class="p">
+						收缩压
+					</view>
+					<view class="ptwo">
+						90-140mmHg
+					</view>
+				</view>
+				<view class="text">
+					<view class="p">
+						舒张压
+					</view>
+					<view class="ptwo">
+						60-90mmHg
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bottomlist">
+			<view class="timelist">
+				<view class="item" v-for="(item,index) in timelist" :class="timeindex == index?'timeitem':''"
+					@tap='taptimeindex(index)'>
+					{{item.name}}
+				</view>
+			</view>
+			<view class="text">
+				注:全部视图主要展示全部血压数值的趋势曲线 单位:mmHg
+			</view>
+			<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true" :chartData="datalist" />
+		</view>
+		<view class="bottomtexts">
+			<view class="lefttext">
+				<view class="pone">
+					平均值
+				</view>
+				<view class="ptwo">
+					{{echartData.calc.avgVal?echartData.calc.avgVal:'暂无'}}
+				</view>
+			</view>
+			<view class="lefttext">
+				<view class="pone">
+					最大
+				</view>
+				<view class="ptwo">
+					<view class="">
+						{{echartData.calc.maxDbpVal?echartData.calc.maxDbpVal:'暂无'}}
+					</view>
+					{{echartData.calc.maxSbpVal?echartData.calc.maxSbpVal:'暂无'}}
+				</view>
+			</view>
+			<view class="righttext">
+				<view class="pone">
+					最小
+				</view>
+				<view class="ptwo">
+					<view class="">
+						{{echartData.calc.minDbpVal?echartData.calc.minDbpVal:'暂无'}}
+					</view>
+					{{echartData.calc.minSbpVal?echartData.calc.minSbpVal:'暂无'}}
+				</view>
+			</view>
+		</view>
+		<view class="charts-box">
+			<qiun-data-charts type="pie" :opts="pie_opts" :chartData="datalisttwo" />
+		</view>
+		<!-- <qiun-data-charts type="pie" :opts="opts" :chartData="chartData" /> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			current: {
+				type: Number,
+				require: true
+			},
+			echartData: {
+				type: Object,
+				require: true
+			}
+		},
+		computed: {},
+		data() {
+			return {
+				timelist: [{
+						name: '全部',
+						id: 0
+					},
+					{
+						name: '周',
+						id: 1
+					}, {
+						name: '月',
+						id: 2
+					}, {
+						name: '年',
+						id: 3
+					},
+				],
+				timeindex: 0,
+				socketOpen: false,
+				timer: null,
+				datalist: null,
+				datalisttwo: null,
+				pie_opts: {
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+						"#ea7ccc"
+					],
+					padding: [5, 5, 5, 5],
+					enableScroll: false,
+					extra: {
+						pie: {
+							activeOpacity: 0.5,
+							activeRadius: 10,
+							offsetAngle: 0,
+							labelWidth: 15,
+							border: false,
+							borderWidth: 3,
+							borderColor: "#FFFFFF"
+						},
+					},
+				},
+				line_opts: {
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+						"#ea7ccc"
+					],
+					dataLabel: false,
+					enableScroll: true,
+					touchMoveLimit: 24,
+					padding: [15, 10, 0, 15],
+					xAxis: {
+						lineHeight: 40,
+						disableGrid: true,
+						boundaryGap: "center",
+						fontSize: 12,
+						type: 'grid',
+						gridType: 'dash',
+						itemCount: 4, //x轴单屏显示数据的数量，默认为5个
+						scrollShow: true, //新增是否显示滚动条，默认false
+						scrollAlign: 'left', //滚动条初始位置
+					},
+					yAxis: {
+						gridType: "dash",
+						dashLength: 2
+					},
+					extra: {
+						line: {
+							type: "straight",
+							width: 2,
+							activeType: "hollow"
+						}
+					}
+				},
+			}
+		},
+		created() {},
+		mounted() {
+			// if (this.current == 1) {
+			// 	this.scoket()
+			// }
+			this.getServerData()
+		},
+		destroyed() {
+			clearInterval(this.timer);
+			if (this.socketOpen == true) {
+				uni.closeSocket();
+			}
+		},
+		watch: {
+			echartData: {
+				handler() {
+					this.getServerData()
+				},
+				deep: true
+			},
+			current(newValue, oldValue) {
+				if (newValue != 1) {
+					clearInterval(this.timer);
+					if (this.socketOpen == true) {
+						uni.closeSocket();
+					}
+				} else {
+					setTimeout(() => {
+						this.scoket()
+					}, 800)
+				}
+			}
+		},
+		methods: {
+			taptimeindex(index) {
+				this.timeindex = index
+				this.$emit('taptimeindex', index);
+			},
+			addPressure() {
+				uni.navigateTo({
+					url: "/pagesC/addPressure/addPressure"
+				})
+			},
+			getServerData() {
+				if (this.echartData) {
+					setTimeout(() => {
+						let res = {
+							categories: [],
+							series: [{
+									name: "舒张压",
+									data: []
+								},
+								{
+									name: "收缩压",
+									data: []
+								}
+							]
+						};
+						res.series[0].data = this.echartData.list.map(e => e.dbp)
+						res.series[1].data = this.echartData.list.map(e => e.sbp)
+						res.categories = this.echartData.list.map(e => e.measureTime)
+						this.datalist = res
+						let restwo = {
+							series: [{
+								data: [{
+									"name": "正常" + this.echartData.calc.normalNum + "次",
+									"value": this.echartData.calc.normalNum
+								}, {
+									"name": "超标" + this.echartData.calc.overNum + "次",
+									"value": this.echartData.calc.overNum
+								}]
+							}]
+						};
+						this.datalisttwo = restwo
+					}, 500)
+				}
+			},
+			scoket() {
+				var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+				const that = this
+				uni.closeSocket()
+				this.socketOpen = false
+				try {
+					uni.connectSocket({
+						url: SOCKETURL
+					})
+					uni.onSocketOpen(res => {
+						console.log('webScoket连接已打开', res);
+						that.socketOpen = true
+						that.reset()
+					})
+
+					uni.onSocketError(err => {
+						console.log('webScoket连接打开失败', err);
+						if (err && err.code != 1000) {
+							setTimeout(() => {
+								that.socketOpen = true
+								uni.connectSocket({
+									url: SOCKETURL
+								})
+							}, 3 * 1000)
+						}
+					})
+
+					uni.onSocketClose(err => {
+						console.log('webScoket连接关闭', err);
+						if (err && err.code !== 1000) {
+							setTimeout(() => {
+								that.socketOpen = true
+								uni.connectSocket({
+									url: SOCKETURL
+								})
+							}, 3 * 1000)
+						}
+					})
+					uni.onSocketMessage(res => {
+						console.log("webScoket监听收到的信息", res);
+						// that.newsList.push({
+						// 	senderName: that.currentItem.senderName,
+						// 	content: JSON.parse(res.data).message
+						// })
+						this.$emit('websocket-message');
+						this.$forceUpdate()
+					})
+				} catch (e) {
+					console.log(e);
+				}
+			},
+			// 心跳响应
+			reset() {
+				let that = this
+				var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+				clearInterval(that.timer);
+				that.timer = setInterval(() => {
+					uni.sendSocketMessage({
+						data: 'ping',
+						success(res) {
+							console.log('正在发送心跳');
+						},
+						fail(err) {
+							console.log('心跳发送失败，重新连接...');
+							_socketOpen = true
+							uni.connectSocket({
+								url: SOCKETURL
+							})
+						}
+					})
+				}, 60000)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F7F5F5;
+	}
+
+	.app {
+		width: 96%;
+		margin: 0 auto;
+		padding-bottom: 60rpx;
+
+		/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
+		.charts-box {
+			width: 100%;
+			background-color: #fff;
+		}
+
+		.bottomtexts {
+			width: 100%;
+			display: flex;
+			background-color: #fff;
+			padding: 20rpx 0 40rpx;
+
+			.lefttext,
+			.righttext {
+				width: 50%;
+				text-align: center;
+			}
+		}
+
+		.bottomlist {
+			width: 100%;
+			background-color: #fff;
+			margin-top: 17rpx;
+
+			.text {
+				width: 90%;
+				margin: 20rpx auto 30rpx;
+				font-size: 18rpx;
+				font-weight: 400;
+				color: #595959;
+			}
+
+			.timelist {
+				width: 90%;
+				margin: 0 auto;
+				display: flex;
+				padding-top: 25rpx;
+
+				.item {
+					width: 25%;
+					height: 56rpx;
+					border-radius: 5rpx 0rpx 0rpx 5rpx;
+					text-align: center;
+					line-height: 56rpx;
+					background: #FFFFFF;
+					border: 2rpx solid #26A888;
+					border-radius: 0rpx 5rpx 5rpx 0rpx;
+					color: #26A888;
+				}
+
+				.timeitem {
+					background: #26A888;
+					color: #fff;
+				}
+			}
+		}
+
+
+		.titletexts {
+			width: 100%;
+			height: 250rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 5rpx;
+			position: relative;
+
+			.texts {
+				width: 100%;
+				display: flex;
+				position: absolute;
+				top: 130rpx;
+
+				.text {
+					width: 50%;
+
+					.p {
+						text-align: center;
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #000000;
+					}
+
+					.ptwo {
+						font-size: 30rpx;
+						font-weight: 500;
+						color: #26A888;
+						text-align: center;
+						margin-top: 20rpx;
+					}
+				}
+			}
+
+			.add {
+				width: 205rpx;
+				height: 64rpx;
+				background: #26A888;
+				border-radius: 32rpx 0rpx 0rpx 32rpx;
+				line-height: 64rpx;
+				text-align: center;
+				position: absolute;
+				right: 0%;
+				color: #fff;
+				top: 25rpx;
+			}
+
+			.title {
+				text-align: center;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #26A888;
+				width: 100%;
+				position: absolute;
+				top: 46rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/BloodSugar/BloodSugar.vue b/components/BloodSugar/BloodSugar.vue
new file mode 100644
index 0000000..59946de
--- /dev/null
+++ b/components/BloodSugar/BloodSugar.vue
@@ -0,0 +1,438 @@
+<template>
+	<view class="app" v-if="current==0">
+		<view class="titletexts">
+			<view class="title">
+				— 正常范围 —
+			</view>
+			<view class="add" @click="addSuger">
+				＋ 添加数据
+			</view>
+			<view class="texts">
+				<view class="text">
+					<view class="p">
+						餐前血糖
+					</view>
+					<view class="ptwo">
+						4.4-7.0mmol/L
+					</view>
+				</view>
+				<view class="text">
+					<view class="p">
+						餐后/凌晨/睡前/随机
+					</view>
+					<view class="ptwo">
+						4.4-10.0mmol/L
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bottomlist">
+			<view class="timelist">
+				<view class="item" v-for="(item,index) in timelist" :class="timeindex == index?'timeitem':''"
+					@tap='taptimeindex(index)'>
+					{{item.name}}
+				</view>
+			</view>
+			<view class="text">
+				注：全部视图主要展示全部血糖数值的趋势曲线 单位:mmol/L
+			</view>
+			<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true" :chartData="datalist" />
+		</view>
+		<view class="bottomtexts">
+			<view class="lefttext">
+				<view class="pone">
+					最大
+				</view>
+				<view class="ptwo">
+					{{echartData.calc.maxVal?echartData.calc.maxVal:'暂无'}}
+				</view>
+			</view>
+			<view class="righttext">
+				<view class="pone">
+					最小
+				</view>
+				<view class="ptwo">
+					{{echartData.calc.minVal?echartData.calc.minVal:'暂无'}}
+				</view>
+			</view>
+		</view>
+		<view class="charts-box">
+			<qiun-data-charts type="pie" :opts="pie_opts" :chartData="datalisttwo" />
+		</view>
+		<!-- <qiun-data-charts type="pie" :opts="opts" :chartData="chartData" /> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			current: {
+				type: Number,
+				require: true
+			},
+			echartData: {
+				type: Object,
+				require: true
+			}
+		},
+		computed: {},
+		data() {
+			return {
+				timelist: [{
+						name: '全部',
+						id: 0
+					},
+					{
+						name: '周',
+						id: 1
+					}, {
+						name: '月',
+						id: 2
+					}, {
+						name: '年',
+						id: 3
+					},
+				],
+				timeindex: 0,
+				socketOpen: false,
+				timer: null,
+				datalist: null,
+				datalisttwo: null,
+				pie_opts: {
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+						"#ea7ccc"
+					],
+					padding: [5, 5, 5, 5],
+					enableScroll: false,
+					extra: {
+						pie: {
+							activeOpacity: 0.5,
+							activeRadius: 10,
+							offsetAngle: 0,
+							labelWidth: 15,
+							border: false,
+							borderWidth: 3,
+							borderColor: "#FFFFFF"
+						},
+					},
+				},
+				line_opts: {
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+						"#ea7ccc"
+					],
+					dataLabel: false,
+					enableScroll: true,
+					touchMoveLimit: 24,
+					padding: [15, 10, 0, 15],
+					xAxis: {
+						lineHeight: 40,
+						disableGrid: true,
+						boundaryGap: "center",
+						fontSize: 12,
+						type: 'grid',
+						gridType: 'dash',
+						itemCount: 4, //x轴单屏显示数据的数量，默认为5个
+						scrollShow: true, //新增是否显示滚动条，默认false
+						scrollAlign: 'left', //滚动条初始位置
+					},
+					yAxis: {
+						gridType: "dash",
+						dashLength: 2
+					},
+					extra: {
+						line: {
+							type: "straight",
+							width: 2,
+							activeType: "hollow"
+						}
+					}
+				},
+			}
+		},
+		created() {},
+		mounted() {
+			// if (this.current == 0) {
+			// 	this.scoket()
+			// }
+			this.getServerData()
+		},
+		destroyed() {
+			clearInterval(this.timer);
+			if (this.socketOpen == true) {
+				uni.closeSocket();
+			}
+		},
+		watch: {
+			echartData: {
+				handler() {
+					this.getServerData()
+				},
+				deep: true
+			},
+			current(newValue, oldValue) {
+				if (newValue != 0) {
+					clearInterval(this.timer);
+					if (this.socketOpen == true) {
+						uni.closeSocket();
+					}
+				} else {
+					setTimeout(() => {
+						this.scoket()
+					}, 800)
+				}
+			}
+		},
+		methods: {
+			taptimeindex(index) {
+				this.timeindex = index
+				this.$emit('taptimeindex', index);
+			},
+			addSuger() {
+				uni.navigateTo({
+					url: "/pagesC/addsugar/addsugar"
+				})
+			},
+			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: [{
+								name: "血糖值",
+								data: []
+							}]
+						}
+						res.series[0].data = this.echartData.list.map(e => e.bg)
+						res.categories = this.echartData.list.map(e => e.timename + e.measureTime)
+						this.datalist = res
+						let restwo = {
+							series: [{
+								data: [{
+									"name": "偏低" + this.echartData.calc.lowerNum + "次",
+									"value": this.echartData.calc.lowerNum
+								}, {
+									"name": "正常" + this.echartData.calc.normalNum + "次",
+									"value": this.echartData.calc.normalNum
+								}, {
+									"name": "偏高" + this.echartData.calc.higherNum + "次",
+									"value": this.echartData.calc.higherNum
+								}]
+							}]
+						};
+						this.datalisttwo = restwo
+					}, 500)
+				}
+			},
+			scoket() {
+				var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+				const that = this
+				uni.closeSocket()
+				this.socketOpen = false
+				try {
+					uni.connectSocket({
+						url: SOCKETURL
+					})
+					uni.onSocketOpen(res => {
+						console.log('webScoket连接已打开', res);
+						that.socketOpen = true
+						that.reset()
+					})
+
+					uni.onSocketError(err => {
+						console.log('webScoket连接打开失败', err);
+						if (err && err.code != 1000) {
+							setTimeout(() => {
+								that.socketOpen = true
+								uni.connectSocket({
+									url: SOCKETURL
+								})
+							}, 3 * 1000)
+						}
+					})
+
+					uni.onSocketClose(err => {
+						console.log('webScoket连接关闭', err);
+						if (err && err.code !== 1000) {
+							setTimeout(() => {
+								that.socketOpen = true
+								uni.connectSocket({
+									url: SOCKETURL
+								})
+							}, 3 * 1000)
+						}
+					})
+					uni.onSocketMessage(res => {
+						console.log("webScoket监听收到的信息", res);
+						// that.newsList.push({
+						// 	senderName: that.currentItem.senderName,
+						// 	content: JSON.parse(res.data).message
+						// })
+						this.$emit('websocket-message');
+						this.$forceUpdate()
+					})
+				} catch (e) {
+					console.log(e);
+				}
+			},
+			// 心跳响应
+			reset() {
+				let that = this
+				var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+				clearInterval(that.timer);
+				that.timer = setInterval(() => {
+					uni.sendSocketMessage({
+						data: 'ping',
+						success(res) {
+							console.log('正在发送心跳');
+						},
+						fail(err) {
+							console.log('心跳发送失败，重新连接...');
+							_socketOpen = true
+							uni.connectSocket({
+								url: SOCKETURL
+							})
+						}
+					})
+				}, 60000)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F7F5F5;
+	}
+
+	.app {
+		width: 96%;
+		margin: 0 auto;
+		padding-bottom: 60rpx;
+
+		/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
+		.charts-box {
+			width: 100%;
+			background-color: #fff;
+		}
+
+		.bottomtexts {
+			width: 100%;
+			display: flex;
+			background-color: #fff;
+			padding: 20rpx 0 40rpx;
+
+			.lefttext,
+			.righttext {
+				width: 50%;
+				text-align: center;
+			}
+		}
+
+		.bottomlist {
+			width: 100%;
+			background-color: #fff;
+			margin-top: 17rpx;
+
+			.text {
+				width: 90%;
+				margin: 20rpx auto 30rpx;
+				font-size: 18rpx;
+				font-weight: 400;
+				color: #595959;
+			}
+
+			.timelist {
+				width: 90%;
+				margin: 0 auto;
+				display: flex;
+				padding-top: 25rpx;
+
+				.item {
+					width: 25%;
+					height: 56rpx;
+					border-radius: 5rpx 0rpx 0rpx 5rpx;
+					text-align: center;
+					line-height: 56rpx;
+					background: #FFFFFF;
+					border: 2rpx solid #26A888;
+					border-radius: 0rpx 5rpx 5rpx 0rpx;
+					color: #26A888;
+				}
+
+				.timeitem {
+					background: #26A888;
+					color: #fff;
+				}
+			}
+		}
+
+
+		.titletexts {
+			width: 100%;
+			height: 250rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 5rpx;
+			position: relative;
+
+			.texts {
+				width: 100%;
+				display: flex;
+				position: absolute;
+				top: 130rpx;
+
+				.text {
+					width: 50%;
+
+					.p {
+						text-align: center;
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #000000;
+					}
+
+					.ptwo {
+						font-size: 30rpx;
+						font-weight: 500;
+						color: #26A888;
+						text-align: center;
+						margin-top: 20rpx;
+					}
+				}
+			}
+
+			.add {
+				width: 205rpx;
+				height: 64rpx;
+				background: #26A888;
+				border-radius: 32rpx 0rpx 0rpx 32rpx;
+				line-height: 64rpx;
+				text-align: center;
+				position: absolute;
+				right: 0%;
+				color: #fff;
+				top: 25rpx;
+			}
+
+			.title {
+				text-align: center;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #26A888;
+				width: 100%;
+				position: absolute;
+				top: 46rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/Bloodtemperature/Bloodtemperature.vue b/components/Bloodtemperature/Bloodtemperature.vue
new file mode 100644
index 0000000..455120b
--- /dev/null
+++ b/components/Bloodtemperature/Bloodtemperature.vue
@@ -0,0 +1,425 @@
+<template>
+	<view class="app" v-if="current == 6">
+		<view class="titletexts">
+			<view class="title">
+				— 正常范围 —
+			</view>
+			<view class="add" @click="addTemperature">
+				＋ 添加数据
+			</view>
+			<view class="texts">
+				<view class="text">
+					<view class="p">
+						体温
+					</view>
+					<view class="ptwo">
+						36—37摄氏度
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bottomlist">
+			<view class="timelist">
+				<view class="item" v-for="(item,index) in timelist" :class="timeindex == index?'timeitem':''"
+					@tap='taptimeindex(index)'>
+					{{item.name}}
+				</view>
+			</view>
+			<view class="text">
+				注：全部视图主要展示全部体温数值的趋势曲线
+			</view>
+			<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true" :chartData="datalist" />
+		</view>
+		<view class="bottomtexts">
+			<view class="lefttext">
+				<view class="pone">
+					平均值
+				</view>
+				<view class="ptwo">
+					{{echartData.calc.avgVal?echartData.calc.avgVal:'暂无'}}
+				</view>
+			</view>
+			<view class="lefttext">
+				<view class="pone">
+					最大
+				</view>
+				<view class="ptwo">
+					{{echartData.calc.maxVal?echartData.calc.maxVal:'暂无'}}
+				</view>
+			</view>
+			<view class="righttext">
+				<view class="pone">
+					最小
+				</view>
+				<view class="ptwo">
+					{{echartData.calc.minVal?echartData.calc.minVal:'暂无'}}
+				</view>
+			</view>
+		</view>
+		<view class="charts-box">
+			<qiun-data-charts type="pie" :opts="pie_opts" :chartData="datalisttwo" />
+		</view>
+		<!-- <qiun-data-charts type="pie" :opts="opts" :chartData="chartData" /> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			current: {
+				type: Number,
+				require: true
+			},
+			echartData: {
+				type: Object,
+				require: true
+			}
+		},
+		computed: {},
+		data() {
+			return {
+				timelist: [{
+						name: '全部',
+						id: 0
+					},
+					{
+						name: '周',
+						id: 1
+					}, {
+						name: '月',
+						id: 2
+					}, {
+						name: '年',
+						id: 3
+					},
+				],
+				timeindex: 0,
+				socketOpen: false,
+				timer: null,
+				datalist: null,
+				datalisttwo: null,
+				pie_opts: {
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+						"#ea7ccc"
+					],
+					padding: [5, 5, 5, 5],
+					enableScroll: false,
+					extra: {
+						pie: {
+							activeOpacity: 0.5,
+							activeRadius: 10,
+							offsetAngle: 0,
+							labelWidth: 15,
+							border: false,
+							borderWidth: 3,
+							borderColor: "#FFFFFF"
+						},
+					},
+				},
+				line_opts: {
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
+						"#ea7ccc"
+					],
+					dataLabel: false,
+					enableScroll: true,
+					touchMoveLimit: 24,
+					padding: [15, 10, 0, 15],
+					xAxis: {
+						lineHeight: 40,
+						disableGrid: true,
+						boundaryGap: "center",
+						fontSize: 12,
+						type: 'grid',
+						gridType: 'dash',
+						itemCount: 4, //x轴单屏显示数据的数量，默认为5个
+						scrollShow: true, //新增是否显示滚动条，默认false
+						scrollAlign: 'left', //滚动条初始位置
+					},
+					yAxis: {
+						gridType: "dash",
+						dashLength: 2
+					},
+					extra: {
+						line: {
+							type: "straight",
+							width: 2,
+							activeType: "hollow"
+						}
+					}
+				},
+			}
+		},
+		created() {},
+		mounted() {
+			// if (this.current == 6) {
+			// 	this.scoket()
+			// }
+			this.getServerData()
+		},
+		destroyed() {
+			clearInterval(this.timer);
+			if (this.socketOpen == true) {
+				uni.closeSocket();
+			}
+		},
+		watch: {
+			echartData: {
+				handler() {
+					this.getServerData()
+				},
+				deep: true
+			},
+			current(newValue, oldValue) {
+				if (newValue != 6) {
+					clearInterval(this.timer);
+					if (this.socketOpen == true) {
+						uni.closeSocket();
+					}
+				} else {
+					setTimeout(() => {
+						this.scoket()
+					}, 800)
+				}
+			}
+		},
+		methods: {
+			taptimeindex(index) {
+				this.timeindex = index
+				this.$emit('taptimeindex', index);
+			},
+			addTemperature() {
+				uni.navigateTo({
+					url: "/pagesC/addTemperature/addTemperature"
+				})
+			},
+			getServerData() {
+				if (this.echartData) {
+					setTimeout(() => {
+						let res = {
+							categories: [],
+							series: [{
+								name: "体温",
+								data: []
+							}]
+						};
+						res.series[0].data = this.echartData.list.map(e => e.temp)
+						res.categories = this.echartData.list.map(e => e.measureTime)
+						this.datalist = res
+						let restwo = {
+							series: [{
+								data: [{
+									"name": "正常" + this.echartData.calc.normalNum + "次",
+									"value": this.echartData.calc.normalNum
+								}, {
+									"name": "超标" + this.echartData.calc.overNum + "次",
+									"value": this.echartData.calc.overNum
+								}]
+							}]
+						};
+						this.datalisttwo = restwo
+					}, 500)
+				}
+			},
+			scoket() {
+				var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+				const that = this
+				uni.closeSocket()
+				this.socketOpen = false
+				try {
+					uni.connectSocket({
+						url: SOCKETURL
+					})
+					uni.onSocketOpen(res => {
+						console.log('webScoket连接已打开', res);
+						that.socketOpen = true
+						that.reset()
+					})
+
+					uni.onSocketError(err => {
+						console.log('webScoket连接打开失败', err);
+						if (err && err.code != 1000) {
+							setTimeout(() => {
+								that.socketOpen = true
+								uni.connectSocket({
+									url: SOCKETURL
+								})
+							}, 3 * 1000)
+						}
+					})
+
+					uni.onSocketClose(err => {
+						console.log('webScoket连接关闭', err);
+						if (err && err.code !== 1000) {
+							setTimeout(() => {
+								that.socketOpen = true
+								uni.connectSocket({
+									url: SOCKETURL
+								})
+							}, 3 * 1000)
+						}
+					})
+					uni.onSocketMessage(res => {
+						console.log("webScoket监听收到的信息", res);
+						// that.newsList.push({
+						// 	senderName: that.currentItem.senderName,
+						// 	content: JSON.parse(res.data).message
+						// })
+						this.$emit('websocket-message');
+						this.$forceUpdate()
+					})
+				} catch (e) {
+					console.log(e);
+				}
+			},
+			// 心跳响应
+			reset() {
+				let that = this
+				var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userInfo').cardNo
+				clearInterval(that.timer);
+				that.timer = setInterval(() => {
+					uni.sendSocketMessage({
+						data: 'ping',
+						success(res) {
+							console.log('正在发送心跳');
+						},
+						fail(err) {
+							console.log('心跳发送失败，重新连接...');
+							_socketOpen = true
+							uni.connectSocket({
+								url: SOCKETURL
+							})
+						}
+					})
+				}, 60000)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F7F5F5;
+	}
+
+	.app {
+		width: 96%;
+		margin: 0 auto;
+		padding-bottom: 60rpx;
+
+		/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
+		.charts-box {
+			width: 100%;
+			background-color: #fff;
+		}
+
+		.bottomtexts {
+			width: 100%;
+			display: flex;
+			background-color: #fff;
+			padding: 20rpx 0 40rpx;
+
+			.lefttext,
+			.righttext {
+				width: 50%;
+				text-align: center;
+			}
+		}
+
+		.bottomlist {
+			width: 100%;
+			background-color: #fff;
+			margin-top: 17rpx;
+
+			.text {
+				width: 90%;
+				margin: 20rpx auto 30rpx;
+				font-size: 18rpx;
+				font-weight: 400;
+				color: #595959;
+			}
+
+			.timelist {
+				width: 90%;
+				margin: 0 auto;
+				display: flex;
+				padding-top: 25rpx;
+
+				.item {
+					width: 25%;
+					height: 56rpx;
+					border-radius: 5rpx 0rpx 0rpx 5rpx;
+					text-align: center;
+					line-height: 56rpx;
+					background: #FFFFFF;
+					border: 2rpx solid #26A888;
+					border-radius: 0rpx 5rpx 5rpx 0rpx;
+					color: #26A888;
+				}
+
+				.timeitem {
+					background: #26A888;
+					color: #fff;
+				}
+			}
+		}
+
+
+		.titletexts {
+			width: 100%;
+			height: 250rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 5rpx;
+			position: relative;
+
+			.texts {
+				width: 100%;
+				display: flex;
+				position: absolute;
+				top: 130rpx;
+
+				.text {
+					width: 100%;
+
+					.p {
+						text-align: center;
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #000000;
+					}
+
+					.ptwo {
+						font-size: 30rpx;
+						font-weight: 500;
+						color: #26A888;
+						text-align: center;
+						margin-top: 20rpx;
+					}
+				}
+			}
+
+			.add {
+				width: 205rpx;
+				height: 64rpx;
+				background: #26A888;
+				border-radius: 32rpx 0rpx 0rpx 32rpx;
+				line-height: 64rpx;
+				text-align: center;
+				position: absolute;
+				right: 0%;
+				color: #fff;
+				top: 25rpx;
+			}
+
+			.title {
+				text-align: center;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #26A888;
+				width: 100%;
+				position: absolute;
+				top: 46rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3abd619..af91147 100644
--- a/pages.json
+++ b/pages.json
@@ -32,6 +32,12 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
+		}, {
+			"path": "pages/startup/startup",
+			"style": {
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
 		},
 		{
 			"path": "pages/medicalservice/medicalservice",
@@ -532,6 +538,38 @@
 					"navigationBarTitleText": "签约协议",
 					"enablePullDownRefresh": false
 				}
+			}, {
+				"path": "addequipment/addequipment",
+				"style": {
+					"navigationBarTitleText": "设备绑定",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "healthdata/healthdata",
+				"style": {
+					"navigationBarTitleText": "体征检测",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "addsugar/addsugar",
+				"style": {
+					"navigationBarTitleText": "记录血糖",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "addPressure/addPressure",
+				"style": {
+					"navigationBarTitleText": "记录血压",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "addTemperature/addTemperature",
+				"style": {
+					"navigationBarTitleText": "记录体温",
+					"enablePullDownRefresh": false
+				}
 			}
 			// {
 			// 	"path": "contractsigningprotocol/contractsigningprotocol",
@@ -581,4 +619,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index bcb5034..a366f0a 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -86,8 +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')
@@ -100,7 +100,7 @@
 				})
 			}else{
 				this.patientName=''
-				
+
 			}
 		},
 		methods: {
@@ -191,13 +191,16 @@
 			},
 			// 体征检测
 			sign() {
-				if (!this.userinfo) {
-					this.gologin();
-				} else {
-					uni.navigateTo({
-						url: "/pagesC/Physicalexamination/Physicalexamination"
-					})
-				}
+				uni.navigateTo({
+					url: "/pagesC/Physicalexamination/Physicalexamination"
+				})
+				// if (!this.userinfo) {
+				// 	this.gologin();
+				// } else {
+				// 	uni.navigateTo({
+				// 		url: "/pagesC/Physicalexamination/Physicalexamination"
+				// 	})
+				// }
 			},
 			// 服务预约
 			goappoint() {
diff --git a/pagesC/Physicalexamination/Physicalexamination.vue b/pagesC/Physicalexamination/Physicalexamination.vue
index a18f978..5d6844a 100644
--- a/pagesC/Physicalexamination/Physicalexamination.vue
+++ b/pagesC/Physicalexamination/Physicalexamination.vue
@@ -7,7 +7,6 @@
 				<view class="itemdata">
 					绑定设备，关注健康
 				</view>
-
 			</view>
 			<view class="device">
 				<image src="../../static/pageC/report.png" mode=""></image>
@@ -18,7 +17,7 @@
 			</view>
 		</view>
 		<view class="body">
-			<view class="item">
+			<view class="item" @tap='gohealthdata(0)'>
 				<view class="itemtitle">
 					血糖
 				</view>
@@ -30,7 +29,7 @@
 				</view>
 				<image src="../../static/pageC/sugar.png" mode=""></image>
 			</view>
-			<view class="item">
+			<view class="item" @tap='gohealthdata(1)'>
 				<view class="itemtitle">
 					血压
 				</view>
@@ -41,45 +40,8 @@
 					快来测量吧~
 				</view>
 				<image src="../../static/pageC/bloodpressure.png" mode=""></image>
-
 			</view>
-			<view class="item">
-				<view class="itemtitle">
-					体温
-				</view>
-				<view class="itemtext">
-					您30天未测量
-				</view>
-				<view class="itemtext two">
-					快来测量吧~
-				</view>
-				<image src="../../static/pageC/temperature.png" mode=""></image>
-			</view>
-			<view class="item">
-				<view class="itemtitle">
-					BMI
-				</view>
-				<view class="itemtext">
-					您30天未测量
-				</view>
-				<view class="itemtext two">
-					快来测量吧~
-				</view>
-				<image src="../../static/pageC/dkw.png" mode=""></image>
-			</view>
-			<view class="item">
-				<view class="itemtitle">
-					心率
-				</view>
-				<view class="itemtext">
-					您30天未测量
-				</view>
-				<view class="itemtext two">
-					快来测量吧~
-				</view>
-				<image src="../../static/pageC/heartrate.png" mode=""></image>
-			</view>
-			<view class="item">
+			<view class="item" @tap='gohealthdata(2)'>
 				<view class="itemtitle">
 					血脂
 				</view>
@@ -91,7 +53,19 @@
 				</view>
 				<image src="../../static/pageC/bloodfat.png" mode=""></image>
 			</view>
-			<view class="item">
+			<view class="item" @tap='gohealthdata(3)'>
+				<view class="itemtitle">
+					BMI
+				</view>
+				<view class="itemtext">
+					您30天未测量
+				</view>
+				<view class="itemtext two">
+					快来测量吧~
+				</view>
+				<image src="../../static/pageC/dkw.png" mode=""></image>
+			</view>
+			<view class="item" @tap='gohealthdata(4)'>
 				<view class="itemtitle">
 					血氧
 				</view>
@@ -103,13 +77,37 @@
 				</view>
 				<image src="../../static/pageC/oxygen.png" mode=""></image>
 			</view>
+			<view class="item" @tap='gohealthdata(5)'>
+				<view class="itemtitle">
+					心率
+				</view>
+				<view class="itemtext">
+					您30天未测量
+				</view>
+				<view class="itemtext two">
+					快来测量吧~
+				</view>
+				<image src="../../static/pageC/heartrate.png" mode=""></image>
+			</view>
+			<view class="item" @tap='gohealthdata(6)'>
+				<view class="itemtitle">
+					体温
+				</view>
+				<view class="itemtext">
+					您30天未测量
+				</view>
+				<view class="itemtext two">
+					快来测量吧~
+				</view>
+				<image src="../../static/pageC/temperature.png" mode=""></image>
+			</view>
+
+
 
 
 		</view>
-
 	</view>
 </template>
-
 <script>
 	export default {
 		data() {
@@ -118,11 +116,15 @@
 			}
 		},
 		methods: {
-
+			gohealthdata(index) {
+				uni.navigateTo({
+					url: `/pagesC/healthdata/healthdata?index=${index}`
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="scss">
 	@import './Physicalexamination.scss';
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesC/addPressure/addPressure.vue b/pagesC/addPressure/addPressure.vue
new file mode 100644
index 0000000..88bf613
--- /dev/null
+++ b/pagesC/addPressure/addPressure.vue
@@ -0,0 +1,229 @@
+<template>
+	<view class="app">
+		<view class="uptext">
+			<view class="pressureg">
+				舒张压
+			</view>
+			<input placeholder="请输入数值" border="bottom" v-model="dbp" fontSize='50rpx' inputAlign='center'></input>
+			<view class="text">
+				mmHg
+			</view>
+		</view>
+		<view class="uptext">
+			<view class="pressured">
+				收缩压
+			</view>
+			<input placeholder="请输入数值" border="bottom" v-model="sbp" fontSize='50rpx' inputAlign='center'></input>
+			<view class="text">
+				mmHg
+			</view>
+		</view>
+		<view class="uptext">
+			<view class="heart">
+				心率
+			</view>
+			<input placeholder="请输入心率值" border="bottom" v-model="hr" fontSize='50rpx' inputAlign='center'></input>
+			<view class="text">
+				次/分钟
+			</view>
+		</view>
+		<view class="time">
+			<view style="display: flex;align-items: center;">
+				<text style="margin-left: 50rpx">记录时间：</text>
+				<view style="display: flex;margin: 0 auto; color: #999;">
+					<uni-datetime-picker v-model="measureTime" @change="timeconfirm">{{measureTime}}
+						<image style="margin-right: 40rpx;" src="../../static/huijiantou.png" mode="widthFix" />
+					</uni-datetime-picker>
+					</uni-datetime-picker>
+				</view>
+			</view>
+		</view>
+		<view class="submit" @tap="submit">
+			保存
+		</view>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		savebp
+	} from '@/api/examinationapi/add.js'
+	export default {
+		data() {
+			return {
+				dbp: '',
+				sbp: '',
+				hr: '',
+				timetext: this.formatDate(Date.now()),
+				measureTime: this.formatDate(Date.now()),
+			};
+		},
+		methods: {
+			formatDate(timestamp) {
+				const now = new Date(parseInt(timestamp))
+				const year = now.getFullYear();
+				const month = now.getMonth() + 1;
+				const date = now.getDate();
+				const hour = now.getHours();
+				const minute = now.getMinutes();
+				const second = now.getSeconds();
+				return year + "-" + ((month < 10) ? '0' + month : month) + "-" + ((date < 10) ? '0' + date : date) + " " +
+					((hour < 10) ? '0' + hour : hour) + ":" + ((minute < 10) ? '0' + minute : minute) + ":" + ((second <
+						10) ? '0' + second : second);
+			},
+			timeconfirm(time) {
+				this.timetext = time
+			},
+			submit() {
+				if (this.ruls(this.dbp) && this.ruls(this.sbp) && this.ruls(this.hr)) {
+					let data = {
+						dbp: this.dbp,
+						sbp: this.sbp,
+						hr: this.hr,
+						// identity: uni.getStorageSync('userinfo').cardNo
+						identity: '370882199909092123',
+						measureTime: this.timetext,
+						uploadType: 1,
+					}
+					savebp(data).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								title: '保存成功',
+								type: 'success',
+							})
+							setTimeout(() => {
+								uni.navigateBack({
+									delta: 1
+								})
+							}, 1000)
+						}
+					})
+				} else {
+					this.$refs.uToast.show({
+						title: '各项格式为正整数，请重新输入',
+						type: 'error',
+					})
+				}
+			},
+			ruls(num) {
+				let reg = /^((?!0)\d{1,9})$/;
+				if (!num.match(reg)) {
+					return false
+				} else {
+					return true
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.app {
+		.submit {
+			width: 60%;
+			height: 98rpx;
+			margin: 60rpx auto;
+			background-color: #55d0df;
+			border-radius: 10rpx;
+			border: solid 0rpx #0c0c0c;
+			color: #ffffff;
+			text-align: center;
+			line-height: 98rpx;
+		}
+
+		.time {
+			margin-top: 100rpx;
+			position: relative;
+			border-bottom: 1rpx solid #f0f1f6;
+			height: 80rpx;
+			line-height: 65rpx;
+
+			image {
+				width: 20rpx;
+				height: 20rpx;
+				position: absolute;
+				right: 10rpx;
+				top: 20%;
+			}
+
+			// text:nth-child(1) {
+			// 	margin-left: 50rpx;
+			// }
+
+			text:nth-child(2) {
+				float: right;
+				margin-right: 100rpx;
+				color: #999999;
+				font-size: 28rpx;
+			}
+
+		}
+
+		.uptext:nth-child(2) {
+			margin-top: 80rpx;
+		}
+
+		.uptext:nth-child(1) {
+			margin-top: 40rpx;
+		}
+
+		.uptext {
+			width: 100%;
+			height: 300rpx;
+			position: relative;
+			border-bottom: 1rpx solid #f0f1f6;
+
+			.pressured {
+				margin-left: 20rpx;
+				font-size: 32rpx;
+				line-height: 34rpx;
+				letter-spacing: 2rpx;
+				color: #d34141;
+			}
+
+			.pressureg {
+				margin-left: 20rpx;
+				font-size: 32rpx;
+				line-height: 34rpx;
+				letter-spacing: 2rpx;
+				color: #41d36d;
+			}
+
+			.heart {
+				margin-left: 20rpx;
+				font-size: 32rpx;
+				line-height: 34rpx;
+				letter-spacing: 2rpx;
+				color: #00aaff;
+			}
+
+			.text {
+				position: absolute;
+				top: 75%;
+				width: 20%;
+				text-align: center;
+				left: 40%;
+				font-size: 30rpx;
+				line-height: 34rpx;
+				letter-spacing: 1rpx;
+				color: #999999;
+			}
+
+			/deep/ input {
+				text-align: center;
+				font-size: 40rpx;
+				border-bottom: 2rpx solid #f0f1f6;
+				position: absolute;
+				width: 40%;
+				height: 10%;
+				top: 50%;
+				left: 30%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesC/addTemperature/addTemperature.vue b/pagesC/addTemperature/addTemperature.vue
new file mode 100644
index 0000000..a94685a
--- /dev/null
+++ b/pagesC/addTemperature/addTemperature.vue
@@ -0,0 +1,206 @@
+<template>
+	<view class="app">
+		<view class="uptext">
+			<view class="pressureg">
+				体温
+			</view>
+			<input placeholder="请输入数值" border="bottom" v-model="temp" fontSize='50rpx' inputAlign='center'></input>
+			<view class="text">
+				℃
+			</view>
+		</view>
+		<view class="time">
+			<view style="display: flex;align-items: center;">
+				<text style="margin-left: 50rpx">记录时间：</text>
+				<view style="display: flex;margin: 0 auto; color: #999;">
+					<uni-datetime-picker v-model="measureTime" @change="timeconfirm">{{measureTime}}
+						<image style="margin-right: 40rpx;" src="../../static/huijiantou.png" mode="widthFix" />
+					</uni-datetime-picker>
+					</uni-datetime-picker>
+				</view>
+			</view>
+		</view>
+		<view class="submit" @tap="submit">
+			保存
+		</view>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		savetemp
+	} from '@/api/examinationapi/add.js'
+	export default {
+		data() {
+			return {
+				temp: '',
+				timetext: this.formatDate(Date.now()),
+				measureTime: this.formatDate(Date.now()),
+			};
+		},
+		methods: {
+			formatDate(timestamp) {
+				const now = new Date(parseInt(timestamp))
+				const year = now.getFullYear();
+				const month = now.getMonth() + 1;
+				const date = now.getDate();
+				const hour = now.getHours();
+				const minute = now.getMinutes();
+				const second = now.getSeconds();
+				return year + "-" + ((month < 10) ? '0' + month : month) + "-" + ((date < 10) ? '0' + date : date) + " " +
+					((hour < 10) ? '0' + hour : hour) + ":" + ((minute < 10) ? '0' + minute : minute) + ":" + ((second <
+						10) ? '0' + second : second);
+			},
+			timeconfirm(time) {
+				this.timetext = time
+			},
+			submit() {
+				if (this.timetext && this.temp) {
+					let data = {
+						// identity: uni.getStorageSync('userinfo').cardNo
+						identity: '370882199909092123',
+						measureTime: this.timetext,
+						temp: this.temp,
+					}
+					savetemp(data).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								title: '保存成功',
+								type: 'success',
+							})
+							setTimeout(() => {
+								uni.navigateBack({
+									delta: 1
+								})
+							}, 1000)
+						}
+					})
+				} else {
+					this.$refs.uToast.show({
+						title: '各项格式为正整数，请重新输入',
+						type: 'error',
+					})
+				}
+			},
+			ruls(num) {
+				let reg = /^((?!0)\d{1,9})$/;
+				if (!num.match(reg)) {
+					return false
+				} else {
+					return true
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.app {
+		.submit {
+			width: 60%;
+			height: 98rpx;
+			margin: 60rpx auto;
+			background-color: #55d0df;
+			border-radius: 10rpx;
+			border: solid 0rpx #0c0c0c;
+			color: #ffffff;
+			text-align: center;
+			line-height: 98rpx;
+		}
+
+		.time {
+			margin-top: 100rpx;
+			position: relative;
+			border-bottom: 1rpx solid #f0f1f6;
+			height: 80rpx;
+			line-height: 65rpx;
+
+			image {
+				width: 20rpx;
+				height: 20rpx;
+				position: absolute;
+				right: 10rpx;
+				top: 20%;
+			}
+
+			// text:nth-child(1) {
+			// 	margin-left: 50rpx;
+			// }
+
+			text:nth-child(2) {
+				float: right;
+				margin-right: 100rpx;
+				color: #999999;
+				font-size: 28rpx;
+			}
+
+		}
+
+		.uptext:nth-child(2) {
+			margin-top: 80rpx;
+		}
+
+		.uptext:nth-child(1) {
+			margin-top: 40rpx;
+		}
+
+		.uptext {
+			width: 100%;
+			height: 300rpx;
+			position: relative;
+			border-bottom: 1rpx solid #f0f1f6;
+
+			.pressured {
+				margin-left: 20rpx;
+				font-size: 32rpx;
+				line-height: 34rpx;
+				letter-spacing: 2rpx;
+				color: #d34141;
+			}
+
+			.pressureg {
+				margin-left: 20rpx;
+				font-size: 32rpx;
+				line-height: 34rpx;
+				letter-spacing: 2rpx;
+				color: #41d36d;
+			}
+
+			.heart {
+				margin-left: 20rpx;
+				font-size: 32rpx;
+				line-height: 34rpx;
+				letter-spacing: 2rpx;
+				color: #00aaff;
+			}
+
+			.text {
+				position: absolute;
+				top: 75%;
+				width: 20%;
+				text-align: center;
+				left: 40%;
+				font-size: 30rpx;
+				line-height: 34rpx;
+				letter-spacing: 1rpx;
+				color: #999999;
+			}
+
+			/deep/ input {
+				text-align: center;
+				font-size: 40rpx;
+				border-bottom: 2rpx solid #f0f1f6;
+				position: absolute;
+				width: 40%;
+				height: 10%;
+				top: 50%;
+				left: 30%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesC/addequipment/addequipment.vue b/pagesC/addequipment/addequipment.vue
new file mode 100644
index 0000000..4da696d
--- /dev/null
+++ b/pagesC/addequipment/addequipment.vue
@@ -0,0 +1,162 @@
+<template>
+	<view class="app">
+		<view class="title">
+			<view class="left">
+			</view>
+			<view class="right">
+				设备序列号
+			</view>
+			<image src="../../static/pageC/ScanAdd.png" mode="" @click="scanning"></image>
+		</view>
+		<view class="uptext">
+			<input placeholder="请输入设备序列号" v-model="data.sn"></input>
+		</view>
+		<view class="title">
+			<view class="left">
+			</view>
+			<view class="right">
+				设备类型
+			</view>
+		</view>
+		<view class="types">
+			<view @tap='data.deviceType=0' :class="data.deviceType==0?'type':'type2'">血压计</view>
+			<view @tap='data.deviceType=1' :class="data.deviceType==1?'type':'type2'">血糖仪</view>
+		</view>
+		<view class="submit" @click="submit">
+			保存
+		</view>
+	</view>
+</template>
+
+<script>
+	// import { bindDevice } from '@/service/api/api.js'
+	export default {
+		data() {
+			return {
+				type: 1,
+				data: {
+					deviceType: 0,
+					identity: uni.getStorageSync('userInfo').identity,
+					signNo: uni.getStorageSync('signInfo').signNo,
+					sn: ''
+				}
+			};
+		},
+		methods: {
+			scanning() {
+				const that = this
+				uni.scanCode({
+					onlyFromCamera: true,
+					success(res) {
+						that.data.sn = res.result
+					}
+				})
+			},
+			submit() {
+				// bindDevice(this.data).then(res => {
+				// 	if(res.data.code == '1') {
+				// 		uni.showToast({
+				// 			title: '绑定成功',
+				// 			duration: 1000
+				// 		})
+				// 		setTimeout(function() {
+				// 			uni.navigateBack({
+				// 				delta: 1
+				// 			})
+				// 		}, 1000);
+				// 	}
+				// })
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		margin-top: 40rpx;
+
+		.submit {
+			width: 60%;
+			height: 98rpx;
+			margin: 60rpx auto;
+			background-color: #55d0df;
+			border-radius: 10rpx;
+			border: solid 0rpx #0c0c0c;
+			color: #ffffff;
+			text-align: center;
+			line-height: 98rpx;
+		}
+
+		.types {
+			text-align: center;
+			line-height: 60rpx;
+			font-size: 28rpx;
+			margin-top: 30rpx;
+			display: flex;
+			padding-bottom: 50rpx;
+			border-bottom: 1rpx solid #f0f1f6;
+			;
+
+			.type2 {
+				margin-left: 50rpx;
+				color: #999999;
+				width: 144rpx;
+				height: 60rpx;
+				background-color: #ffffff;
+				border-radius: 10rpx;
+				border: solid 1rpx #d0d0d0;
+			}
+
+			.type {
+				margin-left: 50rpx;
+				width: 144rpx;
+				height: 60rpx;
+				background-color: #ffffff;
+				border-radius: 10rpx;
+				border: solid 1rpx #55d0df;
+				color: #55d0df;
+			}
+		}
+
+
+		.uptext {
+			width: 100%;
+
+			input {
+				width: 580rpx;
+				height: 88rpx;
+				background-color: #ffffff;
+				border-radius: 10rpx;
+				border: solid 1rpx #d0d0d0;
+				text-align: center;
+				font-size: 40rpx;
+				margin: 40rpx auto;
+			}
+		}
+
+		.title {
+			display: flex;
+			padding: 30rpx 0 30rpx 30rpx;
+			font-size: 30rpx;
+
+			image {
+				width: 160rpx;
+				height: 40rpx;
+				margin-left: 40%;
+			}
+
+			.right {
+				line-height: 34rpx;
+				padding-left: 20rpx;
+				color: #666666;
+			}
+
+			.left {
+				width: 8rpx;
+				height: 32rpx;
+				background-color: #55d0df;
+				border-radius: 4rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesC/addsugar/addsugar.vue b/pagesC/addsugar/addsugar.vue
new file mode 100644
index 0000000..527fda3
--- /dev/null
+++ b/pagesC/addsugar/addsugar.vue
@@ -0,0 +1,228 @@
+<template>
+	<view class="app">
+		<view class="uptext">
+			<input placeholder="请输入血糖值" border="bottom" v-model="number" fontSize='50rpx' inputAlign='center'>
+			</input>
+			<view class="text">
+				mmol/L
+			</view>
+		</view>
+		<view class="time">
+			<view style="display: flex;align-items: center;">
+				<text style="margin-left: 50rpx">记录时间：</text>
+				<view style="display: flex;margin: 0 auto; color: #999;">
+					<uni-datetime-picker v-model="measureTime" @change="timeconfirm">{{measureTime}}
+						<image style="margin-right: 40rpx;" src="../../static/huijiantou.png" mode="widthFix" />
+					</uni-datetime-picker>
+				</view>
+			</view>
+		</view>
+		<view class="scene">
+			<view class="title">
+				测量场景
+			</view>
+			<view class="choices">
+				<view @tap='bucketchoice=1' :class="bucketchoice==1?'choice':'choice2'">凌晨</view>
+				<view @tap='bucketchoice=2' :class="bucketchoice==2?'choice':'choice2'">早餐前</view>
+				<view @tap='bucketchoice=3' :class="bucketchoice==3?'choice':'choice2'">早晨后</view>
+				<view @tap='bucketchoice=4' :class="bucketchoice==4?'choice':'choice2'">午餐前</view>
+				<view @tap='bucketchoice=5' :class="bucketchoice==5?'choice':'choice2'">午餐后</view>
+				<view @tap='bucketchoice=6' :class="bucketchoice==6?'choice':'choice2'">晚餐前</view>
+				<view @tap='bucketchoice=7' :class="bucketchoice==7?'choice':'choice2'">晚餐后</view>
+				<view @tap='bucketchoice=8' :class="bucketchoice==8?'choice':'choice2'">睡前2小时</view>
+			</view>
+		</view>
+		<view class="btn">
+			<view class="submit" @tap="submit">
+				添加
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		savebg
+	} from '@/api/examinationapi/add.js'
+	export default {
+		data() {
+			return {
+				number: '',
+				timetext: this.formatDate(Date.now()),
+				measureTime: this.formatDate(Date.now()),
+				bucketchoice: 1,
+			};
+		},
+		onLoad(options) {},
+		methods: {
+			timeconfirm(time) {
+				this.timetext = time
+			},
+			formatDate(timestamp) {
+				const now = new Date(parseInt(timestamp))
+				const year = now.getFullYear();
+				const month = now.getMonth() + 1;
+				const date = now.getDate();
+				const hour = now.getHours();
+				const minute = now.getMinutes();
+				const second = now.getSeconds();
+				return year + "-" + ((month < 10) ? '0' + month : month) + "-" + ((date < 10) ? '0' + date : date) + " " +
+					((hour < 10) ? '0' + hour : hour) + ":" + ((minute < 10) ? '0' + minute : minute) + ":" + ((second <
+						10) ? '0' + second : second);
+			},
+			submit() {
+				if (!this.number || this.timetext == "请选择时间") {
+					this.$refs.uToast.show({
+						title: '请填写完整后提交',
+						type: 'error',
+					})
+					return
+				}
+				let data = {
+					bg: this.number,
+					bucket: this.bucketchoice,
+					measureTime: this.measureTime,
+					uploadType: 1,
+					// identity: uni.getStorageSync('userinfo').cardNo
+					identity: '370882199909092123'
+				}
+				savebg(data).then(res => {
+					if (res.code == 200) {
+						this.$refs.uToast.show({
+							title: '保存成功',
+							type: 'success',
+						})
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							})
+						}, 1000)
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.app {
+
+		.btn {
+			position: absolute;
+			bottom: 0;
+			width: 100%;
+
+			.submit {
+				width: 90%;
+				height: 80rpx;
+				margin: 60rpx auto;
+				background-color: #4AC4AB;
+				border-radius: 10rpx;
+				color: #ffffff;
+				text-align: center;
+				line-height: 80rpx;
+			}
+		}
+
+		.scene {
+			margin-top: 50rpx;
+			width: 100%;
+
+			.choices {
+				text-align: center;
+				line-height: 60rpx;
+				font-size: 28rpx;
+				margin-top: 50rpx;
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-evenly;
+
+				.choice2 {
+					margin: 0 10rpx 30rpx;
+					color: #a3a3a3;
+					width: 20%;
+					height: 60rpx;
+					background-color: #ffffff;
+					border-radius: 10rpx;
+					border: solid 1rpx #ccc;
+				}
+
+				.choice {
+					margin: 0 10rpx 30rpx;
+					width: 20%;
+					height: 60rpx;
+					background-color: #ffffff;
+					border-radius: 10rpx;
+					border: solid 1rpx #4AC4AB;
+					color: #4AC4AB;
+				}
+			}
+
+
+			.title {
+				font-size: 34rpx;
+				margin-left: 50rpx;
+				line-height: 34rpx;
+				color: #333333;
+			}
+		}
+
+		.time {
+			margin-top: 100rpx;
+			position: relative;
+			border-bottom: 1rpx solid #f0f1f6;
+			height: 80rpx;
+			line-height: 80rpx;
+
+			image {
+				width: 20rpx;
+				height: 20rpx;
+				position: absolute;
+				right: 10rpx;
+				top: 30%;
+			}
+
+			text:nth-child(2) {
+				float: right;
+				margin-right: 100rpx;
+				color: #999999;
+				font-size: 28rpx;
+			}
+
+		}
+
+		.uptext {
+			width: 100%;
+			height: 500rpx;
+			position: relative;
+
+			.text {
+				position: absolute;
+				top: 85%;
+				width: 20%;
+				text-align: center;
+				left: 40%;
+				font-size: 30rpx;
+				line-height: 34rpx;
+				letter-spacing: 1rpx;
+				color: #999999;
+			}
+
+			/deep/ input {
+				text-align: center;
+				font-size: 40rpx;
+				border-bottom: 2rpx solid #f0f1f6;
+				position: absolute;
+				width: 40%;
+				height: 10%;
+				top: 50%;
+				left: 30%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pagesC/healthdata/healthdata.vue b/pagesC/healthdata/healthdata.vue
new file mode 100644
index 0000000..bd704e5
--- /dev/null
+++ b/pagesC/healthdata/healthdata.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="app">
+		<u-tabs :list="tabList" :current="tabindex" @change="tabchange" active-color='#26A888'
+			:show-bar='false'></u-tabs>
+		<view class="content">
+			<view v-if="tabindex == 0">
+				<blood-sugar :current="tabindex" :echartData="list" @taptimeindex='taptimeindex'
+					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>
+			</view>
+			<view v-if="tabindex == 6">
+				<Bloodtemperature :current="tabindex" :echartData="list" @taptimeindex='taptimeindex'
+					v-on:websocket-message="handleWebSocketMessage"></Bloodtemperature>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		record
+	} from '@/api/pagesC/healthdata/index.js'
+	import BloodPressure from '../../components/BloodPressure/BloodPressure.vue'
+	import BloodSugar from '../../components/BloodSugar/BloodSugar.vue'
+	import Bloodtemperature from '../../components/Bloodtemperature/Bloodtemperature.vue'
+	export default {
+		components: {
+			BloodPressure,
+			BloodSugar,
+			Bloodtemperature
+		},
+		data() {
+			return {
+				tabindex: 0,
+				tabList: [{
+					name: '血糖',
+				}, {
+					name: '血压',
+				}, {
+					name: '血脂',
+				}, {
+					name: 'BMI',
+				}, {
+					name: '血氧',
+				}, {
+					name: '心率',
+				}, {
+					name: '体温',
+				}, ],
+				list: null,
+				type: 0,
+			};
+		},
+		onLoad(options) {
+			this.tabindex = options.index
+		},
+		onShow() {
+			this.info();
+		},
+		methods: {
+			taptimeindex(e) {
+				this.type = e
+				this.info()
+			},
+			info() {
+				let userinfo = uni.getStorageSync('userinfo');
+				var obj = {
+					label: Number(this.tabindex) + 1,
+					// identity: userinfo.cardNo,
+					identity: '370882199909092123',
+					type: this.type,
+				}
+				record(obj).then(res => {
+					this.list = res.data
+				})
+			},
+			tabchange(e) {
+				this.list = null
+				this.tabindex = e
+				setTimeout(() => {
+					this.info();
+				}, 1000)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F7F5F5;
+	}
+
+	::v-deep .u-tabs {
+		background-color: #F7F5F5 !important;
+	}
+</style>
\ No newline at end of file
diff --git a/static/pageC/BindDevice.png b/static/pageC/BindDevice.png
new file mode 100644
index 0000000000000000000000000000000000000000..ded4a96413b03f35752a9c4775ed633ade03f356
GIT binary patch
literal 1705
zcmd6n`!~}K0LCY_a*w=-$}**tG?zv$Nh}k~tXzs(N>VbHrkdPuF}Y{%qt?uZ=|ZN2
zFuClNwoyqgnei<{l8ku$8Sit>^L&1N&UwyxQe4p|73H+#Kp>DJ%F*6!gN++Lx<z^;
z596L|Zy?jv`HaH`*Z)t-18tw%=wx)u4UGlG*ftxDgg}*XbCSh_R(%u<By$^~BygH_
z<%8ZwSs{XXcZtT)mT5TAi$w2>TjJcKfk5B_l>PBD*S-!HDuz8eyfq0Co2g8<ed=C4
z$XsML{TBaSUl-fi9*52hd;7OXT&=2h6kT!&N2qE|goh%AWaCMf+k;lD*iVkx8(vgR
zOP%nuc+$u2a+=lY2-Ve@9=Gc5diDqN*&p!>9;yhf9W*zf^?+K=WmASkGV_5Buq$Sy
zEUOWs@;azK8`&KtPc5yTgp5B#_A+C-0%BG)<sBX)t5rs@%8)PpQ*3EZqsjYbK2k@K
z`r^B3dwjsB+Lyh8;CE;T#<pJ-bc>GF{+^Ujdgy&aVA6or^v&;f3A)O}cpG>)`MYZF
zwWRybqg)XW4Ebc$-*Lx5x6+qnxSZdsLc;qfWZyr8guPBhL^Mlo2mY*W!^Uu}ebWCz
z1kNSpWf}Z$f);1gnwxd*FO3Px>sKvl2Mt<*%Zs&Sf_fz3LY;<!aAIuF3@=xu<kY3k
zh3oW0&UlWEYD(y={FFRjK0%)V=~-^}dspd_ROWP@UY_*63};rVs#9h)7bo<fSHwAn
zl*Wd2Wx`kX8O9Z=>C$DtpK>X&lzG0TxBwyZrcmN*rmB!fez~-|80<!QBb=RG9?JPy
z*%SIU*u3h9{`C0U{^Xn!9^!}IG4;!EzJXb}zCVopM0OXwZ;UL}yGFH9snzox$7VoN
zda!)985Ui_v)~^19C;8Y0#tf2=4ub_k~cd~1s!g7_Vv^vtW11FTLZe##EyWfuyfQ2
z>?}7H=>y(c?lin;&%vX?;%k=X{8^j|FGs?YJ_0|IKVk~_?1l`xAv!2@kz=JB%a9k!
zer!xV8ocdOGAAuOU!mUL^OV4u7hj03n4Mz`byXymy;s!q6D)K)7<awrtQn@<!u3-%
zffgiJFIY{WuxQenE;A9#_fHN=l5GMkoJ_&Na_-jKD*hDvX-0ZyvxVrqq|V!)OvBW&
zvSRlCfc11GCqSiznCKsjV|N8-)kAjEQ;5}HTO#C5YFimh6Dexe!)^^woZZ5hnu&hQ
z8mcLTSDoGd(4t`eJu4mJp4z5r-#K^S_RjdWarJp}rTp=m1YhLNozl%js4KY&FejN?
zo(yr>MTqZYxeogMlbz-TrZKbCc8a9JfbF*v9uNt?%q1C{gO$9jq>;8!w6*8Vs3}5v
zHx(nNbkddas{N}e;<d-8)^n6R)0x4d9o?f8noH;}W>}G?pd90|Lau3yDLP*atBWN7
z3Nu;lDu<KBbWx2SZPbPk9s0#Cnr_p%x1i4jdKzHj{RpXam#6f}yj!~HlE>~Q-IfC<
z22WgHx#mP9JlJl0Rd&<}brv@2K{g7uszL*&YxBnhfeEYh3uQGq9E6KN7p5^^<`V^F
z1QbEkrJ`Z3br+)uAHtyN^D`op^_Lc4hop^l-!Z=t4&U@I3C4Q|5s+S_YO#J&@GXCa
zSd8gK=4t(9;?pf+0qXC3)Y57=4<kAVeo=$n(NF`aQyp-EaU%c*TF3xx%70fO#uJC#
z+L#yM!?VKjl1o=ukWE_?b2;>LB?iw7OyoQQ8lHHsRyMM^GbshJqeATj_fn~EUe_Ba
zu@{@lF*;BM&ne_hv_GIV{S={L-pa)4CGLj;uY+)pkWFt{yBhAC-d44-=x%;z`T?pO
zt?+TNsJCCC(DYly2*F^bNiiPpWnFE<_jPT;Px3o$V|%SfaL;vs!L}l$Wl#Q+Hh<TR
zzz9qRJbEfKiZmao2Ar?@dy#Cjo3mB<azpD<s=cI{8udl7QD0)KQ6b6x9DM^PA!-oV
z=hJ-~a$iE$lC_No?`i)i#M@k0FdQ)!duFU7Eya;T+IvlX_ioy|gf}Rd384P)w{4WH
z*Z=fhfG~LVb$9fJ29&TC{T+wIf#(;Dn+CXXGlqrmL(Z%H>f8~HH8YfhlH=Ene+Qu)
L(DpTUxVZlS_A8bT

literal 0
HcmV?d00001

diff --git a/static/pageC/ScanAdd.png b/static/pageC/ScanAdd.png
new file mode 100644
index 0000000000000000000000000000000000000000..69ea187fb0237dc0b2fc3e9784516aeb250a39bd
GIT binary patch
literal 1058
zcmeAS@N?(olHy`uVBq!ia0vp^bAecugBeKXCrbYTQaJ%WA+A6=^um2i6msESC<uY1
zLeAd{yYwLR;sb=T^AIVJNXU5*0y4rc+yyHDsstN&{z2G<haizV&tuPC1u~i@Y5WA*
zr(6=`7tHW()fwaRyUr|EA9ipHD5dS58PYJBGurKC&XO;OxA=+etJAJ7{QQuCf!WE^
z#W5t}@Y5N*#kUoB+5`{n&}B_7zk93n{`>#``!{doIT*L;$EKLF+r{C}vs9m1aym9i
z{S=DNcy>E{>xZM0K74w)cbDvXjhX;%DfXK1?MizX`M(>>?~Tf^zst?f(6dW${Q>uS
z^I+C@Eyv3bOx`8ve_(;%C8qaRcm;OfKl6)U+WPqw`Q?QV`EN32*)v<#EBR!s&%U0t
zFmt8CVk3vSuQHEreWN3LVf~wc4Dm{)MaR0bZwm5V_^NPEN9NhhiD%ZzeXB_2WQt8n
z=PKOzIr3Qe``Ei%E|j`kuxFSHYVA(D-xcI_Y}JD47p)3%uQpw2YuMEja+cX?@|5NN
zZRa;R%RJrKZ+~v<<rm`CLU&iSsV#I=Q#O`ZP{KR)Zk^ZGZDnDTCKX?6SX$+_X^WbD
z@Ve`pjemAB@95%TkbYUrP&D_%(P^*0zNv~Zzch7@>yDlBC3$ZeO!hQS)eJ4VyYB5g
z`STBc`dFU|-Zb61C+}tWy!=XTZAHDRxi<n+zh}vxJ7Aal)@gU-d#Q%Gmmge_OKZ9y
zDSYI>`AM5zv1(OKdYzd1y=ikr^v$ngdp3Ta5_daOA&#9jztM48obv*+bbB@B=;wX!
z&o6v(uKc20WS~jc+-E!s^;wsA=53n%rm=U*&gneYVhhXpvJNT=vhSZ;&R4k6y5(ZW
ztV{-@)Z0?Cc5G?${T#gh&9@|njn<b$?aZXDB_m9t*X~`Mx5@Y-yTXY%UmPYpkJ+-Q
zCD=Cl=GyPyJ=IRmdKt!VuB){)b?LtF==WW*-ZSm?-)@}DuKtk0dZyV@%@m<E-*2wp
ze?R^EEycyr7lIO}ue&5_^RHB4e$paO39a3K_gDGdc1^b0U_SGL=R)2Gm-!Tr<}K4Q
znsemPpM=dDcmJ7Pz0v!_`lP~LwhZ3qXZ@_7ovb;l>0<AZ({BnKwkgYLzK+(Mb^Ob#
z()rS@?V7Jro=?sF_38bwe=T#vwAnPH_^p01_qea_oB8~>fKLC7y=9Z+8u~(~t=eL#
z6!q$j!oq}`*V5%>FKG4)a=kiK$=<L_xlEhMZO!za_LwZgb0&rV3NQW;S)O9P;a+~Z
z<-wNvCo-yY9c|BtxCfkX+W%BCq=Gr_&6)Igp<`h;>g&GWpHtg+_T%+=(*Idb9c+m>
UF?U-AF!M2Zy85}Sb4q9e02P7`TmS$7

literal 0
HcmV?d00001