优化一些页面

pages.json

@@ -309,6 +309,31 @@
 			}]
 		},
 		{
+			"root": "pages/cb/nlNewXy",
+			"pages": [{
+				"path": "nlNewXy",
+				"style": {
+					"navigationBarTitleText": "设备详情",
+					"enablePullDownRefresh": false
+				}
+		
+			}, {
+				"path": "thxyhisdata",
+				"style": {
+					"navigationBarTitleText": "历史数据",
+					"enablePullDownRefresh": false
+				}
+		
+			}, {
+				"path": "thxyset",
+				"style": {
+					"navigationBarTitleText": "设备控制",
+					"enablePullDownRefresh": false
+				}
+		
+			}]
+		},
+		{
 			"root": "pages/cb/thxydetail",
 			"pages": [{
 					"path": "thxydetail",

pages/cb/nlNewXy/nlNewXy.vue

@@ -0,0 +1,371 @@
+<template>
+	<view>
+		<view :class="['info',equipInfo.is_online==1?'on':'off']">
+			<view class="" @click="copy(equipInfo)">
+				设备ID：{{showId}}
+				<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}}
+			</view>
+			<view class="">
+				设备类型：性诱监测
+			</view>
+			<view class="">
+				最新上报时间：{{equipInfo.uptime||equipInfo.uptime | timeFormat}}
+			</view>
+			<view class="">
+				设备地址：{{equipInfo.address}}
+			</view>
+			<view class="" @click="setdecoy">
+				诱芯名称：{{equipInfo.decoy}}
+				<u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon>
+			</view>
+			<view class="" @click="setdecoy">
+				诱芯到期时间：{{equipInfo.xy_expire}}
+				<u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon>
+			</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"
+				:field-style="fieldstyle" placeholder="请填写害虫名称">
+			</u-field>
+			<u-field label="诱芯到期时间" label-width='240' required :error-message="xyErrtime" v-model="decoytime"
+				@click="settime" class="field" :field-style="fieldstyle" placeholder="请填写到期时间">
+			</u-field>
+			<view class="" style="text-align: center;color: #fa3534;">
+				{{tishitext}}
+			</view>
+			<view class="btn-box">
+				<u-button @click="yxSubmit" size="mini" type="success" class="box-item">确定</u-button>
+			</view>
+		</u-popup>
+		<u-calendar v-model="tiemshow" mode="date" :max-date="date" @change="tiemchange"></u-calendar>
+		<view class="caobox">
+			<view class="caobox_item" v-if="$QueryPermission(358)" @click="toset">
+				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/4.png" mode="widthFix"></image>
+				<view class="">
+					设备控制
+				</view>
+			</view>
+			<view class="caobox_item" v-if="$QueryPermission(359)" @click="tohis">
+				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/2.png" mode="widthFix"></image>
+				<view class="">
+					历史数据
+				</view>
+			</view>
+		</view>
+		<view class="realtime">
+			<view class="realtime_title">
+				<p>实时数据</p>
+			</view>
+			<view class="realtime_text">
+				<view class="realtime_item">
+					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/wendu.png" mode=""></image>
+					<view class="text">
+						<p>环境温度</p>
+						<p>{{at}}℃</p>
+					</view>
+				</view>
+				<view class="realtime_item">
+					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/shidu.png" mode=""></image>
+					<view class="text">
+						<p>环境湿度</p>
+						<p>{{ah}}</p>
+					</view>
+				</view>
+				<view class="realtime_item">
+					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/tianqi.png" mode=""></image>
+					<view class="text">
+						<p>天气</p>
+						<p>{{wea}}</p>
+					</view>
+				</view>
+				<view class="realtime_item">
+					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/xiayu.png" mode=""></image>
+					<view class="text">
+						<p>是否下雨</p>
+						<p>{{rain}}</p>
+					</view>
+				</view>
+				<view class="realtime_item">
+					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/yujing.png" mode=""></image>
+					<view class="text">
+						<p>诱虫次数</p>
+						<p>{{wormnum}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				showId:'',
+				baseimei: "",
+				equipInfo: {},
+				trapnum: 1,
+				at: "",
+				ah: "",
+				wind: "",
+				wea: "",
+				rain: "",
+				wormnum: "",
+				decoy: "",
+				xyErr: "",
+				xyErrtime: "",
+				decoytime: "",
+				yxShow: false,
+				tiemshow: false,
+				date: "",
+				fieldstyle: { //输入框样式
+					border: "2rpx solid #f6f6f6",
+					"border-radius": "24px",
+					"padding-left": "20rpx",
+					"background-color": "#f6f6f6"
+				},
+				tishitext:""
+			}
+		},
+		methods: {
+			toset() {
+				uni.navigateTo({
+					url: "./thxyset?device_id=" + this.equipInfo.imei + "&d_id=" + this.equipInfo.d_id +
+						"&dtype=" + this.equipInfo.dtype +
+						"&device_name=" + this.equipInfo.device_name
+				})
+			},
+			tohis() {
+				uni.navigateTo({
+					url: "./thxyhisdata?device_id=" + this.equipInfo.imei + "&d_id=" + this.equipInfo.d_id
+				})
+			},
+			copy(item) {
+				console.log(item)
+				uni.setClipboardData({
+					data: item.imei || item.device_id,
+					success: function() {
+						console.log('success');
+					}
+				});
+			},
+			async getbaseinfo() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.xy_three_list',
+					data: {
+						device_id: this.baseimei,
+						device_type_id: "29",
+						page: "1",
+						page_size: "10",
+					}
+				})
+				console.log(res.data[0])
+				this.equipInfo = res.data[0]
+				this.getweather()
+				this.getworm()
+			},
+			async getweather() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=device.device_manage.weathers',
+					data: {
+						lng: Number(this.equipInfo.lng),
+						lat: Number(this.equipInfo.lat),
+					}
+				})
+				console.log(res)
+				// this.
+				if (res[0]) {
+					this.wea = res[0].wea;
+					this.rain = res[0].wea.indexOf("雨") == -1 ? "否" : "是";
+					this.ah = res[0].ah;
+					this.at = res[0].at;
+				} else {
+					this.wea = "暂无"
+					this.rain = "暂无"
+				}
+			},
+			async getworm() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.xycb_pest_chart_new',
+					data: {
+						d_id: this.equipInfo.d_id,
+						start_time: Math.floor(+new Date() / 1000 - 30 * 24 * 60 * 60),
+						end_time: Math.floor(+new Date() / 1000),
+						device_type_id: "29",
+						years: new Date().getFullYear()
+					}
+				})
+				console.log(res)
+				this.wormnum = res.total_num[new Date().getFullYear()]
+			},
+			setdecoy() {
+				this.decoy = this.equipInfo.decoy
+				this.decoytime = this.equipInfo.xy_expire
+				this.yxShow = true
+			},
+			settime() {
+				console.log(12)
+				this.tiemshow = true
+			},
+			tiemchange(e) {
+				console.log(e)
+				this.decoytime = e.result
+			},
+			async yxSubmit() {
+				var time = Math.floor(+new Date(this.decoytime) / 1000)
+				console.log(time)
+				if (this.decoy == "") {
+					this.tishitext = "请填写诱芯名称"
+					return
+				} else if (isNaN(time)) {
+					this.tishitext = "请填写诱芯到期时间"
+					return
+				}
+				this.tishitext = ""
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.set_decopy',
+					data: {
+						decoy: this.decoy,
+						device_id: this.equipInfo.imei,
+						device_type_id: "29",
+						expire_time: time,
+					}
+				})
+				console.log(res)
+				if (res.status) {
+					uni.showToast({
+						title: "设置成功",
+						icon: "none"
+					})
+					this.yxShow = false
+					this.getbaseinfo()
+				}
+			}
+		},
+		onLoad(option) {
+			var times = new Date()
+			this.date = times.getFullYear() + 1 + "-" + Number(times.getMonth() + 1) + "-" + times.getDate()
+			this.baseimei = option.imei;
+			this.showId = option.showId;
+			// console.log(this.equipInfo)
+			this.getbaseinfo()
+		},
+	}
+</script>
+
+<style lang='less'>
+	page {
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		.info {
+			padding: 20rpx 40rpx;
+			color: #fff;
+			line-height: 50rpx;
+			font-size: 26rpx;
+			background-size: 100% auto;
+			background-repeat: no-repeat;
+			background-color: #0DC6B6;
+			background-position: top left;
+			box-sizing: border-box;
+			width: 100%;
+
+			.tishi {
+				width: 28rpx;
+				height: 28rpx;
+				margin: 0rpx 0 0 20rpx;
+			}
+		}
+
+		.on {
+			background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
+		}
+
+		.off {
+			background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
+		}
+
+		.caobox {
+			display: flex;
+			flex-wrap: wrap;
+			text-align: center;
+			font-size: 28rpx;
+			color: #666;
+			line-height: 50rpx;
+
+			image {
+				width: 52rpx;
+			}
+
+			.caobox_item {
+				padding: 20rpx 0;
+				box-sizing: border-box;
+				flex-basis: 25%;
+			}
+		}
+
+		.realtime {
+			width: 95%;
+			margin: 0rpx auto;
+
+			.realtime_title {
+				font-size: 32rpx;
+				display: flex;
+				justify-content: space-between;
+				font-weight: 700;
+
+				.span {
+					color: #6e6c76;
+					font-size: 24rpx;
+					display: flex;
+					justify-content: space-between;
+					margin-top: 12rpx;
+				}
+			}
+
+			.realtime_text {
+				margin-top: 20rpx;
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
+
+				.realtime_item {
+					width: 48%;
+					height: 100rpx;
+					display: flex;
+					box-shadow: 0 0 10rpx #bcb9ca;
+					margin-top: 20rpx;
+					padding: 20rpx 0;
+
+					image {
+						width: 60rpx;
+						height: 60rpx;
+						margin: 20rpx 20rpx 20rpx 40rpx;
+					}
+
+					.text {
+						padding: 10rpx 0 10rpx 30rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.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/cb/nlNewXy/thxyhisdata.vue

@@ -0,0 +1,492 @@
+<template>
+	<view>
+		<view class="timeandtype">
+			<view class="timebox">
+				<view class="firsttime" @click="timeshow=true">
+					<view class="" v-if="start_time!=''">
+						{{start_time/1000|timeFormat()}}
+					</view>
+					<view class="" v-else>
+						{{start_time==""?'请选择开始时间':start_time}}
+					</view>
+				</view>
+				<view class="jiange">
+					-
+				</view>
+				<view class="endtime" @click="timeshow=true">
+					<view class="" v-if="end_time!=''">
+						{{end_time/1000|timeFormat()}}
+					</view>
+					<view class="" v-else>
+						{{end_time==""?'请选择结束时间':end_time}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="shuju_one">
+			<view class="canvastishi" v-if="!canvastishiTF2">
+				暂无数据
+			</view>
+			<view class="canvastishi" v-if="dataloadingtf2">
+				<p class="dataloading">加载中</p>
+			</view>
+			<canvas v-if="canvastishiTF2" canvas-id="canvasColumnB" id="canvasColumnB" class="charts"
+				@touchstart="touchLineB($event)" @touchmove="moveLineB($event)" @touchend="touchEndLineB($event)"
+				disable-scroll=true
+				:style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
+		</view>
+		<view class="condition">
+			<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
+				<table class="table">
+					<tr class="tr">
+						<th class="th" v-for="(item,index) in thdata" :key="'a'+index">{{item[0]}}</th>
+					</tr>
+					<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs">
+						<td class="td" v-for="head in thdata" :key="'head'+ head[1]" >
+							<view v-if="head[1] == 'addtime'">{{items.d_h_t.addtime|timeFormat()}}</view>
+							<view v-else>
+								{{items.d_h_t[head[1]]}}
+							</view>
+						</td>
+					</tr>
+					<tr class="tr" v-if="forbidden">
+						<td class="td" v-for="item in 7">暂无数据</td>
+					</tr>
+				</table>
+			</scroll-view>
+			<view class="pagenumber">
+				<button @click="prev">上一页</button>
+				<view class="pagenumber_page">
+					第 {{page}} 页
+				</view>
+				<view class="pagenumber_page">
+					共 {{pagesum}} 页
+				</view>
+				<button @click="next" :disabled="forbidden">下一页</button>
+			</view>
+		</view>
+		<u-calendar v-model="timeshow" :mode="mode" @change="timechange"></u-calendar>
+	</view>
+</template>
+
+<script>
+	import uCharts from '../../../components/js_sdk/u-charts/u-charts/u-charts.js';
+	import Circulation from "../../../static/js/equipState_dict.json"
+	var canvaColumnA = null;
+	var canvaColumnB = null
+	export default {
+		data() {
+			return {
+				start_time: "",
+				end_time: "",
+				timeshow: false,
+				mode: 'range',
+				cWidth: '400',
+				cHeight: '400',
+				pixelRatio: 1,
+				canvastishiTF: false,
+				dataloadingtf: false,
+				canvastishiTF2: false,
+				dataloadingtf2: false,
+				equipInfo: {},
+				historylistdata: [],
+				thdata: [
+					['上报时间', 'addtime'],
+					['电池功率', 'battery_p'],
+					['太阳能板电流', 'solar_c'],
+					['太阳能板功率', 'solar_p'],
+					['电池电压', 'battery_v'],
+					['太阳能板电压', 'solar_v'],
+					['电池电流', 'battery_c'],
+				],
+				page: 1,
+				pagesum: "10",
+				Circulation: Circulation,
+				forbidden: false
+			}
+		},
+		methods: {
+			timechange(e) {
+				this.start_time = +new Date(e.startDate)
+				this.end_time = +new Date(e.endDate)
+				this.page = 1;
+				this.history()
+				this.getworm()
+				this.getwind()
+			},
+			async history() { //历史数据列表折线图
+				this.dataloadingtf = true
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.xy_three_at_ah',
+					data: {
+						device_type_id: 8,
+						d_id: this.equipInfo.d_id,
+						start_time: Math.floor(+new Date(this.start_time) / 1000),
+						end_time: Math.floor(+new Date(this.end_time) / 1000),
+					}
+				})
+				console.log(res)
+				this.dataloadingtf = false
+				this.historydatas = res
+			},
+			async getworm() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.xycb_pest_chart_new',
+					data: {
+						d_id: this.equipInfo.d_id,
+						start_time: Math.floor(+new Date(this.start_time) / 1000),
+						end_time: Math.floor(+new Date(this.end_time) / 1000),
+						device_type_id: 29,
+						years: new Date().getFullYear()
+					}
+				})
+				console.log(res)
+				this.dataloadingtf2 = false
+				var data = res.pest_data
+				if (data.length == 0) {
+					this.canvastishiTF2 = false
+				} else {
+					this.canvastishiTF2 = true
+					// console.log(arr1)
+					var obj = [{
+						name: '诱虫次数',
+						data: res.pest_data[0],
+						color: '#00E29D'
+					}]
+					this.showColumn2("canvasColumnB", res.md_lst, obj)
+				}
+			},
+			async getwind() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.xy_three_history_data',
+					data: {
+						d_id: this.equipInfo.d_id,
+						start_time: Math.floor(+new Date(this.start_time) / 1000),
+						end_time: Math.floor(+new Date(this.end_time) / 1000),
+						device_id: this.equipInfo.device_id,
+						page: this.page,
+					}
+				})
+				console.log(res.data)
+				this.historylistdata = res.data
+				this.pagesum = Math.ceil(res.counts / 10)
+				if (res.data.length > 0) {
+					this.forbidden = false
+				} else {
+					this.forbidden = true
+				}
+			},
+			prev() { //上一页
+				if (this.page > 1) {
+					this.page--
+					this.getwind()
+				}
+			},
+			next() { //下一页
+				if (this.page < this.pagesum) {
+					this.page++
+					this.getwind()
+				}
+			},
+			showColumn(id, xtitle, xinfo) {
+				var _self = this
+				canvaColumnA = new uCharts({
+					canvasId: id,
+					type: 'line',
+					legend: {
+						position: "top"
+					},
+					fontSize: 11,
+					background: '#FFFFFF',
+					pixelRatio: 1,
+					animation: true,
+					dataLabel: false,
+					categories: xtitle,
+					series: xinfo,
+					enableScroll: true, //开启图表拖拽功能
+					xAxis: {
+						disableGrid: true,
+						type: 'grid',
+						gridType: 'dash',
+						itemCount: 4, //x轴单屏显示数据的数量，默认为5个
+						scrollShow: true, //新增是否显示滚动条，默认false
+						// scrollAlign: 'left', //滚动条初始位置
+						scrollBackgroundColor: '#F7F7FF', //默认为 #EFEBEF
+						scrollColor: '#DEE7F7', //默认为 #A6A6A6
+					},
+					yAxis: {},
+					width: _self.cWidth * 1,
+					height: _self.cHeight * 1,
+					extra: {
+						line: {
+							type: 'curve'
+						}
+					}
+				});
+			},
+			showColumn2(id, xtitle, xinfo) {
+				var _self = this
+				canvaColumnB = new uCharts({
+					canvasId: id,
+					type: 'line',
+					legend: {
+						position: "top"
+					},
+					fontSize: 11,
+					background: '#FFFFFF',
+					pixelRatio: 1,
+					animation: true,
+					dataLabel: false,
+					categories: xtitle,
+					series: xinfo,
+					enableScroll: true, //开启图表拖拽功能
+					xAxis: {
+						disableGrid: true,
+						type: 'grid',
+						gridType: 'dash',
+						itemCount: 4, //x轴单屏显示数据的数量，默认为5个
+						scrollShow: true, //新增是否显示滚动条，默认false
+						// scrollAlign: 'left', //滚动条初始位置
+						scrollBackgroundColor: '#F7F7FF', //默认为 #EFEBEF
+						scrollColor: '#DEE7F7', //默认为 #A6A6A6
+					},
+					yAxis: {},
+					width: _self.cWidth * 1,
+					height: _self.cHeight * 1,
+					extra: {
+						line: {
+							type: 'curve'
+						}
+					}
+				});
+			},
+			touchLineA(e) {
+				console.log(e)
+				canvaColumnA.scrollStart(e);
+			},
+			moveLineA(e) {
+				canvaColumnA.scroll(e);
+			},
+			touchEndLineA(e) {
+				canvaColumnA.scrollEnd(e);
+				//下面是toolTip事件，如果滚动后不需要显示，可不填写
+				canvaColumnA.showToolTip(e, {
+					format: function(item, category) {
+						return category + ' ' + item.name + ':' + item.data
+					}
+				});
+			},
+			touchLineB(e) {
+				console.log(e)
+				canvaColumnB.scrollStart(e);
+			},
+			moveLineB(e) {
+				canvaColumnB.scroll(e);
+			},
+			touchEndLineB(e) {
+				canvaColumnB.scrollEnd(e);
+				//下面是toolTip事件，如果滚动后不需要显示，可不填写
+				canvaColumnB.showToolTip(e, {
+					format: function(item, category) {
+						return category + ' ' + item.name + ':' + item.data
+					}
+				});
+			},
+		},
+		onLoad(option) {
+			this.equipInfo = option
+			console.log(option)
+			this.end_time = +new Date()
+			this.start_time = +new Date() - 30 * 24 * 60 * 60 * 1000
+			this.cWidth = uni.upx2px(650);
+			this.cHeight = uni.upx2px(500);
+			this.history()
+			this.getworm()
+			this.getwind()
+		}
+	}
+</script>
+
+<style lang="less">
+	.timeandtype {
+		// background-color: #F6F6FB;
+		// padding: 20rpx;
+		box-sizing: border-box;
+		width: 90%;
+		margin: 40rpx auto 0;
+
+		.timebox {
+			box-shadow: 0 0 10rpx #bcb9ca;
+			display: flex;
+			background-color: #fff;
+			padding: 10px;
+			border-top-right-radius: 5px;
+			border-top-left-radius: 5px;
+
+			.jiange {
+				width: 5%;
+				text-align: center;
+			}
+
+			.firsttime,
+			.endtime {
+				width: 45%;
+				text-align: center;
+			}
+		}
+
+		.warntypebox {
+			display: flex;
+			justify-content: space-between;
+			background-color: #fff;
+			padding: 10px;
+			border-top: 1px solid #F6F6FB;
+			border-bottom-right-radius: 5px;
+			border-bottom-left-radius: 5px;
+		}
+	}
+
+	.shuju_one {
+		position: relative;
+		width: 90%;
+		margin: 30rpx auto;
+		box-shadow: 0 0 10rpx #bcb9ca;
+		padding-top: 20rpx;
+		height: 550rpx;
+
+		.canvastishi {
+			font-size: 32rpx;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			margin-left: -64rpx;
+			margin-top: -21rpx;
+
+			.dataloading:after {
+				overflow: hidden;
+				display: inline-block;
+				vertical-align: bottom;
+				animation: ellipsis 2s infinite;
+				content: "\2026";
+			}
+
+			@keyframes ellipsis {
+				from {
+					width: 2px;
+				}
+
+				to {
+					width: 15px;
+				}
+			}
+		}
+
+		.shuju_one_title {
+			width: 70%;
+			margin: 0 auto;
+			display: flex;
+
+			.tltle_text {
+				width: 25%;
+				border: 2rpx solid #B2B2B2;
+				color: #57c878;
+				text-align: center;
+				font-size: 24rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+
+			.title_text_color {
+				width: 25%;
+				border: 2rpx solid #57c878;
+				background-color: #57c878;
+				color: #fff;
+				text-align: center;
+				font-size: 24rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+		}
+	}
+
+	/deep/.u-calendar__action {
+		display: flex;
+		justify-content: space-around;
+
+		.u-calendar__action__text {
+			line-height: 25px;
+		}
+	}
+
+	.condition {
+		display: flex;
+		flex-wrap: wrap;
+		width: 90%;
+		margin: 30rpx auto;
+		box-shadow: 0 0 10rpx #bcb9ca;
+		margin-bottom: 30rpx;
+
+		.scroll-X {
+			width: 95%;
+			margin: 20rpx auto;
+
+			.table {
+				width: 1740rpx;
+			}
+
+			.tr {
+				display: flex;
+				overflow: hidden;
+
+				.th,
+				.td {
+					display: inline-block;
+					padding: 5rpx;
+					width: 240rpx;
+					text-align: center;
+					height: 52rpx;
+					line-height: 52rpx;
+					border: 2rpx solid #F1F1F1;
+				}
+
+				.th:first-child,
+				.td:first-child {
+					width: 300rpx;
+				}
+			}
+
+			.tr:nth-child(2n-1) {
+				background-color: #f5fff8;
+			}
+
+			.tr:first-child {
+				background-color: #57c878;
+				color: #fff;
+			}
+		}
+
+		.pagenumber {
+			display: flex;
+			margin: 20rpx auto;
+
+			button {
+				width: 150rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+				font-size: 26rpx;
+				text-align: center;
+				background-color: #57c878;
+				color: #FFFFFF;
+			}
+
+			.pagenumber_page {
+				// width: 100rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+				font-size: 26rpx;
+				text-align: center;
+				margin: 0 20rpx;
+			}
+		}
+	}
+</style>

pages/cb/nlNewXy/thxyset.vue

@@ -0,0 +1,153 @@
+<template>
+	<view>
+		<view class="setitem">
+			设备编号：{{option.device_id}}
+		</view>
+		<view class="setitem">
+			设备名称：{{option.device_name}}
+		</view>
+		<view class="setitem" v-for="(item, index) in equipContrlForm">
+			<view class="timeBox" @click="seleteTime(item)">
+				定时时间：{{item.time ? item.time : '请选择时间'}}
+			</view>
+			<u-radio-group v-model="item.value">
+				<u-radio :name="1">开</u-radio>
+				<u-radio :name="0">关</u-radio>
+			</u-radio-group>
+			<u-button style="margin: 0" type="primary" v-if="index == equipContrlForm.length - 1" size="mini" @click="editForm('add')">增加</u-button>
+			<u-button style="margin: 0" type="error" v-if="index < equipContrlForm.length - 1" size="mini" @click="editForm(index)">删除</u-button>
+		</view>
+		<u-picker mode="time" v-model="timePiker" :default-time="`${item.time}`" :params="params" @confirm="(e) => changeControlTime(e)"></u-picker>
+		<view class="submit-box">
+			<u-button @click="submit" type="success">确定</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				myuser_type:false,
+				option: {},
+				dsArr: ['关机', '开机'],
+				timePiker: false,
+				equipContrlForm: [{ time: '', value: 0 }],
+				item:{}, // 当前编辑的对象
+				params: {
+					year: false,
+					month: false,
+					day: false,
+					hour: true,
+					minute: true,
+					second: false
+				},
+			}
+		},
+		methods: {
+			editForm(type) {
+			  if (type == 'add') {
+				this.equipContrlForm.push({ time: '', value: 0 });
+			  } else {
+				this.equipContrlForm.splice(type, 1);
+			  }
+			},
+			seleteTime(item) {
+				this.item = item;
+				this.timePiker = true;
+			},
+			changeControlTime(e) {
+				this.item.time = `${e.hour}:${e.minute}`
+				this.timePiker = false;
+			},
+			async getconf() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.address_info.get_set_time',
+					data: {
+						d_id: this.option.d_id
+					}
+				})
+				this.equipContrlForm = res.length > 0 ? res : [{ time: '', value: 0 }];
+				console.log(res)
+
+			},
+			async submit() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.address_info.set_time',
+					data: {
+						device_type_id: 29,
+						device_id: this.option.device_id,
+						data: JSON.stringify(this.equipContrlForm),
+					}
+				})
+				console.log(res)
+				if (res == true) {
+					uni.showToast({
+						title: '指令下发成功！',
+						duration: 2000
+					});
+				} else {
+					uni.showToast({
+						title: '指令下发失败！',
+						duration: 2000,
+						icon: "none"
+					});
+				}
+			},
+		},
+		onLoad(option) {
+			uni.getStorage({
+				key:"myuser_type",
+				success:(res)=>{
+					console.log(res.data)
+					if(Number(res.data) == 1){
+						this.myuser_type = true
+					}
+				}
+			})
+			this.option = option
+			this.getconf()
+			
+		}
+	}
+</script>
+
+<style lang='less'>
+	page {
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		.buttonbox {
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.setitem {
+			margin-top: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+
+		.uni-list-cell {
+			background: #F7F8FA;
+			padding: 10rpx 40rpx;
+			font-size: 28rpx;
+			box-sizing: border-box;
+
+			/* margin-top: 30rpx; */
+			.arrow {
+				display: inline-block;
+				border-width: 12rpx 8rpx;
+				border-style: solid;
+				float: right;
+				margin-top: 10rpx;
+				border-color: #888 transparent transparent transparent;
+			}
+		}
+
+		.submit-box {
+			margin-top: 60rpx
+		}
+	}
+</style>

pages/cb/smallPest/analyse.vue

@@ -56,12 +56,12 @@
 				<u-button type="primary" text="归档时间" size="mini" @click="timeshow = true">归档时间</u-button>
 				<u-select v-model="timeshow" mode="mutil-column" :list="list" @confirm="Hourchange" :default-value="defaultValue"></u-select>
 			</view>
-			<view class="tendency" v-if="!tiemshow && !timeshow">
+			<view class="tendency" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
 				<canvas canvas-id="canvasColumnA" id="canvasColumnA" class="charts" @touchstart="touchLineA($event)"
 					@touchmove="moveLineA($event)" @touchend="touchEndLineA($event)" disable-scroll=true
 					:style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
 			</view>
-			<view class="tendency" v-if="!tiemshow && !timeshow">
+			<view class="tendency" v-show="!tiemshow && !timeshow && !pickertfone && !pickertfworm">
 				<canvas canvas-id="canvasRing" id="canvasRing" class="charts" @touchstart="touchRing"
 					:style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
 			</view>

pages/cb/smallPest/xctset.vue

@@ -7,7 +7,7 @@
 			<view class="btns">
 				<button type="warn" @click="equipBtnControl('dtu_update')" size="mini">升级</button>
 				<button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">重启</button>
-				<button type="warn" @click="equipBtnControl('yfwlw')" size="mini">平台切换</button>
+				<!-- <button type="warn" @click="equipBtnControl('yfwlw')" size="mini">平台切换</button> -->
 			</view>
 			<view class="tit adminTit">
 				强制操作
@@ -16,8 +16,8 @@
 				<button type="warn" @click="equipBtnControl('takephoto')" size="mini">拍照</button>
 				<button type="warn" @click="equipBtnControl('update')" size="mini">升级</button>
 				<button type="warn" @click="equipBtnControl('reboot')" size="mini">重启</button>
-				<button type="warn" @click="equipBtnControl('close_shake')" size="mini">震动关闭</button>
-				<button type="warn" @click="equipBtnControl('open_shake')" size="mini">震动开启</button>
+				<!-- <button type="warn" @click="equipBtnControl('close_shake')" size="mini">震动关闭</button>
+				<button type="warn" @click="equipBtnControl('open_shake')" size="mini">震动开启</button> -->
 			</view>
 		</view>
 		<view class="setitem">
@@ -55,6 +55,7 @@
 				<u-radio-group v-model="equipContrlForm.ts">
 					<u-radio :name="1">光控</u-radio>
 					<u-radio :name="0">时控</u-radio>
+					<u-radio :name="2">晨曦</u-radio>
 				</u-radio-group>
 			</u-form-item>
 			<u-form-item label="定时时长" :label-width="240" v-if="equipContrlForm.ts == 0">
@@ -279,6 +280,7 @@
 					url: '/api/api_gateway?method=forecast.send_control.admin_device_control',
 					data: {
 						cmd,
+						device_type_id: 28,
 						d_id: this.option.d_id,
 					}
 				})

