墒情监测 摄像头增加查看图片功能

pages.json

@@ -671,7 +671,16 @@
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom"
 				}
-			}]
+			}    ,{
+                    "path" : "imagelist",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		},
 		{
 			"root": "pages/disease",

pages/cbqxyj/cbwarn.vue

@@ -134,22 +134,20 @@
 			</view>
 		</view>
 		<view class="wornsetbox" v-show="active == 2">
-			<view class="" v-for="(item, index) in configlist" :key="item.id" style="margin-bottom: 30rpx;">
-				<u-swipe-action :show="item.show" :index="index" 
-					@click="delconfig(item.id)" :options="options">
-					<view class="wornsetbox_item" @click="toset(item.id)">
-						<view class="">
-							{{item.title}}
-						</view>
-						<view class="" @click.stop>
-							<u-switch v-model="item.statustf" size="40" style="margin-top: 13rpx;"
-								@change="swichchange($event,item.id)"></u-switch>
-						</view>
+			<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in configlist" :key="item.id"
+				@click="delconfig(item.id)" :options="options" style="margin-bottom: 30rpx;">
+				<view class="wornsetbox_item" @click="toset(item.id)">
+					<view class="">
+						{{item.title}}
 					</view>
-				</u-swipe-action>
-			</view>
+					<view class="" @click.stop>
+						<u-switch v-model="item.statustf" size="40" style="margin-top: 13rpx;"
+							@change="swichchange($event,item.id)"></u-switch>
+					</view>
+				</view>
+			</u-swipe-action>
 		</view>
-		<view class="addwarnlist" v-show="active == 2" @click="addshow = true">
+		<view class="addwarnlist" v-show="active == 2" @click="addwarning_config">
 			添 加
 		</view>
 		<view class="">
@@ -504,28 +502,31 @@
 				})
 			},
 			async addwarning_config() {
-				this.addshow = true
-				if (this.addvalue == "") {
-					uni.showToast({
-						title: "请填写预警名称",
-						icon: "none"
-					})
-				}else{
-					const res = await this.$myRequest({
-						url: '/api/api_gateway?method=device.device_sms_alert.create_user_warning_config',
-						data: {
-							title: this.addvalue,
-							device_type_id: 3
-						}
-					})
-					console.log(res)
-					if(res){
-						this.addshow = false
-						this.configlist = []
-						this.confpage = 1
-						this.getconfiglist()
-					}
-				}
+				uni.navigateTo({
+					url:'./warnset'
+				})
+				// this.addshow = true
+				// if (this.addvalue == "") {
+				// 	uni.showToast({
+				// 		title: "请填写预警名称",
+				// 		icon: "none"
+				// 	})
+				// }else{
+				// 	const res = await this.$myRequest({
+				// 		url: '/api/api_gateway?method=device.device_sms_alert.create_user_warning_config',
+				// 		data: {
+				// 			title: this.addvalue,
+				// 			device_type_id: 3
+				// 		}
+				// 	})
+				// 	console.log(res)
+				// 	if(res){
+				// 		this.addshow = false
+				// 		this.configlist = []
+				// 		this.confpage = 1
+				// 		this.getconfiglist()
+				// 	}
+				// }
 			},
 			async delconfig(id){
 				const res = await this.$myRequest({
@@ -549,6 +550,7 @@
 		},
 		onShow() {
 			this.getuseriphonelist()
+			this.getconfiglist()
 		},
 		onReachBottom() {
 			if (this.active == 0) {

pages/cbqxyj/warnset.vue

@@ -2,14 +2,22 @@
 	<view style="padding-bottom: 30rpx;">
 		<view class="basesel">
 			<view class="basesel_list">
+				<view class="">
+					<view class="">
+						预警名称
+					</view>
+					<view class="">
+						<u-input v-model="title"/>
+					</view>
+				</view>
 				<view class="basesel_list_tilte">
 					预警设备选择：
 				</view>
 				<view class="basesel_list_sel" @click="accServiceShow = true">
-					<view class="basesel_list_sel_left" v-if="selbaselist.length==0">
-						请选择预警设备
+					<view class="basesel_list_sel_left" v-show="!selbaselist.length">
+						请选择预警
 					</view>
-					<view class="basesel_list_sel_left" v-if="selbaselist.length!=0">
+					<view class="basesel_list_sel_left" v-show="selbaselist.length">
 						<view class="" style="margin-right: 20rpx;" v-for="item in selbaselist" :key="item">
 							{{item}}
 						</view>
@@ -22,10 +30,10 @@
 					预警计算：
 				</view>
 				<u-radio-group v-model="warnjihe">
-					<u-radio name="0">
+					<u-radio name="0" icon-size="10" label-size="20">
 						逐台预警
 					</u-radio>
-					<u-radio name="1" :disabled="disabled">
+					<u-radio name="1" icon-size="10" label-size="20" :disabled="selbaselist.length<2">
 						合并预警
 					</u-radio>
 				</u-radio-group>
@@ -74,10 +82,10 @@
 				</view>
 				<view class="target_text_item" v-for="item,index in confnum" :key="index">
 					<view class="target_text_item_sel" @click="selwormindex = index;wormshow=true">
-						<view class="itemtwo_left" v-if="item.appointPestName==''">
+						<view class="itemtwo_left" v-show="item.appointPestName==''">
 							请选择害虫
 						</view>
-						<view class="itemtwo_left" v-if="item.appointPestName!=''">
+						<view class="itemtwo_left" v-show="item.appointPestName!=''">
 							{{item.appointPestName}}
 						</view>
 						<u-icon name="arrow-down" class="icon" color="#999999"></u-icon>
@@ -140,10 +148,10 @@
 				</view>
 			</view>
 			<view class="warmissue_itemtwo" @click="accServiceShowphone = true">
-				<view class="itemtwo_left" v-if="!userphone.length">
+				<view class="itemtwo_left" v-show="!userphone.length">
 					请选择短信接收人
 				</view>
-				<view class="itemtwo_left" v-if="userphone.length">
+				<view class="itemtwo_left" v-show="userphone.length">
 					<view class="" style="margin-right: 20rpx;" v-for="item in userphone" :key="item">
 						{{item}}
 					</view>
@@ -174,9 +182,8 @@
 		},
 		data() {
 			return {
-				warning_id: "",
+				warning_id:'',
 				selbaselist: [],
-				// disabled:false,
 				warnjihe: "0",
 				accServiceShow: false,
 				serviceList: [],
@@ -185,6 +192,7 @@
 				accServiceShowphone: false,
 				serviceListphone: [],
 				defaultSelectedphone: [],
+				title:'',// 预警名称
 				//预警配置
 				conf: {
 					pestCategory: false,
@@ -197,7 +205,7 @@
 				confnum: [{
 					appointPestName: "",
 					appointPestNum: "",
-					appointPestNameid: ""
+					appointPestNameid:""
 				}],
 				device_ids: [],
 				send_user: [],
@@ -206,11 +214,6 @@
 				selwormindex: 0
 			}
 		},
-		computed: {
-			disabled(){
-				return this.selbaselist.length<=1?true:false
-			}
-		},
 		methods: {
 			accServiceConfirm(e) {
 				this.selbaselist = []
@@ -245,6 +248,7 @@
 
 				this.conf.pestCategoryNum = res.conf.pestCategoryNum
 				this.conf.pestTotalNum = res.conf.pestTotalNum
+				this.title = res.warning_name
 
 				for (var key in res.device_ids) {
 					this.selbaselist.push(res.device_ids[key]);
@@ -269,13 +273,13 @@
 						var obj = {
 							appointPestName: dict[Number(res.conf["appointPestName"])],
 							appointPestNum: res.conf["appointPestNum"],
-							appointPestNameid: res.conf["appointPestName"]
+							appointPestNameid:res.conf["appointPestName"]
 						};
 					} else {
 						var obj = {
 							appointPestName: dict[Number(res.conf["appointPestName" + i])],
 							appointPestNum: res.conf["appointPestNum" + i],
-							appointPestNameid: res.conf["appointPestName" + i]
+							appointPestNameid:res.conf["appointPestName"+ i]
 						};
 					}
 					this.confnum.push(obj);
@@ -392,6 +396,13 @@
 				} else {
 					console.log(this.device_ids)
 					console.log(this.send_user)
+					if(this.title.length > 32 || this.title == '') {
+						uni.showToast({
+							title: "标题不能为空且长度不大于32个字符",
+							icon: "none"
+						})
+						return
+					}
 					var obj = {
 
 					}
@@ -409,9 +420,9 @@
 						if (key == "pestCategory" ||
 							key == "appointPest" ||
 							key == "pestTotal" ||
-							key == "pestWarn") {
+							key == "pestWarn" ) {
 							obj[key] = this.conf[key] ? "on" : "off"
-						} else {
+						}else{
 							obj[key] = this.conf[key]
 						}
 					}
@@ -423,17 +434,22 @@
 							device_ids: this.device_ids.join(","),
 							send_user: this.send_user.join(","),
 							warning_id: this.warning_id,
-							warning_type: this.warnjihe
+							warning_type: this.warnjihe,
+							title: this.title
 						}
 					})
 					console.log(res)
-					uni.showToast({
-						title: "预警配置成功",
-						icon: "none"
-					})
-					uni.navigateBack({
-						delta: 1
-					})
+					if(res) {
+						uni.showToast({
+							title: "预警配置成功",
+							icon: "none",
+							complete: () => {
+								uni.navigateBack({
+									delta:1
+								})
+							}
+						})
+					}
 				}
 			}
 		},
