Merge remote-tracking branch 'origin/master'

src/assets/css/xpgj.css

@@ -206,9 +206,7 @@
 	background-color: #3385FF;
 	box-shadow: none;
 }
-.vongi-bar .mui-title{
-	color:#020101;
-}
+
 .vongi-index-bar .mui-title{
 	color:#ffffff;
 	text-align: left;
@@ -305,3 +303,25 @@
 	border-radius: initial;
 	font-size:16px
 }
+.vongi-floor-num{
+	border: 1px #eee solid;
+    padding: 10px;
+	border-radius: 7px;
+	text-align: center;
+}
+.vongi-floor-num .mui-media-body{
+	padding:2px 20px;
+	display:  inline-block;;
+	border-radius: 5px;
+	color:#ffffff;
+	font-size:18px
+}
+.vongi-bag-blue{
+	background:#096DD9
+}
+.vongi-bag-green{
+	background:#389E0D
+}
+.vongi-floor-num h4{
+	margin:8px 0 0
+}

src/projects/business/views/HouseKeeper/Admin/Home.vue

@@ -39,6 +39,12 @@
 							<div class="mui-media-body">健康档案</div>
 						</a>
 					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
+						<a href="javascript:void(0)">
+							<img src="~$project/assets/img/logo_xiaopengguanjia.png" />
+							<div class="mui-media-body">考勤统计</div>
+						</a>
+					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
 						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/icon_shipinjiankong.png" />

src/projects/business/views/HouseKeeper/Control/Home.vue

@@ -2,32 +2,32 @@
 	<div>
 		<common @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="pageTitle" headerClass="vongi-bar vongi-index-bar" :rightLink="rightLink" :doRightLink="doRightLink"
-		 :leftShow="false"></top-header>
+		 :leftShow="false" :titleDownShow="true" :downAction="downAction"></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">
 						<router-link :to="{name:'HouseKeeperAdminPersonAdd'}">
-							<img src="~$project/assets/img/icon35.png" />
+							<img src="~$project/assets/img/icon13.png" />
 							<div class="mui-media-body">发送通知</div>
 						</router-link>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon05.png" />
+							<img src="~$project/assets/img/icon34.png" />
 							<div class="mui-media-body">职工台账</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon49.png" />
+							<img src="~$project/assets/img/icon50.png" />
 							<div class="mui-media-body">异常统计</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon52.png" />
+							<img src="~$project/assets/img/icon16.png" />
 							<div class="mui-media-body">健康公示</div>
 						</a>
 					</li>
@@ -35,31 +35,31 @@
 				<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="javascript:void(0)">
-							<img src="~$project/assets/img/icon_jiankangdangan.png" />
+							<img src="~$project/assets/img/icon_danweiliebiao.png" />
 							<div class="mui-media-body">单位列表</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon_shipinjiankong.png" />
+							<img src="~$project/assets/img/icon_cewenjilu.png" />
 							<div class="mui-media-body">职工测温</div>
 						</a>
 					</li>
                     <li class="mui-table-view-cell mui-media mui-col-xs-3">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon_jiankangdangan.png" />
+							<img src="~$project/assets/img/icon_fangkecewen.png" />
 							<div class="mui-media-body">访客测温</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon_shipinjiankong.png" />
+							<img src="~$project/assets/img/icon_fangkejilu.png" />
 							<div class="mui-media-body">访客记录</div>
 						</a>
 					</li>
                     <li class="mui-table-view-cell mui-media mui-col-xs-3">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/icon_jiankangdangan.png" />
+							<img src="~$project/assets/img/icon_shebeizhuangtai.png" />
 							<div class="mui-media-body">设备状态</div>
 						</a>
 					</li>
@@ -72,25 +72,21 @@
 				</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 class="vongi-floor-num">
+							<div class="mui-media-body vongi-bag-blue">
+								26	
 							</div>
-							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon15.png" width="54" />
+                            <h4 class="mui-ellipsis">今日到岗人数</h4>							
 						</div>
-
 					</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 class="vongi-floor-num">
+							<div class="mui-media-body vongi-bag-green">
+								26	
 							</div>
-							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon18.png" width="54" />
+                            <h4 class="mui-ellipsis">体温正常人数</h4>							
 						</div>
 					</div>
 					<div class="mui-col-xs-12">
@@ -104,26 +100,7 @@
 						</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="javascript:void(0)">
-									<img src="~$project/assets/img/02.jpg">
-								</a>
-							</div>
-							<!-- 第二张 -->
-							<div class="mui-slider-item">
-								<a href="javascript:void(0)">
-									<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>
+					
 				</div>
 			</div>
 		</div>