pages/cb/thxydetail/thxyhisdata.vue

@@ -136,6 +136,7 @@
 			timechange(e){
 				this.start_time = +new Date(e.startDate)
 				this.end_time = +new Date(e.endDate)
+				this.page = 1;
 				this.history()
 				this.getworm()
 				this.getwind()

pages/cb/xctdetail/xctset.vue

@@ -64,14 +64,14 @@
 			<u-select v-model="etShow" mode="single-column" :list="list" @confirm="etConfirm"></u-select>
 		</view>
 		<view class="setitem">
-			震动时间(min)：
-			<slider :value="equipContrlForm.shake_sec" show-value="true" :min="10" :max="60"
+			震动时间(s)：
+			<slider :value="equipContrlForm.shake_sec" show-value="true" :min="0" :max="300"
 				@change="sliderChange($event,'shake_sec')" block-color="#57C878" activeColor="#57C878" step="1" />
 		</view>
 		<view class="setitem">
 			数据上传(min)：
-			<slider :value="equipContrlForm.dat_f" show-value="true" :min="10" :max="60"
-				@change="sliderChange($event,'dat_f')" block-color="#57C878" activeColor="#57C878" step="1" />
+			<slider :value="equipContrlForm.dat_f" show-value="true" :min="5" :max="60"
+				@change="sliderChange($event,'dat_f')" block-color="#57C878" activeColor="#57C878" step="5" />
 		</view>
 		<view class="submit-box">
 			<u-button @click="submit" type="success">确定</u-button>

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

@@ -53,7 +53,7 @@
 							<td class="td">{{items.d_h_t.cv}}</td>
 							<td class="td">{{items.d_h_t.bv}}</td>
 							<td class="td">{{items.d_h_t.bs}}</td>
-							<td class="td">{{items.d_h_t.cs?"充电":"非充电"}}</td>
+							<td class="td">{{items.d_h_t.cs != 0 ?"充电":"非充电"}}</td>
 							<td class="td">{{items.d_h_t.infr_ct}}</td>
 							<td class="td">{{items.d_h_t.csq}}</td>
 						</tr>
@@ -72,7 +72,7 @@
 							<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.bs}}</td>