@@ -449,8 +465,10 @@
 			}
 			this.getbaselist()
 			this.getuseriphonelist()
-			this.getpeizhi(option.id)
-			this.warning_id = option.id
+			if(option.id) {
+				this.getpeizhi(option.id)
+				this.warning_id = option.id;
+			}
 		}
 	}
 </script>
@@ -599,19 +617,10 @@
 					/deep/.u-input__right-icon {
 						line-height: 35px;
 					}
-
-					/deep/.uni-input-input {
-						border-bottom: 1px solid #aaaaad;
-					}
-
-					/deep/.u-input__input {
-						border-bottom: 1px solid #aaaaad;
-					}
 				}
 
 				.addordel {
 					width: 10%;
-					line-height: 35px;
 				}
 			}
 		}

pages/index/index.vue

@@ -108,12 +108,19 @@
 					</view>
 				</view>
 				<view class="facilitybox_item" v-if="$QueryPermission(242)"
-					@click="tabequipment('../qxzyj/cbwarn')">
+					@click="tabequipment('../qxzyj/cbwarn', 5)">
 					<image src="http://www.hnyfwlw.com:8006/bigdata_app/newindex/qxyj.png" mode="" class="itemimg"></image>
 					<view class="">
 						气象预警
 					</view>
 				</view>
