设备到期时间增加权限控制

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.8.5",
-    "versionCode" : 185,
+    "versionName" : "1.9.1",
+    "versionCode" : 191,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/cb/bzy/equip-set/equip-set.vue

@@ -372,9 +372,10 @@
 						config: JSON.stringify(this.setFrom),
 					}
 				})
-				if(res){
+				// console.log(res);
+				if(res === true){
 					this.$refs.toast.show({
-						title: '修改成功!',
+						title: '指令下发成功',
 						type: 'success',
 						callback:function(){
 							uni.navigateBack({
@@ -382,6 +383,11 @@
 							});	
 						}
 					})
+				} else {
+					this.$refs.toast.show({
+						title: '服务出错了',
+						type: 'error'
+					})
 				}
 			}
 		}

pages/cb/cbd/equip-set/equip-set.vue

@@ -391,7 +391,7 @@
 				})
 				if(res){
 					this.$refs.wsToast.show({
-						title: '修改成功',
+						title: '指令下发成功',
 						type: 'success',
 					})
 				}
@@ -463,9 +463,9 @@
 						config: JSON.stringify(this.equipContrlForm)
 					}
 				})
-				if(res){
+				if(res === true){
 					this.$refs.toast.show({
-						title: '修改成功!',
+						title: '指令下发成功',
 						type: 'success',
 						callback:function(){
 							uni.navigateBack({
@@ -473,8 +473,24 @@
 							});	
 						}
 					})
-				
+				} else {
+					this.$refs.toast.show({
+						title: '服务出错了',
+						type: 'error'
+					})
 				}
+				// if(res){
+				// 	this.$refs.toast.show({
+				// 		title: '指令下发成功',
+				// 		type: 'success',
+				// 		callback:function(){
+				// 			uni.navigateBack({
+				// 				delta: 1
+				// 			});	
+				// 		}
+				// 	})
+				
+				// }
 			},
 			async equipBtnControl(cmd){
 				let res=await this.$myRequest({

pages/cb/index/index.vue

@@ -33,7 +33,7 @@
 								<p>设备ID：{{item.imei || item.device_id}}</p>
 								<p>最新上报时间：{{item.addtime|timeFormat}}</p>
 								<view class="" style="display: flex;justify-content: space-between;"
-									v-if="device_type == 3 || device_type==7">
+									v-if="(device_type == 3 || device_type==7) && showLastTime">
 									<p>设备到期情况：<span
 											:class="'prevents_item_bot_sapn'+item.device_expire">{{item.device_expiretext}}</span>
 									</p>
@@ -142,12 +142,16 @@
 				show: false,
 				title: "",
 				content: "",
+				showLastTime: false,
 			}
 		},
 		onLoad() {
 			uni.getStorage({
 				key: "jurisdiction",
 				success: (res) => {
+					let list = res.data;
+					this.showLastTime = this.testId(325, JSON.parse(res.data));
+					console.log(this.showLastTime);
 					let items = JSON.parse(res.data).filter((item) => {
 						return item.pur_id == 36
 					})
@@ -184,8 +188,8 @@
 								break
 						}
 					}
-					for(var i=0;i<this.equipArr.length;i++){
-						if(this.equipArr[i].tf){
+					for (var i = 0; i < this.equipArr.length; i++) {
+						if (this.equipArr[i].tf) {
 							this.active = i
 							this.device_type = this.equipArr[i].type
 							console.log(i)
@@ -194,7 +198,7 @@
 					}
 				}
 			})
-			
+
 		},
 		onShow() {
 
@@ -253,6 +257,24 @@
 			return true;
 		},
 		methods: {
+			testId(id, list) {
+				for (var i = 0; i < list.length; i++) {
+					if (list[i].children) {
+						var data = list[i].children
+						for (var j = 0; j < data.length; j++) {
+							if (data[j].children) {
+								var item = data[j].children
+								for (var k = 0; k < item.length; k++) {
+									if (item[k].pur_id == id) {
+										return true
+									}
+								}
+							}
+
+						}
+					}
+				};
+			},
 			async getEquipList(act) {
 				this.loadingtf = true
 				const res = await this.$myRequest({
@@ -263,7 +285,7 @@
 						page_size: 10,
 						device_status: this.device_status,
 						device_id: this.imports,
-						device_model: this.equipArr[act].device_model ? this.equipArr[act].device_model:0
+						device_model: this.equipArr[act].device_model ? this.equipArr[act].device_model : 0
 					}
 				})
 				this.loadingtf = false
@@ -360,7 +382,7 @@
 					uni.navigateTo({
 						url: '/pages/cb/sy/detail?detail=' + data
 					});
-				} else{
+				} else {
 					uni.navigateTo({
 						url: '/pages/cb/equip-detail/equip-detail?info=' + data
 					});
@@ -557,7 +579,8 @@
 			padding: 10rpx 20rpx;
 			text-align: center;
 			display: inline-block;
-			span{
+
+			span {
 				display: inline-block;
 			}
 		}
@@ -610,4 +633,4 @@
 			color: #fff;
 		}
 	}
-</style>
+</style>

pages/cb/xy/equip-set/equip-set.vue

@@ -213,18 +213,34 @@
 						config: JSON.stringify(obj),
 					}
 				})
