Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -370,7 +370,7 @@ body {
 .mui-input-row .mui-btn {
 	width: 70%;
 	padding: 0;
-	padding-right: 45px;
+	padding-right: 35px;
 	line-height: 43px;
 	text-align: right;
 	background: 0;
@@ -384,7 +384,10 @@ body {
 	right: 15px;
 	padding-top: 22px;
 }
-
+.vongi-qingjiadt .mui-input-row i{
+	position:initial;
+	padding-top:0
+}
 .fyy-footer {
 	position: fixed;
 	bottom: 0;
@@ -410,7 +413,8 @@ body {
 	width: 30%;
 }
 .fyy-view .mui-table-view-cell span{
-	display: flow-root;
+	display: flex;
+    justify-content: space-between;
 }
 
 .mui-table-view.fyy-view:before,
@@ -936,7 +940,13 @@ h3 {
 	width: 100%;
 	padding: 11px 15px
 }
-
+.vongi-yj-btn {
+    padding: 15px 20%;
+}
+.vongi-yj-btn button{
+	padding:5px 15px;
+	border-radius: 17px;
+}
 .vongi-login-form.mui-input-group .mui-input-row:after {
 	-webkit-transform: initial;
 	transform: initial;
@@ -977,9 +987,14 @@ h3 {
 }
 
 .vongi-pipei .mui-pull-left {
-	margin-right: 15px
+	margin-right: 15px;
+	position:relative
+}
+.vongi-pipei .mui-pull-left .mui-badge{
+	position:absolute;
+	right:0;
+	top:0
 }
-
 .vongi-pipei .mui-table-view-cell a {
 	display: flex;
 	align-items: center;
@@ -1678,6 +1693,11 @@ h3 {
 }
 .vongi-fkdat-name .flew{
 	justify-content : flex-end;
+	align-items: center;
+}
+.vongi-qingjiadt .mui-input-group .flew span{
+	padding:0;
+	margin-left:5px
 }
 .vongi-fkdat-name h5{
 	width:20px;
@@ -1694,3 +1714,48 @@ h3 {
 	border-radius: 7px;
 	overflow: hidden;
 }
+.vongi-yqma .mui-table-view{
+	width:90%;
+	margin:0 auto;
+}
+.vongi-yqma-ma{
+	border:1px solid #EEEEEE;
+	border-radius: 3px;
+	padding:10px;
+	margin-bottom:10px
+}
+.vongi-yqma-ma img{
+	width:100%
+}
+.vongi-yqma .mui-table-view-cell span{
+	text-align: right;
+    justify-content: flex-end;
+}
+.vongi-yqma .mui-table-view-cell p{
+	text-align: center;
+	font-size:14px;
+}
+.vongi-yqma .mui-content-padded{
+	background:#ffffff;
+	border-radius: 9px;
+}
+.vongi-yqma-logo{
+	margin: 15px auto;
+    width: 100px;
+}
+.vongi-yqma-logo img{
+	display: flex;
+}
+.vongi-sbzt-yuan {
+	width:12px;
+	height:12px;
+	border-radius: 50%;	
+	display: block;
+	margin-right:5px
+}
+.yuan-green{
+	background:#52C41A
+}
+.yuan-red{
+	background:#FF6666
+}

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

@@ -1,8 +1,46 @@
 <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>
+					设备列表
+					<span class='mui-pull-right'>
+						<span class="color55f868">在线</span> 1 台 / <span class="colorfe616c">离线</span> 1 台
+					</span>
+				</h5>
+
+			</div>
+
+			<ul class="mui-table-view">
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						<div class="mui-media-body flew-sp">
+							1.设备别称1
+							<h4 class='flew-items'><span class="vongi-sbzt-yuan yuan-green"></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 flew-sp">
+							2.设备别称2
+							<h4 class='flew-items'><span class="vongi-sbzt-yuan yuan-red"></span>在线</h4>
+						</div>
+					</a>
+				</li>
+			</ul>
+
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
-</style>
+</style>

src/projects/home/views/User/Role.vue

@@ -15,6 +15,7 @@
 									<img :src="person_data.faceImageUrl">
 								</div>
 								<p class='mui-ellipsis'>员工</p>
+								<span class="mui-badge mui-badge-danger">1</span>
 							</div>
 							<div class="mui-media-body mui-col-xs-10">
 								{{person_data.position1}}