-							<td class="td">{{items.d_h_t.cs?"充电":"非充电"}}</td>
+							<td class="td">{{items.d_h_t.cs != 0?"充电":"非充电"}}</td>
 							<td class="td">{{items.d_h_t.infr_ct}}</td>
 						</tr>
 						<tr class="tr" v-if="forbidden">
@@ -489,7 +489,7 @@
 			width: 95%;
 			margin: 20rpx auto;
 			.table{
-				width: 1672px;
+				width: 1400px;
 			}
 			.tr {
 				display: flex;

pages/environment/history.vue

@@ -175,8 +175,8 @@
 				obj.name = res.conf[eindex]
 				var arr = []
 				for (var i = 0; i < res.data.length; i++) {
-					if (parseFloat(res.data[i].dat[eindex]) != -99.99) {
-						arr.unshift(parseFloat(res.data[i].dat[eindex]))
+					if (parseFloat(((res.data[i].dat)[0][eindex].split('#'))[0]) != -99.99) {
+						arr.unshift(parseFloat(((res.data[i].dat)[0][eindex].split('#'))[0]))
 					}
 				}
 				obj.data = arr

pages/equipList/index.vue

@@ -37,7 +37,7 @@
 							<p :class="[item.is_online ? 'p2' : 'p_out']">{{ item.is_online ? "在线" : "离线" }}</p>
 						</view>
 						<view class="list_item_text">
-							<p>设备ID：{{ item.imei || item.device_id }}</p>
+							<p>设备ID：{{ item.only_for_show || item.device_id }}</p>
 							<p>适配用户：{{ item.real_name == '' ? "无" : item.real_name }}</p>
 							<p>最新上报时间：{{ item.uptime | timeFormat() }}</p>
 							<p>添加设备时间：{{ item.addtime | timeFormat() }}</p>
@@ -311,6 +311,12 @@
 							url: "../cb/thxydetail/thxydetail?imei=" + item.imei
 						});
 						break;
