Merge remote-tracking branch 'origin/master'

src/assets/css/wallfyy.css

@@ -4,8 +4,12 @@
 
 .fyy-statistics.mui-grid-view.mui-grid-9 .mui-table-view-cell {
 	padding: 0 5px;
+	margin-top:10px
 }
 
+.fyy-statistics.mui-grid-view.mui-grid-9 .mui-table-view-cell:first-child{
+	margin-top:10px
+}
 .fyy-statistics.mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-body {
 	text-align: left;
 	margin: 0;
@@ -14,7 +18,9 @@
 }
 
 .fyy-statistics.mui-grid-view.mui-grid-9 .mui-media .fyy-statistics-body {
-	padding: 15px 10px
+	padding: 15px 10px;
+	background: #fff;
+    border-radius: 4px;
 }
 
 .fyy-statistics-body .iconfont {
@@ -87,13 +93,19 @@
 	object-fit: cover;
 	min-height: 100%;
 }
-
+.fyy-slider .mui-slider-group .mui-table-view-cell .mui-media-object .mui-icon{
+	position:absolute;
+	bottom:0;
+	left:0;
+	font-size:26px
+}
 .fyy-slider .mui-table-view .mui-table-view-cell .mui-media-object {
 	width: 100%;
 	overflow: hidden;
 	max-width: 100%;
 	height: 100px;
 	display: flex;
+	position:relative
 }
 
 .fyy-slider .mui-table-view .mui-table-view-cell {
@@ -115,14 +127,24 @@
 }
 
 .mui-segmented-control.mui-segmented-control-inverted .mui-control-item.mui-active {
-	background: #375cf5;
-	color:#ffffff
+	position:relative;
+	color:#333
+}
+.mui-segmented-control.mui-segmented-control-inverted .mui-control-item.mui-active:after{
+	width:50px;
+	height:2px;
+	content: "";
+	background:#3385FF;
+	position:absolute;
+	bottom:0;
+	left:50%;
+	margin-left:-25px
 }
-
 .mui-segmented-control.mui-scroll-wrapper .mui-control-item {
 	padding: 0;
 	display: inline-block;
 	line-height: 38px;
+	color:#999
 }
 
 .mui-segmented-control.mui-scroll-wrapper,
@@ -159,3 +181,32 @@
 	display: block;
 	float:right
 }
+.fyy-wall-top{
+	position:relative
+}
+
+.fyy-wall .fyy-statistics.mui-grid-view.mui-grid-9{
+	padding:0;
+	padding:0 5px
+}
+.fyy-wall-date{
+	position:absolute;
+	top:0;
+	left:50%;
+	background:#FFFFFF;
+	padding:0 15px;
+	-webkit-box-shadow: 0 1px 6px #ccc;
+    box-shadow: 0 1px 6px #ccc;
+    color:#333;
+    z-index: 2;
+    margin-left:-51px;
+    border-radius: 0 0 10.5px 10.5px;
+    font-size:12px
+}
+.fyy-danwei{
+	float: right;
+	display: block;
+}
+.fyy-wall-num{
+	text-align: center;
+}

src/assets/css/xpwyfyy.css

