页面调整

src/projects/business/components/NavMenu.vue

@@ -0,0 +1,42 @@
+<template>
+	<nav class="mui-bar mui-bar-tab">
+		<a class="mui-tab-item" @click="doRouter('home')">
+			<span class="mui-icon iconfont icon-shouye2"></span>
+			<span class="mui-tab-label">首页</span>
+		</a>
+		<a :class="'mui-tab-item '+'mui-active'" @click="doRouter('message')">
+			<span class="mui-icon iconfont icon-xiaoxi1"></span>
+			<span class="mui-tab-label">消息</span>
+		</a>
+		<a class="mui-tab-item" @click="doRouter('center')">
+			<span class="mui-icon iconfont icon-wode1"></span>
+			<span class="mui-tab-label">我的</span>
+		</a>
+	</nav>
+</template>
+
+<script>
+	import router from '@/router'
+	export default {
+		name: 'NavMenu',
+		props: {
+			visible: {
+				require: false,
+				default: true,
+			},
+			name: {
+				require: false,
+				default: '',
+			},
+		},
+		created(){
+			console.log(router);
+		},
+		methods: {},
+		mounted() {}
+	}
+</script>
+
+<style scoped src="$project/assets/css/iconfont.css"></style>
+<style scoped>
+</style>

src/projects/business/router/master.js

@@ -464,6 +464,35 @@ const routesMaster = [
 				]
 			},
 
+			//健康
+			{
+				path: 'health',
+				component: () => import('../views/Layout.vue'),
+				children: [
+					//测温记录
+					{
+						path: 'temperatureRecord',
+						name: 'MasterHealthTemperatureRecord',
+						component: () => import('../views/Master/Health/TemperatureRecord.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '测温记录',
+						}
+					},
+					//疫情上报
+					{
+						path: 'report',
+						name: 'MasterHealthReport',
+						component: () => import('../views/Master/Health/Report.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '疫情上报',
+						}
+					},
+				],
+			}
 
 		],
 	},

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

@@ -90,6 +90,6 @@
 	}
 </script>
 
-<style src="$project/assets/css/xpwyfyy.css"></style>
-<style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style scoped>
 </style>

src/projects/business/views/Master/Health/Report.vue

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

src/projects/business/views/Master/Health/TemperatureRecord.vue

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

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

@@ -1,194 +1,238 @@
 <template>
 	<div>
-		<header class="mui-bar mui-bar-nav vongi-bar">
-				<h1 class="mui-title">荆鹏软件集团有限公司</h1>
-			</header>
-			<div class="mui-content margin49">
-				<div class="vongi-icons">
-					<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-grid-head">
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/icon54.png" />
-								<div class="mui-media-body">健康证</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/icon41.png" />
-								<div class="mui-media-body">健康证</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/icon39.png" />
-								<div class="mui-media-body">考勤记录</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/icon.png" />
-								<div class="mui-media-body">请假</div>
-							</a>
-						</li>
-					</ul>
-					<ul class="mui-table-view mui-grid-view mui-grid-9">
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/cicon19.png" />
-								<div class="mui-media-body">疫情上报</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/cicon10.png" />
-								<div class="mui-media-body">访客审批</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/cicon01.png" />
-								<div class="mui-media-body">携物出厂</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/cicon27.png" />
-								<div class="mui-media-body">每周菜谱</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/cicon04.png" />
-								<div class="mui-media-body">申请补卡</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/cicon05.png" />
-								<div class="mui-media-body">异地打卡</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/cicon22.png" />
-								<div class="mui-media-body">用车申请</div>
-							</a>
-						</li>
-						<li class="mui-table-view-cell mui-media mui-col-xs-3">
-							<a href="#">
-								<img src="~$project/assets/img/cicon30.png" />
-								<div class="mui-media-body">全部</div>
-							</a>
-						</li>
-					</ul>
-				</div>
-				<div class="vongi-index-floor">
-					<h4 class="vongi-floor-title">功能推荐区</h4>
-					<div class="vongi-index-inter flew-sp">
-						<div class="mui-col-xs-6">
-							<div class="vongi-floor-padded">
-								<div class="mui-media-body">
-									<h4 class="mui-ellipsis">关联健康码</h4>
-									<p class="mui-ellipsis">出行更便捷</p>
-								</div>
-								<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon15.png" width="54" />
-							</div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
 
