优化，对接

pages/accountManage/accountManage.vue

@@ -68,7 +68,7 @@
 		methods: {
 			
 			
-			// 维保计划列表数据请求
+			// 列表数据请求
 			async getDataList(params = {}) {
 				const res = await this.$myRequest({
 					url: 'PermissionBinding/getPermissionBindingList',

pages/analyse/buildingCheck/buildingCheck.vue

@@ -2,30 +2,10 @@
 	<view>
 
 		<!-- 筛选框start -->
-		<view class="ding">
-			<view class="cu-bar search bg-gray filter-section" style="with:50%;">
-				<view class="search-form round bg-white">
-					<select name="" id="" placeholder="" style="width:98%;background-size: 4%;font-size:28rpx">
-						<option value="">请选择建筑</option>
-						<option value="">建筑1</option>
-						<option value="">建筑2</option>
-					</select>
-				</view>
-			</view>
-			<view class="cu-bar search bg-gray filter-section">
-				<calendar></calendar>
-				<!-- <view class="search-form round bg-white" style="margin-bottom:26rpx">
-					<input class="" @focus="InputFocus" v-model="siteName" @blur="InputBlur" :adjust-position="false" type="text"
-					 placeholder="请选择时间" confirm-type="search"></input>
-				</view> -->
-				<view class="action">
-					<button class="cu-btn bg-blue round" @click="searchData()">查询</button>
-				</view>
-			</view>
-		</view>
+		<view style="line-height:100rpx;text-align:center">建筑名称：{{getDetailData.company_name}}</view>
 		<!-- 筛选框end -->
 
-		<view class="processStatus  bg-white margin-bottom-sm" style="margin-top:206rpx">
+		<view class="processStatus  bg-white margin-bottom-sm" style="">
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
 				安全分析
@@ -48,106 +28,70 @@
 						<td>误报频率</td>
 					</tr>
 					<tr>
-						<td>火灾自动报警系统 </td>
-						<td>报警数量68，处理37</td>
-						<td>12%</td>
+						<td>用户信息传输装置 </td>
+						<td>报警数量{{this.getDetailData.count_yc}}，处理{{this.getDetailData.count_ycl_yc}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_yc,this.getDetailData.count_yc)}}</td> 
 					</tr>
 					<tr>
-						<td>电气火灾监控系统</td>
-						<td>报警数量595，处理88</td>
-						<td>0</td>
+						<td>水系统</td>
+						<td>报警数量{{this.getDetailData.count_sj}}，处理{{this.getDetailData.count_ycl_sj}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_sj,this.getDetailData.count_sj)}}</td>
 					</tr>
 					<tr>
-						<td>消防给水系统</td>
-						<td>报警数量1414，处理1252 </td>
-						<td>1% </td>
+						<td>烟感</td>
+						<td>报警数量{{this.getDetailData.count_yg}}，处理1{{this.getDetailData.count_ycl_yg}} </td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_yg,this.getDetailData.count_yg)}} </td>
 					</tr>
 					<tr>
-						<td>消火栓系统</td>
-						<td>报警数量3020，处理387</td>
-						<td> 15%</td>
+						<td>消防栓</td>
+						<td>报警数量{{this.getDetailData.count_xfs}}，处理{{this.getDetailData.count_ycl_xfs}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_xfs,this.getDetailData.count_xfs)}} </td>
 					</tr>
 					<tr>
-						<td>自动喷水灭火系统</td>
-						<td>报警数量36351，处理9</td>
-						<td> 23%</td>
+						<td>液位</td>
+						<td>报警数量{{this.getDetailData.count_yw}}，处理{{this.getDetailData.count_ycl_yw}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_yw,this.getDetailData.count_yw)}} </td>
 					</tr>
 					<tr>
-						<td>防排烟系统</td>
-						<td>报警数量10，处理9</td>
-						<td> 0</td>
+						<td>RTU</td>
+						<td>报警数量{{this.getDetailData.count_rtu}}，处理{{this.getDetailData.count_ycl_rtu}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_rtu,this.getDetailData.count_rtu)}} </td>
 					</tr>
