7/5

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.0.4",
-    "versionCode" : 104,
+    "versionName" : "1.0.5",
+    "versionCode" : 105,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/afterSale/index.vue

@@ -181,6 +181,7 @@
 			
 		},
 		onShow(){
+			this.faultdata=[]
 			this.getAftersale()
 		},
 		onReachBottom() {

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

@@ -29,8 +29,8 @@
 						</tr>
 						<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
 							<td class="td">{{items.d_h_t.addtime|timeFormat()}}</td>
-							<td class="td">{{items.d_h_t.at==""?"--":items.d_h_t.at}}</td>
-							<td class="td">{{items.d_h_t.ah==""?"--":items.d_h_t.ah}}</td>
+							<td class="td">{{items.d_h_t.at==""||items.d_h_t.at=="25"||items.d_h_t.at=="25.0"||items.d_h_t.at=="2.5"?items.d_h_t.new_tem:items.d_h_t.at}}</td>
+							<td class="td">{{items.d_h_t.ah==""||items.d_h_t.ah=="30"||items.d_h_t.ah=="30.0"||items.d_h_t.ah=="3.0"?items.d_h_t.new_hum:items.d_h_t.ah}}</td>
 							<td class="td">{{items.d_h_t.hrt}}</td>
 							<td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td>
 							<td class="td">{{items.d_h_t.tps==0?"正常":"温控"}}</td>

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

@@ -68,7 +68,7 @@
 				isTop:false,
 				resultdata:{},
 				titletext: ["24小时", "近一个月", "近半年", "近一年"],
-				titleidnex:0
+				titleidnex:0,
 			}
 		},
 		methods: {
@@ -188,7 +188,6 @@
 				for(var i=0;i<this.imglists.length;i++){
 					imgarr.push(this.imglists[i].addr)
 				}
-				console.log(imgarr)
 				uni.previewImage({
 					urls: imgarr,
 					current:index
@@ -210,18 +209,18 @@
 				var newtime = new Date()
 				this.timeend = +new Date(newtime)/1000
 				if(index == 0){
-					this.timestate = newtime - 60 * 60 * 24*1000
-					this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
+					this.timestate = (newtime - 60 * 60 * 24*1000)/1000
+					this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
 				}else if(index == 1){
-					this.timestate = newtime.setMonth(newtime.getMonth() - 1)
-					this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
+					this.timestate = (newtime.setMonth(newtime.getMonth() - 1))/1000
+					this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
 				}else if(index == 2){
-					this.timestate = newtime.setMonth(newtime.getMonth() - 6)
-					this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
+					this.timestate = (newtime.setMonth(newtime.getMonth() - 6))/1000
+					this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
 				}else if(index == 3){
-					this.timestate = newtime.setFullYear(newtime.getFullYear() - 1)
-					this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
-				} 
+					this.timestate = (newtime.setFullYear(newtime.getFullYear() - 1))/1000
+					this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
+				}
 			}
 		},
 		onLoad(option) {
@@ -233,11 +232,13 @@
 			this.timeend = +new Date() / 1000
 			this.timestate = this.timeend - 60 * 60 * 24
 			this.imglists=[]
+			console.log(this.timestate)
 			this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
 		},
 		onReachBottom() {
 			this.page++
-			this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
+			console.log(this.timestate)
+			this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听，可用bindingx代替
 			if (e.scrollTop > 200) { //距离大于200时显示

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

@@ -16,7 +16,7 @@
 		<view class="information">
 			<p class="title">识别结果</p>
 			<view class="information_data" v-for="item,index in resuils.result">
-				<p>害虫名称：<span>{{item.result_list}}</span></p>
+				<p>害虫名称：<span>{{item.result_list+"("+item.number+")"}}</span></p>
 				<p>害虫数量：<span>{{item.nums}}只</span></p>
 			</view>
 		</view>
@@ -144,7 +144,7 @@
 		}
 	}
 	.information{
-		width: 90%;
+		width: 97%;
 		margin: 0 auto;
 		padding-top: 20rpx;
 		.title{

pages/cb/equip-detail/equip-detail.vue

@@ -6,10 +6,10 @@
 				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
 			</view>
 			<view class="">
-				设备名称：{{equipInfo.device_name}}
+				设备名称：{{equipInfo.device_name==""?"无":equipInfo.device_name}}
 			</view>
 			<view class="">
-				设备类型：{{equipInfo.type|equipType}}{{equipInfo.type_name}}
+				设备类型：<span v-if="equipInfo.type">{{equipInfo.type|equipType}}</span><span v-else>{{equipInfo.type_name}}</span>
 			</view>
 			<view class="">
 				最新上报时间：{{equipInfo.addtime||equipInfo.uptime | timeFormat}}
@@ -27,16 +27,16 @@
 			</view>
 			<u-popup v-model="setTimeShow" mode="center" width="600rpx">
 				<u-field label="载玻片更换时间" placeholder="选择日期" label-width='240' required :error-message="glassErr" v-model="glass_slide_time"
-				 @click="glass_show=true" :field-style="fieldstyle">
+				 @click="glass_show=true" :field-style="fieldstyle" disabled>
 				</u-field>
 				<u-field label="培养液更换时间" placeholder="选择日期" label-width='240' required :error-message="culErr" v-model="cultivate_time"
-				 @click="cultivate_show=true" :field-style="fieldstyle">
+				 @click="cultivate_show=true" :field-style="fieldstyle" disabled>
 				</u-field>
 				<view class="btn-box">
 					<u-button @click="setTimeSubmit" size="mini" type="success">确定</u-button>
 				</view>
-				<u-calendar v-model="glass_show" mode="date" @change="timeChange($event,'glass')"></u-calendar>
-				<u-calendar v-model="cultivate_show" mode="date" @change="timeChange($event,'cultivate')"></u-calendar>
+				<u-calendar v-model="glass_show" mode="date" :max-date="date" @change="timeChange($event,'glass')"></u-calendar>
+				<u-calendar v-model="cultivate_show" mode="date" :max-date="date" @change="timeChange($event,'cultivate')"></u-calendar>
 			</u-popup>
 			<u-popup v-model="yxShow" mode="center" width="600rpx">
 				<u-field label="监测害虫名称" label-width='240' required :error-message="xyErr" v-model="decoy" :field-style="fieldstyle">
@@ -210,6 +210,7 @@
 				xyErr: '',
 				decoy: '',
 				newtishitf:false,
+				date:""//最大可选时间
 			}
 		},
 		computed: {
@@ -264,11 +265,11 @@
 							}, {
 								icon: '/image/cb/icon08.png',
 								txt: '环境温度(℃)',
-								value: this.newState.at=="2.5"||this.newState.at=="25"||this.newState.at==""?this.newState.new_tem:this.newState.at
+								value: this.newState.at=="2.5"||this.newState.at=="25.0"||this.newState.at==""||this.newState.at=="25"?this.newState.new_tem:this.newState.at
 							}, {
 								icon: '/image/cb/icon07.png',
 								txt: '环境湿度(%)',
-								value:this.newState.ah=="30"||this.newState.ah=="3.0"||this.newState.ah==""?this.newState.new_hum:this.newState.ah
+								value:this.newState.ah=="30.0"||this.newState.ah=="30.0"||this.newState.ah==""||this.newState.ah=="30"?this.newState.new_hum:this.newState.ah
 							}, {
 								icon: '/image/cb/icon16.png',
 								txt: '信号强度',
@@ -327,11 +328,11 @@
 							}, {
 								icon: '/image/cb/icon08.png',
 								txt: '环境温度(℃)',
-								value: this.newState.at=="2.5"||this.newState.at=="25"||this.newState.at==""?this.newState.new_tem:this.newState.at
+								value: this.newState.at=="2.5"||this.newState.at=="25"||this.newState.at==""||this.newState.at=="25.0"?this.newState.new_tem:this.newState.at
 							}, {
 								icon: '/image/prevention/66.png',
 								txt: '环境湿度(%)',
-								value:this.newState.ah=="30"||this.newState.ah=="3.0"||this.newState.ah==""?this.newState.new_hum:this.newState.ah
+								value:this.newState.ah=="30"||this.newState.ah=="3.0"||this.newState.ah==""||this.newState.ah=="30.0"?this.newState.new_hum:this.newState.ah
 							}, {
 								icon: '/image/cb/icon16.png',
 								txt: '信号强度',
@@ -378,12 +379,12 @@
 							{
 								icon: '/image/cb/icon08.png',
 								txt: '环境温度(℃)',
-								value: this.newState.at=="2.5"||this.newState.at=="25"||this.newState.at==""?this.newState.new_tem:this.newState.at
+								value: this.newState.at=="2.5"||this.newState.at=="25"||this.newState.at==""||this.newState.at=="25.0"?this.newState.new_tem:this.newState.at
 							},
 							{
 								icon: '/image/cb/icon07.png',
 								txt: '环境湿度(%)',
-								value:this.newState.ah=="30"||this.newState.ah=="3.0"||this.newState.ah==""?this.newState.new_hum:this.newState.ah
+								value:this.newState.ah=="30"||this.newState.ah=="3.0"||this.newState.ah==""||this.newState.ah=="30.0"?this.newState.new_hum:this.newState.ah
 							},
 							{
 								icon: '/image/prevention/105.png',
@@ -447,12 +448,14 @@
 		},
 		onLoad(option) {
 			this.equipInfo = JSON.parse(option.info)
-			this.type = Number(this.equipInfo.type) || Number(this.equipInfo.equip_type)
+			this.type = Number(this.equipInfo.type) || Number(this.equipInfo.equip_type)|| Number(this.equipInfo.device_type_id)
+			this.equipInfo.type = this.type
 			this.device_status = this.equipInfo.is_online
 			this.getState()
 			console.log(this.equipInfo)
-			this.selectaddress(this.lat,this.lng)
-			
+			this.selectaddress(Number(this.equipInfo.lat),Number(this.equipInfo.lng))
+			var times = new Date()
+			this.date = times.getFullYear()+1 + "-" + Number(times.getMonth()+1) + "-" + times.getDate()
 			uni.getStorage({
 				key:"jurisdiction",
 				success:(res)=>{
@@ -533,7 +536,7 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
 					data: {
-						device_type_id: this.equipInfo.type || this.equipInfo.equip_type,
+						device_type_id: this.equipInfo.type || this.equipInfo.equip_type || this.equipInfo.device_type_id,
 						device_id: this.equipInfo.imei || this.equipInfo.device_id,
 						page: 1,
 						page_size: 1,
@@ -650,13 +653,15 @@
 			},
 			selectaddress(lat,lng) { //获取分布位置
 				uni.request({
-					url: '/dpc/ws/geocoder/v1/?location='+lat+","+lng+"&key=B2EBZ-2UW6P-RDJDG-LCMLE-AIQUS-CGFMJ",
-					success: (res) => {
-						if(res==0){
-							this.city = res.data.result.address
-						}
+					type: "GET",
+					url: "https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=" + lng + "," + lat +
+						"&key=27273b81090f78759e4057f94474516f&radius=1000&extensions=all",
+					dataType: "json",
+					complete: ress => {
+						console.log(ress)
+						this.city = ress.data.regeocode.formatted_address
 					}
-				})
+				});
 			},
 			copy(item){
 				console.log(item)
@@ -797,4 +802,11 @@
 			}
 		}
 	}
+	/deep/.u-calendar__action{
+		display: flex;
+		justify-content: space-around;
+		.u-calendar__action__text{
+			line-height: 25px;
+		}
+	}
 </style>

pages/cb/index/search.vue

@@ -17,7 +17,7 @@
 					<image :src="item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'" mode=""
 					 class="prevents_item_img"></image>
 					<view class="prevents_item_top">
-						<p>设备名称：{{item.device_name}}</p>
+						<p>设备名称：{{item.device_name==""?"无":item.device_name}}</p>
 						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
@@ -72,6 +72,7 @@
 					url: '/api/api_gateway?method=sex_lure_nl.sex_lure.nl_device_list',
 					data: {
 						device_type_id: this.device_id,
+						device_id: this.imports,
 						page: this.page,
 						page_size: 10,
 					}

pages/cb/xy2.0/particulars.vue

@@ -3,13 +3,13 @@
 		<view class="">
 			<view :class="['info',equipInfo.is_online==1?'on':'off']">
 				<p @click="copy(newState.device_id)">设备ID：{{newState.device_id}}<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image></p>
-				<p>设备名称：{{newState.device_name}}</p>
+				<p>设备名称：{{newState.device_name==""?"无":newState.device_name}}</p>
 				<p>最新上报时间：{{newState.uptime | timeFormat}}</p>
 				<p>最新地址：{{newState.addr}}</p>
 				<p class="fillin" @click="addxy">测报害虫：<input type="text" v-model="newState.decoy" disabled v-if="newState.decoy"/><u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon></p>
 				<p @click="glass_show=true">诱芯更换时间：<span style="margin:0 20rpx;">{{yxchangetime}}</span><u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon></p>
 				<p @click="glass_showtwo=true">诱芯到期时间：<span style="margin:0 20rpx;">{{yxendtime}}</span><u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon></p>
-				<u-calendar v-model="glass_show" mode="date" @change="timeChange"></u-calendar>
+				<u-calendar v-model="glass_show" mode="date" :max-date="date" @change="timeChange"></u-calendar>
 				<u-calendar v-model="glass_showtwo" mode="date" :max-date="date" @change="timeChangetwo"></u-calendar>
 			</view>
 			<view class="control">
@@ -101,8 +101,8 @@
 				</view>
 			</view>
 			<u-popup v-model="yxShow" mode="center" width="600rpx">
-				<u-field label="害虫名称" label-width='240' required :error-message="xyErr" v-model="decoy" class="field">
-				</u-field>
+				<u-field label="害虫名称" label-width='240' required :error-message="xyErr" v-model="decoy" class="field" :field-style="fieldstyle" placeholder="请填写害虫名称">
+				</u-field >
 				<view class="btn-box">
 					<u-button @click="yxSubmit" size="mini" type="success" class="box-item">确定</u-button>
 				</view>
@@ -130,7 +130,13 @@
 				yxendtime:0,//诱芯到期时间
 				glass_show:false,//更换诱芯时间选择
 				glass_showtwo:false,//诱芯到期时间选择
-				date:""
+				date:"",//日历可选最大时间
+				fieldstyle:{//输入框样式
+					border:"2rpx solid #f6f6f6",
+					"border-radius":"24px",
+					"padding-left":"20rpx",
+					"background-color":"#f6f6f6"
+				},
 			}
 		},
 		methods: {
@@ -411,20 +417,15 @@
 			}
 		}
 	}