-				if (res) {
+				if(res === true){
 					this.$refs.toast.show({
-						title: '修改成功!',
+						title: '指令下发成功',
 						type: 'success',
-						callback: function() {
+						callback:function(){
 							uni.navigateBack({
 								delta: 1
-							});
+							});	
 						}
 					})
-
+				} else {
+					this.$refs.toast.show({
+						title: '服务出错了',
+						type: 'error'
+					})
 				}
+				// if (res) {
+				// 	this.$refs.toast.show({
+				// 		title: '指令下发成功',
+				// 		type: 'success',
+				// 		callback: function() {
+				// 			uni.navigateBack({
+				// 				delta: 1
+				// 			});
+				// 		}
+				// 	})
+
+				// }
 			}
 		}
 	}

pages/environment/index.vue

@@ -45,7 +45,7 @@
 						<view class="prevents_item_bot">
 							<p>设备 ID：{{ item.equip_id || item.device_id }}</p>
 							<p>最新上报时间：{{ item.uptime | timeFormat() }}</p>
-							<view class="" style="display: flex; justify-content: space-between">
+							<view class="" style="display: flex; justify-content: space-between" v-if="showLastTime">
 								<p>
 									设备到期情况：<span
 										:class="'prevents_item_bot_sapn' + item.device_expire">{{ item.device_expiretext }}</span>
@@ -178,9 +178,28 @@
 				show: false,
 				title: "",
 				content: "",