+				<view class="facilitybox_item" v-if="$QueryPermission(284)" @click="tabequipment('../qxzyj/cbwarn', '15')">
+					<image src="http://www.hnyfwlw.com:8006/bigdata_app/newindex/sqyj.png" mode="" class="itemimg">
+					</image>
+					<view class="">
+						墒情预警
+					</view>
+				</view>
 				<view class="facilitybox_item" v-if="jurisdiction.ggtf" @click="tabequipment('../irrigate/index')">
 					<image src="http://www.hnyfwlw.com:8006/bigdata_app/newindex/guangai.png" mode="" class="itemimg"></image>
 					<view class="">
@@ -444,9 +451,10 @@
 					})
 				}
 			},
-			tabequipment(url) {
+			tabequipment(url, type) {
+				console.log(url)
 				uni.navigateTo({
-					url: url
+					url: `${url}${type ? `?typeId=${type}` : ''}` 
 				})
 			},
 			onok(ev) {

pages/monitor/imagelist.vue

@@ -0,0 +1,375 @@
+<template>
+	<view>
+		<!-- <view class="status_bar"></view> -->
+		<view class="" style="position: relative;top: 44px;">
+			<!-- <view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="查看图片"></uni-nav-bar>
+			</view> -->
+			<p class="tishi" v-if="tishi">暂无数据</p>
+			<view class="selecttimes" @click="tiemshow=!tiemshow">
+				<view class="timesbox">
+					<image
+						:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'"
+						mode=""></image>
+					<p>{{timetab(timestate)}}</p>
+					<p class="or">~</p>
+					<p>{{timetab(timeend)}}</p>
+					<u-icon name="rili" custom-prefix="custom-icon" class="icon"></u-icon>
+				</view>
+				<u-calendar v-model="tiemshow" mode="range" @change="tiemchange"></u-calendar>
+			</view>
+			<view class="imglist">
+				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
+					<view class="imglist_left">
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="">
+						</image>
+						<image :src="item.addr" mode="" @click="examine(index)"></image>
+					</view>
+					<view class="imglist_right">
+						<view class="icon_box" @click="delimg(item.photo_id)">
+							<p class="iconfont icon-shanchu">删除</p>
+						</view>
+						<p style="color: #06B535;">{{item.addtime|timeFormat()}}</p>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="top" v-if="isTop" @click="top">
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'"
+				mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				page: 1,
+				imglists: [],
+				tishi: true,
+				d_id: '',
+				timeend: '', //当前时间 也是搜索的结束时间
+				timestate: '',
+				timeshow: false,
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: false
+				},
+				flag: 1,
+				self: true,
+				isTop: false,
+				resultdata: {},
+				titletext: ["24小时", "近一个月", "近半年", "近一年"],
+				titleidnex: 0,
+				tiemshow: false, //时间选择器
+				disable: "",
+				device_type: "",
+				myuid:""
+			}
+		},
+		methods: {
+			//forecast.forecast_system.equip_photofo
+			async imglistdata(time_begin, time_end) { //获取图片列表
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=camera.camera_manage.camera_photo',
+					data: {
+						device_id: this.device_id,
+						page: this.page,
+						page_size: 8,
+						start_time: time_begin, //开始时间
+						end_time: time_end, //结束时间
+					}
+				})
+				this.imglists = this.imglists.concat(res.data)
+				console.log(this.imglists)
+				if (this.imglists.length == 0) {
+					this.tishi = true
+				} else {
+					this.tishi = false
+				}
+			},
+			//forecast.forecast_system.equip_photo_del
+			async del(id) { //删除图片
+				var arr = id;
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=camera.camera_manage.del_camera_photo',
+					data: {
+						// device_id: this.device_id,
+						photo_id_list: JSON.stringify(arr)
+					}
+				})
+				if (res) {
+					uni.showToast({
+						title: '删除成功！',
+						duration: 2000
+					});
+					this.page = 1
+					this.imglists = []
+					if(this.timestate != '') {
+						this.timestate = parseInt(this.timestate)
+					}
+					if(this.timeend != '') {
+						this.timeend = parseInt(this.timeend)
+					}
+					this.imglistdata(this.timestate, this.timeend)
+				} else {
+					uni.showToast({
+						title: '删除失败！',
+						duration: 2000,
+						icon: "none"
+					});
+				}
+			},
+			//forecast.forecast_system.equip_photo_species  pest_list
+			//forecast.forecast_system.equip_photo_species统计
+
+			//forecast.send_control.admin_device_control 拍照 
+			clickLeft() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			delimg(id) { //删除图片
+				uni.showModal({
+					title: '提示',
+					content: '是否删除此图片？',
+					success: (res) => {
+						if (res.confirm) {
+							this.del(id)
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			top() {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 500
+				})
+			},
+			tiemchange(e) {
+				this.imglists = []
+				this.page = 1
+				console.log(e)
+				this.timestate = +new Date(e.startDate) / 1000 - 8 * 60 * 60
+				this.timeend = +new Date(e.endDate) / 1000 + 16 * 60 * 60
+				this.imglistdata(parseInt(this.timestate), parseInt(this.timeend))
+			},
+			timetab(e) {
+				if(!e) return '请选择'
+				e = new Date(e * 1000)
+				var year = e.getFullYear()
+				var month = e.getMonth() + 1 < 10 ? "0" + (e.getMonth() + 1) : e.getMonth() + 1
+				var day = e.getDate() < 10 ? "0" + e.getDate() : e.getDate()
+				var time = year + "/" + month + "/" + day
+				return time
+			},
+		},
+		onLoad(option) {
+			uni.getStorage({
+				key:"myuid",
+				success:(res)=> {
+					this.myuid = res.data
+					console.log(this.myuid)
+				}
+			})
+			// this.timeend = +new Date() / 1000
+			// this.timestate = this.timeend - 60 * 60 * 24
+			console.log(option)
+			this.device_id = option.id
+			console.log(this.timestate)
+			this.imglistdata('', '')
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+			this.page++
+			console.log(this.timestate)
+			if(this.timestate != '') {
+				this.timestate = parseInt(this.timestate)
+			}
+			if(this.timeend != '') {
+				this.timeend = parseInt(this.timeend)
+			}
+			this.imglistdata(this.timestate, this.timeend)
+		},
+		onPageScroll(e) { //nvue暂不支持滚动监听，可用bindingx代替
+			if (e.scrollTop > 200) { //距离大于200时显示
+				this.isTop = true
+			} else { //距离小于200时隐藏
+				this.isTop = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tishi {
+		position: absolute;
+		top: 40px;
+		width: 95%;
+		left: 2.5%;
+		text-align: center;
+		font-size: 40rpx;
+	}
+
+	.selecttimes {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+		background-color: #fff;
+		padding-top: 30rpx;
+
+		.timesbox {
+			display: flex;
+			width: 95%;
+			margin: 0 auto;
+			justify-content: space-around;
+			box-shadow: 0 0 10rpx #bcb9ca;
+			padding: 10rpx 20rpx;
+			box-sizing: border-box;
+
+			image {
+				width: 30rpx;
+				height: 30rpx;
+				margin-top: 6rpx;
+			}
+
+			.icon {
+				color: #949494;
+				text-align: right;
+				margin-left: 30rpx;
+
+			}
+		}
+
+		/deep/.u-calendar__action {
+			display: flex;
+			justify-content: space-around;
+
+			.u-calendar__action__text {
+				line-height: 25px;
+			}
+		}
+	}
+
+	.timeshow {
+		width: 96%;
+		height: 50rpx;
+		background-color: #FFFFFF;
+		position: fixed;
+		top: 10px;
+		left: 2.5%;
+		display: flex;
+		z-index: 100;
+		padding-top: 10px;
+
+		.shuju_one_title {
+			width: 70%;
+			margin: 0 auto;
+			display: flex;
+
+			.tltle_text {
+				width: 25%;
+				border: 2rpx solid #B2B2B2;
+				color: #B2B2B2;
+				text-align: center;
+				font-size: 24rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+
+			.title_text_color {
+				width: 25%;
+				border: 2rpx solid #28AE4F;
+				color: #28AE4F;
+				text-align: center;
+				font-size: 24rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+		}
+
+		.timeshow_tate,
+		.timeshow_end {
+			height: 50rpx;
+			width: 45%;
+			line-height: 50rpx;
+			text-align: center;
+			margin-right: 10rpx;
+			background-color: #56C877;
+			color: #FFFFFF;
+		}
+	}
+
+	.imglist {
+		position: absolute;
+		top: 0;
+		width: 95%;
+		left: 2.5%;
+
+		.imglist_box {
+			display: flex;
+			box-shadow: 0 0 10rpx #bcb9ca;
+			padding: 20rpx;
+			margin-bottom: 20rpx;
+			height: 140px;
+		}
+
+		.imglist_left {
+			width: 50%;
+			position: relative;
+
+			image {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 280rpx;
+			}
+		}
+
+		.imglist_right {
+			margin-left: 40rpx;
+			padding: 10rpx 0;
+
+			.icon_box {
+				margin-bottom: 12rpx;
+				font-size: 24rpx;
+
+				.iconfont {
+					margin-right: 20rpx;
+					color: #56C877;
+					font-size: 32rpx;
+				}
+			}
+
+			p:last-child {
+				margin-bottom: 0;
+			}
+
+		}
+	}
+
+	.top {
+		position: fixed;
+		right: 30px;
+		bottom: 100px;
+		z-index: 100;
+
+		image {
+			width: 100rpx;
+			height: 100rpx;
+		}
+	}
+</style>

pages/qxzyj/cbwarn.vue

@@ -1,9 +1,7 @@
 <template>
 	<view class="content">
 		<view class="cbwtop">
-			<image :src="
-			  'http://www.hnyfwlw.com:8006/bigdata_app/image/cbyj/banner2.png'
-			" mode="" class="image">
+			<image :src="bannersrc" mode="" class="image">
 			</image>
 			<view class="tab-box">
 				<view v-for="(item, index) in equipArr" :key="index" @click="tabClick(index)"
@@ -12,7 +10,7 @@
 					<text class="bottom-line"></text>
 				</view>
 			</view>
-			<view class="timeandtype" v-if="active==0">
+			<view class="timeandtype" v-if="active==0 && wranlistdata.length > 0">
 				<view class="timebox">
 					<view class="firsttime" @click="timeshow=true">
 						{{start_time==""?'请选择开始时间':start_time}}
@@ -30,11 +28,11 @@
 			</view>
 		</view>
 		<view class="" v-show="active==0">
-			<view class="warmlistbox">
+			<view class="warmlistbox" v-if="wranlistdata.length > 0">
 				<view class="warmlistbox_item" v-for="item in wranlistdata" :key="item.id" @click="singleread(item)">
 					<view class="warmlistbox_item_title" :style="{'border-color':item.status==1?'#14A478':'#fd4646'}">
 						<!-- {{recordtypelist[item.warning_type].label}} -->
-						气象预警
+						{{device_type == 5 ? '气象' : '墒情'}}预警
 					</view>
 					<view class="warmlistbox_item_text">
 						<view class="item_text_item">
@@ -75,6 +73,9 @@
 					</view>
 				</view>
 			</view>
+			<view class="warmlistbox empty" v-else>
+				暂无数据
+			</view>
 		</view>
 		<view class="warmissuebox" v-show="active == 1">
 			<view class="warmissue">
@@ -129,22 +130,23 @@
 			</view>
 		</view>
 		<view class="wornsetbox" v-show="active == 2">
-			<view class=""  v-for="(item, index) in configlist" :key="item.id"  style="margin-bottom: 30rpx;">
-				<u-swipe-action :show="item.show" :index="index"
-					@click="delconfig(item.id)" :options="options">
-					<view class="wornsetbox_item" @click="toset(item.id)">
-						<view class="">
-							{{item.title}}
-						</view>
-						<view class="" @click.stop>
-							<u-switch v-model="item.statustf" size="40" style="margin-top: 13rpx;"
-								@change="swichchange($event,item.id)"></u-switch>
-						</view>
-					</view>
-				</u-swipe-action>
+			<view class="empty" v-if="configlist.length == 0">
+				暂无数据
 			</view>
+			<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in configlist" :key="item.id"
+				@click="delconfig(item.id)" :options="options" style="margin-bottom: 30rpx;">
+				<view class="wornsetbox_item" @click="toset(item.id)">
+					<view class="">
+						{{item.title}}
+					</view>
+					<view class="" @click.stop>
+						<u-switch v-model="item.statustf" size="40" style="margin-top: 13rpx;"
+							@change="swichchange($event,item.id)"></u-switch>
+					</view>
+				</view>
+			</u-swipe-action>
 		</view>
-		<view class="addwarnlist" v-show="active == 2" @click="addshow = true">
+		<view class="addwarnlist" v-show="active == 2" @click="addwarning_config">
 			添 加
 		</view>
 		<view class="">
@@ -187,6 +189,8 @@
 		},
 		data() {
 			return {
+				bannersrc:'http://www.hnyfwlw.com:8006/bigdata_app/image/cbyj/banner2.png',
+				device_type:'',
 				date: "",
 				active: 0,
 				equipArr: ["预警记录", "预警发布", "预警设置"],
@@ -290,6 +294,7 @@
 						page: this.listpage,
 						page_size: "10",
 						start_time: start_time,
+						device_type: this.device_type
 					}
 				})
 				console.log(res)
@@ -309,6 +314,7 @@
 					url: '/api/api_gateway?method=device.device_sms_alert.user_warning_liaisons_list',
 					data: {
 						page: 1,
+						device_type: this.device_type,
 						page_size: 9999999,
 					}
 				})
@@ -325,7 +331,9 @@
 			async getmessagescounts() {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=device.device_sms_alert.remaining_messages_counts',
-					data: {}
+					data: {
+						device_type: this.device_type
+					}
 				})
 				console.log(res)
 				this.total_sms_counts = res.total_sms_counts
@@ -351,7 +359,8 @@
 						data: {
 							send_user: list.join(","),
 							content: this.wormvalue,
-							device_type_id: 5
+							device_type_id: this.device_type,
+							device_type: this.device_type
 						}
 					})
 					console.log(res)