-	.field {
-		/deep/.fild-body{
-			margin-left: -30px;
-		}
-		/deep/.uni-input-input {
-			border: 2rpx solid #FF0000;
-			border-radius: 24rpx;
-			width: 140px;
-			padding-left: 20rpx;
-			box-sizing: border-box;
-		}
-	}
 	.btn-box {
 		text-align: center;
 		padding: 20rpx 30rpx;
 	}
+	/deep/.u-calendar__action{
+		display: flex;
+		justify-content: space-around;
+		.u-calendar__action__text{
+			line-height: 25px;
+		}
+	}
 </style>

pages/distribution/index.vue

@@ -8,16 +8,9 @@
 				</view>
 			</view>
 			<view class="LocationAndDetails">
-				<view class="search">
-					<input type="text" v-model="device_id" placeholder="请输入设备ID"/>
-				</view>
-				<view class="Location">
-					<view class="particulars_par" @click="eqinfo">
-						查看详情
-					</view>
-					<view class="particulars_ser" @click="serTFs">
-						查看位置
-					</view>
+				<view class="search_bot_input">
+					<input type="text" value="" placeholder="请输入设备ID" @input="searchinput" />
+					<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
 				</view>
 			</view>
 			<view class="page-section page-section-gap">
@@ -29,6 +22,11 @@
 	</view>
 </template>
 <script>
