基础页面

config/project.js

@@ -1 +1 @@
-exports.name = 'business'
+exports.name = 'pension'

src/projects/pension/router/master.js

@@ -261,6 +261,17 @@ const routesMaster = [
 							title: '坐标地图轨迹详情',
 						}
 					},
+					//步数统计图
+					{
+						path: 'chartStep',
+						name: 'MasterHealthChartStep',
+						component: () => import('../views/Master/Health/ChartStep.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '步数统计图',
+						}
+					},
 					//预警参数设置
 					{
 						path: 'warningSet',
@@ -323,6 +334,40 @@ const routesMaster = [
 							title: '亲属详情',
 						}
 					},
+					//通讯录联系人
+					{
+						path: 'phoneList',
+						name: 'MasterRelativesPhoneList',
+						component: () => import('../views/Master/Relatives/PhoneList.vue'),
+						meta: {
+							requireAuth: true,
+							role: [],
+							title: '通讯录联系人',
+							mode: true
+						}
+					},
+					//通讯录联系人详情
+					{
+						path: 'phoneInfo',
+						name: 'MasterRelativesPhoneInfo',
+						component: () => import('../views/Master/Relatives/PhoneInfo.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '通讯录联系人详情',
+						}
+					},
+					//通讯录联系人新增修改
+					{
+						path: 'phoneSave',
+						name: 'MasterRelativesPhoneSave',
+						component: () => import('../views/Master/Relatives/PhoneSave.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '通讯录联系人新增修改',
+						}
+					},
 				],
 			},
 

src/projects/pension/views/Master/Drug/Add.vue

@@ -1,9 +1,8 @@
 <template>
-<div>
-    <header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">添加用药提醒</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-		</header>
+	<div>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+		
 		<div class="mui-content margin60">
 			<div class="vongi-yqsb flew-items">
 				<i class="iconfont icon-mn_dunpai_fill pink"></i> 安全用药，请按说明书或在药师指导下使用
@@ -62,12 +61,54 @@
 			</div>
 		</div>
 		<div class="fyy-footer">
-			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-pink ">确  定</button></div>
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-pink ">确 定</button></div>
 		</div>
-</div>
+		
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterDrugAdd',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				isLoading: false,
+
+				pageTitle: '添加用药提醒',
+			}
+		},
+		created() {},
+		methods: {
+			asynCallBack() {
+
+			},
+		},
+		mounted() {},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	}
 </script>
 
 <style scoped src="$project/assets/css/pension.css"></style>

src/projects/pension/views/Master/Drug/AddSuccess.vue

@@ -1,9 +1,8 @@
 <template>
-<div>
-    <header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">添加完成</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-		</header>
+	<div>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content vongi-cytx">
 			<div class="mui-content-padded padd10">
 				<div class="vongi-center">
@@ -12,6 +11,7 @@
 					<h4 class='color666'>您还没有添加用药提醒</h4>
 				</div>
 			</div>
+			<!--
 			<div class="mui-content-padded vongi-cytx-time">
 				<ul class="mui-table-view mui-grid-view mui-grid-9">
 					<li class="mui-table-view-cell mui-media">
@@ -250,17 +250,62 @@
 					</li>
 				</ul>
 			</div>
+			-->
+			<drug-calendar></drug-calendar>
 			<div class="fyy-scon-botton">
 				<div class="examine-btn mui-btn-pink mui-btn-outlined">返回修改</div>
 				<div class="examine-btn mui-btn-pink">完成</div>
 			</div>
 		</div>
-</div>
+		
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
-</script>
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import DrugCalendar from '@/components/DrugCalendar.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterDrugAddSuccess',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+			DrugCalendar
+		},
+		data() {
+			return {
+				isLoading: false,
+
+				pageTitle: '添加完成',
+			}
+		},
+		created() {},
+		methods: {
+			asynCallBack() {
 
+			},
+		},
+		mounted() {},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	}
+</script>
 <style scoped src="$project/assets/css/pension.css"></style>
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>

src/projects/pension/views/Master/Drug/Home.vue

@@ -1,10 +1,8 @@
 <template>
 	<div>
-		<header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">用药提醒</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-			<a class="pink mui-pull-right"><span class="mui-icon iconfont icon-jia pink"></span>添加提醒</a>
-		</header>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle" :rightLink="rightLink" :doRightLink="doRightLink"></top-header>
+
 		<div class="mui-content vongi-cytx">
 			<!--<div class="mui-content-padded vongi-sqtpdat-name">
 				<div class="vongi-center">
@@ -125,8 +123,6 @@
 			</div>
 		</div>
 
-		<!-- <drug-calendar></drug-calendar> -->
-
 		<loading :visible="isLoading"></loading>
 	</div>
 </template>
