修改

src/projects/business/views/Common/Notice/Home.vue

@@ -57,7 +57,11 @@
 				recordList: [],
 			}
 		},
-		created() {},
+		created() {
+			if (this.$route.query.title) {
+				this.pageTitle = this.$route.query.title;
+			}
+		},
 		methods: {
 			//获取列表
 			getList() {

src/projects/business/views/Master/Mine/Message.vue

@@ -6,7 +6,7 @@
 		<div class="mui-content margin49">
 			<ul class="mui-table-view vongi-news">
 				<li class="mui-table-view-cell mui-media">
-					<router-link :to="{name:'CommonNotice',query:{type:noticeInfo.type}}">
+					<router-link :to="{name:'CommonNotice',query:{type:noticeInfo.type,title:noticeInfo.name}}">
 						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/bell1.png">
 						<div class="mui-media-body">
 							<h3 class="flew-sp">{{noticeInfo.name}}<span class="mui-h6" v-text="noticeInfo.message?noticeInfo.message.date:''"></span></h3>
@@ -18,7 +18,7 @@
 			</ul>
 			<ul class="mui-table-view vongi-news">
 				<li v-for="(item,index) in messageList" class="mui-table-view-cell mui-media">
-					<router-link :to="{name:'CommonNotice',query:{type:item.type}}">
+					<router-link :to="{name:'CommonNotice',query:{type:item.type,title:item.name}}">
 						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/kaoqin1.png">
 						<div class="mui-media-body">
 							<h3 class="flew-sp">{{item.name}}<span class="mui-h6" v-text="item.message?item.message.date:''"></span></h3>

src/projects/pension/views/Common/Notice/Home.vue

@@ -39,7 +39,8 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader,NullList
+			TopHeader,
+			NullList
 		},
 		data() {
 			return {
@@ -56,7 +57,11 @@
 				recordList: [],
 			}
 		},
-		created() {},
+		created() {
+			if (this.$route.query.title) {
+				this.pageTitle = this.$route.query.title;
+			}
+		},
 		methods: {
 			//获取列表
 			getList() {

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

@@ -8,7 +8,7 @@
 				<li class="mui-table-view-cell mui-col-xs-4">
 					<div class="vongi-color-block block-red" @click="goToInfo({name:'MasterHealthChart',query:{type:'heart',title:'心率'}})">
 						<span class="vongi-color-unit">次/分</span>
-						<div class="mui-h1" v-text="healthData.heart?healthData.heart:'暂无'"></div>
+						<div class="mui-h1" v-text="healthData.heart.value?healthData.heart.value:'暂无'"></div>
 						<div class="mui-media-body">心率</div>
 					</div>
 				</li>
@@ -22,28 +22,28 @@
 				<li class="mui-table-view-cell mui-col-xs-4">
 					<div class="vongi-color-block block-green" @click="goToInfo({name:'MasterHealthChart',query:{type:'oxygen',title:'血氧浓度'}})">
 						<span class="vongi-color-unit"></span>
-						<div class="mui-h1" v-text="healthData.oxygen?healthData.oxygen:'暂无'"></div>
+						<div class="mui-h1" v-text="healthData.oxygen.value?healthData.oxygen.value:'暂无'"></div>
 						<div class="mui-media-body">血氧浓度</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-8">
 					<div class="vongi-color-block block-green" @click="goToInfo({name:'MasterHealthChart',query:{type:'temperature',title:'体温'}})">
 						<span class="vongi-color-unit"></span>
-						<div class="mui-h1">{{healthData.temperature?(healthData.temperature+'℃'):'暂无'}}</div>
+						<div class="mui-h1">{{healthData.temperature.value?(healthData.temperature.value+'℃'):'暂无'}}</div>
 						<div class="mui-media-body">体温</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-4" @click="goToInfo({name:'MasterHealthChart',query:{type:'power',title:'电量'}})">
 					<div class="vongi-color-block block-blue">
 						<span class="vongi-color-unit"></span>
-						<div class="mui-h1">{{healthData.power?healthData.power:'暂无'}}%</div>
+						<div class="mui-h1">{{healthData.power.value?healthData.power.value:'暂无'}}%</div>
 						<div class="mui-media-body">电量</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-4">
 					<div class="vongi-color-block block-yellowe" @click="goToInfo({name:'MasterHealthChartStep',query:{type:'step',title:'运动步数'}})">
 						<span class="vongi-color-unit">步</span>
-						<div class="mui-h1" v-text="healthData.step?healthData.step:'暂无'"></div>
+						<div class="mui-h1" v-text="healthData.step.value?healthData.step.value:'暂无'"></div>
 						<div class="mui-media-body">运动</div>
 					</div>
 				</li>
@@ -54,14 +54,14 @@
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-12">
-					<div class="vongi-color-block block-green" @click="goToInfo({name:'MasterHealthChartMap',query:{type:'lbs',title:'活动轨迹'}})">
+					<div class="vongi-color-block block-green" @click="goToInfo({name:'MasterHealthChartMap',query:{type:'lbs',title:'活动轨迹',day:healthData.lbs.time.substr(0,10)}})">
 						<span class="vongi-color-unit"></span>
 						<div class="mui-h1" v-text="address"></div>
 						<div class="mui-media-body">定位</div>
 					</div>
 				</li>
 			</ul>
-			<div class="vongi-center" v-show="healthData.time">设备最后更新时间：{{healthData.time}}</div>
+			<div class="vongi-center" v-show="healthData.time">设备最后更新时间：{{healthData.time.value}}</div>
 		</div>
 
 		<loading :visible="isLoading"></loading>
@@ -93,7 +93,18 @@
 
 				pageTitle: '健康档案',
 
-				healthData: {},
+				healthData: {
+					diastolic: {},
+					lbs: {},
+					heart: {},
+					oxygen: {},
+					power: {},
+					signal: {},
+					step: {},
+					systolic: {},
+					temperature: {},
+					time: {}
+				},
 
 				address: '暂无',
 			}
@@ -108,8 +119,8 @@
 
 					if (JSON.stringify(response) != "{}" && response) {
 						this.healthData = response;
-						if (response.lbs) {
-							let lbsArr = response.lbs.split(',');
+						if (response.lbs.value) {
+							let lbsArr = response.lbs.value.split(',');
 							//获取定位地址
 							this.getPositionByLonLats(lbsArr[0], lbsArr[1]);
 						}
@@ -167,8 +178,8 @@
 			tolic: {
 				// getter
 				get: function() {
-					if (this.healthData.diastolic) {
-						return this.healthData.diastolic + '/' + this.healthData.systolic;
+					if (this.healthData.diastolic.value) {
+						return this.healthData.diastolic.value + '/' + this.healthData.systolic.value;
 					} else {
 						return '暂无';
 					}

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

@@ -66,7 +66,13 @@
 			} else {
 				this.pageTitle = '活动轨迹';
 			}
-			this.listForm.day = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+
+			if (this.$route.query.day) {
+				this.listForm.day = this.$route.query.day;
+			} else {
+				this.listForm.day = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+			}
+
 			this.typeList = ['lbs'];
 		},
 		methods: {

src/projects/pension/views/Master/Mine/Message.vue

@@ -6,7 +6,7 @@
 		<div class="mui-content margin49">
 			<ul class="mui-table-view vongi-news">
 				<li class="mui-table-view-cell mui-media">
-					<router-link :to="{name:'CommonNotice',query:{type:noticeInfo.type}}">
+					<router-link :to="{name:'CommonNotice',query:{type:noticeInfo.type,title:noticeInfo.name}}">
 						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/bell1.png">
 						<div class="mui-media-body">
 							<h3 class="flew-sp">{{noticeInfo.name}}<span class="mui-h6" v-text="noticeInfo.message?noticeInfo.message.date:''"></span></h3>
@@ -18,7 +18,7 @@
 			</ul>
 			<ul class="mui-table-view vongi-news">
 				<li v-for="(item,index) in messageList" class="mui-table-view-cell mui-media">
-					<router-link :to="{name:'CommonNotice',query:{type:item.type}}">
+					<router-link :to="{name:'CommonNotice',query:{type:item.type,title:item.name}}">
 						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/kaoqin1.png">
 						<div class="mui-media-body">
 							<h3 class="flew-sp">{{item.name}}<span class="mui-h6" v-text="item.message?item.message.date:''"></span></h3>