+		<div class="mui-content margin49">
+			<div class="vongi-icons">
+				<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-grid-head">
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/icon54.png" />
+							<div class="mui-media-body">健康证</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/icon41.png" />
+							<div class="mui-media-body">健康证</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/icon39.png" />
+							<div class="mui-media-body">考勤记录</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/icon.png" />
+							<div class="mui-media-body">请假</div>
+						</a>
+					</li>
+				</ul>
+				<ul class="mui-table-view mui-grid-view mui-grid-9">
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/cicon19.png" />
+							<div class="mui-media-body">疫情上报</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/cicon10.png" />
+							<div class="mui-media-body">访客审批</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/cicon01.png" />
+							<div class="mui-media-body">携物出厂</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/cicon27.png" />
+							<div class="mui-media-body">每周菜谱</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/cicon04.png" />
+							<div class="mui-media-body">申请补卡</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/cicon05.png" />
+							<div class="mui-media-body">异地打卡</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/cicon22.png" />
+							<div class="mui-media-body">用车申请</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3">
+						<a href="#">
+							<img src="~$project/assets/img/cicon30.png" />
+							<div class="mui-media-body">全部</div>
+						</a>
+					</li>
+				</ul>
+			</div>
+			<div class="vongi-index-floor">
+				<h4 class="vongi-floor-title">功能推荐区</h4>
+				<div class="vongi-index-inter flew-sp">
+					<div class="mui-col-xs-6">
+						<div class="vongi-floor-padded">
+							<div class="mui-media-body">
+								<h4 class="mui-ellipsis">关联健康码</h4>
+								<p class="mui-ellipsis">出行更便捷</p>
+							</div>
+							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon15.png" width="54" />
 						</div>
-						<div class="mui-col-xs-6">
-							<div class="vongi-floor-padded">
-								<div class="mui-media-body">
-									<h4 class="mui-ellipsis">上传登记照</h4>
-									<p class="mui-ellipsis">打卡快人一步</p>
-								</div>
-								<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon18.png" width="54" />
+
+					</div>
+					<div class="mui-col-xs-6">
+						<div class="vongi-floor-padded">
+							<div class="mui-media-body">
+								<h4 class="mui-ellipsis">上传登记照</h4>
+								<p class="mui-ellipsis">打卡快人一步</p>
 							</div>
+							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon18.png" width="54" />
 						</div>
-						<div class="mui-col-xs-12">
-							<div class="vongi-floor-padded">
-								<a href="" class="text-list">
-									<h5 class="mui-ellipsis">9月园区活动通知</h5><span>9月20日</span>
+					</div>
+					<div class="mui-col-xs-12">
+						<div class="vongi-floor-padded">
+							<a href="" class="text-list">
+								<h5 class="mui-ellipsis">9月园区活动通知</h5><span>9月20日</span>
+							</a>
+							<a href="" class="text-list">
+								<h5 class="mui-ellipsis">9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知</h5><span>9月20日</span>
+							</a>
+						</div>
+						<a href="" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></a>
+					</div>
+					<div id="slider" class="mui-slider">
+						<div class="mui-slider-group">
+							<!-- 第一张 -->
+							<div class="mui-slider-item">
+								<a href="#">
+									<img src="~$project/assets/img/02.jpg">
 								</a>
-								<a href="" class="text-list">
-									<h5 class="mui-ellipsis">9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知9月园区活动通知</h5><span>9月20日</span>
+							</div>
+							<!-- 第二张 -->
+							<div class="mui-slider-item">
+								<a href="#">
+									<img src="~$project/assets/img/02.jpg">
 								</a>
 							</div>
-							<a href="" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></a>
 						</div>
-						<div id="slider" class="mui-slider">
-							<div class="mui-slider-group">
-								<!-- 第一张 -->
-								<div class="mui-slider-item">
-									<a href="#">
-										<img src="~$project/assets/img/02.jpg">
-									</a>
-								</div>
-								<!-- 第二张 -->
-								<div class="mui-slider-item">
-									<a href="#">
-										<img src="~$project/assets/img/02.jpg">
-									</a>
-								</div>
-							</div>
-							<div class="mui-slider-indicator">
-								<div class="mui-indicator mui-active"></div>
-								<div class="mui-indicator"></div>
-							</div>
+						<div class="mui-slider-indicator">
+							<div class="mui-indicator mui-active"></div>
+							<div class="mui-indicator"></div>
 						</div>
 					</div>
 				</div>
