修改

src/projects/business/views/Master/Home.vue

@@ -83,11 +83,11 @@
 					</div>
 					<div v-if="noticeList.length" class="mui-col-xs-12">
 						<div class="vongi-floor-padded">
-							<router-link :to="{name:'CommonNotice'}" v-for="(item,index) in noticeList" :key="index" class="text-list">
+							<router-link :to="{name:'CommonNotice',query:{type:1}}" v-for="(item,index) in noticeList" :key="index" class="text-list">
 								<h5 class="mui-ellipsis" v-text="item.title"></h5><span v-text="item.date"></span>
 							</router-link>
 						</div>
-						<router-link :to="{name:'CommonNotice'}" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></router-link>
+						<router-link :to="{name:'CommonNotice',query:{type:1}}" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></router-link>
 					</div>
 					<div class="mui-col-xs-12">
 						<div id="slider" class="mui-slider">
@@ -258,12 +258,11 @@
 			asynCallBack() {
 				//获取用户角色列表
 				this.getRoleList();
+				//获取最新二条通知消息
+				this.prefetchNotice();
 			},
 		},
 		mounted() {
-			//获取最新二条通知消息
-			this.prefetchNotice();
-
 			var gallery = mui('.mui-slider');
 			var slider = gallery.slider({
 				interval: 2000, //自动轮播周期，若为0则不自动播放，默认为0；

src/projects/pension/router/common.js

@@ -50,7 +50,38 @@ const routesCommon = [
 					},
 				]
 			},
-			
+
+			//设备
+			{
+				path: 'device',
+				component: () => import('../views/Layout.vue'),
+				children: [
+					//设备列表
+					{
+						path: 'list',
+						name: 'CommonDeviceList',
+						component: () => import('@/views/Common/Device/List.vue'),
+						meta: {
+							requireAuth: true,
+							role: [],
+							title: '设备列表',
+							mode: true
+						}
+					},
+					//增加设备
+					{
+						path: 'add',
+						name: 'CommonDeviceAdd',
+						component: () => import('../views/Common/Device/Add.vue'),
+						meta: {
+							requireAuth: true,
+							role: [],
+							title: '增加设备',
+						}
+					},
+				],
+			},
+
 		],
 	}
 ]

src/projects/pension/router/master.js

@@ -31,6 +31,28 @@ const routesMaster = [
 					title: '所有功能',
 				}
 			},
+			//主页长者模式
+			{
+				path: 'bigFontHome',
+				name: 'MasterBigFontHome',
+				component: () => import('../views/Master/BigFontHome.vue'),
+				meta: {
+					requireAuth: false,
+					role: [],
+					title: '主页长者模式',
+				}
+			},
+			//切换角色
+			{
+				path: 'exchangeRole',
+				name: 'MasterExchangeRole',
+				component: () => import('../views/Master/ExchangeRole.vue'),
+				meta: {
+					requireAuth: false,
+					role: [],
+					title: '切换角色',
+				}
+			},
 
 			//我的
 			{
@@ -208,6 +230,26 @@ const routesMaster = [
 				],
 			},
 
