Merge remote-tracking branch 'origin/master'

src/assets/css/mui.min.css

@@ -2667,7 +2667,7 @@ select:focus {
 .mui-checkbox input[type=checkbox],
 .mui-radio input[type=radio] {
 	position: absolute;
-	top: 15px;
+	top: 7px;
 	right: 20px;
 	display: inline-block;
 	width: 28px;

src/projects/business/apis/Guest/from.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+//
+export function healthShowNumData(params) {
+    return request({
+        url: '/mobile/healthShowApi/numData',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+

src/projects/business/apis/Guest/to.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+//
+export function healthShowNumData(params) {
+    return request({
+        url: '/mobile/healthShowApi/numData',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+

src/projects/business/apis/HouseKeeper/control.js

@@ -18,3 +18,12 @@ export function queryCompanyList(params) {
 		method: 'post',
 	})
 }
+
+//设备列表
+export function listOfDevice(params) {
+	return request({
+		url: '/devOps/listOfDevice',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

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

@@ -1,44 +1,111 @@
 <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">
+
+	<common @asynCallBack="asynCallBack"></common>
+	<top-header :pageTitle="pageTitle"></top-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 class="color55f868">在线</span> {{onNum}} 台 / <span class="colorfe616c">离线</span> {{offNum}} 台
 					</span>
 				</h5>
 
 			</div>
 
 			<ul class="mui-table-view">
-				<li class="mui-table-view-cell mui-media">
-					<a href="javascript:;">
+				<li class="mui-table-view-cell mui-media" v-for="(device,index) in devices">
+					<a  >
 						<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>
+							{{index+1}}.{{device.aliasName}}
+							<h4 class='flew-items'>
+								<span class="vongi-sbzt-yuan " :class="device.isOnline?'yuan-green':'yuan-red'"></span>
+								{{device.isOnline?'在线':'离线'}}
+							</h4>
 						</div>
 					</a>
 				</li>
+
 			</ul>
 
 		</div>
+	<loading :visible="isLoading"></loading>
+
 </div>
 </template>
 
+
 <script>
+	import * as API_Control from '@/apis/HouseKeeper/control'
+
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'HouseKeeperControlDeviceList',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '设备列表',
+				devices:[],
+				isLoading: false,
+				onNum:0,
+				offNum:0,
+			}
+		},
+		created() {
+			this.pageTitle=this.person_data.companyName;
+		},
+		methods: {
+
+			//提交
+			getList() {
+
+				API_Control.listOfDevice({
+					schoolId : this.person_data.companyId
+				}).then(data=>{
+					this.devices = data;
+					for(var i in data){
+						if(data[i].isOnline){
+							this.onNum++;
+						}else{
+							this.offNum++;
+						}
+					}
+				}).catch(error=>{
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+			//获取列表
+			this.getList();
+		},
+		destroyed() {},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	}
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>