7/5

pages/afterSale/index.vue

@@ -186,6 +186,7 @@
 			// this.getAftersale()
 		},
 		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

@@ -209,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) {
@@ -236,7 +236,7 @@
 		},
 		onReachBottom() {
 			this.page++
-			this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
+			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

@@ -35,11 +35,12 @@
 				<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" class="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">确定</u-button>
@@ -103,102 +104,104 @@
 	export default {
 		data() {
 			return {
-				fieldstyle:{
-					border:"2rpx solid #f6f6f6",
-					"border-radius":"24px",
-					"padding-left":"20rpx",
-					"background-color":"#f6f6f6"
+				fieldstyle: {
+					border: "2rpx solid #f6f6f6",
+					"border-radius": "24px",
+					"padding-left": "20rpx",
+					"background-color": "#f6f6f6"
 				},
-				city:"",
+				city: "",
 				type: null, //设备类型
 				device_status: null,
 				equipInfo: {},
 				cbd: [{
-					icon: '/image/cb/1.png',
-					tex: '查看图片',
-					path: '/pages/cb/cbd/equip-set/imgpage',
-					tf:false
-				}, 
-				// {
-				// 	icon: '/image/cb/2.png',
-				// 	tex: '历史数据',
-				// 	path: '/pages/cb/cbd/equip-set/historyfile',
-				// 	tf:false
-				// }, 
-				{
-					icon: '/image/cb/3.png',
-					tex: '害虫统计',
-					path: '/pages/cb/cbd/equip-set/statistics',
-					tf:false
-				}, {
-					icon: '/image/cb/4.png',
-					tex: '设备控制',
-					path: '/pages/cb/cbd/equip-set/equip-set',
-					tf:false
-				}, {
-					icon: '/image/cb/5.png',
-					tex: '短信预警',
-					path: '/pages/cb/cbd/equip-set/note',
-					tf:false
-				}, {
-					icon: '/image/cb/6.png',
-					tex: 'sim卡详情',
-					path: '/pages/cb/sim/sim',
-					tf:true
-				},{
-					icon: '/image/environment/7.png',
-					tex: '一键报修',
-					path: '/pages/afterSale/addafter',
-					tf:true
-				}],
+						icon: '/image/cb/1.png',
+						tex: '查看图片',
+						path: '/pages/cb/cbd/equip-set/imgpage',
+						tf: false
+					},
+					// {
+					// 	icon: '/image/cb/2.png',
+					// 	tex: '历史数据',
+					// 	path: '/pages/cb/cbd/equip-set/historyfile',
+					// 	tf:false
+					// }, 
+					{
+						icon: '/image/cb/3.png',
+						tex: '害虫统计',
+						path: '/pages/cb/cbd/equip-set/statistics',
+						tf: false
+					}, {
+						icon: '/image/cb/4.png',
+						tex: '设备控制',
+						path: '/pages/cb/cbd/equip-set/equip-set',
+						tf: false
+					}, {
+						icon: '/image/cb/5.png',
+						tex: '短信预警',
+						path: '/pages/cb/cbd/equip-set/note',
+						tf: false
+					}, {
+						icon: '/image/cb/6.png',
+						tex: 'sim卡详情',
+						path: '/pages/cb/sim/sim',
+						tf: true
+					}, {
+						icon: '/image/environment/7.png',
+						tex: '一键报修',
+						path: '/pages/afterSale/addafter',
+						tf: true
+					}
+				],
 				bzy: [{
-					icon: '/image/cb/4.png',
-					tex: '设备控制',
-					path: '/pages/cb/bzy/equip-set/equip-set',
-					tf:false
-				}, {
-					icon: '/image/cb/1.png',
-					tex: '查看图片',
-					path: '/pages/cb/cbd/equip-set/imgpage',
-					tf:false
-				}, 
-				// {
-				// 	icon: '/image/cb/2.png',
-				// 	tex: '历史数据',
-				// 	path: '/pages/cb/bzy/equip-set/bzyhistoryile',
-				// 	tf:false
-				// }, 
-				{
-					icon: '/image/cb/6.png',
-					tex: 'sim卡详情',
-					path: '/pages/cb/sim/sim',
-					tf:false
-				},{
-					icon: '/image/environment/7.png',
-					tex: '一键报修',
-					path: '/pages/afterSale/addafter',
-					tf:true
-				}],
+						icon: '/image/cb/4.png',
+						tex: '设备控制',
+						path: '/pages/cb/bzy/equip-set/equip-set',
+						tf: false
+					}, {
+						icon: '/image/cb/1.png',
+						tex: '查看图片',
+						path: '/pages/cb/cbd/equip-set/imgpage',
+						tf: false
+					},
+					// {
+					// 	icon: '/image/cb/2.png',
+					// 	tex: '历史数据',
+					// 	path: '/pages/cb/bzy/equip-set/bzyhistoryile',
+					// 	tf:false
+					// }, 
+					{
+						icon: '/image/cb/6.png',
+						tex: 'sim卡详情',
+						path: '/pages/cb/sim/sim',
+						tf: false
+					}, {
+						icon: '/image/environment/7.png',
+						tex: '一键报修',
+						path: '/pages/afterSale/addafter',
+						tf: true
+					}
+				],
 				xy: [{
 					icon: '/image/cb/4.png',
 					tex: '设备控制',
 					path: '/pages/cb/xy/equip-set/equip-set',
-					tf:false
+					tf: false
 				}, {
 					icon: '/image/cb/6.png',
 					tex: 'sim卡详情',
 					path: '/pages/cb/sim/sim',
-					tf:false
+					tf: false
 				}, {
 					icon: '/image/cb/2.png',
 					tex: '历史数据',
 					path: '/pages/cb/xy/equip-set/xyhistoryile',
-					tf:false
-				},{
+					tf: false
+				}, {
 					icon: '/image/environment/7.png',
 					tex: '一键报修',
 					path: '/pages/afterSale/addafter',
-					tf:true
+					tf: true
 				}],
 				newState: {}, //设备最新状态
 				setTimeShow: false,
@@ -211,7 +214,8 @@
 				yxShow: false, //诱芯弹框
 				xyErr: '',
 				decoy: '',
-				newtishitf:false,
+				newtishitf: false,
+				date: "", //日历最大可选日期
 			}
 		},
 		computed: {
@@ -266,11 +270,13 @@
 							}, {
 								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/icon16.png',
 								txt: '信号强度',
@@ -329,11 +335,13 @@
 							}, {
 								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/prevention/icon16.png',
 								txt: '信号强度',
@@ -380,12 +388,14 @@
 							{
 								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',
@@ -449,33 +459,35 @@
 		},
 		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)=>{
+				key: "jurisdiction",
+				success: (res) => {
 					console.log(JSON.parse(res.data))
-					let items = JSON.parse(res.data).filter((item)=>{
+					let items = JSON.parse(res.data).filter((item) => {
 						return item.purview_name == "测报系统"
 					})
 					console.log(items)
-					let items2 = items[0].children.filter((item)=>{
+					let items2 = items[0].children.filter((item) => {
 						return item.purview_name == "虫情测报灯"
 					})
-					let items3 = items[0].children.filter((item)=>{
+					let items3 = items[0].children.filter((item) => {
 						return item.purview_name == "性诱测报"
 					})
-					let items4 = items[0].children.filter((item)=>{
+					let items4 = items[0].children.filter((item) => {
 						return item.purview_name == "孢子仪"
 					})
 					console.log(items2)
 					var arr = items2[0].children
-					for(var i =0;i<arr.length;i++){
-						switch (arr[i].purview_name){
+					for (var i = 0; i < arr.length; i++) {
+						switch (arr[i].purview_name) {
 							case "数据详情":
 								this.cbd[1].tf = true
 								break
@@ -496,8 +508,8 @@
 					}
 					console.log(items3[0].children)
 					var arr2 = items3[0].children
-					for(var i =0;i<arr2.length;i++){
-						switch (arr2[i].purview_name){
+					for (var i = 0; i < arr2.length; i++) {
+						switch (arr2[i].purview_name) {
 							case "设备控制":
 								this.xy[0].tf = true
 								break;
@@ -511,8 +523,8 @@
 					}
 					console.log(items4[0].children)
 					var arr3 = items4[0].children
-					for(var i =0;i<arr3.length;i++){
-						switch (arr3[i].purview_name){
+					for (var i = 0; i < arr3.length; i++) {
+						switch (arr3[i].purview_name) {
 							case "设备控制":
 								this.bzy[0].tf = true
 								break;
@@ -535,7 +547,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,
@@ -543,10 +555,10 @@
 				})
 				console.log(res)
 				console.log(1222)
-				if(res.counts!=0){
+				if (res.counts != 0) {
 					this.newState = res.data[0].d_h_t
 					this.newtishitf = true
-				}else{
+				} else {
 					this.newtishitf = false
 				}
 			},
@@ -554,21 +566,21 @@
 				console.log(path)
 				var device_id = this.equipInfo.device_id || this.equipInfo.imei
 				uni.navigateTo({
-					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + device_id + "&device_type="+this.type
+					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + device_id + "&device_type=" + this.type
 				});
 			},
-			partClicks(){
+			partClicks() {
 				var path = ""
 				var device_id = this.equipInfo.device_id || this.equipInfo.imei
-				if(this.type==3){
-					path="/pages/cb/cbd/equip-set/historyfile"
-				}else if(this.type == 7){
-					path="/pages/cb/bzy/equip-set/bzyhistoryile"
-				}else if(this.type == 4){
-					path="/pages/cb/xy/equip-set/xyhistoryile"
+				if (this.type == 3) {
+					path = "/pages/cb/cbd/equip-set/historyfile"
+				} else if (this.type == 7) {
+					path = "/pages/cb/bzy/equip-set/bzyhistoryile"
+				} else if (this.type == 4) {
+					path = "/pages/cb/xy/equip-set/xyhistoryile"
 				}
 				uni.navigateTo({
-					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + device_id + "&device_type="+this.type
+					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + device_id + "&device_type=" + this.type
 				});
 			},
 			async setTime(d_id) {
@@ -652,23 +664,25 @@
 					this.yxShow = false
 				}
 			},
-			selectaddress(lat,lng) { //获取分布位置
+			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){
+			copy(item) {
 				console.log(item)
 				uni.setClipboardData({
-				    data: item.imei||item.device_id,
-				    success: function () {
-				        console.log('success');
-				    }
+					data: item.imei || item.device_id,
+					success: function() {
+						console.log('success');
+					}
 				});
 			},
 		},
@@ -679,6 +693,7 @@
 	page {
 		padding: 20rpx;
 		box-sizing: border-box;
+
 		.info {
 			padding: 20rpx 40rpx;
 			color: #fff;
@@ -690,7 +705,8 @@
 			background-position: top left;
 			box-sizing: border-box;
 			width: 100%;
-			.tishi{
+
+			.tishi {
 				width: 28rpx;
 				height: 28rpx;
 				margin: 0rpx 0 0 20rpx;
@@ -712,6 +728,7 @@
 			font-size: 28rpx;
 			color: #666;
 			line-height: 50rpx;
+
 			image {
 				width: 52rpx;
 			}
@@ -728,7 +745,8 @@
 				flex-basis: 33%;
 				/* flex-grow: 1; */
 			}
-			.item3{
+
+			.item3 {
 				padding: 20rpx 0;
 				box-sizing: border-box;
 				flex-basis: 25%;
@@ -742,7 +760,8 @@
 			margin-bottom: 20rpx;
 			display: flex;
 			justify-content: space-between;
-			.span{
+
+			.span {
 				color: #6e6c76;
 				font-size: 24rpx;
 				display: flex;
@@ -750,13 +769,15 @@
 				/* margin-top: 12rpx; */
 			}
 		}
-		.newtishi{
+
+		.newtishi {
 			width: 90%;
 			margin: 0 auto;
 			text-align: center;
 			padding-top: 40rpx;
 			font-size: 32rpx;
 		}
+
 		.newState {
 			display: flex;
 			flex-wrap: wrap;
@@ -780,10 +801,11 @@
 					text-align: left;
 					line-height: 40rpx;
 				}
-				
+
 				.item_info_img {
 					width: 30%;
 					text-align: center;
+
 					image {
 						width: 64rpx;
 						height: 64rpx;
@@ -797,6 +819,7 @@
 			text-align: center;
 			padding: 30rpx;
 		}
+
 		.field {
 			/deep/.uni-input-input {
 				border: 2rpx solid #FF0000;
@@ -807,4 +830,13 @@
 			}
 		}
 	}
+
+	/deep/.u-calendar__action {
+		display: flex;
+		justify-content: space-around;
+
+		.u-calendar__action__text {
+			line-height: 25px;
+		}
+	}
 </style>

pages/cb/index/search.vue

@@ -175,7 +175,7 @@
 			// text-indent: 1rem;
 			font-size: 26rpx;
 			padding-left: 20px;
-			box-sizing: border-box;
+			// box-sizing: border-box;
 		}
 	
 		.icon {

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,7 +101,7 @@
 				</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 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>
@@ -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">
@@ -96,7 +89,7 @@
 				facilitydatas:[],
 			}
 		},
-		onShow() {
+		onLoad() {
 			this.device_id = ""
 			this.list = [{
 					name: "全部"
@@ -207,11 +200,24 @@
 				this.device_id = this.facilitydatas[e.detail.markerId].device_id
 				this.punctuation_did = this.facilitydatas[e.detail.markerId].d_id
 				this.punctuation_type = this.facilitydatas[e.detail.markerId].device_type_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()
 			},
-			eqinfo() { //设备信息
+			eqinfo(item) { //设备信息
 				if (this.punctuation_type == '') {
 					uni.showToast({
 						title: '请点击需查看的设备',
@@ -222,37 +228,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;
 					}
@@ -273,49 +281,59 @@
 	}
 	.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;
+		.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;
+				padding-left: 40rpx;
 				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;
+		
+			.icon {
+				position: absolute;
+				top: 8rpx;
+				right: 26rpx;
 			}
 		}
+		// .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;
+		margin-top: 100px;
 		height: 80vh;
 		// position: fixed;
 		// top: 144px;

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>
@@ -151,8 +151,9 @@
 				})
 			},
 			charts() { //历史数据
+				var device_id = this.eqinfo.item.equip_id || this.eqinfo.item.device_id
 				uni.navigateTo({
-					url: "./history?device_id=" + this.eqinfo.item.equip_id
+					url: "./history?device_id=" + device_id
 				})
 			},
 			reverseGeocode(lat, lng) {

pages/environment/history.vue

@@ -309,6 +309,7 @@
 			this.end = presenttime / 1000
 			this.begintime = presenttime / 1000 - 24 * 60 * 60
 			console.log(new Date(1616145097 * 1000), new Date(1616231497 * 1000))
+			console.log(option.device_id)
 			this.historydata(option.device_id)
 			this.listhistorydata(option.device_id)
 		}

pages/prevention/equipmentdetails.vue

@@ -15,7 +15,7 @@
 					<p>设备名称：{{eqinfo.item.device_name?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">
@@ -100,11 +100,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: '信号强度',
@@ -157,6 +157,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
@@ -193,12 +205,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) => {

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>

style/html/h52.html

@@ -159,7 +159,6 @@
 					}
 				}).then((res) => {
 					$('#dialog').html('指令下发成功,请等待...').stop().show(500).delay(3000).hide(500)
-
 				})
 			}
 		}

unpackage/dist/dev/mp-weixin/.gitignore

@@ -0,0 +1,14 @@
+# Windows
+[Dd]esktop.ini
+Thumbs.db
+$RECYCLE.BIN/
+
+# macOS
+.DS_Store
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+
+# Node.js
+node_modules/

unpackage/dist/dev/mp-weixin/pages/cb/cbd/equip-set/results.wxss

@@ -91,7 +91,7 @@
   margin-left: -10rpx;
 }
 .information {
-  width: 90%;
+  width: 97%;
   margin: 0 auto;
   padding-top: 20rpx;
 }

unpackage/dist/dev/mp-weixin/pages/cb/equip-detail/equip-detail.wxss

@@ -165,4 +165,14 @@ page .field .uni-input-input {
   padding-left: 10rpx;
   box-sizing: border-box;
 }
+ .u-calendar__action {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-justify-content: space-around;
+          justify-content: space-around;
+}
+ .u-calendar__action .u-calendar__action__text {
+  line-height: 25px;
+}
 

unpackage/dist/dev/mp-weixin/pages/cb/index/search.wxss

@@ -39,7 +39,6 @@
   width: 85%;
   font-size: 26rpx;
   padding-left: 20px;
-  box-sizing: border-box;
 }
 .search_top_input .icon {
   position: absolute;

unpackage/dist/dev/mp-weixin/pages/cb/xy2.0/particulars.wxss

@@ -174,18 +174,18 @@
   background-color: #0dc6b6;
   border-radius: 8rpx;
 }
-.field .fild-body {
-  margin-left: -30px;
-}
-.field .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;
 }
+ .u-calendar__action {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-justify-content: space-around;
+          justify-content: space-around;
+}
+ .u-calendar__action .u-calendar__action__text {
+  line-height: 25px;
+}
 

unpackage/dist/dev/mp-weixin/pages/distribution/index.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "设备分布",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u-tabs": "/uview-ui/components/u-tabs/u-tabs"
+    "u-tabs": "/uview-ui/components/u-tabs/u-tabs",
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
   }
 }

unpackage/dist/dev/mp-weixin/pages/distribution/index.wxss

@@ -33,54 +33,33 @@
 }
 .LocationAndDetails {
   width: 100%;
-  height: 200rpx;
+  height: 60rpx;
   position: fixed;
   top: 54px;
 }
-.LocationAndDetails .search {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-}
-.LocationAndDetails .search input {
+.LocationAndDetails .search_bot_input {
   width: 90%;
-  font-size: 28rpx;
-  margin-left: 40rpx;
-  border: 1px solid #cfccc9;
-  height: 60rpx;
-  padding-left: 15px;
+  height: 54rpx;
+  background-color: #E4E4E4;
+  border-radius: 27rpx;
+  position: relative;
   box-sizing: border-box;
-  border-radius: 60rpx;
-}
-.LocationAndDetails .Location {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  margin-top: 20rpx;
-  -webkit-justify-content: space-around;
-          justify-content: space-around;
+  padding-top: 8rpx;
+  margin: 0 auto;
 }
-.LocationAndDetails .Location .particulars_par {
-  background-color: #F1F1F1;
-  text-align: center;
-  width: 40%;
-  height: 80rpx;
-  line-height: 80rpx;
-  font-size: 28rpx;
-  border-radius: 40rpx;
+.LocationAndDetails .search_bot_input input {
+  width: 85%;
+  font-size: 26rpx;
+  padding-left: 40rpx;
+  box-sizing: border-box;
 }
-.LocationAndDetails .Location .particulars_ser {
-  background-color: #57C87B;
-  text-align: center;
-  width: 40%;
-  height: 80rpx;
-  line-height: 80rpx;
-  font-size: 28rpx;
-  color: #FFFFFF;
-  border-radius: 40rpx;
+.LocationAndDetails .search_bot_input .icon {
+  position: absolute;
+  top: 8rpx;
+  right: 26rpx;
 }
 .page-section {
-  margin-top: 144px;
+  margin-top: 100px;
   height: 80vh;
 }
 .page-section .map {

unpackage/dist/dev/mp-weixin/project.config.json

@@ -4,10 +4,40 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
-    "minified": true,
+    "urlCheck": true,
+    "es6": true,
+    "enhance": false,
     "postcss": false,
-    "es6": true
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": false,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "bundle": false,
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
@@ -15,19 +45,15 @@
   "projectname": "云飞智控",
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": 3,
       "list": [
         {
           "name": "about",