+			//服务
+			{
+				path: 'serve',
+				component: () => import('../views/Layout.vue'),
+				children: [
+					//服务主页
+					{
+						path: '',
+						name: 'MasterServe',
+						component: () => import('../views/Master/Serve/Home.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '服务主页',
+							mode: true
+						}
+					},
+				],
+			},
+
 			//直播
 			{
 				path: 'live',

src/projects/pension/views/Common/Device/Add.vue

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

src/projects/pension/views/Common/Device/List.vue

@@ -1,111 +1,8 @@
 <template>
-	<div>
-
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
-
-		<div class="mui-content">
-			<div class="mui-content-padded">
-				<h5>
-					设备列表
-					<span class='mui-pull-right'>
-						<span class="color55f868">在线</span> {{onNum}} 台 / <span class="colorfe616c">离线</span> {{offNum}} 台
-					</span>
-				</h5>
-
-			</div>
-
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell mui-media" v-for="(device,index) in devices">
-					<a>
-						<div class="mui-media-body flew-sp">
-							{{index+1}}.{{device.aliasName}}
-							<h4 class='flew-items'>
-								<span class="vongi-sbzt-yuan " :class="device.isOnline?'yuan-green':'yuan-red'"></span>
-								{{device.isOnline?'在线':'离线'}}
-							</h4>
-						</div>
-					</a>
-				</li>
-
-			</ul>
-
-		</div>
-		<loading :visible="isLoading"></loading>
-
-	</div>
 </template>
 
-
 <script>
-	import * as API_Device from '@/apis/Common/device'
-
-	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: 'CommonDeviceList',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '设备列表',
-				devices: [],
-				isLoading: false,
-				onNum: 0,
-				offNum: 0,
-			}
-		},
-		created() {
-			this.pageTitle = this.person_data.companyName;
-		},
-		methods: {
-			//获取列表
-			getList() {
-				API_Device.listOfDevice({
-					schoolId: this.person_data.companyId
-				}).then(data => {
-					this.devices = data;
-					for (var i in data) {
-						if (data[i].isOnline) {
-							this.onNum++;
-						} else {
-							this.offNum++;
-						}
-					}
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			asynCallBack() {
-
-			},
-		},
-		mounted() {
-			//获取列表
-			this.getList();
-		},
-		destroyed() {},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-				person_popedom: 'person_popedom',
-			})
-		}
-	}
 </script>
 
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
 </style>

src/projects/pension/views/Common/Device/OpenDoor.vue