@@ -204,7 +204,7 @@ body {
 	select,
 	textarea,
 	.mui-input-group .mui-input-row .mui-btn {
-		font-size: 15px
+		font-size: 14px
 	}
 	.mui-content .faceaifyy-content.mui-content-padded {
 		height: 240px
@@ -1567,9 +1567,7 @@ h3 {
 	padding:0 5px;
 	display: flex;
 	height:46px;
-	border-radius: 4px;
-	
-	 
+	border-radius: 4px;		 
 }
 .vongi-yddk-dat-photo .mui-col-xs-3 img{
 	width:100%;
@@ -1577,3 +1575,15 @@ h3 {
 	background:#999;
 	min-height: 45px;
 }
+.vongi-send .mui-input-row{
+	position:relative
+}
+.vongi-send .mui-input-row h6{
+	position:absolute;
+	right:15px;
+	bottom:0
+}
+.vongi-dwlist h6{
+	text-align: center;
+    padding: 10px 15px;
+}

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

@@ -1,8 +1,37 @@
 <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 class="mui-content vongi-dwlist">
+			<ul class="mui-table-view openfyy-list">
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;" class="mui-navigate-right">
+						<div class="mui-media-body">
+							远鹏众创空间
+							<h4 class='mui-pull-right'><span class="color4fc5f7">2</span>/<span class="color4fc5f7">2</span></h4>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;" class="mui-navigate-right">
+						<div class="mui-media-body">
+							远鹏众创空间
+							<h4 class='mui-pull-right'><span class="color4fc5f7">2</span>/<span class="color4fc5f7">2</span></h4>
+						</div>
+					</a>
+				</li>
+			</ul>
+			<h6>已测：<span class="color4fc5f7">193</span>  /  应测：<span class="color4fc5f7">198</span></h6>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
-</style>
+</style>

src/projects/business/views/HouseKeeper/Control/Health/Wall.vue

@@ -1,8 +1,185 @@
 <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 class="mui-content fyy-wall">
+			<div class="fyy-wall-top">
+				<div class="fyy-wall-date">
+					2020-04-03
+				</div>
+				<ul class="mui-table-view mui-grid-view mui-grid-9 fyy-statistics">
+					<li class="mui-table-view-cell mui-media mui-col-xs-6">
+						<div class="fyy-statistics-body">
+							<div class="fyy-wall-number fyy-wall-small">
+								<div class="mui-media-body" style="margin-bottom:5px">
+									<span class="mui-icon iconfont icon-renyuanjieshao"></span>
+									<p class="mui-col-xs-7">已测员工</p>
+									<span class="mui-col-xs-5"><span class="color55f868">18</span><span class="fyy-danwei">人</span></span>
+								</div>
+								<div class="mui-media-body">
+									<span class="mui-icon iconfont icon-yuangongruzhi"></span>
+									<p class="mui-col-xs-7">应测员工</p>
+									<span class="mui-col-xs-5"><span class="color4fc5f7">100</span><span class="fyy-danwei">人</span></span>
+								</div>
+							</div>
+						</div>
+					</li>
+					<li class="mui-table-view-cell mui-media mui-col-xs-6">
+						<div class="fyy-statistics-body">
+							<div class="fyy-wall-number fyy-wall-small ">
+								<div class="mui-media-body" style="margin-bottom:5px">
+									<span class="mui-icon iconfont icon-renshu"></span>
+									<p class="mui-col-xs-6">已测访客</p>
+									<span class="mui-col-xs-6"><span class="colorf8b155">18</span><span class="fyy-danwei">人</span></span>
+								</div>
+								<div class="mui-media-body">
+									<span class="mui-icon iconfont icon-leijicishu1"></span>
+									<p class="mui-col-xs-6">当日异常</p>
+									<span class="mui-col-xs-6"><span class="colorfe616c">5000</span><span class="fyy-danwei">人</span></span>
+								</div>
+							</div>
+						</div>
+					</li>
+				</ul>
+
+				<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="fyy-statistics-body">
+							<div class="fyy-wall-number fyy-wall-small">
+								<div class="mui-media-body" style="margin-bottom:5px">
+									<span class="mui-icon iconfont icon-baojing"></span>
+									<p class="mui-col-xs-8">当日异常<span style="margin:0 15px">/</span>累计异常</p>
+									<span class="mui-col-xs-4"><span class="colorfe616c">0</span>人 <span style="margin:0 15px">/</span><span class="colorfe616c">1</span>人</span>
+								</div>
+								<div class="mui-media-body">
+									<span class="mui-icon iconfont icon-shijian"></span>
+									<p class="mui-col-xs-8">连续无异常天数</p>
+									<span class="mui-col-xs-4"><span class="color55f868">6</span>天</span>
+								</div>
+							</div>
+						</div>
+					</li>
+				</ul>
+
+			</div>
+			<div id="slider" class="mui-slider mui-fullscreen fyy-slider">
+				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
+					<div class="mui-scroll">
+						<a class="mui-control-item mui-active" href="#item1mobile" style="width:30%">
+							全部测温记录
+						</a>
+						<a class="mui-control-item" href="#item2mobile" style="width:36%">
+							内部员工测温记录
+						</a>
+						<a class="mui-control-item" href="#item3mobile" style="width:34%">
+							访客测温记录
+						</a>
+					</div>
+				</div>
+				<div class="mui-slider-group">
+					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
+						<div id="scroll1" class="mui-scroll-wrapper">
+							<div class="mui-scroll">
+								<ul class="mui-table-view">
+									<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-pull-left">
+										<div class="mui-content-padded">
+											<div class="mui-media-object">
+												<img src="~$project/assets/img/zhaop1.jpg">
+												<span class="mui-icon iconfont icon-erweima1 color55f868"></span>
+											</div>
+											<div class="mui-media-body">
+												<span>冯银银</span>
+												<span class="mui-pull-right color55f868">36.5</span>
+											</div>
+											<p>04-03 <span>09:07</span></p>
+										</div>
+									</li>
+									<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-pull-left">
+										<div class="mui-content-padded">
+											<div class="mui-media-object">
+												<img src="~$project/assets/img/zhaop1.jpg">
+												<span class="mui-icon iconfont icon-erweima1 colorfe616c"></span>
+											</div>
+											<div class="mui-media-body">
+												<span>冯银银</span>
+												<span class="mui-pull-right colorfe616c">38.5</span>
+											</div>
+											<p>04-03 <span>09:07</span></p>
+										</div>
+									</li>
+									<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-pull-left">
+										<div class="mui-content-padded">
+											<div class="mui-media-object">
+												<img src="~$project/assets/img/zhaop1.jpg">
+												<span class="mui-icon iconfont icon-erweima1 color999"></span>
+											</div>
+											<div class="mui-media-body">
+												<span>冯银银</span>
+												<span class="mui-pull-right color55f868">36.5</span>
+											</div>
+											<p>04-03 <span>09:07</span></p>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+					<div id="item2mobile" class="mui-slider-item mui-control-content">
+						<div class="mui-scroll-wrapper">
+							<div class="mui-scroll">
+								<ul class="mui-table-view">
+									<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-pull-left">
+										<div class="mui-content-padded">
+											<div class="mui-media-object">
+												<img src="~$project/assets/img/zhaop1.jpg">
+												<span class="mui-icon iconfont icon-erweima1 color55f868"></span>
+											</div>
+											<div class="mui-media-body">
+												<span>冯银银</span>
+												<span class="mui-pull-right color55f868">36.5</span>
+											</div>
+											<p>04-03 <span>09:07</span></p>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+					<div id="item3mobile" class="mui-slider-item mui-control-content">
+						<div class="mui-scroll-wrapper">
+							<div class="mui-scroll">
+								<ul class="mui-table-view">
+									<li class="mui-table-view-cell mui-media mui-col-xs-4 mui-pull-left">
+										<div class="mui-content-padded">
+											<div class="mui-media-object">
+												<img src="~$project/assets/img/zhaop1.jpg">
+												<span class="mui-icon iconfont icon-erweima1 color55f868"></span>
+											</div>
+											<div class="mui-media-body">
+												<span>冯银银</span>
+												<span class="mui-pull-right color55f868">36.5</span>
+											</div>
+											<p>04-03 <span>09:07</span></p>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/sczpfyy.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style scoped src="$project/assets/css/wallfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
-</style>
+</style>

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

@@ -1,8 +1,31 @@
 <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 class="mui-content margin60">
+			<form class="mui-input-group vongi-send">
+				<div class="mui-input-row">
+					<label>通知标题</label>
+					<input type="text" placeholder="请输入标题">
+				</div>
+				<div class="mui-input-row">
+					<textarea id="textarea" rows="5" placeholder="请填写内容，最多可输入1000字"></textarea>
+					<h6>0/1000</h6>
+				</div>
+			</form>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">发送</button></div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>