+	import {
+		Debounce,
+		Throttle
+	} from "../../util/anitthro.js"
+	var imports = ""
 	export default {
 		data() {
 			return {
@@ -93,9 +91,12 @@
 					position:"absolute",
 					bottom:"0rpx"
 				},
-				facilitydatas:[],
+				facilitydatas:[]
 			}
 		},
+		onLoad() {
+			this.history(this.device_id)
+		},
 		onShow() {
 			this.device_id = ""
 			this.list = [{
@@ -147,21 +148,22 @@
 							this.type = this.icon[i].id
 						}
 					}
-					this.history()
+					// this.history()
 				},
 			})
 		},
 		methods: {
-			async history() { //获取分布位置
+			async history(device_id) { //获取分布位置
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=home.homes.equip_map_location',
 					data: {
 						equip_type: this.type,
-						device_id: this.device_id
+						device_id: device_id
 					}
 				})
-				console.log(res)
+				// console.log(res)
 				this.covers = []
+				var arr = []
 				for (var i = 0; i < res.length; i++) {
 					var obj = {}
 					obj.latitude = Number(res[i].lat)
@@ -175,8 +177,10 @@
 							obj.iconPath = this.icon[j].url
 						}
 					}
-					this.covers.push(obj)
+					arr.push(obj)
+					// console.log(arr)
 				}
+				this.covers = arr
 				this.facilitydatas = res
 				if(res.length == 0){
 					uni.showToast({
@@ -200,17 +204,40 @@
 						}
 					}
 				}
-				this.history()
+				this.history(this.device_id)
 			},
 			markertap(e) {
+				console.log(this.facilitydatas[e.detail.markerId])
 				this.punctuation_did = this.facilitydatas[e.detail.markerId].d_id
 				this.punctuation_type = this.facilitydatas[e.detail.markerId].device_type_id
 				this.device_id = this.facilitydatas[e.detail.markerId].device_id
+				console.log(this.device_id)
+				uni.showModal({
+				    title: '设备详情查询',
+				    content: "设备id:"+this.device_id,
+					cancelText:"取消",
+					confirmText:"设备详情",
+				    success:(res)=> {
+				        if (res.confirm) {
+							this.eqinfo(this.facilitydatas[e.detail.markerId])
+				        } else if (res.cancel) {
+							// this.serTFs()
+				        }
+				    }
+				});
 			},