-				</table>
-			</view>
-		</view>
-
-		<view class="processStatus  bg-white margin-bottom-sm">
-			<view class="info-tit margin-left-xs">
-				<text class="cuIcon-titles margin-right-xs"></text>
-				告警频发点位统计分析
-			</view>
-			<view class="info-content padding-lr padding-bottom">
-				<table style="border:1px solid #ccc" cellspacing="0" cellpadding="0" align="center">
 					<tr>
-						<td>子系统 </td>
-						<td>报警点位 </td>
-						<td>报警次数</td>
+						<td>电气火灾</td>
+						<td>报警数量{{this.getDetailData.count_dqhz}}，处理{{this.getDetailData.count_ycl_dqhz}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_dqhz,this.getDetailData.count_dqhz)}} </td>
 					</tr>
 					<tr>
-						<td rowspan="3">火灾自动报警系统</td>
-						<td>一楼大厅门口 </td>
-						<td>12</td>
+						<td>视频监测</td>
+						<td>报警数量{{this.getDetailData.count_spjc}}，处理{{this.getDetailData.count_ycl_spjc}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_spjc,this.getDetailData.count_spjc)}} </td>
 					</tr>
 					<tr>
-
-						<td>二楼茶水间</td>
-						<td>10</td>
+						<td>电梯监测</td>
+						<td>报警数量{{this.getDetailData.count_dtjc}}，处理{{this.getDetailData.count_ycl_dtjc}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_dtjc,this.getDetailData.count_dtjc)}} </td>
 					</tr>
 					<tr>
-
-						<td>厨房</td>
-						<td>8</td>
+						<td>井盖监测</td>
+						<td>报警数量{{this.getDetailData.count_jgjc}}，处理{{this.getDetailData.count_ycl_jgjc}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_jgjc,this.getDetailData.count_jgjc)}} </td>
 					</tr>
 					<tr>
-						<td rowspan="3"> 电气火灾监控系统</td>
-						<td> 二楼卫生间 </td>
-						<td> 7</td>
+						<td>地磁监测</td>
+						<td>报警数量{{this.getDetailData.count_dcjc}}，处理{{this.getDetailData.count_ycl_dcjc}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_dcjc,this.getDetailData.count_dcjc)}} </td>
 					</tr>
 					<tr>
-
-						<td>二楼茶水间</td>
-						<td>6</td>
+						<td>门禁监测</td>
+						<td>报警数量{{this.getDetailData.count_mcjc}}，处理{{this.getDetailData.count_ycl_mcjc}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_mcjc,this.getDetailData.count_mcjc)}} </td>
 					</tr>
 					<tr>
-						<td>三楼大厅</td>
-						<td>5</td>
+						<td>可燃气体监测</td>
+						<td>报警数量{{this.getDetailData.count_krqt}}，处理{{this.getDetailData.count_ycl_krqt}}</td>
+						<td>{{GetPercent(this.getDetailData.count_ycl_krqt,this.getDetailData.count_krqt)}} </td>
 					</tr>
-
-					<tr>
-						<td>消防给水系统</td>
-						<td>二楼接待室</td>
-						<td>4</td>
-					</tr>
-					<tr>
-						<td> 消火栓系统</td>
-						<td> 三楼会议室</td>
-						<td>3</td>
-					</tr>
-					<tr>
-						<td> 自动喷水灭火系统</td>
-						<td> 一楼大厅 </td>
-						<td>2</td>
-					</tr>
-					<tr>
-						<td rowspan="2">防排烟系统</td>
-						<td>三楼档案室 </td>
-						<td>1</td>
-					</tr>
-					<tr>
-						<td>一楼展厅</td>
-						<td>1</td>
-					</tr>
-
 				</table>
 			</view>
 		</view>
@@ -159,14 +103,19 @@
 				存在问题或需要改进事项
 			</view>
 			<view class="padding-lr padding-bottom-lg" style="font-size:30rpx;text-indent:60rpx;line-height:1.7">
