Merge remote-tracking branch 'origin/master'

src/assets/css/mui.min.css

@@ -230,7 +230,7 @@ body {
 
 a {
 	text-decoration: none;
-	color: #eb59fc
+	color: #666
 }
 
 a:active {
@@ -843,14 +843,14 @@ p {
 	width: 100%;
 	height: 100%;
 	content: '';
-	background-image: url("data:image/svg+xml;charset=utf-8,<svg viewBox='0 0 120 120' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'><defs><line id='l' x1='60' x2='60' y1='7' y2='27' stroke='%236c6c6c' stroke-width='11' stroke-linecap='round'/></defs><g><use xlink:href='%23l' opacity='.27'/><use xlink:href='%23l' opacity='.27' transform='rotate(30 60,60)'/><use xlink:href='%23l' opacity='.27' transform='rotate(60 60,60)'/><use xlink:href='%23l' opacity='.27' transform='rotate(90 60,60)'/><use xlink:href='%23l' opacity='.27' transform='rotate(120 60,60)'/><use xlink:href='%23l' opacity='.27' transform='rotate(150 60,60)'/><use xlink:href='%23l' opacity='.37' transform='rotate(180 60,60)'/><use xlink:href='%23l' opacity='.46' transform='rotate(210 60,60)'/><use xlink:href='%23l' opacity='.56' transform='rotate(240 60,60)'/><use xlink:href='%23l' opacity='.66' transform='rotate(270 60,60)'/><use xlink:href='%23l' opacity='.75' transform='rotate(300 60,60)'/><use xlink:href='%23l' opacity='.85' transform='rotate(330 60,60)'/></g></svg>");
+	background-image: url("data:image/svg+xml;charset=utf-8,<svg viewBox=\'0 0 120 120\' xmlns=\'http://www.w3.org/2000/svg\' xmlns:xlink=\'http://www.w3.org/1999/xlink\'><defs><line id=\'l\' x1=\'60\' x2=\'60\' y1=\'7\' y2=\'27\' stroke=\'%236c6c6c\' stroke-width=\'11\' stroke-linecap=\'round\'/></defs><g><use xlink:href=\'%23l\' opacity=\'.27\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(30 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(60 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(90 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(120 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(150 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.37\' transform=\'rotate(180 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.46\' transform=\'rotate(210 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.56\' transform=\'rotate(240 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.66\' transform=\'rotate(270 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.75\' transform=\'rotate(300 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.85\' transform=\'rotate(330 60,60)\'/></g></svg>");
 	background-repeat: no-repeat;
 	background-position: 50%;
 	background-size: 100%
 }
 
 .mui-spinner-white:after {
-	background-image: url("data:image/svg+xml;charset=utf-8,<svg viewBox='0 0 120 120' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'><defs><line id='l' x1='60' x2='60' y1='7' y2='27' stroke='%23fff' stroke-width='11' stroke-linecap='round'/></defs><g><use xlink:href='%23l' opacity='.27'/><use xlink:href='%23l' opacity='.27' transform='rotate(30 60,60)'/><use xlink:href='%23l' opacity='.27' transform='rotate(60 60,60)'/><use xlink:href='%23l' opacity='.27' transform='rotate(90 60,60)'/><use xlink:href='%23l' opacity='.27' transform='rotate(120 60,60)'/><use xlink:href='%23l' opacity='.27' transform='rotate(150 60,60)'/><use xlink:href='%23l' opacity='.37' transform='rotate(180 60,60)'/><use xlink:href='%23l' opacity='.46' transform='rotate(210 60,60)'/><use xlink:href='%23l' opacity='.56' transform='rotate(240 60,60)'/><use xlink:href='%23l' opacity='.66' transform='rotate(270 60,60)'/><use xlink:href='%23l' opacity='.75' transform='rotate(300 60,60)'/><use xlink:href='%23l' opacity='.85' transform='rotate(330 60,60)'/></g></svg>")
+	background-image: url("data:image/svg+xml;charset=utf-8,<svg viewBox=\'0 0 120 120\' xmlns=\'http://www.w3.org/2000/svg\' xmlns:xlink=\'http://www.w3.org/1999/xlink\'><defs><line id=\'l\' x1=\'60\' x2=\'60\' y1=\'7\' y2=\'27\' stroke=\'%23fff\' stroke-width=\'11\' stroke-linecap=\'round\'/></defs><g><use xlink:href=\'%23l\' opacity=\'.27\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(30 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(60 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(90 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(120 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.27\' transform=\'rotate(150 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.37\' transform=\'rotate(180 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.46\' transform=\'rotate(210 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.56\' transform=\'rotate(240 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.66\' transform=\'rotate(270 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.75\' transform=\'rotate(300 60,60)\'/><use xlink:href=\'%23l\' opacity=\'.85\' transform=\'rotate(330 60,60)\'/></g></svg>")
 }
 
 @-webkit-keyframes spinner-spin {
@@ -1307,6 +1307,9 @@ input[type=submit]:enabled:active {
 	padding-right: 10px;
 	padding-left: 10px
 }
+.mui-bar-nav.mui-bar .mui-pull-right{
+	line-height: 44px;
+}
 
 .mui-title {
 	font-size: 17px;

src/assets/css/sczpfyy.css

@@ -6,50 +6,23 @@
 	color: #4557a2;
 	font-size: 90%
 }
-.mui-content .bindfyy-btn {
-	width: 100%;
-	padding: 0 15%;
-	text-align: center;
-	margin:0;
-}
 
-.bindfyy-btn {
+.mui-content .bindfyy-btn {
 	width: 100%;
 	padding: 0 15%;
 	text-align: center;
-	margin:0;
-	position: fixed;
-	bottom:0
-}
-.bindfyy-btn.fyy-btn{
-	position:initial;
-	margin: 0 auto;
-    width: 100%;
-}
-.bindfyy-btn button {
-	border-radius: 20px;
-	line-height: 26px;
-	width: 100%;
-	margin-bottom: 15px;
-}
-
-.faceaifyy-content.mui-content-padded {
-	background: url(../img/faceai.png) center no-repeat;
-	background-size: 100% 100%;
-	height: 300px;
-	width: 60%;
-	padding: 15px;
-	margin: 30px auto
+	margin: 0;
 }
 
 .faceaifyy-content-region img {
-	background: #283464;
+	background: #999;
 	text-align: center;
 	height: 100%;
 	justify-content: center;
 	flex-direction: column;
 	display: flex;
-	width: 100%
+	width: 100%;
+	object-fit: cover;
 }
 
 .faceaifyy-content-region span {
@@ -72,11 +45,6 @@
 	color: #666;
 }
 
-.faceaifyy-content.mui-content-padded {
-	height: 300px;
-	width: 60%
-}
-
 .mui-content-padded.faceaifyy-content-text {
 	margin: 0;
 	padding-top: 0
@@ -95,7 +63,7 @@
 
 .fyy-small-photo .mui-table-view.fyy-view {
 	padding: 10px 0;
-    background: #eee;
+	background: #eee;
 }
 
 .fyy-view .mui-table-view-cell label {
@@ -188,15 +156,16 @@
 	position: relative;
 }
 
-.fyy-date.mui-content-padded h5{
+.fyy-date.mui-content-padded h5 {
 	padding: 0 15px;
-	margin:15px 0;
-	color:#333
+	margin: 15px 0;
+	color: #333
 }
+
 .fyy-date.mui-content-padded {
-	background:#ffffff;
-	margin:0;
-	margin-bottom:10px
+	background: #ffffff;
+	margin: 0;
+	margin-bottom: 10px
 }
 
 .fyydate-name {
@@ -253,7 +222,7 @@
 }
 
 .fyy-statistics.mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-body {
-	font-size: 15px;
+	text-align: center;
 }
 
 .fyy-statistics.mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-body.mui-h3 {
@@ -270,13 +239,25 @@
 }
 
 .fyy-statistics.mui-grid-view.mui-grid-9 .mui-media .fyy-statistics-body {
-	background: #fff;
-	padding: 20px 0;
 	border-radius: 4px;
 }
 
+.fyy-statistics.mui-grid-view.mui-grid-9 {
+	padding-left: 10px
+}
+
 .fyy-statistics.mui-grid-view.mui-grid-9 .mui-table-view-cell {
-	padding: 0 10px;
+	text-align: left;
+	padding: 0
+}
+
+.fyy-statistics.mui-grid-view.mui-grid-9 .mui-table-view-cell.mui-col-xs-6 .vongi-jkz-list {
+	margin-right: 5px
+}
+
+.fyy-statistics.mui-grid-view.mui-grid-9 .mui-table-view-cell.mui-col-xs-6:last-child .vongi-jkz-list {
+	margin-right: 0;
+	margin-left: 5px
 }
 
 .mui-table-view .mui-media-body h4 {
@@ -354,11 +335,10 @@
 
 .fyy-headimg.mui-table-view .mui-media-body {
 	line-height: 42px;
-	padding-right:20px
+	padding-right: 20px
 }
 
 .fyy-echarts {
-	margin: 10px 20px;
 	position: relative;
 }
 
@@ -377,7 +357,7 @@
 }
 
 .fyy-echarts-inter {
-	background: #283464;
+	background: #ffffff;
 	padding: 15px;
 	border-radius: 4px;
 }
@@ -532,13 +512,16 @@
 .fyy-undetect .mui-segmented-control.mui-segmented-control-inverted .mui-control-item {
 	color: #999
 }
-.fyy-undetect .mui-segmented-control.mui-segmented-control-inverted .mui-control-item.mui-active{
-	background:#999;
-	color:#ffffff
+
+.fyy-undetect .mui-segmented-control.mui-segmented-control-inverted .mui-control-item.mui-active {
+	background: #999;
+	color: #ffffff
 }
-.fyy-undetect .mui-grid-view.mui-grid-9 .mui-media{
-	color:#333
+
+.fyy-undetect .mui-grid-view.mui-grid-9 .mui-media {
+	color: #333
 }
+
 .fyy-bar {
 	font-size: 15px;
 	line-height: 44px;
@@ -553,7 +536,7 @@
 }
 
 .fyynew-detail-photo .fyynew-detail-region {
-	background: #283464;
+	background: #999;
 	border-radius: 2px;
 	overflow: hidden;
 	display: flex;
@@ -564,7 +547,7 @@
 	display: block;
 	border-radius: 2px;
 	object-fit: cover;
-	width:100%
+	width: 100%
 }
 
 .fyynew-detail-text {
@@ -580,23 +563,33 @@
 
 .fyynew-detail-title {
 	position: absolute;
-	top: 15px;
+	top: 30px;
 	right: -10px;
 	text-align: center;
-}
-
-.fyynew-detail-title h4 {
 	padding: 10px 30px;
 	background: rgba(5, 200, 175, 0.6);
 	border-bottom-left-radius: 2px;
 	border-top-left-radius: 2px;
-	color:#ffffff
+	color: #ffffff;
+}
+
+.fyynew-detail-wendu {
+	width: 50px;
+	height: 50px;
+	border-radius: 50%;
+	background: rgba(5, 200, 175, 0.6);
+	line-height: 50px;
+	text-align: center;
+	color: #ffffff;
+	position: absolute;
+	top: 30px;
+	left: 20px
 }
 
 .fyynew-detail-text h4 {
 	font-weight: initial;
 	margin-bottom: 10px;
-	color:#ffffff
+	color: #ffffff
 }
 
 .fyynew-detail-title p {
@@ -611,16 +604,13 @@
 
 .fyynew-detail-text .mui-table-view.fyy-view .mui-table-view-cell {
 	padding: 5px 15px;
-	color:#999
+	color: #999
 }
 
 @media (min-width: 360px) {
 	/*.fyynew-detail {
 		margin-top: 30px
 	}*/
-	.fyynew-detail-title {
-		top: 30px
-	}
 	.fyynew-detail-region {
 		height: 520px;
 	}
@@ -636,29 +626,26 @@
 	.fyy-statistics.mui-grid-view.mui-grid-9 .mui-media .mui-icon {
 		font-size: 36px;
 	}
-	.fyy-statistics.mui-grid-view.mui-grid-9 .mui-media .fyy-statistics-body {
-		padding: 15px 0
-	}
 	.fyy-statistics-examples {
 		padding: 0 0 15px;
 	}
 	/*.fyynew-detail-region {
 		height: 393px;
 	}*/
-	.mui-content.fyy-small-photo .faceaifyy-content.mui-content-padded{
-		height:150px;
-		width:40%
+	.mui-content.fyy-small-photo .faceaifyy-content.mui-content-padded {
+		height: 150px;
+		width: 40%
 	}
-	body{
-		font-size:15px
+	body {
+		font-size: 15px
 	}
 }
 
 .fyy-annotation {
 	position: absolute;
-	top: 15px;
-	right: -20px;
-	background: rgba(16, 25, 58, 0.6);
+	top: 0;
+	right: -10px;
+	background: rgba(0, 0, 0, 0.6);
 	padding: 10px;
 	z-index: 999;
 }
@@ -668,6 +655,10 @@
 	padding: 5px 0
 }
 
+.fyy-annotation-color span {
+	color: #ffffff
+}
+
 .fyy-annotation .color09ae47,
 .fyy-annotation .colorfe616c,
 .fyy-annotation .colord39d33 {
@@ -689,10 +680,11 @@
 	background: #d39d33
 }
 
-.fyy-small-photo .faceaifyy-content.mui-content-padded{
-	height:240px;
-	width:50%
+.fyy-small-photo .faceaifyy-content.mui-content-padded {
+	height: 240px;
+	width: 50%
 }
-.fyy-small-photo .fyy-view li{
-	padding:5px 15px
+
+.fyy-small-photo .fyy-view li {
+	padding: 5px 15px
 }

src/assets/css/xpwyfyy.css

@@ -10,31 +10,31 @@ body {
 }
 
 .color4fc5f7 {
-	color: #4fc5f7
+	color: #3385FF/*蓝*/
 }
 
 .colorf8b155 {
-	color: #f8b155
+	color: #FF8400/*黄*/
 }
 
 .color05c8af {
-	color: #05c8af
+	color: #05c8af/*湖绿*/
 }
 
 .colorfe616c {
-	color: #fe616c
+	color: #fe616c/*红*/
 }
 
 .colorda94f8 {
-	color: #da94f8
+	color: #da94f8/*紫*/
 }
 
 .color55f868 {
-	color: #47bf37
+	color: #47bf37/*绿*/
 }
 
 .color-yellow {
-	color: #fe616c
+	color: #fe616c/*红*/
 }
 
 .color-bule {
@@ -45,6 +45,10 @@ body {
 	color: #375cf5
 }
 
+.margin60 {
+	margin-bottom: 60px
+}
+
 .inedxfyy-content {
 	margin-bottom: 70px
 }
@@ -173,10 +177,6 @@ body {
 	.mui-grid-view.mui-grid-9 .mui-media .mui-icon {
 		font-size: 26px
 	}
-	.mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-body {
-		font-size: 15px;
-		line-height: 15px;
-	}
 	.mui-grid-view.mui-grid-9 .mui-table-view-cell>a:not(.mui-btn) {
 		padding: 5px 0
 	}
@@ -200,6 +200,9 @@ body {
 	.mui-input-group .mui-input-row p {
 		font-size: 14px
 	}
+	.mui-content .vongi-choose .mui-table-view-cell a{
+		padding:11px 15px
+	}
 }
 
 .bindfyy-btn button {
@@ -221,11 +224,13 @@ body {
 .openfyy-list .mui-table-view-cell:after {
 	background: 0
 }
-.openfyy-list .mui-table-view-cell .mui-media-body{
+
+.openfyy-list .mui-table-view-cell .mui-media-body {
 	white-space: nowrap;
-    text-overflow: ellipsis;
-    padding-right:30px
+	text-overflow: ellipsis;
+	padding-right: 30px
 }
+
 .openfyy-progressbar {
 	text-align: center;
 	padding: 30% 30px
@@ -270,15 +275,6 @@ body {
 	border-radius: 3px;
 }
 
-.faceaifyy-content.mui-content-padded {
-	background: url(../img/faceai.png) center no-repeat;
-	background-size: 100% 100%;
-	height: 300px;
-	width: 60%;
-	padding: 15px;
-	margin: 20px auto
-}
-
 .faceaifyy-content-region {
 	background: #999;
 	text-align: center;
@@ -355,10 +351,11 @@ body {
 	padding: 0;
 	padding-right: 45px;
 	line-height: 50px;
-	text-align: left;
+	text-align: right;
 	background: 0;
 	border: 0;
-	font-size: 17px;
+	font-size: 14px;
+	margin-bottom: 0
 }
 
 .mui-input-row {
@@ -375,7 +372,7 @@ body {
 	position: fixed;
 	bottom: 0;
 	width: 100%;
-	padding: 15px;
+	padding: 10px 15px;
 }
 
 .fyy-footer .bindfyy-btn {
@@ -387,14 +384,13 @@ body {
 	padding: 15px 0
 }
 
-.fyy-view .mui-table-view-cell label {
-	float: left;
-	width: 30%;
+.mui-table-view.fyy-view .mui-table-view-cell {
+	padding: 5px 15px
 }
 
-.fyy-view .mui-table-view-cell span {
+.fyy-view .mui-table-view-cell label {
 	float: left;
-	width: 70%;
+	width: 30%;
 }
 
 .mui-table-view.fyy-view:before,
@@ -411,8 +407,8 @@ body {
 .mui-input-row p {
 	line-height: 50px;
 	font-size: 14px;
-	padding-right:15px;
-	color:#333
+	padding-right: 15px;
+	color: #333
 }
 
 .fyy-content {
@@ -533,10 +529,6 @@ h3 {
 	top: 20px
 }
 
-.fyy-footer .mui-btn {
-	margin-top: 10px
-}
-
 .fyy-footer p {
 	text-align: center;
 }
@@ -584,7 +576,7 @@ h3 {
 .fyy-upphoto .mui-content-padded h5 {
 	margin: 25px 0 15px;
 	color: #666;
-	font-size:16px
+	font-size: 16px
 }
 
 .fyy-upphoto .mui-media-body {
@@ -609,67 +601,234 @@ h3 {
 .fyy-radio ul li .mui-media-body {
 	color: #ffffff
 }
-.vongi-notice{
-	background:#ffffff;
-	margin-top:10px;
-	padding:15px;
-	margin-bottom:10px
+
+.vongi-notice {
+	background: #ffffff;
+	margin-top: 10px;
+	padding: 15px;
+	margin-bottom: 10px
 }
-.vongi-notice p{
-	font-size:14px
+
+.vongi-notice p {
+	font-size: 14px
 }
 
-.vongi-notice .mui-h3{
-	padding:15px 0;
-	border-bottom:1px #eee solid;
-	margin-bottom:15px
+.vongi-notice .mui-h3 {
+	padding: 15px 0;
+	border-bottom: 1px #eee solid;
+	margin-bottom: 15px
 }
-.vongi-notice-img{
-	height:68px;
+
+.vongi-notice-img {
+	height: 68px;
 	display: flex;
 	overflow: hidden;
-	margin-bottom:10px
+	margin-bottom: 10px
 }
-.vongi-notice-img img{
-	width:100%;
+
+.vongi-notice-img img {
+	width: 100%;
 	min-height: 100%;
 	object-fit: cover;
 }
-.vongi-notice-list{
-	padding:15px;
-	background:#ffffff
+
+.vongi-notice-list {
+	padding: 15px;
+	background: #ffffff
 }
-.vongi-notice-list h3{
-	margin-bottom:10px;
+
+.vongi-notice-list h3 {
+	margin-bottom: 10px;
 }
-.vongi-notice-list h3 img{
-	margin-right:5px
+
+.vongi-notice-list h3 img {
+	margin-right: 5px
 }
-.vongi-floor-padded a{
-	padding:2px 0 2px 15px;
+
+.vongi-floor-padded a {
+	padding: 2px 0 2px 15px;
 	display: block;
-	color:#333;
-	position:relative;
-	}
-.vongi-floor-padded a:after{
+	color: #333;
+	position: relative;
+}
+
+.vongi-floor-padded a:after {
 	content: "";
-    position: absolute;
-    left: 0;
-    background: #333;
-    width: 3px;
-    height: 3px;
-    border-radius: 1.5px;
-    top: 50%;
-    margin-top: -1.5px;
-}
-.vongi-editme .mui-input-row .mui-btn img{
-	width:32px;
-	height:32px;
+	position: absolute;
+	left: 0;
+	background: #333;
+	width: 3px;
+	height: 3px;
+	border-radius: 1.5px;
+	top: 50%;
+	margin-top: -1.5px;
+}
+.fyy-statistics-body h3{
+	text-align: center;
+	width:100%
+}
+
+.vongi-editme .mui-input-row .mui-btn img {
+	width: 32px;
+	height: 32px;
 	border-radius: 50%;
 	margin: 9px 0;
-    float: right;
+	float: right;
 }
+
 .vongi-editme .mui-input-row input,
-.vongi-editme .mui-input-row p{
+.vongi-editme .mui-input-row p {
 	text-align: right;
 }
+
+.openfyy-list .flew-sp {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.openfyy-list .flew-sp .mui-h4 {
+	display: flex;
+	align-items: center;
+}
+
+.openfyy-list .flew-sp .mui-h4 button {
+	margin-left: 15px;
+	padding: 3px 12px
+}
+
+.openfyy-list .flew-sp a {
+	padding-right:
+}
+
+.openfyy-list .flew-sp .mui-navigate-right:after,
+.openfyy-list .flew-sp .mui-push-right:after {
+	right: 0
+}
+
+.mui-bar .mui-icon.iconfont {
+	font-size: 14px;
+	margin-right: 3px;
+	padding-right: 0
+}
+
+.fyy-footer .bindfyy-btn button {
+	font-size: 14px
+}
+
+.mui-input-row .mui-switch {
+	margin: 0;
+	width: 45px;
+	height: 25px;
+	line-height: 15px;
+}
+
+.mui-switch .mui-switch-handle {
+	width: 23px;
+	height: 23px;
+}
+
+.vongi-jkz-left,
+.vongi-jkz-right {
+	float: left
+}
+
+.vongi-jkz-content .faceaifyy-content.mui-content-padded {
+	margin: 0;
+	background: 0;
+    padding: 0;
+    height:178px;
+    width: 100%;
+}
+
+.fyy-statistics.mui-grid-view.mui-grid-9 .mui-table-view-cell {
+	margin-top: 10px
+}
+.fyy-statistics.mui-grid-view.mui-grid-9 .mui-table-view-cell:first-child{
+	margin-top:0
+}
+.vongi-jkz-right h2{
+	display: flex;
+	align-items: center;
+	float:left
+}
+.vongi-jkz-right h2 span{
+	border:1px #47bf37 solid;
+	padding:3px 8px;
+	font-size:12px;
+	border-radius: 4px;
+	margin-left:10px
+}
+.fyy-statistics.mui-grid-view.mui-grid-9 .mui-media .fyy-statistics-body .mui-icon{
+	font-size:18px
+}
+.fyy-statistics-body{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.fyy-statistics-body a{
+	position:relative;
+	padding-right: 20px;
+}
+.fyy-statistics-body .mui-navigate-right:after, .fyy-statistics-body .mui-push-right:after{
+	right:0
+}
+
+.mui-content.vongi-jkz-content {
+	overflow: hidden;
+}
+.faceaifyy-content .mui-media-body{
+	background:rgba(0,0,0,0.5);
+	padding:5px;
+	position:absolute;
+	bottom:0;
+	color:#ffffff
+}
+.faceaifyy-content .mui-media-body span{
+	margin-left:5px
+}
+.vongi-jkz-list{
+	background:#ffffff;
+	padding:10px;
+	border-radius: 4px;
+}
+.vongi-choose-yq{
+	background:url(../img/blue.png) no-repeat center;	
+}
+.vongi-choose-zz{
+	background:url(../img/green.png) no-repeat center;	
+}
+.vongi-choose-yl{
+	background:url(../img/red.png) no-repeat center;	
+}
+.vongi-choose .mui-media-body,
+.vongi-choose .mui-media-body p,
+.vongi-choose .mui-navigate-right:after, .vongi-choose .mui-push-left:after, .vongi-choose .mui-push-right:after{
+	color:#ffffff
+}
+.vongi-choose{
+	padding:30px
+}
+.vongi-choose .mui-table-view{
+	background:0
+}
+.vongi-choose .mui-table-view-cell{
+	margin-top:15px;
+	background-size:100% 100%;
+	border-radius: 7px;
+}
+
+.vongi-choose .mui-media-body p{
+	margin-top:5px
+}
+.vongi-choose .mui-table-view-cell a{
+	padding:20px 15px
+}
+.vongi-choose h5{
+	line-height: 1.4;
+}
+.vongi-choose h1{
+	text-align: center;
+	margin-bottom:10px
+}

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

@@ -1,8 +1,79 @@
 <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>
+			<a class=" mui-pull-right" href=""><span class="mui-icon iconfont icon-shijian"></span>测温记录</a>
+		</header>
+		<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="~$project/assets/img/zhaop.jpg">
+						</div>
+						<div class="mui-media-body">最近体温测量<span class="color55f868">36.5℃</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>冯银银<span class="color55f868">健康</span></h2>
+									<a href="" class="mui-navigate-right">
+										<span class="mui-icon iconfont icon-erweima1"></span>
+									</a>
+								</div>
+								<div class="mui-ellipsis mui-h5">湖北荆鹏软件集团有限公司</div>
+								<div class="mui-ellipsis mui-h5">信息工程部</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">3</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">0</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 ">
+					<h4 class="colorf6f448">2020-03-21</h4>
+					<div><img src="~$project/assets/img/echarts.png"> </div>
+				</div>
+				<div class="fyy-annotation">
+					<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>
+</div>
 </template>
 
 <script>
 </script>
 
+<style src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/sczpfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -1,8 +1,42 @@
 <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>
+			<a class="mui-pull-right" href=""><span class="mui-icon iconfont icon-tongji"></span>健康统计</a>
+		</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="~$project/assets/img/zhaop1.jpg">
+					</div>
+				</div>
+				<div class="fyynew-detail-title">检测正常</div>
+				<div class="fyynew-detail-wendu">36.5</div>
+				<div class="fyynew-detail-text">
+					<h4>冯银银</h4>
+					<ul class="mui-table-view fyy-view">
+						<li class="mui-table-view-cell">
+							<label>检测时间</label>
+							<span>2020-03-14  15:28</span>
+						</li>
+						<li class="mui-table-view-cell">
+							<label>设备名称</label>
+							<span>荆鹏侧门</span>
+						</li>
+					</ul>
+				</div>
+			</div>								
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/sczpfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -1,8 +1,35 @@
 <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>
+			<a class=" mui-pull-right" href=""><span class="mui-icon iconfont icon-baojing"></span>异常记录</a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded">
+				<ul class="mui-table-view openfyy-list">
+					<li class="mui-table-view-cell mui-media flew-sp">
+						<div class="mui-h4"><span>2020-04-18 08:47</span><button>设备测温</button></div>
+						<a href="javascript:;" class="mui-navigate-right">
+							<p class="color05c8af">正常<span>36.5</span></p>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media flew-sp">
+						<div class="mui-h4"><span>2020-04-18 08:47</span><button>体温上报</button></div>
+						<a href="javascript:;" class="mui-navigate-right">
+							<p class="colorfe616c">异常<span>39.3</span></p>
+						</a>
+					</li>
+				</ul>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

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

@@ -1,8 +1,29 @@
 <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">
+			<div class="mui-content-padded">
+				<h5>如发现疫情，请及时上报</h5>
+				<div class="mui-input-row">
+					<textarea id="textarea" rows="5" placeholder="请输入">下午6：40发现园区电梯未按规定消毒。</textarea>
+				</div>
+			</div>
+		</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 src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/sczpfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Role.vue

@@ -1,6 +1,46 @@
 <template>
 	<div>
-		role
+		<header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">选择行业</h1>
+		</header>
+		<div class="mui-content margin60">
+			<div class="vongi-choose">
+				<h1>选择行业</h1>
+				<h5>“小鹏管家”是智慧物业、智慧园区、智慧养老的云管家，111111是智慧生活的守护神。管家服务于访客、园区（包括小区、养老院、企事业单位、厂区）人员及管理者。主要功能包括出入管理、健康监管、考勤打卡、物业管理、园区安全管理、访客管理以及在线缴费等。</h5>
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell mui-media vongi-choose-yq">
+						<a class="mui-navigate-right">
+							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/icon02.png">
+							<div class="mui-media-body">
+								工厂园区
+								<p class='mui-ellipsis'>适用于办公楼、工厂、工业园等场所</p>
+							</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media vongi-choose-zz">
+						<a class="mui-navigate-right">
+							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/icon02.png">
+							<div class="mui-media-body">
+								社区住宅
+								<p class='mui-ellipsis'>适用于社区、小区、公寓等场所</p>
+							</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media vongi-choose-yl">
+						<a class="mui-navigate-right">
+							<img class="mui-media-object mui-pull-left" src="~$project/assets/img/icon02.png">
+							<div class="mui-media-body">
+								养老院
+								<p class='mui-ellipsis'>适用于养老机构</p>
+							</div>
+						</a>
+					</li>
+				</ul>
+			</div>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-outlined">我是访客</button></div>
+		</div>
 	</div>
 </template>
 
@@ -12,5 +52,6 @@
 </script>
 
 <style scoped src="$project/assets/css/iconfont.css"></style>
+<style scoped src="$project/assets/css/spwyfyy.css"></style>
 <style scoped>
 </style>