@@ -378,6 +387,7 @@
 					url: '/api/api_gateway?method=device.device_sms_alert.user_qxz_warning_record_read',
 					data: {
 						req: "all",
+						device_type: this.device_type
 					}
 				})
 				if (res) {
@@ -398,7 +408,7 @@
 					const res = await this.$myRequest({
 						url: '/api/api_gateway?method=device.device_sms_alert.user_qxz_warning_record_read',
 						data: {
-							id: this.warmstatus.id,
+							id: this.warmstatus.id
 						}
 					})
 					if (res) {
@@ -422,8 +432,9 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=device.device_sms_alert.user_warning_config_list',
 					data: {
-						device_type_id: "5",
+						device_type_id: this.device_type,
 						page: this.confpage,
+						device_type: this.device_type,
 						page_size: "10",
 					}
 				})
@@ -458,32 +469,36 @@
 			toset(id) {
 				console.log(id)
 				uni.navigateTo({
-					url: "./warnset?id=" + id
+					url: "./warnset?id=" + id + '&typeId=' + this.device_type
 				})
 			},
 			async addwarning_config() {
-				this.addshow = true
-				if (this.addvalue == "") {
-					uni.showToast({
-						title: "请填写预警名称",
-						icon: "none"
-					})
-				} else {
-					const res = await this.$myRequest({
-						url: '/api/api_gateway?method=device.device_sms_alert.create_user_warning_config',
-						data: {
-							title: this.addvalue,
-							device_type_id: 5
-						}
-					})
-					console.log(res)
-					if (res) {
-						this.addshow = false
-						this.configlist = []
-						this.confpage = 1
-						this.getconfiglist()
-					}
-				}
+				uni.navigateTo({
+					url: "./warnset?type=new" + '&typeId=' + this.device_type
+				})
+				// this.addshow = true
+				// if (this.addvalue == "") {
+				// 	uni.showToast({
+				// 		title: "请填写预警名称",
+				// 		icon: "none"
+				// 	})
+				// } else {
+				// 	const res = await this.$myRequest({
+				// 		url: '/api/api_gateway?method=device.device_sms_alert.create_user_warning_config',
+				// 		data: {
+				// 			title: this.addvalue,
+				// 			device_type: this.device_type,
+				// 			device_type_id: this.device_type
+				// 		}
+				// 	})
+				// 	console.log(res)
+				// 	if (res) {
+				// 		this.addshow = false
+				// 		this.configlist = []
+				// 		this.confpage = 1
+				// 		this.getconfiglist()
+				// 	}
+				// }
 			},
 			async delconfig(id){
 				const res = await this.$myRequest({
@@ -501,13 +516,20 @@
 			}
 			
 		},
-		onLoad() {
+		onLoad(option) {
+			console.log(option)
+			this.device_type = option.typeId;
+			if(option.typeId == 15) {
+				uni.setNavigationBarTitle({title:'墒情预警'})
+				this.bannersrc = 'https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/image/cbyj/banner15.png'
+			}
 			this.getwranlistdata()
 			// this.getmessagescounts()
 			// this.getconfiglist()
 		},
 		onShow() {
-			this.getuseriphonelist()
+			this.getuseriphonelist();
+			this.getconfiglist();
 		},
 		onReachBottom() {
 			if (this.active == 0) {
@@ -664,7 +686,11 @@
 			}
 		}
 	}
-
+	.empty{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
 	.warmissuebox {
 		width: 95%;
 		margin: 0 auto;

pages/qxzyj/warnset.vue

@@ -2,6 +2,14 @@
 	<view>
 		<view class="basesel">
 			<view class="basesel_list">
+				<view class="">
+					<view class="">
+						预警名称
+					</view>
+					<view class="">
+						<u-input v-model="title"/>
+					</view>
+				</view>
 				<view class="basesel_list_tilte">
 					预警设备选择：
 				</view>
@@ -103,6 +111,8 @@
 		},
 		data() {
 			return {
+				title: '',
+				device_type:'',
 				fanxianid: '',
 				fanxianconf: "",
 				warning_id: "",
@@ -153,6 +163,7 @@
 					data: {
 						page: 1,
 						page_size: 9999999,
+						device_type: this.device_type
 					}
 				})
 				// console.log(res)
@@ -169,7 +180,8 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=device.device_sms_alert.user_warning_device_list',
 					data: {
-						device_type_id: "5",
+						device_type_id: this.device_type,
+						device_type: this.device_type,
 						page: "1",
 						page_size: "999999999"
 					}
@@ -199,6 +211,7 @@
 					url: '/api/api_gateway?method=weather.weather.qxz_early_warning',
 					data: {
 						device_id: device_id,
+						device_type: this.device_type,
 						status: "see"
 					}
 				})