-				<div class="vongi-index-floor">
-					<h4 class="vongi-floor-title">优品推荐</h4>
-					<div class="vongi-index-inter flew-sp">
-						<div class="mui-col-xs-12">
-							<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-floor-padded">
-								<li class="mui-table-view-cell mui-media mui-col-xs-4">
-									<a href="#">
-										<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%"/></div>
-										<div class="mui-media-body">老人防丢手环</div>
-										<div class="mui-media-body color-yellow">¥299.0</div>
-									</a>
-								</li>
-								<li class="mui-table-view-cell mui-media mui-col-xs-4">
-									<a href="#">
-										<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%"/></div>
-										<div class="mui-media-body">老人防丢手环</div>
-										<div class="mui-media-body color-yellow">¥299.0</div>
-									</a>
-								</li>
-								<li class="mui-table-view-cell mui-media mui-col-xs-4">
-									<a href="#">
-										<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%"/></div>
-										<div class="mui-media-body">老人防丢手环</div>
-										<div class="mui-media-body color-yellow">¥299.0</div>
-									</a>
-								</li>
-							</ul>
-						</div>
+			</div>
+			<div class="vongi-index-floor">
+				<h4 class="vongi-floor-title">优品推荐</h4>
+				<div class="vongi-index-inter flew-sp">
+					<div class="mui-col-xs-12">
+						<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-floor-padded">
+							<li class="mui-table-view-cell mui-media mui-col-xs-4">
+								<a href="#">
+									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
+									<div class="mui-media-body">老人防丢手环</div>
+									<div class="mui-media-body color-yellow">¥299.0</div>
+								</a>
+							</li>
+							<li class="mui-table-view-cell mui-media mui-col-xs-4">
+								<a href="#">
+									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
+									<div class="mui-media-body">老人防丢手环</div>
+									<div class="mui-media-body color-yellow">¥299.0</div>
+								</a>
+							</li>
+							<li class="mui-table-view-cell mui-media mui-col-xs-4">
+								<a href="#">
+									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
+									<div class="mui-media-body">老人防丢手环</div>
+									<div class="mui-media-body color-yellow">¥299.0</div>
+								</a>
+							</li>
+						</ul>
 					</div>
 				</div>
 			</div>
-			<nav class="mui-bar mui-bar-tab">
-				<a class="mui-tab-item mui-active" href="#">
-					<span class="mui-icon iconfont icon-shouye2"></span>
-					<span class="mui-tab-label">首页</span>
-				</a>
-				<a class="mui-tab-item" href="news.html">
-					<span class="mui-icon iconfont icon-xiaoxi1"></span>
-					<span class="mui-tab-label">消息</span>
-				</a>
-				<a class="mui-tab-item" href="me.html">
-					<span class="mui-icon iconfont icon-wode1"></span>
-					<span class="mui-tab-label">我的</span>
-				</a>
-			</nav>
+		</div>
+
+		<nav-menu name="Master"></nav-menu>
+
 	</div>
 </template>
 
 <script>
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import isReachBottom from '$project/utils/isReachBottom'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NavMenu from '@/components/NavMenu.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterHome',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+			NavMenu
+		},
+		data() {
+			return {
+				//pageTitle: this.company_data.name,
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+
+		},
+		destroyed() {
+
+		},
+		computed: {
+			pageTitle: {
+				// getter
+				get: function() {
+					return this.company_data.name;
+				},
+				// setter
+				set: function(newValue) {
+					console.log(newValue)
+				}
+			},
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				company_data: 'company_data',
+			})
+		}
+	}
 </script>
 
-<style src="$project/assets/css/xpgj.css"></style>
-<style src="$project/assets/css/iconfont.css"></style>
-<style>
+<style scoped src="$project/assets/css/xpgj.css"></style>
+<style scoped src="$project/assets/css/iconfont.css"></style>
+<style scoped>
 </style>