+					case 29:
+					  // item.type = this.type_id;
+					  uni.navigateTo({
+					    url: `../cb/nlNewXy/nlNewXy?imei=${item.imei}&showId=${item.only_for_show}`
+					  });
+					  break;
 					case 24:
 						// item.type = this.type_id;
 						uni.navigateTo({
@@ -720,6 +726,7 @@
 					font-size: 24rpx;
 					color: #636363;
 					margin-top: 10rpx;
+					word-break: break-all;
 				}
 
 				p:first-child {

pages/waterandfernew/details.vue

@@ -145,11 +145,11 @@
 							<view class="btnName">
 								{{resultBan[index].e_name}}
 							</view>
-							<image src="../../static/images/waterandfernew/colNew.png" v-if="pickBtnList.length == 1">
+							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/colNew.png" v-if="pickBtnList.length == 1">
 							</image>
-							<image src="../../static/images/waterandfernew/colLeft.png"
+							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/colLeft.png"
 								v-else-if="pickBtnList.length > 1 && index == 0"></image>
-							<image src="../../static/images/waterandfernew/colRight.png"
+							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/colRight.png"
 								v-else-if="pickBtnList.length > 1 && index == pickBtnList.length - 1"></image>
 							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/colCenter.png" v-else></image>
 							<view class="jiaoBtn" v-if="resultBan.length > 0">
@@ -159,19 +159,19 @@
 							</view>
 							<view class="shanBox" v-if="resultBan.length > 0">
 								<image v-if="!resultBan[index]['off']"
-									src="../../static/images/waterandfernew/shan.png"></image>
+									src="https://www.hnyfwlw.com:8006/bigdata_app/log/shan.png"></image>
 								<image v-else class="circleAnm"
-									src="../../static/images/waterandfernew/shanannimate.png"></image>
+									src="https://www.hnyfwlw.com:8006/bigdata_app/log/shanannimate.png"></image>
 							</view>
 							<view class="btnBox" @click="switchchange($event, item.number, item, index, true)">
-								<image v-if="item.off" src="../../static/images/waterandfernew/feiopen.png"></image>
-								<image v-else src="../../static/images/waterandfernew/feiclose.png"></image>
+								<image v-if="item.off" src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiopen.png"></image>
+								<image v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiclose.png"></image>
 							</view>
 						</view>
 					</view>
 					<!-- 废料管口 -->
 					<view class="exit">
-						<image src="../../static/images/waterandfernew/exit.png"></image>
+						<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/exit.png"></image>
 					</view>
 					<!-- 注肥泵 -->
 					<view class="feiLight"
@@ -181,33 +181,33 @@
 					</view>
 					<!-- 控制柜 -->
 					<view class="kongBox">
-						<image v-if="feiBengItem.e_status" src="../../static/images/waterandfernew/kongclose.png"></image>
-						<image v-else src="../../static/images/waterandfernew/kongopen.png"></image>
+						<image v-if="feiBengItem.e_status" src="https://www.hnyfwlw.com:8006/bigdata_app/log/kongclose.png"></image>
+						<image v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/kongopen.png"></image>
 					</view>
 					<!-- 进水泵 -->
 					<view class="warterIn"
 						@click="switchchange(!mainBengItem.e_status, mainBengItem.number, mainBengItem, mainBengIndex)">
-						<image v-if="mainBengItem.e_status" src="../../static/images/waterandfernew/feiopen.png"></image>
-						<image v-else src="../../static/images/waterandfernew/feiclose.png"></image>
+						<image v-if="mainBengItem.e_status" src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiopen.png"></image>
+						<image v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/feiclose.png"></image>
 					</view>
 					<!-- 进水指示 -->
 					<view class="warterLight">
-						<image v-if="mainBengItem.e_status" src="../../static/images/waterandfernew/bengopen.png"></image>
-						<image v-else src="../../static/images/waterandfernew/bengclose.png"></image>
+						<image v-if="mainBengItem.e_status" src="https://www.hnyfwlw.com:8006/bigdata_app/log/bengopen.png"></image>
+						<image v-else src="https://www.hnyfwlw.com:8006/bigdata_app/log/bengclose.png"></image>
 					</view>
 					<!-- 电风扇 -->
 					<!-- <view class="fengBox">
 						<view class="relativeBox">
-							<image src="../../static/images/waterandfernew/fengmain.png"></image>
+							<image src="https://www.hnyfwlw.com:8006/bigdata_app/log/fengmain.png"></image>
 							<image :class="feiBeng ? 'circleAnm' : ''"
-								src="../../static/images/waterandfernew/fengleafs.png"></image>
+								src="https://www.hnyfwlw.com:8006/bigdata_app/log/fengleafs.png"></image>
 						</view>
 					</view> -->
 					<!-- 水管控制阀 -->
 					<view class="benList">
 						<!-- <view class="preBen" v-for="item, index in buttonList" v-if="(index + 1) % 2 == 1"
 							@click="switchchange(!item.off, item.number, item, index, true)">
-							<image class="daoguan" src="../../static/images/waterandfernew/bottomNew.png"
+							<image class="daoguan" src="https://www.hnyfwlw.com:8006/bigdata_app/log/bottomNew.png"
 								v-if="(index + 1) % 2 < 4"></image>
 							<view class="info">
 								肥料{{ (index + 1) / 2 > 1 ? (index + 2) / 2 : 1 }}开关
@@ -218,7 +218,7 @@
 						</view> -->
 						<view class="preBen" v-for="item, index in faList"
 							@click="switchchange(!item.e_status, item.number, item, index)">
-							<image class="daoguan" src="../../static/images/waterandfernew/bottomNew.png"
+							<image class="daoguan" src="https://www.hnyfwlw.com:8006/bigdata_app/log/bottomNew.png"
 								v-if="index < 5"></image>
 							<view class="info">
 								{{item.e_name}}

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

@@ -92,6 +92,14 @@
       ]
     },
     {
+      "root": "pages/cb/nlNewXy",
+      "pages": [
+        "nlNewXy",
+        "thxyhisdata",
+        "thxyset"
+      ]
+    },
+    {
       "root": "pages/cb/thxydetail",
       "pages": [
         "thxydetail",

unpackage/dist/dev/mp-weixin/pages/cb/xy/equip-set/xyhistoryile.wxss

@@ -148,7 +148,7 @@ to {
   margin: 20rpx auto;
 }
 .condition .scroll-X .table {
-  width: 1672px;
+  width: 1400px;
 }
 .condition .scroll-X .tr {
   display: flex;

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

@@ -158,6 +158,7 @@ page {
   font-size: 24rpx;
   color: #636363;
   margin-top: 10rpx;
+  word-break: break-all;
 }
 .list .list_item .list_item_text ._p:first-child {
   font-size: 28rpx;