-			serTFs() {
-				this.history()
+			search() { //搜索
+				this.history(imports)
 			},
-			eqinfo() { //设备信息
+			searchinput(e) {
+				console.log(e.detail.value)
+				imports = e.detail.value
+				console.log(imports)
+				Debounce(() => {
+					this.history(imports)
+				}, 1000)()
+			},
+			eqinfo(item) { //设备信息
 				if (this.punctuation_type == '') {
 					uni.showToast({
 						title: '请点击需查看的设备',
@@ -221,37 +248,39 @@
 					switch (this.punctuation_type) {
 						case 2:
 							uni.navigateTo({
-								url: "../prevention/ucharts?d_id=" + this.punctuation_did + "&imei=" + this.device_id
-							})
-							break;
-						case 3:
-							uni.navigateTo({
-								url: "../cb/cbd/equip-set/historyfile?d_id=" + this.punctuation_did + "&device_id=" + this.device_id
-							})
-							break;
-						case 4:
-							uni.navigateTo({
-								url: "../cb/xy/equip-set/xyhistoryile?d_id=" + this.punctuation_did + "&device_id=" + this.device_id
+								url: "../prevention/equipmentdetails?shebei=" + JSON.stringify(item)
 							})
 							break;
+						// case 3:
+							
+						// case 4:
+						// 	uni.navigateTo({
+						// 		url: "../cb/xy/equip-set/xyhistoryile?d_id=" + this.punctuation_did + "&device_id=" + this.device_id
+						// 	})
+						// 	break;
 						case 5:
 							uni.navigateTo({
-								url: "../environment/history?d_id=" + this.punctuation_did + "&device_id=" + this.device_id
+								url: "../environment/equipment?shebei=" +JSON.stringify(item)
 							})
 							break;
-						case 6:
-							// uni.navigateTo({
-							// 	url: "../prevention/ucharts?d_id=" + this.punctuation_did + "&device_id=" + this.punctuation_id
-							// })
-							break;
-						case 7:
+						// case 6:
+						// 	// uni.navigateTo({
+						// 	// 	url: "../prevention/ucharts?d_id=" + this.punctuation_did + "&device_id=" + this.punctuation_id
+						// 	// })
+						// 	break;
+						// case 7:
+						// 	uni.navigateTo({
+						// 		url: "../cb/bzy/equip-set/bzyhistoryile?d_id=" + this.punctuation_did + "&device_id=" + this.device_id
+						// 	})
+						// 	break;
+						case 10:
 							uni.navigateTo({
-								url: "../cb/bzy/equip-set/bzyhistoryile?d_id=" + this.punctuation_did + "&device_id=" + this.device_id
+								url:"../cb/xy2.0/particulars?info=" +  JSON.stringify(item)
 							})
 							break;
-						case 10:
+						default:
 							uni.navigateTo({
-								url:"../cb/xy2.0/historydatas?d_id=" + this.punctuation_did + "&device_id=" + this.device_id
+								url: "../cb/equip-detail/equip-detail?info=" +  JSON.stringify(item)
 							})
 							break;
 					}
@@ -272,52 +301,72 @@
 	}
 	.LocationAndDetails{
 		width: 100%;
-		height: 200rpx;
+		height: 60rpx;
 		position: fixed;
 		top: 54px;
-		.search{
-			display: flex;
-			input{
-				width: 90%;
-				font-size: 28rpx;
-				margin-left: 40rpx;
-				border: 1px solid #cfccc9;
-				height: 60rpx;
-				padding-left: 15px;
-				box-sizing: border-box;
-				border-radius: 60rpx;
-			}
-		}
-		.Location{
-			display: flex;
-			margin-top: 20rpx;
-			justify-content: space-around;
-			.particulars_par {
-				background-color: #F1F1F1;
-				text-align: center;
-				width: 40%;
-				height: 80rpx;
-				line-height: 80rpx;
-				font-size: 28rpx;
-				border-radius: 40rpx;
+		.search_bot_input {
+			width: 90%;
+			height: 54rpx;
+			background-color: #E4E4E4;
+			border-radius: 27rpx;
+			position: relative;
+			box-sizing: border-box;
+			padding-top: 8rpx;
+			margin: 0 auto;
+			input {
+				width: 85%;
+				text-indent: 1rem;
+				font-size: 26rpx;
 			}
-			.particulars_ser {
-				background-color: #57C87B;
-				text-align: center;
-				width: 40%;
-				height: 80rpx;
-				line-height: 80rpx;
-				font-size: 28rpx;
-				color: #FFFFFF;
-				border-radius: 40rpx;
+		
+			.icon {
+				position: absolute;
+				top: 8rpx;
+				right: 26rpx;
 			}
 		}
+		// background-color: #ff0;
+		// .search{
+		// 	display: flex;
+			// input{
+			// 	width: 90%;
+			// 	font-size: 28rpx;
+			// 	margin-left: 40rpx;
+			// 	border: 1px solid #cfccc9;
+			// 	height: 60rpx;
+			// 	padding-left: 15px;
+			// 	box-sizing: border-box;
+			// 	border-radius: 60rpx;
+			// }
+		// }
+		// .Location{
+		// 	display: flex;
+		// 	margin-top: 20rpx;
+		// 	justify-content: space-around;
+		// 	.particulars_par {
+		// 		background-color: #F1F1F1;
+		// 		text-align: center;
+		// 		width: 40%;
+		// 		height: 80rpx;
+		// 		line-height: 80rpx;
+		// 		font-size: 28rpx;
+		// 		border-radius: 40rpx;
+		// 	}
+		// 	.particulars_ser {
+		// 		background-color: #57C87B;
+		// 		text-align: center;
+		// 		width: 40%;
+		// 		height: 80rpx;
+		// 		line-height: 80rpx;
+		// 		font-size: 28rpx;
+		// 		color: #FFFFFF;
+		// 		border-radius: 40rpx;
+		// 	}
+		// }
 	}
 	.page-section {
-		margin-top: 144px;
-		height: 80vh;
-		// position: fixed;
-		// top: 144px;
+		margin-top: 100px;
+		height: 95vh;
 		.map{
 			width: 100%;
 			height: 100%;

pages/environment/equipment.vue

@@ -13,7 +13,7 @@
 						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
 					</p>
 					<p>设备名称：{{eqinfo.item.equip_name?eqinfo.item.equip_name:"无"}}</p>
-					<p>最近上报时间：{{eqinfo.item.uptime|timeFormat()}}</p>
+					<p>最近上报时间：<span v-if="eqinfo.item.uptime">{{eqinfo.item.uptime|timeFormat()}}</span><span v-else>{{eqinfo.item.addtime|timeFormat()}}</span></p>
 					<p>地址：{{city==""?"--":city}}</p>
 				</view>
 			</view>
@@ -148,7 +148,7 @@
 			},
 			charts() { //历史数据
 				uni.navigateTo({
-					url: "./history?device_id=" + this.eqinfo.item.equip_id
+					url: "./history?device_id=" + this.eqinfo.item.equip_id || this.eqinfo.item.device_id
 				})
 			},
 			reverseGeocode(lat, lng) {

pages/login/login.vue

@@ -109,14 +109,14 @@
 				}
 			})
 			console.log(this.value)
-			this.getEquipList()
 			uni.getStorage({
 				key: 'turnover',
 				success: (res) => {
-					this.turnover = Number(res.data)
+					console.log(res.data)
+					this.turnover = res.data
 				}
 			})
-			console.log(this.turnover)
+			this.getEquipList()
 		},
 		methods: {
 			async getEquipList() {

pages/my/about/about.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<!-- <view class="line"></view>
+		<view class="line"></view>
 		<view class="logo-box">
 			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image>
 			<view class="version">
@@ -40,7 +40,7 @@
 				<text class="tit">公司邮箱</text>
 				<text class="val">hnyf826@163.com</text>
 			</view>
-		</view> -->
+		</view>
 		<view class="line"></view>
 		<view class="part">
 			<view class="info-item" @click="renewal">
@@ -55,9 +55,9 @@
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<!-- <view class="bottom">
+		<view class="bottom">
 			©河南云飞科技发展有限公司
-		</view> -->
+		</view>
 		<u-modal title="升级中请勿随意操作" :show-confirm-button="false" v-model="showA" :content="contentA">
 			<view class="upgradeBox">
 				<u-line-progress v-show="isShow" active-color="#19be6b" :striped="true" :percent="percentNum" :striped-active="true"></u-line-progress>

pages/my/index/index.vue

@@ -19,8 +19,8 @@
 			<view style="background-color: #FFFFFF;margin: 20rpx auto 0;">
 				<view class="AboutUs" @click="about">
 					<u-icon name="moban" custom-prefix="custom-icon" class="icon_left"></u-icon>
-					<!-- 关于我们 -->
-					关于更新
+					关于我们
+					<!-- 关于更新 -->
 					<uni-icons type="arrowright" class="icon_right"></uni-icons>
 				</view>
 			</view>

pages/prevention/equipmentdetails.vue

@@ -9,13 +9,13 @@
 				<view class="info_item">
 					<image :src="eqinfo.item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png'"
 					 mode="" class="bgi"></image>
-					<p style="font-size: 32rpx;" @click="copy(eqinfo.item.imei)">设备 ID：{{eqinfo.item.imei}}
+					<p style="font-size: 32rpx;" @click="copy(eqinfo.item.imei || eqinfo.item.device_id)">设备 ID：{{eqinfo.item.imei || eqinfo.item.device_id}}
 					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
 					</p>
 					<p>设备名称：{{eqinfo.item.device_name}}</p>
 					<p>设备型号：{{eqinfo.item.dtype}}</p>
 					<p>最近上报时间：{{eqinfo.item.addtime|timeFormat()}}</p>
-					<p>设备地址：{{eqinfo.item.address}}</p>
+					<p>设备地址：{{city||eqinfo.item.address}}</p>
 				</view>
 			</view>
 			<view class="control">
@@ -69,7 +69,8 @@
 				work: "",
 				shujutf: false,
 				kongtf: false,
-				simtf: false
+				simtf: false,
+				city:""
 			}
 		},
 		methods: {
@@ -96,11 +97,11 @@
 					}, {
 						icon: '/image/cb/icon08.png',
 						txt: '环境温度(℃)',
-						value: this.olddata.new_tem
+						value: this.olddata.new_tem==""?"--":this.olddata.new_tem
 					}, {
 						icon: '/image/cb/icon07.png',
 						txt: '环境湿度(%)',
-						value: this.olddata.new_hum
+						value: this.olddata.new_hum==""?"--":this.olddata.new_hum
 					}, {
 						icon: '/image/prevention/icon16.png',
 						txt: '信号强度',
@@ -153,6 +154,18 @@
 				}
 				this.modification()
 			},
+			async eqlist(id) { //搜索
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.lamp_list',
+					data: {
+						device_type_id: 2,
+						device_id: id
+					}
+				})
+				this.eqinfo.item = res.data[0]
+				console.log(res.data[0])
+				this.history()
+			},
 			clickLeft() {
 				uni.navigateBack({
 					delta: 1
@@ -189,12 +202,25 @@
 				    }
 				});
 			},
+			selectaddress(lat,lng) { //获取分布位置
+				uni.request({
+					type: "GET",
+					url: "https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=" + lng + "," + lat +
+						"&key=27273b81090f78759e4057f94474516f&radius=1000&extensions=all",
+					dataType: "json",
+					complete: ress => {
+						console.log(ress.data.regeocode.formatted_address)
+						this.city = ress.data.regeocode.formatted_address
+					}
+				});
+			},
 		},
 		onLoad(option) {
 			this.$forceUpdate()
 			this.eqinfo.item = JSON.parse(option.shebei)
 			console.log(JSON.parse(option.shebei))
-			this.history()
+			this.eqlist(JSON.parse(option.shebei).device_id || JSON.parse(option.shebei).imei)
+			this.selectaddress(this.eqinfo.item.lat,this.eqinfo.item.lng)
 			uni.getStorage({
 				key: "jurisdiction",
 				success: (res) => {
@@ -241,14 +267,14 @@
 		.info_item {
 			width: 90%;
 			margin: 0 auto;
-			height: 260rpx;
+			height: 280rpx;
 			padding: 26rpx 50rpx;
 			position: relative;
 			box-sizing: border-box;
 
 			.bgi {
 				width: 100%;
-				height: 260rpx;
+				height: 280rpx;
 				position: absolute;
 				top: 0;
 				left: 0;
@@ -271,7 +297,7 @@
 	.control {
 		width: 90%;
 		position: absolute;
-		top: 372rpx;
+		top: 392rpx;
 		left: 5%;
 		display: flex;
 		justify-content: space-between;
@@ -297,7 +323,7 @@
 	.realtime {
 		width: 100%;
 		position: absolute;
-		top: 500rpx;
+		top: 520rpx;
 
 		.realtime_title {
 			font-weight: 700;

pages/prevention/ucharts.vue

@@ -71,8 +71,8 @@
 							<td class="td">{{items.d_h_t.dps==0?"正常":"保护"}}</td>
 							<td class="td">{{items.d_h_t.tt}}</td>
 							<td class="td">{{items.d_h_t.ct}}</td>
-							<td class="td">{{items.d_h_t.at}}</td>
-							<td class="td">{{items.d_h_t.ah}}</td>
+							<td class="td">{{items.d_h_t.new_tem==""?"--":items.d_h_t.new_tem}}</td>
+							<td class="td">{{items.d_h_t.new_hum==""?"--":items.d_h_t.new_hum}}</td>
 							<td class="td">{{items.d_h_t.cv}}</td>
 							<td class="td">{{items.d_h_t.bv}}</td>
 						</tr>

static/h52.html

@@ -1,14 +1,10 @@
 <!DOCTYPE html>
 <html lang=zh-CN>
 	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="divport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
+		<meta charset="utf-8" />
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>监控详情页</title>
-		<meta name="Copyright" content="helang">
-		<link rel="shortcut icon" type="image/png" href="/uniapp-extend/static/logo.png">
-		<meta name="keywords" content="">
-		<meta name="description" content="">
 		<style type="text/css">
 			body {
 				margin: 0;
@@ -40,8 +36,8 @@
 			}
 
 			.direc {
-				width: 400px;
-				height: 400px;
+				width: 150px;
+				height: 150px;
 				background: url('http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/1.png');
 				background-size: 100% auto;
 				background-repeat: no-repeat;
@@ -75,16 +71,33 @@
 			}
 
 			#box {
-				height: 800px;
+				height: 300px;
 				width: 100%;
 				background: #000;
 			}
-		</style>
-		<script type="text/javascript" src="./js/ezuikit.js"></script>
 
+			#dialog {
+				display: none;
+				width: 200px;
+				line-height: 80px;
+				background: rgba(0, 0, 0, .8);
+				color: #fff;
+				text-align: center;
+				position: absolute;
+				left: 50%;
+				margin-left: -100px;
+				border-radius: 4px;
+				z-index: 999;
+				top: 50%;
+				margin-top: -40px;
+			}
+		</style>
 	</head>
 	<body>
 		<div id="box"></div>
+		<div id="dialog">
+
+		</div>
 		<div class="btn-box">
 			<div class="more" ontouchstart="configCamera('move', 8)" ontouchend="stopConfigCamera()">
 				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/3.png" mode="widthFix"></image>
@@ -112,21 +125,17 @@
 		</div>
 	</body>
 	<script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+	<!-- 微信 JS-SDK 如果不需要兼容小程序，则无需引用此 JS 文件。 -->
+	<!-- <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">
-		//上下左右和拍照
-		var str = window.location.search.substr(1)
-		var arr = str.split('&')
-		var device_id = arr[0].split('=')[1]
-		var accessToken = arr[1].split('=')[1]
-		console.log(device_id)
-		console.log(accessToken)
 		function configCamera(ctrl, movenum) {
 			if (ctrl == "takephoto") {
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.camera_takephoto",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.camera_takephoto",
 					data: {
 						device_id: device_id,
 					}
@@ -142,15 +151,14 @@
 				//上下左右、放大、缩小
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 					data: {
 						device_id: device_id,
 						ctrl: ctrl,
 						movenum: movenum,
 					}
 				}).then((res) => {
-					console.log('成功')
-
+					$('#dialog').html('指令下发成功,请等待...').stop().show(500).delay(3000).hide(500)
 				})
 			}
 		}
@@ -158,67 +166,40 @@
 		function stopConfigCamera() {
 			$.ajax({
 				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+				url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 				data: {
 					device_id: device_id,
 					ctrl: "stop",
 				},
 			});
 		}
-		$(function() {
-			// var width = $('.direc').width()
-			// $('.direc').height(width)
-			$.ajax({
-				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.addr_camera",
-				data: {
-					device_id: device_id,
-				}
-			}).then((res) => {
-				console.log(res.data)
-
-				var data = eval("(" + res.data + ")");
-				console.log(data)
-				var hlsHdSrc = data.hlsHd;
-				var rtmpHdSrc = data.rtmpHd;
-				// console.log($("#box"))
-				// $("#box").innerHTML(1234)
-				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);
-
-			})
-
-			// setTimeout(() => {
-			// 	var url = "ezopen://open.ys7.com/" + device_id + "/1.hd.live"
-			// 	var player = new EZUIKit.EZUIPlayer({
-			// 		id: 'myPlayer',
-			// 		url: url,
-			// 		autoplay: true,
-			// 		accessToken: accessToken,
-			// 		decoderPath: 'js',
-			// 		width: 1000,
-			// 		height: 800,
-			// 	});
-			// 	player.play();
-			// }, 1000)
+		//上下左右和拍照
+		var str = window.location.search.substr(1)
+		var arr = str.split('&')
+		console.log(str);
+		var device_id = arr[0].split('=')[1]
+		console.log(device_id);
+		var accessToken = arr[1].split('=')[1]
+		console.log(accessToken)
+		$.ajax({
+			type: "POST",
+			url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.addr_camera",
+			data: {
+				device_id: device_id,
+			}
+		}).then((res) => {
+			console.log(res.data)
+			var data = eval("(" + res.data + ")");
+			var hlsHdSrc = data.hlsHd;
+			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);
 
 		})
-		document.addEventListener('UniAppJSBridgeReady', function() {
-			uni.webView.getEnv(function(res) {
-				console.log(res)
-				console.log('当前环境：' + JSON.stringify(res));
-			});
-			uni.postMessage({
-				data: {
-					action: 'postMessage'
-				}
-			});
-			// uni.webView.navigateTo(...)
-		});
 	</script>
-</html>
+</html>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/383da2d0-d661-11eb-a990-2103d6978d89
+https://service.dcloud.net.cn/build/download/5844f9b0-db14-11eb-94ec-41a48c948e2d

unpackage/cache/wgt/__UNI__DBA6730/static/h52.html

@@ -1,14 +1,10 @@
 <!DOCTYPE html>
 <html lang=zh-CN>
 	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="divport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
+		<meta charset="utf-8" />
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>监控详情页</title>
-		<meta name="Copyright" content="helang">
-		<link rel="shortcut icon" type="image/png" href="/uniapp-extend/static/logo.png">
-		<meta name="keywords" content="">
-		<meta name="description" content="">
 		<style type="text/css">
 			body {
 				margin: 0;
@@ -40,8 +36,8 @@
 			}
 
 			.direc {
-				width: 400px;
-				height: 400px;
+				width: 150px;
+				height: 150px;
 				background: url('http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/1.png');
 				background-size: 100% auto;
 				background-repeat: no-repeat;
@@ -75,16 +71,33 @@
 			}
 
 			#box {
-				height: 800px;
+				height: 300px;
 				width: 100%;
 				background: #000;
 			}
-		</style>
-		<script type="text/javascript" src="./js/ezuikit.js"></script>
 
+			#dialog {
+				display: none;
+				width: 200px;
+				line-height: 80px;
+				background: rgba(0, 0, 0, .8);
+				color: #fff;
+				text-align: center;
+				position: absolute;
+				left: 50%;
+				margin-left: -100px;
+				border-radius: 4px;
+				z-index: 999;
+				top: 50%;
+				margin-top: -40px;
+			}
+		</style>
 	</head>
 	<body>
 		<div id="box"></div>
+		<div id="dialog">
+
+		</div>
 		<div class="btn-box">
 			<div class="more" ontouchstart="configCamera('move', 8)" ontouchend="stopConfigCamera()">
 				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/3.png" mode="widthFix"></image>
@@ -112,21 +125,17 @@
 		</div>
 	</body>
 	<script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+	<!-- 微信 JS-SDK 如果不需要兼容小程序，则无需引用此 JS 文件。 -->
+	<!-- <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">
-		//上下左右和拍照
-		var str = window.location.search.substr(1)
-		var arr = str.split('&')
-		var device_id = arr[0].split('=')[1]
-		var accessToken = arr[1].split('=')[1]
-		console.log(device_id)
-		console.log(accessToken)
 		function configCamera(ctrl, movenum) {
 			if (ctrl == "takephoto") {
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.camera_takephoto",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.camera_takephoto",
 					data: {
 						device_id: device_id,
 					}
@@ -142,15 +151,14 @@
 				//上下左右、放大、缩小
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 					data: {
 						device_id: device_id,
 						ctrl: ctrl,
 						movenum: movenum,
 					}
 				}).then((res) => {
-					console.log('成功')
-
+					$('#dialog').html('指令下发成功,请等待...').stop().show(500).delay(3000).hide(500)
 				})
 			}
 		}
@@ -158,67 +166,40 @@
 		function stopConfigCamera() {
 			$.ajax({
 				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+				url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 				data: {
 					device_id: device_id,
 					ctrl: "stop",
 				},
 			});
 		}
-		$(function() {
-			// var width = $('.direc').width()
-			// $('.direc').height(width)
-			$.ajax({
-				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.addr_camera",
-				data: {
-					device_id: device_id,
-				}
-			}).then((res) => {
-				console.log(res.data)
-
-				var data = eval("(" + res.data + ")");
-				console.log(data)
-				var hlsHdSrc = data.hlsHd;
-				var rtmpHdSrc = data.rtmpHd;
-				// console.log($("#box"))
-				// $("#box").innerHTML(1234)
-				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);
-
-			})
-
-			// setTimeout(() => {
-			// 	var url = "ezopen://open.ys7.com/" + device_id + "/1.hd.live"
-			// 	var player = new EZUIKit.EZUIPlayer({
-			// 		id: 'myPlayer',
-			// 		url: url,
-			// 		autoplay: true,
-			// 		accessToken: accessToken,
-			// 		decoderPath: 'js',
-			// 		width: 1000,
-			// 		height: 800,
-			// 	});
-			// 	player.play();
-			// }, 1000)
+		//上下左右和拍照
+		var str = window.location.search.substr(1)
+		var arr = str.split('&')
+		console.log(str);
+		var device_id = arr[0].split('=')[1]
+		console.log(device_id);
+		var accessToken = arr[1].split('=')[1]
+		console.log(accessToken)
+		$.ajax({
+			type: "POST",
+			url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.addr_camera",
+			data: {
+				device_id: device_id,
+			}
+		}).then((res) => {
+			console.log(res.data)
+			var data = eval("(" + res.data + ")");
+			var hlsHdSrc = data.hlsHd;
+			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);
 
 		})
-		document.addEventListener('UniAppJSBridgeReady', function() {
-			uni.webView.getEnv(function(res) {
-				console.log(res)
-				console.log('当前环境：' + JSON.stringify(res));
-			});
-			uni.postMessage({
-				data: {
-					action: 'postMessage'
-				}
-			});
-			// uni.webView.navigateTo(...)
-		});
 	</script>
-</html>
+</html>

unpackage/dist/build/app-plus/static/h52.html

@@ -1,14 +1,10 @@
 <!DOCTYPE html>
 <html lang=zh-CN>
 	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="divport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
+		<meta charset="utf-8" />
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>监控详情页</title>
-		<meta name="Copyright" content="helang">
-		<link rel="shortcut icon" type="image/png" href="/uniapp-extend/static/logo.png">
-		<meta name="keywords" content="">
-		<meta name="description" content="">
 		<style type="text/css">
 			body {
 				margin: 0;
@@ -40,8 +36,8 @@
 			}
 
 			.direc {
-				width: 400px;
-				height: 400px;
+				width: 150px;
+				height: 150px;
 				background: url('http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/1.png');
 				background-size: 100% auto;
 				background-repeat: no-repeat;
@@ -75,16 +71,33 @@
 			}
 
 			#box {
-				height: 800px;
+				height: 300px;
 				width: 100%;
 				background: #000;
 			}
-		</style>
-		<script type="text/javascript" src="./js/ezuikit.js"></script>
 
+			#dialog {
+				display: none;
+				width: 200px;
+				line-height: 80px;
+				background: rgba(0, 0, 0, .8);
+				color: #fff;
+				text-align: center;
+				position: absolute;
+				left: 50%;
+				margin-left: -100px;
+				border-radius: 4px;
+				z-index: 999;
+				top: 50%;
+				margin-top: -40px;
+			}
+		</style>
 	</head>
 	<body>
 		<div id="box"></div>