@@ -218,7 +231,7 @@
 						for (var i = 0; i < this.fanxianconf.length; i++) {
 							if (Object.keys(this.fanxianconf[i]) == key) {
 								obj.type = true;
-								var arr = this.fanxianconf[i][key].split('#');
+								var arr = this.fanxianconf[i][key].split('|')[0].split('#');
 								if (arr[1].indexOf('&')) {
 									arr[1] = arr[1].split('&');
 									obj.num[1] = arr[1][1];
@@ -285,14 +298,21 @@
 						icon: "none"
 					})
 				} else {
+					if(this.title.length > 32 || this.title == '') {
+						uni.showToast({
+							title: "标题不能为空且长度不大于32个字符",
+							icon: "none"
+						})
+						return
+					}
 					var conf = [
 
 					]
 					for (var i = 0; i < this.tongdaolist.length; i++) {
 						if (this.tongdaolist[i].type) {
 							var obj = {}
-							obj[this.tongdaolist[i].key] = this.tongdaolist[i].valuenum + "#" + this.tongdaolist[i].num
-								.join("&")
+							obj[this.tongdaolist[i].key] = this.tongdaolist[i].valuenum + "#" + this.tongdaolist[i].num 
+								.join("&") + '|' + this.tongdaolist[i].name
 							conf.push(obj)
 						}
 					}
@@ -304,15 +324,19 @@
 							device_id: this.selbaselist,
 							send_user_id: this.send_user.join(","),
 							warning_id: this.warning_id,
+							device_type: this.device_type,
+							title: this.title						,
 						}
 					})