@@ -1,118 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
-
-		<div class="mui-content">
-			<div class="vongi-opendoor">
-				<div class="flew-items">
-					<div class="mui-col-xs-3">
-						<div class="vongi-opendoor-img">
-							<img :src="person_data.faceImageUrl" />
-						</div>
-						{{person_popedom.personRoleName}}
-					</div>
-					<div class="mui-col-xs-9 mui-media-body">
-						{{person_popedom.companyName}}
-						<h5 v-text="person_popedom.deptName"></h5>
-					</div>
-				</div>
-				<div class="vongi-yuan vongi-yuan1"></div>
-				<div class="vongi-yuan vongi-yuan2"></div>
-			</div>
-			<div class="vongi-opendoor-bottom">
-				<div v-for="(item,index) in doorList" class="flew-sp">
-					{{item.name}}
-					<button :disabled="!item.isOnline" class="mui-btn mui-btn-primary" @click="open(item.id)">开门</button>
-				</div>
-			</div>
-		</div>
-
-		<loading :visible="isLoading"></loading>
-	</div>
-</template>
-
-<script>
-	import * as API_Device from '@/apis/Common/device'
-
-	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: 'CommonDeviceOpenDoor',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '手机开门',
-				doorList: [],
-				isLoading: false,
-				onNum: 0,
-				offNum: 0,
-			}
-		},
-		created() {},
-		methods: {
-			//获取列表
-			getDoorList() {
-				this.isLoading = true;
-				API_Device.getDoorList().then(response => {
-					this.isLoading = false;
-					this.doorList = response;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//开门
-			open(id) {
-				var _this = this;
-				var btnArray = ['否', '是'];
-				mui.confirm('确认开门？', '提示', btnArray, function(e) {
-					if (e.index == 1) {
-						_this.openDoor(id);
-					}
-				})
-			},
-			//开门操作
-			openDoor(id) {
-				this.isLoading = true;
-				API_Device.openDoor(id).then(response => {
-					this.isLoading = false;
-					mui.toast('开门成功');
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			asynCallBack() {
-
-			},
-		},
-		mounted() {
-			//获取列表
-			this.getDoorList();
-		},
-		destroyed() {},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-				person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpgj.css"></style>
-<style scoped>
-</style>

src/projects/pension/views/Common/Health/Cert.vue

@@ -1,392 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle" :rightLink="rightLink" :doRightLink="doRightLink" :headerStyle="'background-color:'+statusTitleColor"></top-header>
-		<green-code ref="greenCode" :personId="subForm.personId"></green-code>
-
-		<div class="mui-content vongi-jkz-content">
-			<div class="vongi-jkz-content mui-content-padded mui-clearfix">
-				<div class="vongi-jkz-left mui-col-xs-5">
-					<div class="mui-content-padded faceaifyy-content">
-						<div class="faceaifyy-content-region">
-							<img :src="detail.faceImageUrl">
-						</div>
-						<div class="mui-media-body" style="width: 100%;">最近体温测量<span :style="'color:'+statusTitleColor" v-text="detail.lastTemperature+'℃'"></span></div>
-					</div>
-				</div>
-				<div class="vongi-jkz-right mui-col-xs-7">
-					<ul class="mui-table-view mui-grid-view mui-grid-9 fyy-statistics">
-						<li class="mui-table-view-cell mui-media mui-col-xs-12">
-							<div class="vongi-jkz-list">
-								<div class="fyy-statistics-body">
-									<h2>{{detail.name}}<span :style="'color:'+statusTitleColor">{{statusName}}</span></h2>
-									<a class="mui-navigate-right" @click="showGreenCode">
-										<span class="mui-icon iconfont icon-erweima1" :style="'color: '+statusTitleColor+';margin-right:15px;line-height: 27px'"></span>
-									</a>
-								</div>
-								<div class="mui-ellipsis mui-h5" v-text="detail.parking"></div>
-								<div class="mui-ellipsis mui-h5" v-text="detail.companyName"></div>
-							</div>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-6">
-							<div class="vongi-jkz-list">
-								<div class="fyy-statistics-body">
-									<h3><span class="color55f868 mui-h1" v-text="detail.totalDays"></span>天</h3>
-								</div>
-								<div class="mui-media-body">已连续正常天数</div>
-							</div>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-6">
-							<div class="vongi-jkz-list">
-								<div class="fyy-statistics-body">
-									<h3><span class="colorfe616c mui-h1" v-text="detail.undetectedCount"></span>次</h3>
-								</div>
-								<div class="mui-media-body">漏测记录</div>
-							</div>
-						</li>
-					</ul>
-				</div>
-			</div>
-			<div class="mui-content-padded fyy-echarts">
-				<div class="fyy-echarts-inter" v-for="(item,index) in chartsList">
-					<h4 class="colorf6f448">{{item.startDate}}~{{item.endDate}}</h4>
-					<div :id="'linePicture'+index" style="width:100%;"></div>
-				</div>
-				<!-- <div class="fyy-annotation" @click="doChartTips">
-					<div class="fyy-annotation-color">
-						<span class="color09ae47"></span><span>14天连续测温正常</span>
-					</div>
-					<div class="fyy-annotation-color">
-						<span class="colorfe616c"></span><span>7天内有一次以上异常</span>
-					</div>
-					<div class="fyy-annotation-color">
-						<span class="colord39d33"></span><span>14天内有一次以上异常</span>
-					</div>
-				</div> -->
-			</div>
-		</div>
-
-		<loading :visible="isLoading"></loading>
-	</div>
-</template>
-
-<script>
-	import * as API_Health from '@/apis/Common/health'
-	import GreenCode from '@/components/GreenCode.vue'
-	import echarts from 'echarts/lib/echarts'
-	import 'echarts/lib/chart/line'
-	import 'echarts/lib/component/legend'
-	import 'echarts/lib/component/title'
-	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: 'CommonHealthCert',
-		components: {
-			Common,
-			Loading,
-			TopHeader,
-			GreenCode
-		},
-		data() {
-			return {
-				pageTitle: '健康证',
-
-				isLoading: false,
-
-				rightLink: {
-					show: true,
-					icon: 'icon-shijian',
-					style: 'font-size:14px;color:#000;',
-					title: '测温记录'
-				},
-
-				detail: {},
-
-				subForm: {
-					personId: ''
-				},
-				chartsList: [],
-				maxTemparture: 37,
-				//和下面的对应默认值
-				lineColor: '#e5aa37',
-				statusColor: '#e5aa37',
-				statusTitleColor: '#d39d33',
-				statusName: '异常',
-			}
-		},
-		created() {
-			this.subForm.personId = this.$route.query.personId ? this.$route.query.personId : this.person_data.id;
-		},
-		methods: {
-			//获取详情
-			getDetail() {
-				this.isLoading = true;
-				API_Health.getCertDetail(this.subForm).then(response => {
-					this.detail = response;
-					this.maxTemparture = response.temperatureMax;
-
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//获取统计图表数据
-			getEcharts() {
-				this.isLoading = true;
-				API_Health.getCertList(this.subForm).then(response => {
-					this.chartsList = response;
-					if (response.length > 0) {
-						this.maxTemparture = response[0]['temperatureMax'];
-						this.detail.totalDays = response[0]['totalDays'];
-						this.detail.undetectedCount = response[0]['undetectedCount'];
-						//this.getStatus()
-						//只根据绿码来判断状态
-						this.getGreenCode()
-						this.echarts();
-					}
-
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//根据绿码显示颜色
-			getGreenCode() {
-				var colors = this.$refs.greenCode.getCode();
-				this.statusColor = colors.foreground;
-				this.statusTitleColor = colors.foreground;
-				this.statusName = colors.title;
-				console.log(colors);
-			},
-			//计算显示颜色
-			getStatus() {
-				if (this.chartsList.length) {
-					var chartList = this.chartsList[0]['list'].slice();
-					chartList.reverse();
-					//console.log(chartList)
-					for (var index in chartList) {
-						if (chartList[index]['value'] >= this.maxTemparture && index < 7) {
-							this.statusColor = '#fe616c';
-							this.statusTitleColor = '#ed5b65';
-							this.statusName = '异常';
-							break;
-						} else if (chartList[index]['value'] >= this.maxTemparture && index < 14) {
-							this.statusColor = '#e5aa37';
-							this.statusTitleColor = '#d39d33';
-							this.statusName = '异常';
-							break;
-						} else {
-							this.statusColor = '#0bcf54';
-							this.statusTitleColor = '#09ae47';
-							this.statusName = '正常';
-						}
-					}
-
-					//如果全为0则显示默认值
-					var allzero = true;
-					for (var index in chartList) {
-						if (chartList[index]['value'] > 0) {
-							allzero = false;
-							break;
-						}
-					}
-					if (allzero) {
-						this.statusColor = '#e5aa37';
-						this.statusTitleColor = '#d39d33';
-						this.statusName = '异常';
-					}
-				}
-			},
-			echarts() {
-				this.$nextTick(() => {
-					var _titleData = [];
-					var _listData = [];
-					for (var index in this.chartsList) {
-						for (var k in this.chartsList[index]['list']) {
-							_titleData.push(this.chartsList[index]['list'][k]['name']);
-							_listData.push(this.chartsList[index]['list'][k]['value']);
-						}
-					}
-
-					console.log(_titleData);
-					console.log(_listData);
-					for (var index in this.chartsList) {
-						var _this = this;
-						//是否有异常数据
-						for (var k in this.chartsList[index]['list']) {
-							if (this.chartsList[index]['list'][k]['value'] >= this.maxTemparture) {
-								this.lineColor = 'yellow';
-								break;
-							}
-						}
-
-						var wheight = window.screen.height;
-						if (wheight < 480) {
-							var rHeight = '180';
-							var gHeight = '130';
-						} else if (wheight >= 480 && wheight <= 568) {
-							var rHeight = '190';
-							var gHeight = '130';
-						} else if (wheight > 568 && wheight <= 736) {
-							var rHeight = '200';
-							var gHeight = '130';
-						} else {
-							var rHeight = '230';
-							var gHeight = '180';
-						}
-
-						// 基于准备好的dom，初始化echarts实例
-						var myChart = echarts.init(document.getElementById('linePicture' + index));
-						// 指定图表的配置项和数据
-						var option = {
-							xAxis: {
-								type: 'category',
-								boundaryGap: false,
-								data: _titleData,
-								axisLabel: {
-									textStyle: {
-										color: '#fff',
-										fontSize: '12'
-									},
-									showMinLabel: true,
-									showMaxLabel: true,
-								},
-								axisLine: {
-									lineStyle: {
-										type: 'solid',
-										color: '#fff',
-										//width: '2'
-									}
-								},
-							},
-							yAxis: {
-								type: 'value',
-								axisLabel: {
-									textStyle: {
-										color: '#fff',
-										//fontSize: '12'
-									},
-								},
-								min: 30,
-								max: 40,
-								splitNumber: 6,
-								axisLine: {
-									lineStyle: {
-										type: 'solid',
-										color: '#fff',
-										//width: '2'
-									}
-								},
-								splitLine: {
-									lineStyle: {
-										type: 'dashed',
-										color: '#404978',
-									}
-								}
-							},
-							series: [{
-								data: _listData,
-								type: 'line',
-								//smooth: true,
-								markLine: { //添加警戒线
-									symbol: "none", //去掉警戒线最后面的箭头
-									name: "",
-									silent: true,
-									precision: 2,
-									data: [{
-										silent: true, //鼠标悬停事件  true没有，false有
-										lineStyle: { //警戒线的样式  ，虚实  颜色
-											type: "solid",
-											color: "red"
-										},
-										label: {
-											position: 'start'
-										},
-										yAxis: _this.maxTemparture
-									}]
-								},
-								lineStyle: {
-									normal: {
-										color: _this.statusColor //改变区域颜色
-									}
-								},
-								areaStyle: {
-									color: _this.statusColor,
-								}
-							}],
-							visualMap: {
-								show: false,
-								//dimension: 0,
-								seriesIndex: 0,
-								pieces: [{
-									gt: _this.maxTemparture,
-									lt: 40,
-									color: 'red'
-								}, {
-									gt: 0,
-									lt: _this.maxTemparture,
-									color: 'green'
-								}],
-							},
-							grid: {
-								show: true,
-								x: 40,
-								x2: 30,
-								y: 20,
-								height: gHeight
-							},
-						};
-
-						// 使用刚指定的配置项和数据显示图表。
-						myChart.setOption(option);
-						myChart.resize({
-							height: rHeight + 'px'
-						})
-					}
-				});
-			},
-			//显示健康码
-			showGreenCode() {
-				this.$refs.greenCode.showGreenCode();
-			},
-			//右上角点击事件
-			doRightLink() {
-				this.$router.push({
-					name: 'CommonHealthTemperatureRecord',
-					query: {}
-				})
-			},
-			asynCallBack() {},
-		},
-		mounted() {
-			//获取详情
-			this.getDetail();
-			//获取统计图表
-			this.getEcharts();
-
-			this.$refs.greenCode.getGreenCode();
-		},
-		destroyed() {},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style scoped src="$project/assets/css/sczpfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style scoped>
-</style>

src/projects/pension/views/Common/Health/TemperatureInfo.vue

@@ -1,117 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle" :rightLink="rightLink" :doRightLink="doRightLink"></top-header>
-
-		<div class="mui-content fyy-detail-content mui-fullscreen">
-			<div class="mui-content-padded fyynew-detail">
-				<div class="fyynew-detail-photo">
-					<div class="fyynew-detail-region">
-						<img :src="detail.faceImage">
-					</div>
-				</div>
-				<div class="fyynew-detail-title" :style="detail.fever?'background: rgba(254,97,108,0.6);':'background: rgba(5,200,175,0.6);'"
-				 v-text="detail.fever?'检测异常':'检测正常'"></div>
-				<div class="fyynew-detail-wendu" :style="'background-color:'+detail.fever?'#fe616c':'#05c8af'" v-text="detail.temperature"></div>
-				<div class="fyynew-detail-text">
-					<h4 v-text="detail.personName"></h4>
-					<ul class="mui-table-view fyy-view">
-						<li class="mui-table-view-cell">
-							<label>检测时间</label>
-							<span v-text="detail.recordTime"></span>
-						</li>
-						<li class="mui-table-view-cell">
-							<label>设备名称</label>
-							<span v-text="detail.deviceName"></span>
-						</li>
-					</ul>
-				</div>
-			</div>
-		</div>
-
-		<loading :visible="isLoading"></loading>
-	</div>
-</template>
-
-<script>
-	import * as API_Health from '@/apis/Common/health'
-	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: 'CommonHealthTemperatureInfo',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '详情',
-
-				isLoading: false,
-
-				rightLink: {
-					show: true,
-					icon: 'icon-tongji',
-					style: 'font-size:14px',
-					title: '健康统计'
-				},
-
-				detail: {},
-
-				subForm: {
-					id: this.$route.query.id
-				},
-			}
-		},
-		created() {
-
-		},
-		methods: {
-			//获取详情
-			getInfo() {
-				this.isLoading = true;
-				API_Health.getTemperatureInfo(this.subForm).then(response => {
-					this.detail = response;
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//右上角点击事件
-			doRightLink() {
-				this.$router.push({
-					name: 'CommonHealthCert',
-					query: {
-						personId: this.detail.personId
-					}
-				})
-			},
-			asynCallBack() {},
-		},
-		mounted() {
-			this.getInfo();
-		},
-		destroyed() {},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style scoped src="$project/assets/css/sczpfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style scoped>
-</style>

src/projects/pension/views/Common/Health/TemperatureRecord.vue

@@ -1,158 +0,0 @@
-<template>
-	<div>
-		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle" :rightLink="rightLink" :doRightLink="doRightLink"></top-header>
-
-		<div class="mui-content">
-			<div class="mui-content-padded">
-				<ul class="mui-table-view openfyy-list">
-					<li v-for="(item,index) in recordList" @click="goToPage(item.id)" class="mui-table-view-cell mui-media flew-sp">
-						<div class="mui-h4">
-							<span v-text="item.recordTime"></span>
-							<!-- <button>设备测温</button> -->
-						</div>
-						<span class="mui-navigate-right">
-							<p class="color05c8af">
-								{{item.fever?'异常':'正常'}}
-								<!-- <span v-text="item.temperature"></span> -->
-							</p>
-						</span>
-					</li>
-				</ul>
-			</div>
-		</div>
-
-		<loading :visible="isLoading"></loading>
-	</div>
-</template>
-
-<script>
-	import * as API_Health from '@/apis/Common/health'
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-	import isReachBottom from '$project/utils/isReachBottom'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	export default {
-		name: 'CommonHealthTemperatureRecord',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '测温记录',
-
-				isLoading: false,
-
-				rightLink: {
-					show: true,
-					icon: 'icon-baojing',
-					style: 'font-size:14px',
-					title: '异常记录'
-				},
-
-				recordList: [],
-
-				listForm: {
-					pageIndex: 1,
-					pageSize: 20,
-					token: '',
-					fever: '',
-					totalPage: 1
-				},
-			}
-		},
-		created() {
-
-		},
-		methods: {
-			goToPage(id) {
-				this.$router.push({
-					name: 'CommonHealthTemperatureInfo',
-					query: {
-						id: id
-					}
-				})
-			},
-			//获取列表
-			getList() {
-				this.isLoading = true;
-				API_Health.getRecordList(this.listForm).then(response => {
-					if (response) {
-						if (this.listForm.pageIndex == 1) {
-							this.recordList = response.data;
-							this.listForm.pageIndex = response.pageNumber;
-							this.listForm.totalPage = response.totalPage;
-						} else {
-							this.recordList = [
-								...this.recordList,
-								...response.data
-							];
-						}
-					}
-					this.listForm.pageIndex++;
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//下拉事件
-			handleScrool() {
-				if (isReachBottom()) {
-					console.log('到达底部')
-					if (this.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
-						this.getList();
-					} else {
-						return;
-					}
-				}
-			},
-			//右上角点击事件
-			doRightLink() {
-				this.listForm.pageIndex = 1;
-				this.listForm.fever = this.listForm.fever == 1 ? '' : 1;
-				this.getList();
-			},
-			asynCallBack() {},
-		},
-		mounted() {
-			this.getList();
-			//监控下拉加载事件
-			var _this = this;
-			window.addEventListener('scroll', _this.handleScrool);
-		},
-		destroyed() {
-			//销毁监听事件
-			var _this = this;
-			window.removeEventListener('scroll', _this.handleScrool);
-		},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-                person_popedom: 'person_popedom',
-			})
-		},
-		watch: {
-			'listForm.fever': function(newValue, oldValue) {
-				if (newValue == 1) {
-					this.rightLink.title = '全部记录';
-				} else {
-					this.rightLink.title = '异常记录';
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style scoped>
-</style>

src/projects/pension/views/Master/BigFontHome.vue

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

src/projects/pension/views/Master/ExchangeRole.vue

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

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

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