+		<div id="dialog">
+
+		</div>
 		<div class="btn-box">
 			<div class="more" ontouchstart="configCamera('move', 8)" ontouchend="stopConfigCamera()">
 				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/3.png" mode="widthFix"></image>
@@ -112,21 +125,17 @@
 		</div>
 	</body>
 	<script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+	<!-- 微信 JS-SDK 如果不需要兼容小程序，则无需引用此 JS 文件。 -->
+	<!-- <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">
-		//上下左右和拍照
-		var str = window.location.search.substr(1)
-		var arr = str.split('&')
-		var device_id = arr[0].split('=')[1]
-		var accessToken = arr[1].split('=')[1]
-		console.log(device_id)
-		console.log(accessToken)
 		function configCamera(ctrl, movenum) {
 			if (ctrl == "takephoto") {
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.camera_takephoto",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.camera_takephoto",
 					data: {
 						device_id: device_id,
 					}
@@ -142,15 +151,14 @@
 				//上下左右、放大、缩小
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 					data: {
 						device_id: device_id,
 						ctrl: ctrl,
 						movenum: movenum,
 					}
 				}).then((res) => {
-					console.log('成功')
-
+					$('#dialog').html('指令下发成功,请等待...').stop().show(500).delay(3000).hide(500)
 				})
 			}
 		}