-				<view>用户信息传输装置该类设备隐患极高或存在故障，建议尽早进行排查；</view>
-				<view>水系统该类设备隐患极高或存在故障，建议尽早进行排查；</view>
-				<view> 消防栓该类设备隐患极高或存在故障，建议尽早进行排查；</view>
-				<view>液位该类设备隐患极高或存在故障，建议尽早进行排查；</view>
-				<view>电气火灾该类设备隐患极高或存在故障，建议尽早进行排查；</view>
-				<view> 视频监测该类设备隐患极高或存在故障，建议尽早进行排查；</view>
-				<view> 电梯监测该类设备隐患极高或存在故障，建议尽早进行排查； </view>
-				<view>可燃气体监测该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_yc==1">用户信息传输装置该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_sj==1">水系统该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_yg==1"> 烟感栓该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_xfs==1"> 消防栓该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_yw==1">液位该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_rtu==1">RTU该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_dqhz==1">电气火灾该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_spjc==1"> 视频监测该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_dtjc==1"> 电梯监测该类设备隐患极高或存在故障，建议尽早进行排查； </view>
+				<view v-if="this.getDetailData.state_dcjc==1">地磁监测该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_mcjc ==1">门禁监测该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				<view v-if="this.getDetailData.state_krqt==1">可燃气体监测该类设备隐患极高或存在故障，建议尽早进行排查；</view>
+				
 			</view>
 		</view>
 
@@ -176,8 +125,20 @@
 				其他事宜
 			</view>
 			<view class="padding-lr padding-bottom-lg" style="font-size:30rpx;text-indent:60rpx;line-height:1.7">
-				<view>目前数据反映：烟感该类设备通信情况较好，需要保持； </view>
-				<view>目前数据反映：RTU该类设备通信情况较好，需要保持。</view>
+				
+				<view v-if="this.getDetailData.state_yc==0">目前数据反映：用户信息传输装置该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_sj==0">目前数据反映：水系统该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_yg==0">目前数据反映： 烟感栓该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_xfs==0">目前数据反映： 消防栓该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_yw==0">目前数据反映：液位该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_rtu==0">目前数据反映：RTU该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_dqhz==0">目前数据反映：电气火灾该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_spjc==0">目前数据反映： 视频监测该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_dtjc==0">目前数据反映： 电梯监测该类设备通信情况较好，需要保持； </view>
+				<view v-if="this.getDetailData.state_dcjc==0">目前数据反映：地磁监测该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_mcjc ==0">目前数据反映：门禁监测该类设备通信情况较好，需要保持；</view>
+				<view v-if="this.getDetailData.state_krqt==0">目前数据反映：可燃气体监测该类设备通信情况较好，需要保持；</view>
+			
 			</view>
 		</view>
 
@@ -236,6 +197,20 @@
 		},
 		
 		methods: {
+			
+			GetPercent(num, total) {
+			    /// <summary>
+			    /// 求百分比
+			    /// </summary>
+			    /// <param name="num">当前数</param>
+			    /// <param name="total">总数</param>
+			    num = parseFloat(num);
+			    total = parseFloat(total);
+			    if (isNaN(num) || isNaN(total)) {
+			        return "-";
+			    }
+			    return total <= 0 ? "0%" : (Math.round(num / total * 10000) / 100.00)+"%";
+			},
 			// 建筑体检数据请求
 			async getDetails(params = {}) {
 				const res = await this.$myRequest({

pages/deviceManage/deviceManage.vue

@@ -198,8 +198,25 @@
 				}
 			})
 		},