+				showLastTime: false,
 			};
 		},
 		methods: {
+			testId(id, list) {
+				for (var i = 0; i < list.length; i++) {
+					if (list[i].children) {
+						var data = list[i].children
+						for (var j = 0; j < data.length; j++) {
+							if (data[j].children) {
+								var item = data[j].children
+								for (var k = 0; k < item.length; k++) {
+									if (item[k].pur_id == id) {
+										return true
+									}
+								}
+							}
+			
+						}
+					}
+				};
+			},
 			async eqlist() {
 				console.log("搜素字段s", this.imports);
 				//设备列表 环境监测
@@ -379,6 +398,7 @@
 			uni.getStorage({
 				key: "jurisdiction",
 				success: (res) => {
+					this.showLastTime = this.testId(325, JSON.parse(res.data));
 					let items = JSON.parse(res.data).filter((item) => {
 						return item.pur_id == 40;
 					});

pages/prevention/index.vue

@@ -28,7 +28,8 @@
 					<view class="prevents_item_bot">
 						<p>设备 ID：{{item.imei}}</p>
 						<p>最新上报时间：{{item.addtime|timeFormat()}}</p>
-						<view class="" style="display: flex;justify-content: space-between;">
+						<view class="" style="display: flex;justify-content: space-between;"
+							v-if="showLastTime">
 							<p>设备到期情况：<span
 									:class="'prevents_item_bot_sapn'+item.device_expire">{{item.device_expiretext}}</span>
 							</p>
@@ -88,10 +89,29 @@
 				show: false,
 				title: "",
 				content: "",
-				allqingchong: false
+				allqingchong: false,
+				showLastTime: false,
 			}
 		},
 		methods: {
+			testId(id, list) {
+				for (var i = 0; i < list.length; i++) {
+					if (list[i].children) {
+						var data = list[i].children
+						for (var j = 0; j < data.length; j++) {
+							if (data[j].children) {
+								var item = data[j].children
+								for (var k = 0; k < item.length; k++) {
+									if (item[k].pur_id == id) {
+										return true
+									}
+								}
+							}
+
+						}
+					}
+				};
+			},
 			async eqlist() { //设备列表
 				this.loadingtf = true
 				const res = await this.$myRequest({
@@ -218,6 +238,12 @@
 		onLoad() {
 			this.getworm()
 			this.eqlist()
+			uni.getStorage({
+				key: "jurisdiction",
+				success: (res) => {
+					this.showLastTime = this.testId(325, JSON.parse(res.data));
+				}
+			})
 		},
 		onReachBottom() {
 			this.page++
@@ -376,4 +402,4 @@
 			color: #fff;
 		}
 	}
-</style>
+</style>

pages/waterandfer/index.vue

@@ -29,12 +29,12 @@
 					<view class="prevents_item_bot">
 						<p>设备 ID：{{item.device_id}}</p>
 						<p>最新上报时间：{{item.uptime|timeFormat()}}</p>
-						<!-- <view class="" style="display: flex;justify-content: space-between;">
+						<view class="" style="display: flex;justify-content: space-between;" v-if="$QueryPermission(325)">
 							<p>设备到期情况：<span
 									:class="'prevents_item_bot_sapn'+item.device_expire">{{item.device_expiretext}}</span>
 							</p>
 							<p style="color: #3C84FE;" v-if="item.device_expire!=0" @click.stop="examine(item)">查看详情</p>
-						</view> -->
+						</view>
 					</view>
 				</view>
 			</view>

static/h52.html

@@ -5,12 +5,15 @@
 		<meta name="viewport"
 			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>监控详情页</title>
+		<link href="https://unpkg.com/video.js@7.10.2/dist/video-js.min.css" rel="stylesheet" />
 		<style type="text/css">
 			body {
 				margin: 0;
 				background-color: #f3f3f3;
 			}
-
+			span.vjs-control-text{
+				display: none;
+			}
 			/* iframe {
 				width: 375px;
 				height: 667px;
@@ -74,6 +77,7 @@
 				height: 300px;
 				width: 100%;
 				background: #000;
+				overflow: hidden;
 			}
 
 			#dialog {
@@ -103,7 +107,8 @@
 				font-size: 16px;
 				box-sizing: border-box;
 			}
-			.imgBtn img{
+
+			.imgBtn img {
 				display: inline-block;
 				width: 20px;
 				height: 20px;
@@ -152,7 +157,8 @@
 	<!-- <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.4.0.js"></script> -->
 	<!-- uni 的 SDK -->
 	<script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
-	<script type="text/javascript" src="http://www.hnyfwlw.com:8006/bigdata_app/js/ezuikit.js"></script>
+	<!-- <script type="text/javascript" src="http://www.hnyfwlw.com:8006/bigdata_app/js/ezuikit.js"></script> -->
+	<script src="https://unpkg.com/video.js@7.10.2/dist/video.min.js"></script>
 	<script type="text/javascript">
 		function configCamera(ctrl, movenum) {
 			if (ctrl == "takephoto") {
@@ -199,35 +205,58 @@
 		//上下左右和拍照
 		var str = window.location.search.substr(1)
 		var arr = str.split('&')
-		console.log(str);
+		// console.log(str);
 		var device_id = arr[0].split('=')[1]
-		console.log(device_id);
+		// console.log(device_id);
 		var accessToken = arr[1].split('=')[1]
-		console.log(accessToken)
+		// console.log(accessToken)
 		$.ajax({
 			type: "POST",
 			url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.addr_camera",
+			// url: "http://192.168.0.117:8003/api/api_gateway?method=camera.camera_manage.addr_camera",
 			data: {
-				device_id: device_id,
+				device_id: device_id
+				// device_id: 'FA8690323-1',
+				// token: localStorage.getItem('session_key')
 			}
 		}).then((res) => {
-			console.log(res.data)
-			var data = eval("(" + res.data + ")");
-			var hlsHdSrc = data.hlsHd;
-			console.log(hlsHdSrc)
-			var rtmpHdSrc = data.rtmpHd;
-			var playHtml =
-				`<video id="myPlayer" autoplay   poster='' controls playsInline  webkit-playsinline src=${hlsHdSrc}  style="width:100%; height:100%;"></video>`;
-			$("#box").html(playHtml)
-			var myVideo = new EZUIKit.EZUIPlayer("myPlayer");
-			setTimeout(() => {
-				myVideo.play();
-			}, 150);
+			// console.log(JSON.stringify(res))
+			if(res.message == '') {
+				if (typeof res.data == 'string') {
+					var data = eval('(' + res.data + ')');
+				} else {
+					var data = res.data;
+				}
+				// console.log(data, 'data');
+				let hlsHdSrc = data.type_id == 0 ? data.hls : data.hlsHd;
+				var playHtml =
+					`<video id="myPlayer"   poster='' controls playsInline  webkit-playsinline src=${hlsHdSrc}  style="width:100%; height:100%;"></video>`;
+				$("#box").html(playHtml)
+				var myVideo = videojs(`myPlayer`, {
+					controls: true,
+					autoplay: 'play',
+					url:hlsHdSrc,
+					sources: [{
+						type: 'application/x-mpegURL',
+						src: hlsHdSrc,
+					}],
+				},function onPlayerReady() {
+					myVideo.play()
+					console.log('准备好了')
+				});
+				myVideo.on('play',function(){
+				  console.log('开始播放')
+				})
+			} else {
+				alert(res.message)
+			}
 
 		})
 		document.addEventListener('UniAppJSBridgeReady', function() {
 			$('.imgBtn').click(function() {
-				uni.navigateTo({url:'/pages/monitor/imagelist?id=' + device_id})
+				uni.navigateTo({
+					url: '/pages/monitor/imagelist?id=' + device_id
+				})
 			})
 		});
 	</script>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/adef8330-135b-11ef-8289-d96268c0f620
+https://app.liuyingyong.cn/build/download/1a8c8110-3f59-11ef-ace3-19ac6c8d787e

util/api.js

@@ -5,7 +5,7 @@ export const myRequest = (options) => {
 	console.log(BASE_URL,'my request',process.env.NODE_ENV)
 	if (BASE_URL == '') {
 		// BASE_URL = 'http://114.55.0.7:8002'//测试
-		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.1.110:8003" : "http://8.136.98.49:8002"
+		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.0.117:8003" : "http://8.136.98.49:8002"
 		// BASE_URL = process.env.NODE_ENV === 'development' ? "http://114.55.0.7:8002" : "http://8.136.98.49:8002"
 		BASE_URL = process.env.NODE_ENV === 'development' ? "http://8.136.98.49:8002" : "http://8.136.98.49:8002"
 		// BASE_URL = 'http://192.168.1.77:8002'

util/neutral.js

@@ -1,4 +1,4 @@
 export default{
-	// isneutral:true//云飞智控
-	isneutral:false//智控
+	isneutral:true//云飞智控
+	// isneutral:false//智控
 }