@@ -158,67 +166,40 @@
 		function stopConfigCamera() {
 			$.ajax({
 				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+				url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 				data: {
 					device_id: device_id,
 					ctrl: "stop",
 				},
 			});
 		}
-		$(function() {
-			// var width = $('.direc').width()
-			// $('.direc').height(width)
-			$.ajax({
-				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.addr_camera",
-				data: {
-					device_id: device_id,
-				}
-			}).then((res) => {
-				console.log(res.data)
-
-				var data = eval("(" + res.data + ")");
-				console.log(data)
-				var hlsHdSrc = data.hlsHd;
-				var rtmpHdSrc = data.rtmpHd;
-				// console.log($("#box"))
-				// $("#box").innerHTML(1234)
-				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);
-
-			})
-
-			// setTimeout(() => {
-			// 	var url = "ezopen://open.ys7.com/" + device_id + "/1.hd.live"
-			// 	var player = new EZUIKit.EZUIPlayer({
-			// 		id: 'myPlayer',
-			// 		url: url,
-			// 		autoplay: true,
-			// 		accessToken: accessToken,
-			// 		decoderPath: 'js',
-			// 		width: 1000,
-			// 		height: 800,
-			// 	});
-			// 	player.play();
-			// }, 1000)
+		//上下左右和拍照
+		var str = window.location.search.substr(1)
+		var arr = str.split('&')
+		console.log(str);
+		var device_id = arr[0].split('=')[1]
+		console.log(device_id);
+		var accessToken = arr[1].split('=')[1]
+		console.log(accessToken)
+		$.ajax({
+			type: "POST",
+			url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.addr_camera",
+			data: {
+				device_id: device_id,
+			}
+		}).then((res) => {
+			console.log(res.data)
+			var data = eval("(" + res.data + ")");
+			var hlsHdSrc = data.hlsHd;
+			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);
 
 		})