-
+		onLoad:function(option){
+			this.getDataList({'company_code':uni.getStorageSync('selectedCode')})
+		},
 		methods: {
+			
+			// 列表数据请求
+			async getDataList(params = {}) {
+				const res = await this.$myRequest({
+					url: 'DeviceConfig/getDeviceList',
+					data:params,
+					showLoading: true
+				})
+				this.getData=res.data.data;
+			
+				// console.log(res.data.data.length)
+				console.log(this.getData);
+				
+			},
+			
 			// 页面跳转
 			goDeviceAdd() {
 				uni.navigateTo({

pages/setting/building/building.vue

@@ -123,14 +123,12 @@
 		data() {
 			return {
 				getDetailData:{}
-			
 			}
 		},
 		onLoad: function(option) {
 			this.getDetails({'company_code':uni.getStorageSync('selectedCode')})
 		},
 		methods: {
-			
 			// 建筑基础数据请求
 			async getDetails(params = {}) {
 				const res = await this.$myRequest({
@@ -140,25 +138,12 @@
 				})
 				this.getDetailData = res.data.data[0];
 				console.log(this.getDetailData)
-				
 			},
-			
-			
-
-			
-
-
 		}
 	}
 </script>
 
 <style lang="scss">
-	
-	
-
-	
-	
-
 
 </style>
 

pages/videoList/videoDetail/videoDetail.vue

@@ -1,50 +1,24 @@
 <template>
 	<view>
-		<!-- <view class="timeBox flex justify-between align-center padding-lr-sm">
-			<view class="time">火点侦测摄像机</view>
-		</view>
-		<view class="basic-info">
-			<view class="info-tit margin-left-xs">
-				<text class="cuIcon-titles margin-right-xs"></text>
-				基本信息
-			</view>
-			<view class="info-content">
-				<view class="info-one-info ">
-					<text>设备类型：</text>
-					<text>视频监控</text>
-				</view>
-				<view>
-					<text>设备编号：</text>
-					<text>YTVA00001</text>
-				</view>
-				<view>
-					<text style="width:auto!important">物联网卡号：</text>
-					<text></text>
-				</view>
-				<view>
-					<text>安装位置：</text>
-					<text>伍继办公室</text>
-				</view>
-				<view>
-					<text>添加时间：</text>
-					<text>2019-05-28 16:12:45</text>
-				</view>
-				<view>
-					<text>设备地址：</text>
-					<text>上海市虹口区塘沽路</text>
-				</view>
-			</view>
+	<!-- 	<view class="timeBox flex justify-between align-center padding-lr-sm">
+			<view class="time"></view>
 		</view> -->
+		
 
 		<!-- 处理状态start -->
 		<view class="processStatus">
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
-				设备编号：JPL120DAQ
+				设备编号：{{deviceCode}}
 			</view>
-			<view class="padding-lr padding-bottom-lg">
-				<video src="" style="width:690rpx;"></video>
-				<br><br>
+			<view class="padding-lr padding-bottom-lg ">
+
+				<video id="myVideo" :src="videoUrl" style="width:100%" loop="loop" autoplay="autoplay"></video>
+
+				      <!--  <view class="video-js" ref="video" style="text-align:center;width:100%;height:400rpx">  
+				
+				        </view>  -->
+				
 			</view>
 		</view>
 		<!-- 处理状态end -->
@@ -56,27 +30,49 @@
 	export default {
 		data() {
 			return {
-				
-			
+				videoDetail: '',
+				videoUrl:"",
+				deviceCode:''
+
 			}
 		},
-		methods: {
-			
-			
+		 onReady() {  
+	     
+		        },  
+
+		onLoad: function(option) {
 
+
+			// console.log(111)
+			// console.log(option.deviceCode)
+			this.companyCode = option.companyCode
+			this.deviceType = option.deviceType
+			this.deviceCode=option.deviceCode
+			this.videoUrl = 'http://47.103.74.123/hls/'+option.deviceCode+'.m3u8';
 			
+		},
+
 
+		methods: {
+
+			// async getDeviceDetail(ming = {}) {
+			// 	const res = await this.$myRequest({
+			// 		url: 'OperationMonitoring/getMonitoringScreen',
+			// 		data: ming
+			// 	})
+			// 	console.log(res.data.data[0])
+			// 	this.videoDetail = res.data.data[0]
 
+			// },
 		}
 	}
 </script>
 
 <style lang="scss">
-	
 
-	
-	
 
 
-</style>
 
+
+
+</style>

pages/videoList/videoList.vue

@@ -1,29 +1,46 @@
 <template>
 
 	<view class="">
+		<view v-if="loadingStatus" class="loadingMask">Loading...</view>
 		<view class="cu-list menu-avatar">
-			<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in deviceData"
-			 :key="index" :data-target="'move-box-' + index" @tap="goVideoDetail">
-				<view class="cu-avatar round lg" :style="`background-image:url(${item.imgUrl})`" style="opacity:.7"></view>
-				<view class="content">
-					<view class="">{{item.title}}</view>
-				</view>
-				<view class="nav-right num">
-					<view v-if="item.status=='在线'" class="online" >
-						{{item.status}}
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+			
+			<view v-if="!this.openId&&!this.onLineVideoList.length" class="text-center margin-top-lg">加载中...</view>
+		<view v-if="!this.matchedDeviceList.length&&this.onLineVideoList.length" class="text-center margin-top-lg">暂无数据</view>
+			
+			<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in matchedDeviceList"
+			 :key="index" :data-target="'move-box-' + index">
+				<view v-if="item.ALIVEVALUE==3" class="cu-avatar round lg" style="background-image:url(../../static/video-icon-on.png);opacity:.7"></view>
+				<view v-else class="cu-avatar round lg" style="background-image:url(../../static/video-icon-off.png);opacity:.7"></view>
+				<view v-if="item.ALIVEVALUE==3" @tap="open_video(item)">
+					<view class="content">
+						<view class="">{{item.DEVICE}}</view>
 					</view>
-					<view v-else-if="item.status=='离线'" class="text-gray" >
-						{{item.status}}
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+					<view class="nav-right num">
+						<view class="online">
+							在线
+							<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+						</view>
+
 					</view>
-					<view v-else="item.status=='异常'" class="error" >
-						{{item.status}}
-						<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+				</view>
+
+				<view v-else>
+					<view class="content">
+						<view class="">{{item.DEVICE}}</view>
+					</view>
+					<view class="nav-right num">
+
+						<view class="offline">
+							离线
+							<text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
+						</view>
 					</view>
 				</view>
+
 			</view>
 		</view>
+
+		<input type="hidden" v-model="openId" style="opacity:0">
 	</view>
 </template>
 
@@ -31,60 +48,198 @@
 	export default {
 		data() {
 			return {
-				deviceData: [{
-						status: '离线',
-						imgUrl: '../../static/video-icon-off.png',
-						title: 'C59360332',
-						num: 6
-					}, {
-						status: '在线',
-						imgUrl: '../../static/video-icon-on.png',
-						title: 'C59360332',
-						num: 11
-					},
-					{
-						status: '异常',
-						imgUrl: '../../static/video-icon-error.png',
-						title: 'C59360332',
-						num: 6
-					}
-				],
+
+				d: {
+					CMD: 1
+				},
+				deviceData: [],
+				onLineVideoList: [],
+				matchedDeviceList: [],
 				modalName: null,
+				openId: '',
+				reCount: 0,
+				count: 0,
+				loadingStatus: false
 
 			};
 		},
-		onLoad:function(option){
-			this.getVideoList({'company_code':uni.getStorageSync('selectedCode')})
-		
+		onLoad: function(option) {
+
+			// this.companyCode = option.companyCode
+			// this.deviceType = option.deviceType
+			this.getDeviceManage({
+				'company_code':uni.getStorageSync('selectedCode')
+			})
+
+
+			this.chk_video()
+
+
+
+		},
+		computed: {
+
 		},
 		methods: {
+
+			chk_video() {
 			
-			// 视频列表数据请求
-			async getVideoList(params = {}) {
-				const res = await this.$myRequest({
-					url: 'VideoMonitoring/getVideoList',
-					data:params,
-					showLoading: true
-				})
-				this.getData=res.data.data;
-				console.log(this.getData)
+				uni.request({
+					url: 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
+					data: 'queryJson:' + JSON.stringify({
+						CMD: 1
+					}),
+					method: 'post',
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+					},
+					success: (res) => {
+						this.onLineVideoList = res.data.RESULT.LIST;
+						// console.log('this.onLineVideoList');
+						// console.log(this.onLineVideoList)
+						// console.log('this.openId')
+						// console.log(this.openId)
+						if (this.openId.length > 0) {
+							console.log('doododododododo')
+							for (var n = 0; n < this.onLineVideoList.length; n++) {
+								if (this.openId == this.onLineVideoList[n].DEVICE) {
+									this.reCount++;
+									if (this.onLineVideoList[n].ONAIR) {
+										if ((++this.count) > 2) {
+											// var mask = document.getElementById('videomask');
+											// if (mask != undefined) {
+											// 	removeDIV('videomask');
+											// }
+											this.loadingStatus = false;
+
+											uni.navigateTo({
+												url: '/pages/videoList/videoDetail/videoDetail?deviceCode=' + this.onLineVideoList[n].DEVICE,
+											});
+
+										} else {
+											setTimeout(this.chk_video, 5000);
+										}
+									} else {
+
+										if (this.reCount > 7) {
+											// var mask = document.getElementById('videomask');
+											// if (mask != undefined) {
+											// 	removeDIV('videomask');
+											// }
+											this.loadingStatus = false;
+											// alert('远程摄像头链接超时，请稍后再试')
+											uni.showToast({
+												title: "远程摄像头链接超时，请稍后再试",
+												icon: "none"
+											});
+											// $("#myPopup").popup("open");
+
+											break;
+
+
+										}
+
+										setTimeout(this.chk_video, 5000);
+									}
+
+
+
+								}
+							}
+						} else {
+							for (var i = 0; i < this.onLineVideoList.length; i++) {
+								for (var j = 0; j < this.deviceData.length; j++) {
+									if (this.onLineVideoList[i].DEVICE == this.deviceData[j].owner_code) {
+										this.matchedDeviceList.push({
+											"DEVICE": this.onLineVideoList[i].DEVICE,
+											"ALIVEVALUE": this.onLineVideoList[i].ALIVEVALUE,
+											"ONAIR": this.onLineVideoList[i].ONAIR
+										})
+									}
+								}
+							}
+							console.log('this.matchedDeviceList')
+							console.log(this.matchedDeviceList)
+						}
+
+					}
+				});
 			},
+			open_video(item) {
+				// alert( item.DEVICE);
+				if (this.openId != item.DEVICE) {
+					this.openId = item.DEVICE
+				}
+				console.log('this.openId')
+				console.log(this.openId)
+				console.log('this.onLineVideoList')
+				console.log(this.onLineVideoList)
+				for (var n = 0; n < this.onLineVideoList.length; n++) {
+					if (this.onLineVideoList[n].DEVICE == this.openId) {
+						if (this.onLineVideoList[n].ONAIR) {
+							uni.navigateTo({
+								url: '/pages/videoList/videoDetail/videoDetail?deviceType=2&companyCode=' + uni.getStorageSync('selectedCode') + '&deviceCode=' + item.DEVICE +
+									'',
+							});
+							return;
+						}
+					}
+				}
+				this.count = 0;
+				this.reCount = 0;
+				this.loadingStatus = true;
 			
-			goVideoDetail() {
-				uni.navigateTo({
-					url: '/pages/videoList/videoDetail/videoDetail',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
+				alert('一些loading操作')
+				uni.request({
+					url: 'https://fire.usky.cn:8443/YtIoT/cgi-bin/demo2.cgi',
+					data: 'queryJson:' + JSON.stringify({
+						CMD: 3,
+						BODY: {
+							DEVICE: item.DEVICE,
+							ACTION: 1,
+							IDX: 7
+						}
+					}),
+					method: 'post',
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+					},
+					success: (res) => {
+						setTimeout(this.chk_video, 5000);
+					}
 				});
+
 			},
 
 
+			async getDeviceManage(ming = {}) {
+				const res = await this.$myRequest({
+					url: 'VideoMonitoring/getVideoList',
+					data: ming
+				})
+				this.deviceData = res.data.data;
+				console.log(this.deviceData)
+			},
+
 		}
 
 	}
 </script>
 
 <style lang="scss">
-	
-</style>
+	.loadingMask {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		background: rgba(0, 0, 0, .3);
+		z-index: 1000;
+		color: #000;
+		justify-content: center;
+		align-items: center;
+		display: flex;
+		text-align: center;
+		padding-top: 100rpx;
+		font-size: 34rpx;
+	}
+</style>