-					if (res) {
+					if(res) {
 						uni.showToast({
-							title: "预警设置成功",
-							icon: "none"
-						})
-						uni.navigateBack({
-							delta: 1
+							title: "预警配置成功",
+							icon: "none",
+							complete: () => {
+								uni.navigateBack({
+									delta:1
+								})
+							}
 						})
 					}
 					// console.log(res)
@@ -333,6 +357,7 @@
 				this.userphone = []
 				this.send_user = []
 				this.fanxianconf = res.conf;
+				this.title = res.warning_name;
 				for (var key in res.send_user) {
 					this.defaultSelectedphone.push(Number(key))
 					this.userphone.push(res.send_user[key][0] + "/" + res.send_user[key][1])
@@ -342,10 +367,13 @@
 			}
 		},
 		onLoad(option) {
-			this.warning_id = option.id
+			this.device_type = option.typeId;
 			this.getbaselist()
 			this.getuseriphonelist()
-			this.getstatsu()
+			if(option.id) {
+				this.warning_id = option.id;
+				this.getstatsu()
+			}
 		}
 	}
 </script>
@@ -477,11 +505,6 @@
 				text-align: right;
 				width: 200rpx;
 			}
-			/deep/.u-input__input{
-				border-bottom: 1px solid #aaaaad;
-				text-align: right;
-				width: 200rpx;
-			}
 
 			/deep/.u-input__right-icon {
 				line-height: 35px;

pages/webview.vue

@@ -18,6 +18,7 @@
 			this.device_id = options.device_id
 			this.accessToken = options.accessToken
 			this.url = "https://wx.hnyfwlw.com/wechat?device_id=" + this.device_id + "&accessToken=" + this.accessToken
+			// this.url = "http://192.168.0.36:8003/wechat?device_id=" + this.device_id + "&accessToken=" + this.accessToken
 			//设置 webview 界面的状态栏的 title
 			uni.setNavigationBarTitle({
 				title: '监控详情'