-		document.addEventListener('UniAppJSBridgeReady', function() {
-			uni.webView.getEnv(function(res) {
-				console.log(res)
-				console.log('当前环境：' + JSON.stringify(res));
-			});
-			uni.postMessage({
-				data: {
-					action: 'postMessage'
-				}
-			});
-			// uni.webView.navigateTo(...)
-		});
 	</script>
-</html>
+</html>

unpackage/dist/dev/app-plus/static/h52.html

@@ -1,14 +1,10 @@
 <!DOCTYPE html>
 <html lang=zh-CN>
 	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="divport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
+		<meta charset="utf-8" />
+		<meta name="viewport"
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>监控详情页</title>
-		<meta name="Copyright" content="helang">
-		<link rel="shortcut icon" type="image/png" href="/uniapp-extend/static/logo.png">
-		<meta name="keywords" content="">
-		<meta name="description" content="">
 		<style type="text/css">
 			body {
 				margin: 0;
@@ -40,8 +36,8 @@
 			}
 
 			.direc {
-				width: 400px;
-				height: 400px;
+				width: 150px;
+				height: 150px;
 				background: url('http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/1.png');
 				background-size: 100% auto;
 				background-repeat: no-repeat;
@@ -75,16 +71,33 @@
 			}
 
 			#box {