@@ -135,7 +131,6 @@
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
-	import DrugCalendar from '@/components/DrugCalendar.vue'
 	import {
 		mapGetters,
 		mapMutations
@@ -145,19 +140,29 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader,
-			DrugCalendar
+			TopHeader
 		},
 		data() {
 			return {
 				isLoading: false,
 
 				pageTitle: '用药提醒',
+
+				rightLink: {
+					show: true,
+					icon: 'icon-jia pink',
+					style: 'color: #FF9474;font-size: 12px;',
+					title: '添加提醒'
+				},
 			}
 		},
 		created() {},
 		methods: {
-
+			doRightLink() {
+				this.$router.push({
+					name: 'MasterDrugAdd'
+				})
+			},
 			asynCallBack() {
 
 			},

src/projects/pension/views/Master/Health/ChartStep.vue

@@ -0,0 +1,176 @@
+<template>
+	<div>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content vongi-yjcsdat">
+			<div class="mui-content-padded">
+				<h2>{{pageTitle}}趋势图</h2>
+				<div id="linePicture" style="width:100%;height: 300px;">
+
+				</div>
+			</div>
+			<h4 class="colorfe616c">测量仅供参考，不作为临床诊断使用</h4>
+		</div>
+	</div>
+</template>
+
+<script>
+	import * as API_Health from '@/apis/Master/health'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NavMenu from '@/components/NavMenu.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import echarts from 'echarts/lib/echarts'
+	import 'echarts/lib/chart/line'
+	import 'echarts/lib/component/legend'
+	import 'echarts/lib/component/title'
+	import 'echarts/lib/component/tooltip'
+	export default {
+		name: 'MasterHealthChartStep',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+			NavMenu
+		},
+		data() {
+			return {
+				isLoading: false,
+
+				pageTitle: this.$route.query.title,
+
+				listForm: {
+					names: this.$route.query.type,
+				},
+
+				typeList: '',
+
+				chartsList: [],
+			}
+		},
+		created() {
+			this.typeList = this.$route.query.type.split(',');
+		},
+		methods: {
+			//获取图表数据
+			getChartList() {
+				this.isLoading = true;
+				API_Health.getChartList(this.listForm).then(response => {
+					this.isLoading = false;
+					this.chartsList = response;
+
+					this.setEcharts();
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//设置echart数据
+			setEcharts() {
+				var legendData = [];
+				var xAxisData = [];
+				var series = [];
+				for (var i = 0; i < this.typeList.length; i++) {
+					var seriesData = [];
+					legendData.push(this.chartsList[this.typeList[i]].name);
+					var list = this.chartsList[this.typeList[i]].list;
+					for (var j = 0; j < list.length; j++) {
+						if (i == 0) {
+							xAxisData.push(list[j].recordTime);
+						}
+						seriesData.push(list[j].value);
+					}
+					series.push({
+						name: this.chartsList[this.typeList[i]].name,
+						type: 'line',
+						stack: '',
+						data: seriesData
+					});
+				}
+				this.echarts(legendData, xAxisData, series);
+			},
+			//显示图表
+			echarts(legendData, xAxisData, series) {
+				this.$nextTick(() => {
+
+					// 基于准备好的dom，初始化echarts实例
+					var myChart = echarts.init(document.getElementById('linePicture'));
+					// 指定图表的配置项和数据
+					var option = {
+						tooltip: {
+							trigger: 'axis',
+						},
+						legend: {
+							data: legendData,
+							orient: 'horizontal',
+							x: 'center',
+							y: 'bottom',
+						},
+						grid: {
+							left: '3%',
+							right: '4%',
+							bottom: '10%',
+							x: 40,
+							x2: 30,
+							y: 20,
+							containLabel: true
+						},
+						xAxis: {
+							type: 'category',
+							boundaryGap: false,
+							data: xAxisData,
+							axisLabel: {
+								interval: 0,
+								rotate: 80
+							}
+						},
+						yAxis: {
+							type: 'value',
+							axisLabel: {
+								interval: 0,
+								rotate: 40
+							}
+						},
+						series: series
+					};
+
+					// 使用刚指定的配置项和数据显示图表。
+					myChart.setOption(option);
+					/* myChart.resize({
+						height: rHeight + 'px'
+					}) */
+				});
+			},
+			asynCallBack() {},
+		},
+		mounted() {
+			//获取图表数据
+			this.getChartList();
+		},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+				menu_list: 'menu_list',
+				common_menu_list: 'common_menu_list',
+				persion_home_model: 'persion_home_model'
+			})
+		}
+	}
+</script>
+
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style>
+</style>

src/projects/pension/views/Master/Health/WarningSet.vue

@@ -79,6 +79,21 @@
 					</div>
 				</form>
 			</div>
+			<div class="vongi-qingjiadt">
+				<div class="mui-content-padded">
+					<h5 class="flew-sp">紧急联系电话</h5>
+				</div>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>SOS1</label>
+						<input type="number" v-model="detail.sos1" />
+					</div>
+					<div class="mui-input-row">
+						<label>SOS2</label>
+						<input type="number" v-model="detail.sos2" />
+					</div>
+				</form>
+			</div>
 		</div>
 		<div class="fyy-footer">
 			<div class="bindfyy-btn" @click="submit"><button type="submit" class="mui-btn mui-btn-pink ">提 交</button></div>
@@ -122,7 +137,9 @@
 					heartRateMax: '',
 					bloodOxMin: '',
 					bloodOxMax: '',
-					tempMin: ''
+					tempMin: '',
+					sos1: '',
+					sos2: ''
 				},
 
 				rightLink: {

src/projects/pension/views/Master/Relatives/PhoneInfo.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/pension/views/Master/Relatives/PhoneList.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/pension/views/Master/Relatives/PhoneSave.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>