-				height: 800px;
+				height: 300px;
 				width: 100%;
 				background: #000;
 			}
-		</style>
-		<script type="text/javascript" src="./js/ezuikit.js"></script>
 
+			#dialog {
+				display: none;
+				width: 200px;
+				line-height: 80px;
+				background: rgba(0, 0, 0, .8);
+				color: #fff;
+				text-align: center;
+				position: absolute;
+				left: 50%;
+				margin-left: -100px;
+				border-radius: 4px;
+				z-index: 999;
+				top: 50%;
+				margin-top: -40px;
+			}
+		</style>
 	</head>
 	<body>
 		<div id="box"></div>
+		<div id="dialog">
+
+		</div>
 		<div class="btn-box">
 			<div class="more" ontouchstart="configCamera('move', 8)" ontouchend="stopConfigCamera()">
 				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/3.png" mode="widthFix"></image>
@@ -112,21 +125,17 @@
 		</div>
 	</body>
 	<script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+	<!-- 微信 JS-SDK 如果不需要兼容小程序，则无需引用此 JS 文件。 -->
+	<!-- <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">
-		//上下左右和拍照
-		var str = window.location.search.substr(1)
-		var arr = str.split('&')
-		var device_id = arr[0].split('=')[1]
-		var accessToken = arr[1].split('=')[1]
-		console.log(device_id)
-		console.log(accessToken)
 		function configCamera(ctrl, movenum) {
 			if (ctrl == "takephoto") {
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.camera_takephoto",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.camera_takephoto",
 					data: {
 						device_id: device_id,
 					}
@@ -142,15 +151,14 @@
 				//上下左右、放大、缩小
 				$.ajax({
 					type: "POST",
-					url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+					url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 					data: {
 						device_id: device_id,
 						ctrl: ctrl,
 						movenum: movenum,
 					}
 				}).then((res) => {
-					console.log('成功')
-
+					$('#dialog').html('指令下发成功,请等待...').stop().show(500).delay(3000).hide(500)
 				})
 			}
 		}
@@ -158,67 +166,40 @@
 		function stopConfigCamera() {
 			$.ajax({
 				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+				url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.ctrl_camera",
 				data: {
 					device_id: device_id,
 					ctrl: "stop",
 				},
 			});
 		}
-		$(function() {
-			// var width = $('.direc').width()
-			// $('.direc').height(width)
-			$.ajax({
-				type: "POST",
-				url: "http://8.136.98.49:8002/api/api_gateway?method=camera.camera_manage.addr_camera",
-				data: {
-					device_id: device_id,
-				}
-			}).then((res) => {
-				console.log(res.data)
-
-				var data = eval("(" + res.data + ")");
-				console.log(data)
-				var hlsHdSrc = data.hlsHd;
-				var rtmpHdSrc = data.rtmpHd;
-				// console.log($("#box"))
-				// $("#box").innerHTML(1234)
-				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);
-
-			})
-
-			// setTimeout(() => {
-			// 	var url = "ezopen://open.ys7.com/" + device_id + "/1.hd.live"
-			// 	var player = new EZUIKit.EZUIPlayer({
-			// 		id: 'myPlayer',
-			// 		url: url,
-			// 		autoplay: true,
-			// 		accessToken: accessToken,
-			// 		decoderPath: 'js',
-			// 		width: 1000,
-			// 		height: 800,
-			// 	});
-			// 	player.play();
-			// }, 1000)
+		//上下左右和拍照
+		var str = window.location.search.substr(1)
+		var arr = str.split('&')
+		console.log(str);
+		var device_id = arr[0].split('=')[1]
+		console.log(device_id);
+		var accessToken = arr[1].split('=')[1]
+		console.log(accessToken)
+		$.ajax({
+			type: "POST",
+			url: "https://wx.hnyfwlw.com/api/api_gateway?method=camera.camera_manage.addr_camera",
+			data: {
+				device_id: device_id,
+			}
+		}).then((res) => {
+			console.log(res.data)
+			var data = eval("(" + res.data + ")");
+			var hlsHdSrc = data.hlsHd;
+			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);
 
 		})
-		document.addEventListener('UniAppJSBridgeReady', function() {
-			uni.webView.getEnv(function(res) {
-				console.log(res)
-				console.log('当前环境：' + JSON.stringify(res));
-			});
-			uni.postMessage({
-				data: {
-					action: 'postMessage'
-				}
-			});
-			// uni.webView.navigateTo(...)
-		});
 	</script>
-</html>
+</html>

unpackage/dist/dev/mp-weixin/app.json

@@ -60,7 +60,9 @@
     "pages/cb/index/search",
     "pages/my/record/record",
     "pages/cb/xy2.0/particulars",
-    "pages/cb/xy2.0/historydatas"
+    "pages/cb/xy2.0/historydatas",
+    "pages/cb/cbd/equip-set/results",
+    "pages/cb/cbd/equip-set/manualinput"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/components/bazaar-city_list/index.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }