6/28

components/bazaar-city_list/index.vue

@@ -9,9 +9,12 @@
 						<view class="city-list city-list-inline" @tap="location">
 							<view class="location-city">{{locationCity}}</view>
 						</view>
+						<view class="location-city-btn" @click="back">
+							确定
+						</view>
 					</view>
 					<!-- 热门城市 -->
-					<view id="hotcity" class="city-list-content">
+				<!-- 	<view id="hotcity" class="city-list-content">
 						<view class="city-title">
 							{{hotcity.title}}
 						</view> 
@@ -20,9 +23,9 @@
 								{{item}}
 							</view>
 						</view>
-					</view>
+					</view> -->
 					<!-- 城市列表 -->
-					<view id="citytitle" class="city-list-content">
+				<!-- 	<view id="citytitle" class="city-list-content">
 						<view class="city_title_wrap" v-for="(city,index) in citylist" :key="`citylist${index}`">
 							<view class="city-title city-title-letter">
 								{{city.title}}
@@ -33,7 +36,7 @@
 								</view>
 							</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</scroll-view>
@@ -42,13 +45,13 @@
 			<view class="city-title">{{fixedTitle}}</view>
 		</view>
 		<!-- 侧边栏导航 -->
-		<view class="navrightcity">
+	<!-- 	<view class="navrightcity">
 			<view class="nav-item nav-letter" @tap="scroll_to_city(0)">定</view>
 			<view class="nav-item nav-letter" @tap="scroll_to_city(1)">热</view>
 			<view v-for="(item,index) in citylist" :key="`nav${index}`" class="nav-item nav-letter" @click="scroll_to_city(index+2)">
 				{{item.title}}
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -148,7 +151,6 @@
 			// 获取城市
 			// selectedCity({city}){
 			selectedCity(city){
-				// console.log(city);
 				this.getCity&&this.getCity({city});
 			},
 			// 定位操作
@@ -181,6 +183,11 @@
 				this.scrollTop = this.tops[index]
 				this.scrollY = scrollY
 				this.cityScroll.scrollTo(0, -scrollY, 300)
+			},
+			back(){
+				uni.navigateBack({
+					delta:1
+				})
 			}
 		},
 		// 页面挂载后进行异步操作
@@ -296,4 +303,12 @@
 			background-color: #ebebeb;
 		}
 	}
+	.location-city-btn{
+		color: #FFFFFF;
+		margin: 15px 0 0 20px;
+		height: 33px;
+		background-color: #71cd9a;
+		text-align: center;
+		line-height: 33px;
+	}
 </style>

components/equip-item/equip-item.vue

@@ -54,11 +54,11 @@
 		}
 
 		.tag-on {
-			 background-image:url('http://static.yfpyx.com/bigdata_app/image/on.png');
+			 background-image:url('http://www.hnyfwlw.com:8006/bigdata_app/image/on.png');
 		}
 
 		.tag-off {
-			  background-image:url('http://static.yfpyx.com/bigdata_app/image/off.png');
+			  background-image:url('http://www.hnyfwlw.com:8006/bigdata_app/image/off.png');
 		}
 
 		.info {

components/linzq-citySelect/linzq-citySelect.vue

@@ -2,7 +2,7 @@
 	<div class="wrapper" :style="'top:'+statusBarHeight+'px'">
 		<div class="header">
 			<view class="back_div">
-				<image class="back_img" @click="back_city()" :src="'http://static.yfpyx.com/bigdata_app'+'/back_img.png'" mode=""></image>
+				<image class="back_img" @click="back_city()" :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/back_img.png'" mode=""></image>
 			</view>
 			<input class="input" @input="onInput" placeholder="中文/拼音/首字母" v-model="searchValue" />
 		</div>
@@ -18,7 +18,7 @@
 							{{position}}
 						</view>
 						<view class="dingweis_div" @click="getWarpweft">
-							<image class="dingweis" :src="'http://static.yfpyx.com/bigdata_app'+'/dingweis.png'" mode=""></image>
+							<image class="dingweis" :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/dingweis.png'" mode=""></image>
 							<text>{{po_tips}}</text>
 						</view>
 					</view>

main.js

@@ -10,9 +10,9 @@ Vue.config.productionTip = false
 
 App.mpType = 'app'
 
-Vue.prototype.$imghost = 'http://static.yfpyx.com/projectimg' // 线上图片服务器路径常量
-// http://static.yfpyx.com/bigdata_app/image/10ca93e17420371a82826073c8425c0.png
-Vue.prototype.$appimghost = 'http://static.yfpyx.com/bigdata_app'
+Vue.prototype.$imghost = 'http://www.hnyfwlw.com:8006/projectimg' // 线上图片服务器路径常量
+// http://www.hnyfwlw.com:8006/bigdata_app/image/10ca93e17420371a82826073c8425c0.png
+Vue.prototype.$appimghost = 'http://www.hnyfwlw.com:8006/bigdata_app'
 
 Vue.filter('timeFormat',function(time){
 	function fun(a){

pages.json

@@ -491,6 +491,15 @@
 		    }
 		    
 		}
+        ,{
+            "path" : "pages/cb/cbd/equip-set/manualinput",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "手动统计",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"condition": { //模式配置，仅开发期间生效
 		"current": 3, //当前激活的模式（list 的索引项）

pages/afterSale/addafter.vue

@@ -34,8 +34,8 @@
 					<u-action-sheet :list="actionSheetList" v-model="show" @click="actionSheetCallback"></u-action-sheet>
 				</view>
 				<view class="addafter_con_connect">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png'" mode=""></image>
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png'" mode=""></image>
 				</view>
 				<view class="addafter_con_bot">
 					<p class="addafter_con_bot_title">保修详情</p>
@@ -44,7 +44,10 @@
 					<view class="imgvideo">
 						<view class="imgvideo_img" v-for="(item,index) in 3">
 							<view @click="gainimg(index)">
-								<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png'" mode="" v-if="!uploadingTF[index]"></image>
+								<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png'" mode="" v-if="!uploadingTF[index]"></image>
+							</view>
+							<view class="sim_info_loding" v-if="loding">
+								<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
 							</view>
 							<view class="uploading" v-if="uploadingTF[index]">
 								<!-- <u-icon name="close"  size="16"></u-icon> -->
@@ -56,7 +59,7 @@
 						</view>
 						<view class="imgvideo_video" v-for="(item,index) in 1">
 							<view @click="gainvideo(index)">
-								<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/afterSale/80314eaa07c32e9c76537a8a8224130.png'" mode="" v-if="!uploadingTF[index+3]"></image>
+								<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/80314eaa07c32e9c76537a8a8224130.png'" mode="" v-if="!uploadingTF[index+3]"></image>
 							</view>
 							<view class="uploading" v-if="uploadingTF[index+3]">
 								<video :src="BASE_URL+selfList" :controls="false" class="uploading" ></video>
@@ -99,6 +102,7 @@
 					type:'',
 					type_id:''
 				},
+				loding:false,
 				imageList:[],//图片链接
 				uploadingTF:[false,false,false,false,false,false],//图片的删除
 				selfList:'',//视频链接
@@ -169,6 +173,7 @@
 				    sourceType: ['album','camera'], //从相册选择
 				    success: (res)=> {
 						this.imgs = res.tempFilePaths[0]
+						this.loding = true
 					}
 				});
 			},
@@ -229,6 +234,23 @@
 					}
 				})
 				console.log(res)
+				if(res){
+					uni.showToast({
+					    title: '提交成功',
+					    duration: 2000,
+					});
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta:1
+						})
+					},1000)
+				}else{
+					uni.showToast({
+					    title: '提交失败',
+					    duration: 2000,
+						icon:"none"
+					});
+				}
 			},
 			async getID(data) {
 				const res = await this.$myRequest({
@@ -322,6 +344,7 @@
 						this.imageList[this.imgindex]=JSON.parse(uploadFileRes.data).data.src
 						this.$forceUpdate() //强制刷新视图
 						this.uploadingTF[this.imgindex]=true
+						this.loding = false
 				    }
 				});
 				this.imgs = ""

pages/afterSale/index.vue

@@ -11,7 +11,7 @@
 				</view>
 			</uni-nav-bar>
 		</view>
-		<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/afterSale/dcd7147f4b15d00c5c90006738b8453.png'" class="expertimages"></image>
+		<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/dcd7147f4b15d00c5c90006738b8453.png'" class="expertimages"></image>
 		<view class="aftersaleTF" v-if="aftersaleTF">
 			暂无数据
 		</view>
@@ -29,11 +29,11 @@
 				</view>
 				<view class="aftersale_item_operate">
 					<button :class="item.errordesc?'fault':'none'" :disabled="!item.errordesc" @click="fault(item.errordesc)">故障原因</button>
-					<button :class="item.errorimg.length!=0?'imgs':'none'" :disabled="item.errorimg.length==0" @click="faultImg(item.errorimg)">图片</button>
+					<button :class="item.errorimg?'imgs':'none'" :disabled="!item.errorimg" @click="faultImg(item.errorimg)">图片</button>
 					<button :class="item.errorvideo?'video':'none'" :disabled="!item.errorvideo" @click="faultVideo(item.errorvideo)">视频</button>
 				</view>
 				<view class="aftersale_item_icon">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+aftersale_icon[Number(item.device_type)-2].src" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+aftersale_icon[Number(item.device_type)-2].src" mode=""></image>
 				</view>
 			</view>
 		</view>
@@ -48,7 +48,7 @@
 			</view>
 		</u-modal>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>
@@ -100,19 +100,23 @@
 						page:this.page
 					}
 				})
+				console.log(res)
 				if(res.counts == 0){
 					this.aftersaleTF = true
 				}else{
 					this.aftersaleTF = false
 				}
 				this.faultdata =this.faultdata.concat(res.data)
-				for (var i = 0; i < this.faultdata.length; i++) {
-					this.faultdata[i].errorimg = JSON.parse(this.faultdata[i].errorimg)
-					if (this.faultdata[i].errorimg == null) {
-						this.faultdata[i].errorimg = []
-					}
-				}
-				console.log(res)
+				console.log(this.faultdata)
+				// for (var i = 0; i < this.faultdata.length; i++) {
+				// 	if (this.faultdata[i].errorimg) {
+				// 		this.faultdata[i].errorimg = JSON.parse(this.faultdata[i].errorimg)
+				// 	}else{
+				// 		this.faultdata[i].errorimg = []
+				// 	}
+				// 	console.log(this.faultdata[i].errorimg)
+				// }
+				// console.log(res)
 			}, 
 			fault(info) { //查看故障信息
 				this.title="故障信息"
@@ -123,12 +127,8 @@
 				this.faultvideo_tf=false
 			},
 			faultImg(info) { //查看故障图片
-				this.faultimg=[]
-				for (var i = 0; i < info.length; i++) {
-					let obj = {}
-					obj.image = info[i]
-					this.faultimg.push(obj)
-				}
+				console.log(JSON.parse(info))
+				this.faultimg=JSON.parse(info)
 				console.log(this.faultimg)
 				this.title="故障图片"
 				this.show = true
@@ -137,6 +137,7 @@
 				this.faultvideo_tf=false
 			},
 			faultVideo(info) { //查看故障视频
+				console.log(info)
 				this.title="故障视频" 
 				if(info.indexOf("[")!=-1){
 					this.faultvideo=JSON.parse(info)[0]
@@ -182,6 +183,9 @@
 			}
 		},
 		onLoad() { 
+			// this.getAftersale()
+		},
+		onShow(){
 			this.getAftersale()
 		},
 		onReachBottom() {

pages/afterSale/search.vue

@@ -29,7 +29,7 @@
 					<button :class="item.errorvideo?'video':'none'" :disabled="!item.errorvideo" @click="faultVideo(item.errorvideo)">视频</button>
 				</view>
 				<view class="aftersale_item_icon">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+aftersale_icon[Number(item.device_type)-2].src" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+aftersale_icon[Number(item.device_type)-2].src" mode=""></image>
 				</view>
 			</view>
 		</view>

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

@@ -80,7 +80,7 @@
 				titleidnex: 0,
 				device_id: '',
 				page: 1,
-				pagesum: null,
+				pagesum: 1,
 				historylistdata: [],
 				thdata: ["上报时间", "设备开关", "环境温度(°C)", "环境湿度(%)", "保温仓温度设定温度(°C)", "保温仓温度当前温度(°C)", "电池状态", "雨控状态", "摄像头状态", "信号强度",
 					"电流(mA)",

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 20px;">
+		<view class="" style="position: relative;top: 40px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="手动添加"></uni-nav-bar>
 			</view>
@@ -53,7 +53,8 @@
 					}],
 				},
 				id: '',
-				device_id: ""
+				device_id: "",
+				addtime:1
 
 			}
 		},
@@ -62,16 +63,26 @@
 			// device_id: "819"
 			// img_id: "2396"
 			async species(id) { //统计
+				var time = +new Date()
 				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo_species',
+					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo_describe',
 					data: {
-						ret: "add_pest",
-						pest: this.form.name,
+						ret: "add_desc",
 						img_id: this.id,
-						device_id: this.device_id,
-						describe: JSON.stringify(this.form)
+						describe: JSON.stringify(this.form),
+						device_id:this.device_id,
+						photo_time:this.addtime,
+						time: time,
 					}
 				})
+				console.log(res)
+				if(res){
+					uni.showToast({
+						title: '添加成功',
+						duration: 1000,
+						image: ""
+					});
+				}
 			},
 			clickLeft() {
 				uni.navigateBack({
@@ -96,7 +107,7 @@
 					});
 				} else {
 					this.species()
-					this.clickLeft()
+					// this.clickLeft()
 				}
 			}
 		},
@@ -104,9 +115,10 @@
 			this.$refs.uForm.setRules(this.rules);
 		},
 		onLoad(option) {
-			// this.species(this.id)
+			console.log(option)
 			this.id = option.id
 			this.device_id = option.device_id
+			this.addtime = option.addtime
 		}
 	}
 </script>

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

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 20px;">
-			<view style="position: fixed;z-index: 100;">
+		<view class="" style="position: relative;top: 40px;">
+			<view style="position: fixed;z-index: 100;top: 40px;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="历史数据"></uni-nav-bar>
 			</view>
 			<view class="shuju_one">
@@ -89,7 +89,7 @@
 				cHeight: '400',
 				pixelRatio: 1,
 				canvastishiTF: false,
-				pagesum: null
+				pagesum: 1
 			}
 		},
 		methods: {
@@ -188,9 +188,7 @@
 						duration: 2000,
 						icon: "none"
 					});
-					uni.navigateBack({
-						delta: 1
-					})
+					this.historylist()
 				}else{
 					uni.showToast({
 						title: '刷新失败',
@@ -308,7 +306,14 @@
 				this.history()
 				this.historylist()
 			},1000)
-		}
+		},
+		onPullDownRefresh() {
+			this.history()
+			this.historylist()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1000)
+		},
 	}
 </script>
 

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

@@ -20,7 +20,7 @@
 			<view class="imglist">
 				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
 					<view class="imglist_left">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode=""></image>
+						<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">
@@ -30,10 +30,10 @@
 						<view class="icon_box" @click="shibie(item.id)">
 							<p class="iconfont icon-shibie">识别</p>
 						</view>
-						<view class="icon_box" @click="tongji(item.id)">
+						<view class="icon_box" @click="tongji(item)">
 							<p class="iconfont icon-tongji2">手动统计</p>
 						</view>
-						<view class="icon_box" @click="add(item.id)">
+						<view class="icon_box" @click="add(item)">
 							<p class="iconfont icon-iconzhengli_shouxieqianpi">手动添加</p>
 						</view>
 						<p style="color: #06B535;">{{item.addtime|timeFormat()}}</p>
@@ -42,7 +42,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>
@@ -118,29 +118,6 @@
 					});
 				}
 			},
-			//forecast.forecast_system.equip_photo_species  pest_list
-			//forecast.forecast_system.equip_photo_species统计
-			async species(id) { //统计
-				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo_species',
-					data: {
-						ret: "photo_desc",
-						img_id: id
-					}
-				})
-				if (res) {
-					uni.showToast({
-						title: '指令下发成功！',
-						duration: 2000
-					});
-				}else{
-					uni.showToast({
-						title: '指令下发失败！',
-						duration: 2000,
-						icon:"none"
-					});
-				}
-			},
 			//forecast.send_control.admin_device_control 拍照 
 			async takephoto() { //统计
 				const res = await this.$myRequest({
@@ -195,12 +172,14 @@
 					url: "./results?id="+id
 				})
 			},
-			tongji(id) { //统计
-				this.species(id)
+			tongji(item) { //统计
+				uni.navigateTo({
+					url:"./manualinput?id="+item.id + "&device_id=" + item.device_id+"&addtime="+item.addtime
+				})
 			},
-			add(id) {
+			add(item) {
 				uni.navigateTo({
-					url: "./addimg?id=" + id + "&device_id" + this.device_id
+					url: "./addimg?id=" + item.id + "&device_id=" + item.device_id+"&addtime="+item.addtime
 				})
 			},
 			examine(index) {

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

@@ -0,0 +1,215 @@
+<template>
+	<view>
+		<view class="tishi" v-if="!itemListTF">
+			暂无数据
+		</view>
+		<u-collapse v-else>
+			<u-collapse-item :title="'害虫名称：'+item.pest_name" v-for="(item, index) in itemList" :key="index">
+				<p>害虫数量：{{item.pest_num}}</p>
+				<p>作物种类：{{item.crop_name}}</p>
+				<p>虫害阶段：{{item.pest_case}}</p>
+				<view class="btn">
+					<view class="btn_alter" @click="alter(item)">
+						编辑
+					</view>
+					<view class="btn_add" @click="deletes">
+						删除
+					</view>
+				</view>
+			</u-collapse-item>
+			<u-modal v-model="show" :title="content" :mask-close-able="true" :show-cancel-button="true" @confirm="confirm">
+				<u-form :model="form" ref="uForm" class="uForm">
+					<u-form-item label="害虫名称" :required="requireds" label-width="150rpx" prop="pest_name" class="form_item">
+						<u-input v-model="form.pest_name" />
+					</u-form-item>
+					<u-form-item label="害虫数量" :required="requireds" label-width="150rpx" prop="pest_num" class="form_item">
+						<u-input v-model="form.pest_num" type="number" />
+					</u-form-item>
+					<u-form-item label="作物种类" label-width="150rpx" class="form_item">
+						<u-input v-model="form.crop_name" />
+					</u-form-item>
+					<u-form-item label="虫害阶段" label-width="150rpx" class="form_item">
+						<u-input v-model="form.pest_case" />
+					</u-form-item>
+				</u-form>
+			</u-modal>
+		</u-collapse>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				itemList: [],
+				content:"修改",
+				show:false,
+				form:{
+					pest_name:"",
+					pest_num:"",
+					crop_name:"",
+					pest_case:""
+				},
+				requireds: true,
+				device_id:"",//设备id
+				addtime:"",//图片添加时间
+				wormid:"",//图片id
+				id:"",//害虫信息单条id
+				itemListTF:false
+			}
+		},
+		methods: {
+			async species(id) { //统计
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo_species',
+					data: {
+						ret: "photo_desc",
+						img_id: id
+					}
+				})
+				console.log(res)
+				this.itemList = res
+				if(res.length==0){
+					this.itemListTF = false
+				}else{
+					this.itemListTF = true
+				}
+			},
+			async addspecies() { //修改
+				var time = +new Date()
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo_describe',
+					data: {
+						ret: "change_dsec",
+						img_id: this.id,
+						describe: JSON.stringify(this.form),
+						device_id:this.device_id,
+						photo_time:this.addtime,
+						time: time,
+						id:this.wormid
+					}
+				})
+				console.log(res)
+				if(res){
+					uni.showToast({
+						title: '修改成功',
+						duration: 1000,
+						image: ""
+					});
+					this.species(this.id)
+				}
+			},
+			async delspecies() { //修改
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo_describe',
+					data: {
+						ret: "del_desc",
+						img_id: this.id,
+						describe: JSON.stringify(this.form),
+						device_id:this.device_id,
+						photo_time:this.addtime,
+						id:this.wormid
+					}
+				})
+				console.log(res)
+				if(res){
+					uni.showToast({
+						title: '删除成功',
+						duration: 1000,
+						image: ""
+					});
+					this.species(this.id)
+				}
+			},
+			alter(item){
+				this.show = true
+				this.form.pest_name=item.pest_name
+				this.form.pest_num=item.pest_num
+				this.form.crop_name=item.crop_name
+				this.form.pest_case=item.pest_case
+				this.wormid=item.id
+			},
+			deletes(){
+				uni.showModal({
+				    title: '提示',
+				    content: '确定删除这条害虫信息吗？',
+				    success:(res)=> {
+				        if (res.confirm) {
+				           this.delspecies()
+				        } else if (res.cancel) {
+				            console.log('用户点击取消');
+				        }
+				    }
+				});
+				
+			},
+			confirm(){
+				if (this.form.pest_name== "") {
+					uni.showToast({
+						title: '请输入害虫名称',
+						duration: 1000,
+						image: ""
+					});
+				} else if (this.form.pest_num == "") {
+					uni.showToast({
+						title: '请输入害虫数量',
+						duration: 1000,
+						image: ""
+					});
+				} else {
+					this.addspecies()
+				}
+			}
+		},
+		onLoad(option) {
+			this.species(option.id)
+			this.id = option.id
+			this.device_id = option.device_id
+			this.addtime = option.addtime
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f1f1f1;
+	}
+	.tishi{
+		width: 100%;
+		height: 200rpx;
+		text-align: center;
+		line-height: 200rpx;
+		font-size: 32rpx;
+	}
+	.u-collapse-item {
+		width: 100%;
+		padding: 10rpx 28rpx;
+		justify-content: space-between;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+		background-color: #FFFFFF;
+		p{
+			margin: 10rpx auto;
+			width: 90%;
+		}
+		.btn{
+			width: 90%;
+			margin: 0 auto;
+			display: flex;
+			justify-content: flex-end;
+			.btn_add,.btn_alter{
+				width: 100rpx;
+				height: 50rpx;
+				background-color: #e95354;
+				color: #FFFFFF;
+				text-align: center;
+				line-height: 50rpx;
+				border-radius: 50rpx;
+			}
+			.btn_alter{
+				background-color: #77ab84;
+				margin-right: 20rpx;
+			}
+		}
+	}
+</style>

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 20px;">
+		<view class="" style="position: relative;top: 40px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="短信预警"></uni-nav-bar>
 			</view>

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

@@ -3,7 +3,7 @@
 		<view class="images_box">
 			<p class="title">图片标记</p>
 			<view class="images">
-				<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="" class="jiazai"></image>
+				<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="" class="jiazai"></image>
 				<image :src="resuils.image" mode="" @click="examine(resuils)"></image>
 				<view class="imgbg" v-if="imgbg">
 					<image src="../../../../static/images/cb/6286299.gif" mode="" class="img"></image>

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

@@ -3,10 +3,10 @@
 		<view :class="['info',equipInfo.is_online==1?'on':'off']">
 			<view class="" @click="copy(equipInfo)">
 				设备ID：{{equipInfo.imei||equipInfo.device_id}}
-				<image src="http://static.yfpyx.com/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
+				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
 			</view>
 			<view class="">
-				设备名称：{{equipInfo.device_name==""?"无":equipInfo.device_name}}
+				设备名称：{{equipInfo.device_name?equipInfo.device_name:"无"}}
 			</view>
 			<view class="">
 				设备类型：<span v-if="equipInfo.type">{{equipInfo.type|equipType}}</span><span v-else>{{equipInfo.type_name}}</span>
@@ -27,10 +27,10 @@
 			</view>
 			<u-popup v-model="setTimeShow" mode="center" width="600rpx">
 				<u-field label="载玻片更换时间" placeholder="选择日期" label-width='240' required :error-message="glassErr" v-model="glass_slide_time"
-				 @click="glass_show=true">
+				 @click="glass_show=true" :field-style="fieldstyle">
 				</u-field>
 				<u-field label="培养液更换时间" placeholder="选择日期" label-width='240' required :error-message="culErr" v-model="cultivate_time"
-				 @click="cultivate_show=true">
+				 @click="cultivate_show=true" :field-style="fieldstyle">
 				</u-field>
 				<view class="btn-box">
 					<u-button @click="setTimeSubmit" size="mini" type="success">确定</u-button>
@@ -50,7 +50,7 @@
 		<view class="equip_part">
 			<template v-if="equipInfo.type==7">
 				<view class="item1" v-for="item in bzy" v-if="item.tf" @click="partClick(item.path)">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+item.icon" mode="widthFix"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
 					<view class="">
 						{{item.tex}}
 					</view>
@@ -58,7 +58,7 @@
 			</template>
 			<template v-else-if="equipInfo.type==3">
 				<view class="item2" v-for="item in curEquip" v-if="item.tf" @click="partClick(item.path)">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+item.icon" mode="widthFix"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
 					<view class="">
 						{{item.tex}}
 					</view>
@@ -66,7 +66,7 @@
 			</template>
 			<template v-else>
 				<view class="item3" v-for="item in curEquip" v-if="item.tf" @click="partClick(item.path)">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+item.icon" mode="widthFix"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
 					<view class="">
 						{{item.tex}}
 					</view>
@@ -82,7 +82,9 @@
 		</view>
 		<view class="newState" v-else>
 			<view class="item" v-for="item in curState">
-				<image :src="'http://static.yfpyx.com/bigdata_app'+item.icon" mode="widthFix"></image>
+				<view class="item_info_img">
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
+				</view>
 				<view class="info-con">
 					<view class="active">
 						{{item.txt}}
@@ -101,6 +103,12 @@
 	export default {
 		data() {
 			return {
+				fieldstyle:{
+					border:"2rpx solid #f6f6f6",
+					"border-radius":"24px",
+					"padding-left":"20rpx",
+					"background-color":"#f6f6f6"
+				},
 				city:"",
 				type: null, //设备类型
 				device_status: null,
@@ -544,12 +552,14 @@
 			},
 			partClick(path) {
 				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=" + this.equipInfo.imei + "&device_type="+this.type
+					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + device_id + "&device_type="+this.type
 				});
 			},
 			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){
@@ -558,7 +568,7 @@
 					path="/pages/cb/xy/equip-set/xyhistoryile"
 				}
 				uni.navigateTo({
-					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + this.equipInfo.imei + "&device_type="+this.type
+					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + device_id + "&device_type="+this.type
 				});
 			},
 			async setTime(d_id) {
@@ -688,11 +698,11 @@
 		}
 
 		.on {
-			background-image: url('http://static.yfpyx.com/bigdata_app/image/cb/onBg.png')
+			background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
 		}
 
 		.off {
-			background-image: url('http://static.yfpyx.com/bigdata_app/image/cb/offBg.png')
+			background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
 		}
 
 		.equip_part {
@@ -770,9 +780,15 @@
 					text-align: left;
 					line-height: 40rpx;
 				}
-
-				image {
-					width: 70rpx;
+				
+				.item_info_img {
+					width: 30%;
+					text-align: center;
+					image {
+						width: 64rpx;
+						height: 64rpx;
+						margin-top: 10rpx;
+					}
 				}
 			}
 		}

pages/cb/index/index.vue

@@ -12,7 +12,7 @@
 				 	</view>
 				 </view>
 				<view>
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/banner.jpg'" mode="widthFix"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/banner.jpg'" mode="widthFix"></image>
 				</view>
 				<view class="tab-box">
 					<view v-for="(item,index) in equipArr" :key="item.type" v-if="item.tf" @click="tabClick(index)" :class="['tab-item',active==index?'active':'']">
@@ -34,8 +34,24 @@
 				</view>
 			</view>
 		</view>
-		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+		<view class="top">
+			<view class="backtop" @click="top" v-if="isTop">
+				<image src="../../../static/images/1.png" mode="" class="img0"></image>
+			</view>
+			<view class="more">
+				<view class="box" @click="online" v-show="filtrateTF">
+					<p>在线</p>
+				</view>
+				<view class="box" @click="offline" v-show="filtrateTF">
+					<p>离线</p>
+				</view>
+				<view class="box" @click="complete" v-show="filtrateTF">
+					<p>全部</p>
+				</view>
+				<view @click="filtrate">
+					<image src="../../../static/images/b0bcdb0e3fe8690520f743aa8303bf2.png" mode="" class="img1"></image>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -76,6 +92,8 @@
 				],
 				device_id: '3', //筛选的设备id
 				isTop: false,
+				filtrateTF:false,
+				device_status:""
 			}
 		},
 		onLoad() {
@@ -164,6 +182,7 @@
 						device_type_id: this.equipArr[act].type,
 						page: this.equipArr[act].pageIndex,
 						page_size: 10,
+						device_status:this.device_status
 					}
 				})
 				console.log(res)
@@ -177,6 +196,7 @@
 						device_type_id: this.equipArr[act].type,
 						page: this.equipArr[act].pageIndex,
 						page_size: 10,
+						device_status:this.device_status
 					}
 				})
 				console.log(res)
@@ -210,11 +230,47 @@
 					url: "../../index/index"
 				})
 			},
+			filtrate(){
+				this.filtrateTF = !this.filtrateTF
+			},
 			top() {
 				uni.pageScrollTo({
 					scrollTop: 0,
 					duration: 500
 				})
+			},
+			online(){
+				this.equipArr[this.active].pageIndex=1
+				this.equipArr[this.active].list =[]
+				this.device_status = 1
+				if(this.active==3){
+					this.getxyEquipList(3)
+				}else{
+					this.getEquipList(this.active)
+				}
+				this.filtrateTF = !this.filtrateTF
+			},
+			offline(){
+				this.equipArr[this.active].pageIndex=1
+				this.equipArr[this.active].list =[]
+				this.device_status = 0
+				if(this.active==3){
+					this.getxyEquipList(3)
+				}else{
+					this.getEquipList(this.active)
+				}
+				this.filtrateTF = !this.filtrateTF
+			},
+			complete(){
+				this.equipArr[this.active].pageIndex=1
+				this.equipArr[this.active].list =[]
+				this.device_status = ""
+				if(this.active==3){
+					this.getxyEquipList(3)
+				}else{
+					this.getEquipList(this.active)
+				}
+				this.filtrateTF = !this.filtrateTF
 			}
 		},
 		components: {
@@ -298,13 +354,31 @@
 
 	.top {
 		position: fixed;
-		right: 30px;
-		bottom: 100px;
+		right: 10px;
+		bottom: 40px;
 		z-index: 100;
-
 		image {
 			width: 100rpx;
 			height: 100rpx;
 		}
+		.backtop{
+			display: flex;
+			justify-content: flex-end;
+			margin-bottom: 10rpx;
+		}
+		.more{
+			display: flex;
+		}
+		.box{
+			width: 80rpx;
+			height: 80rpx;
+			background-color: rgba(161,161,161,0.45);
+			border-radius: 50%;
+			text-align: center;
+			line-height: 80rpx;
+			box-sizing: border-box;
+			margin: 14rpx 10rpx 0 0;
+			color: #fff;
+		}
 	}
 </style>

pages/cb/index/search.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="prevents" v-else>
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
-					<image :src="item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/prevention/6.png':'http://static.yfpyx.com/bigdata_app/image/prevention/7.png'" mode=""
+					<image :src="item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'" mode=""
 					 class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备 ID：{{item.imei || item.device_id}}</p>
@@ -28,7 +28,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

pages/cb/sim/sim.vue

@@ -5,7 +5,7 @@
 				<image src="../../../static/images/cb/6286299.gif" mode="" class="img"></image>
 			</view>
 			<view class="tit">
-				<image mode="widthFix" src="http://static.yfpyx.com/bigdata_app/image/cb/sim1.png"></image>
+				<image mode="widthFix" src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/sim1.png"></image>
 				数据sim卡流量{{"("+sim.simnew+")"}}
 			</view>
 			<view class="item">
@@ -22,11 +22,11 @@
 			</view>
 			<view class="item">
 				<text>已用流量:</text>
-				<text>{{sim.data_usage}}MB</text>
+				<text>{{sim.data_usage.toFixed(2)}}MB</text>
 			</view>
 			<view class="item">
 				<text>剩余流量:</text>
-				<text>{{sim.data_balance}}MB</text>
+				<text>{{sim.data_balance.toFixed(2)}}MB</text>
 			</view>
 			<view class="item">
 				<text>到期时间:</text>
@@ -40,7 +40,7 @@
 					<image src="../../../static/images/cb/6286299.gif" mode="" class="img"></image>
 				</view>
 				<view class="tit">
-					<image mode="widthFix" src="http://static.yfpyx.com/bigdata_app/image/cb/sim2.png"></image>
+					<image mode="widthFix" src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/sim2.png"></image>
 					图片sim卡流量{{"("+hksim.simnew+")"}}
 				</view>
 				<view class="item">

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

@@ -2,7 +2,7 @@
 	<view>
 		<view class="status_bar"></view>
 		<view class="" style="position: relative;top: 40px;">
-			<view style="position: fixed;z-index: 100;">
+			<view style="position: fixed;z-index: 100;top: 40px;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="历史数据"></uni-nav-bar>
 			</view>
 			<view class="shuju_one">
@@ -22,11 +22,11 @@
 				<p class="wind_titie">风速、风向</p>
 				<view class="wind_text">
 					<view class="wind_speed">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/xy/1c24243bb184e84ffd13540367569ba.png'" mode=""></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/xy/1c24243bb184e84ffd13540367569ba.png'" mode=""></image>
 						<p>风速：{{wind_sped}}(m/s)</p>
 					</view>
 					<view class="wind_direction">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/xy/c44ae038324e1040a1eaa702e6d71a5.png'" mode=""></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/xy/c44ae038324e1040a1eaa702e6d71a5.png'" mode=""></image>
 						<p>风速：{{wind_drec}}</p>
 					</view>
 				</view>
@@ -100,7 +100,7 @@
 				forbidden: false,
 				wind_sped: '', //风速
 				wind_drec: '',
-				pagesum: null
+				pagesum: 1
 			}
 		},
 		methods: {

pages/cb/xy2.0/historydatas.vue

@@ -78,7 +78,7 @@
 				cHeight: '400',
 				pixelRatio: 1,
 				canvastishiTF: false,
-				pagesum: null,
+				pagesum: 1,
 				worms:[]
 			}
 		},

pages/cb/xy2.0/particulars.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="">
 			<view :class="['info',equipInfo.is_online==1?'on':'off']">
-				<p @click="copy(newState.device_id)">设备ID：{{newState.device_id}}<image src="http://static.yfpyx.com/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image></p>
+				<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.uptime | timeFormat}}</p>
 				<p>最新地址：{{newState.addr}}</p>
@@ -14,11 +14,11 @@
 			</view>
 			<view class="control">
 				<view class="control_item" @click="repairs">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/7.png'" mode=""></image>
 					<p>一键报修</p>
 				</view>
 				<view class="control_item" @click="toggle">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/2.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/2.png'" mode=""></image>
 					<p>历史数据</p>
 				</view>
 			</view>
@@ -28,42 +28,42 @@
 				</view>
 				<view class="realtime_text">
 					<view class="realtime_item">
-						<image src="http://static.yfpyx.com/bigdata_app/image/cb/xy2.0/wendu.png" mode=""></image>
+						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/wendu.png" mode=""></image>
 						<view class="text">
 							<p>环境温度</p>
 							<p>{{newState.at}}℃</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="http://static.yfpyx.com/bigdata_app/image/cb/xy2.0/shidu.png" mode=""></image>
+						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/shidu.png" mode=""></image>
 						<view class="text">
 							<p>环境湿度</p>
 							<p>{{newState.ah}}%</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="http://static.yfpyx.com/bigdata_app/image/cb/xy2.0/tianqi.png" mode=""></image>
+						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/tianqi.png" mode=""></image>
 						<view class="text">
 							<p>天气</p>
 							<p>{{newState.type}}</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="http://static.yfpyx.com/bigdata_app/image/cb/xy2.0/xiayu.png" mode=""></image>
+						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/xiayu.png" mode=""></image>
 						<view class="text">
 							<p>是否下雨</p>
 							<p>{{newState.rain}}</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="http://static.yfpyx.com/bigdata_app/image/cb/xy2.0/fengxiang.png" mode=""></image>
+						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/fengxiang.png" mode=""></image>
 						<view class="text">
 							<p>风力风向</p>
 							<p>{{newState.wind}}</p>
 						</view>
 					</view>
 					<view class="realtime_item">
-						<image src="http://static.yfpyx.com/bigdata_app/image/cb/xy2.0/yujing.png" mode=""></image>
+						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/xy2.0/yujing.png" mode=""></image>
 						<view class="text">
 							<p>虫害情报</p>
 							<p>{{newState.warn==""?"暂无":newState.warn}}</p>
@@ -315,11 +315,11 @@
 	}
 
 	.on {
-		background-image: url('http://static.yfpyx.com/bigdata_app/image/cb/onBg.png')
+		background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png')
 	}
 
 	.off {
-		background-image: url('http://static.yfpyx.com/bigdata_app/image/cb/offBg.png')
+		background-image: url('http://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png')
 	}
 	.control {
 		width: 90%;

pages/disandpests/index.vue

@@ -11,7 +11,7 @@
 			<view class="recognition" v-if="datasTF">
 				<p class="recognition_title">{{name}}</p>
 				<view :class="tishi?'recognition_img':'recognition_img_two'">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+path2" mode="" @error="error" @click="examine(path2)"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+path2" mode="" @error="error" @click="examine(path2)"></image>
 				</view>
 				<button class="recognition_details" v-if="tishi" @click="examines">查看详情</button>
 				<button class="recognition_details" v-if="!tishi" @click="show=!show">再拍一张</button>

pages/environment/equipment.vue

@@ -7,10 +7,10 @@
 			</view>
 			<view class="info">
 				<view class="info_item">
-					<image :src="eqinfo.item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/cb/onBg.png':'http://static.yfpyx.com/bigdata_app/image/cb/offBg.png'"
+					<image :src="eqinfo.item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png'"
 					 mode="" class="bgi"></image>
-					<p style="font-size: 32rpx;" @click="copy(eqinfo.item)">设备 ID：{{eqinfo.item.equip_id||eqinfo.item.imei}}
-						<image src="http://static.yfpyx.com/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
+					<p style="font-size: 32rpx;" @click="copy(eqinfo.item)">设备 ID：{{eqinfo.item.equip_id||eqinfo.item.device_id}}
+						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
 					</p>
 					<p>设备名称：{{eqinfo.item.equip_name?eqinfo.item.equip_name:"无"}}</p>
 					<p>最近上报时间：{{eqinfo.item.uptime|timeFormat()}}</p>
@@ -19,15 +19,15 @@
 			</view>
 			<view class="control">
 				<view class="control_item" v-if="kongtf" @click="control">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/8.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/8.png'" mode=""></image>
 					<p>设备控制</p>
 				</view>
 				<view class="control_item" @click="repairs">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/7.png'" mode=""></image>
 					<p>一键报修</p>
 				</view>
 				<view class="control_item" v-if="shujutf" @click="charts">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/10.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/10.png'" mode=""></image>
 					<p>历史数据</p>
 				</view>
 			</view>
@@ -35,9 +35,9 @@
 				<p class="realtime_title"><span v-if="realtimeTF">实时数据</span><span v-else>实时数据(暂无数据)</span></p>
 				<view class="realtime_text">
 					<view class="realtime_text_item">
-						<view class="realtime_text_item_info" v-for="(item,index) in olddata.conf" :key="index" v-if="olddata.dat[index][1]" @click="oneday(item,index)">
+						<view class="realtime_text_item_info" v-for="(item,index) in olddata.conf" :key="index" v-if="olddata.dat[index][1]&&item" @click="oneday(item,index)">
 							<view class="item_info_img" :style="{'background-color':olddatas[Math.floor(Math.random()*(5-0+1))]}">
-								<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/icon_'+olddata.dat[index][1]+'.png'"
+								<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/icon_'+olddata.dat[index][1]+'.png'"
 								 mode=""></image>
 							</view>
 							<view class="item_info_text">

pages/environment/history.vue

@@ -6,7 +6,7 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="历史数据"></uni-nav-bar>
 			</view>
 			<view class="graph">
-				<view class="canvasbox">
+				<view class="canvasbox" v-show="!pickshow&&!picktwoshow">
 					<view class="" style="display: flex;justify-content: flex-end;">
 						<view class="schedule" @click="pickertfone=!pickertfone">
 							<p class="schedule_value">{{titletext[indexone]}}</p>
@@ -26,7 +26,7 @@
 					<view class="newtimes">
 						<view class="newtimes_state" @click="pickshow = !pickshow">
 							<view class="oldtimes_left">
-								<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/841f87bfd8abb1b09610fa0789f9d8e.png'" mode=""></image>
+								<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/841f87bfd8abb1b09610fa0789f9d8e.png'" mode=""></image>
 								开始时间：{{this.begintime|timeFormat()}}
 							</view>
 							<view class="oldtimes_left">
@@ -36,7 +36,7 @@
 						</view>
 						<view class="newtimes_end" @click="picktwoshow = !picktwoshow">
 							<view class="oldtimes_left">
-								<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'" mode=""></image>
+								<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'" mode=""></image>
 								结束时间：{{this.end|timeFormat()}}
 							</view>
 							<view class="oldtimes_left">
@@ -113,7 +113,7 @@
 				historydatas: [],
 				page: 1,
 				forbidden: false,
-				pagesum: null,
+				pagesum: 1,
 				datalength:0,
 				scrollTF:true,
 				indexone:0,//折线图数据切换列表下标

pages/environment/index.vue

@@ -13,10 +13,10 @@
 					</view>
 				 </uni-nav-bar>
 			</view>
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/1.png'" mode="" class="image"></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/1.png'" mode="" class="image"></image>
 			<view class="prevents">
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
-					<image :src="item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/prevention/6.png':'http://static.yfpyx.com/bigdata_app/image/prevention/7.png'" mode=""
+					<image :src="item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'" mode=""
 					 class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称：{{item.equip_name==""?"无":item.equip_name}}</p>
@@ -29,8 +29,24 @@
 				</view>
 			</view>
 		</view>
-		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+		<view class="top">
+			<view class="backtop" @click="top" v-if="isTop">
+				<image src="../../static/images/1.png" mode="" class="img0"></image>
+			</view>
+			<view class="more">
+				<view class="box" @click="online" v-show="filtrateTF">
+					<p>在线</p>
+				</view>
+				<view class="box" @click="offline" v-show="filtrateTF">
+					<p>离线</p>
+				</view>
+				<view class="box" @click="complete" v-show="filtrateTF">
+					<p>全部</p>
+				</view>
+				<view @click="filtrate">
+					<image src="../../static/images/b0bcdb0e3fe8690520f743aa8303bf2.png" mode="" class="img1"></image>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -42,7 +58,9 @@
 				page: 1,
 				size: 10,
 				eqlistdata: [],
-				isTop:false
+				isTop:false,
+				filtrateTF:false,
+				device_status:""
 			}
 		},
 		methods: {
@@ -51,6 +69,7 @@
 					url: '/api/api_gateway?method=weather.weather.qxz_page',
 					data: {
 						page: this.page,
+						device_status:this.device_status
 					}
 				})
 				this.eqlistdata = this.eqlistdata.concat(res.ids)
@@ -71,11 +90,35 @@
 					url: "./equipment?shebei=" + JSON.stringify(data)
 				})
 			},
+			filtrate(){
+				this.filtrateTF = !this.filtrateTF
+			},
 			top() {
 				uni.pageScrollTo({
 					scrollTop: 0,
 					duration: 500
 				})
+			},
+			online(){
+				this.eqlistdata=[]
+				this.page = 1
+				this.device_status = 1
+				this.eqlist()
+				this.filtrateTF = !this.filtrateTF
+			},
+			offline(){
+				this.eqlistdata=[]
+				this.page = 1
+				this.device_status = 0
+				this.eqlist()
+				this.filtrateTF = !this.filtrateTF
+			},
+			complete(){
+				this.eqlistdata=[]
+				this.page = 1
+				this.device_status = ""
+				this.eqlist()
+				this.filtrateTF = !this.filtrateTF
 			}
 		},
 		onLoad() {
@@ -122,7 +165,6 @@
 			border-radius: 30rpx;
 			display: flex;
 			line-height: 60rpx;
-	
 			.search {
 				padding: 0 20rpx;
 				font-size: 34rpx;
@@ -183,12 +225,31 @@
 	}
 	.top {
 		position: fixed;
-		right: 30px;
-		bottom: 100px;
+		right: 10px;
+		bottom: 40px;
 		z-index: 100;
-		image{
+		image {
 			width: 100rpx;
 			height: 100rpx;
 		}
+		.backtop{
+			display: flex;
+			justify-content: flex-end;
+			margin-bottom: 10rpx;
+		}
+		.more{
+			display: flex;
+		}
+		.box{
+			width: 80rpx;
+			height: 80rpx;
+			background-color: rgba(161,161,161,0.45);
+			border-radius: 50%;
+			text-align: center;
+			line-height: 80rpx;
+			box-sizing: border-box;
+			margin: 14rpx 10rpx 0 0;
+			color: #fff;
+		}
 	}
 </style>

pages/environment/search.vue

@@ -11,7 +11,7 @@
 			</view>
 			<view class="prevents">
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
-					<image :src="item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/prevention/6.png':'http://static.yfpyx.com/bigdata_app/image/prevention/7.png'"
+					<image :src="item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
 					 mode="" class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称：{{item.equip_name==""?"无":item.equip_name}}</p>

pages/equipList/index.vue

@@ -1,20 +1,20 @@
 <template>
 	<view>
 		<view class="utabs_box" >
-			<view class="search_bot_input" @click="clickRight">
-				<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinput" disabled/>
+			<view class="search_bot_input">
+				<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinput"/>
 				<u-icon name="search" size="36" class="icon" @click="search" color="#949494"></u-icon>
 			</view>
 			<view class="utabs">
 				<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" item-width="140" font-size="24" gutter="20"
-				 bar-width="60" active-color="#42b983"></u-tabs>
+				 bar-width="60" active-color="#42b983" ></u-tabs>
 			</view>
 		</view>
 		<view class="list">
 			<view class="list_item" v-for="(item,index) in eqlistdata" :key="index" @click="historys(item)">
 				<view class="list_item_top">
 					<p class="p1">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+imgpath[0].path" mode=""></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+imgpath[0].path" mode=""></image>
 						{{item.device_name==''?"--":item.device_name}}
 					</p>
 					<p :class="[item.is_online?'p2':'p_out']">{{item.is_online?"在线":"离线"}}</p>
@@ -22,7 +22,7 @@
 				<view class="list_item_text">
 					<p>设备ID：{{item.imei||item.device_id}}</p>
 					<p>适配用户：{{item.real_name==''?"无":item.real_name}}</p>
-					<p>添加设备时间：{{item.addtime|timeFormat()}}</p>
+					<p>最新上报时间：{{item.addtime|timeFormat()}}</p>	
 					<p>添加设备时间：{{item.uptime|timeFormat()}}</p>
 					<p>设备已运行：{{item.days}}天</p>
 				</view>
@@ -32,12 +32,16 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		Debounce,
+		Throttle
+	} from "../../util/anitthro.js"
 	export default {
 		data() {
 			return {
@@ -82,7 +86,8 @@
 				isTop: false,
 				infoalter: false, // 权限设置,
 				type_id: 0, //设备类型,
-				imgpath:[]
+				imgpath:[],
+				imports:""
 			}
 		},
 		methods: {
@@ -93,6 +98,7 @@
 						device_type_id: this.type_id,
 						page: this.page,
 						page_size: this.size,
+						device_id: this.imports,
 					}
 				})
 				var newtime = +new Date() / 1000
@@ -114,6 +120,7 @@
 						device_type_id: this.type_id,
 						page: this.page,
 						page_size: this.size,
+						device_id: this.imports,
 					}
 				})
 				var newtime = +new Date() / 1000
@@ -158,11 +165,6 @@
 					this.eqlist()
 				}
 			},
-			clickRight() { //搜索
-				uni.navigateTo({
-					url: "./search?id=" + this.type_id
-				})
-			},
 			modification(item) {
 				uni.navigateTo({
 					url: "./modification?data=" + JSON.stringify(item) + "&id=" + this.type_id,
@@ -174,6 +176,26 @@
 					duration: 500
 				})
 			},
+			searchinput(){
+				Debounce(() => {
+					this.eqlistdata = []
+					this.page = 1
+					if (this.type_id == 10) {
+						this.xyeqlist()
+					} else {
+						this.eqlist()
+					}
+				}, 1000)()
+			},
+			search(){
+				this.eqlistdata = []
+				this.page = 1
+				if (this.type_id == 10) {
+					this.xyeqlist()
+				} else {
+					this.eqlist()
+				}
+			},
 			historys(item) {
 				switch (this.type_id) {
 					case 2:
@@ -332,7 +354,7 @@
 			background-color: #ebebeb;
 			border-radius: 27rpx;
 			box-sizing: border-box;
-			padding-top: 8rpx;
+			padding-top: 4rpx;
 			margin: 0 auto;
 			position: relative;
 			input {

pages/equipList/modification.vue

@@ -12,18 +12,18 @@
 				</view>
 				<view class="mod_id">
 					<p>设备ID</p>
-					<input type="text" :value="moddata.imei||moddata.device_id" disabled />
+					<input type="text" :value="moddata.imei || moddata.device_id" disabled />
 				</view>
 				<view class="mod_user">
 					<p>适配用户</p>
 					<input type="text" :value="moddata.real_name==''?'无':moddata.real_name" disabled />
 				</view>
 				<view class="mod_city" @click="amendcity">
-					<p><span style="color: #ff0000;" v-if="quanxian.cityalter">*</span>设备位置</p>
-					<view style="display: flex;">
-						<input type="text" :value="city" disabled style="width: 400rpx;" />
-						<u-icon name="arrow-right"></u-icon>
+					<view style="width: 90%;">
+						<p><span style="color: #ff0000;" v-if="quanxian.cityalter">*</span>设备位置</p>
+						<input type="text" :value="city" disabled />
 					</view>
+					<u-icon name="arrow-right"></u-icon>
 				</view>
 				<view class="mod_time">
 					<p>设备添加时间</p>
@@ -64,10 +64,15 @@
 				})
 				console.log(res)
 				if (res==false) {
-					uni.showModal({
-						title: "修改地址失败",
+					uni.showToast({
+						title: '修改地址失败!',
 						icon: "none"
-					})
+					});
+				}else{
+					uni.showToast({
+						title: '修改地址成功!',
+						icon: "none"
+					});
 				}
 			},
 			async eqlistname() { //修改设备名称
@@ -80,10 +85,19 @@
 				})
 				console.log(res)
 				if (res==false) {
-					uni.showModal({
-						title: "修改名称失败",
+					uni.showToast({
+						title: '修改名称失败!',
 						icon: "none"
+					});
+				}else{
+					uni.showToast({
+						title: '修改名称成功!',
+						icon: "none"
+					});
+					uni.removeStorage({
+						key: "location"
 					})
+					this.clickLeft()
 				}
 			},
 			async eqlistuser(id, imei) { //获取设备信息
@@ -112,10 +126,6 @@
 			btn() {
 				this.eqlistcity(this.moddata.lat, this.moddata.lng)
 				this.eqlistname()
-				uni.removeStorage({
-					key: "location"
-				})
-				this.clickLeft()
 			},
 			clickLeft() {
 				uni.navigateBack({
@@ -207,8 +217,7 @@
 		.mod_name,
 		.mod_id,
 		.mod_user,
-		.mod_time,
-		.mod_city {
+		.mod_time {
 			width: 90%;
 			margin: 30rpx auto;
 			display: flex;
@@ -226,6 +235,24 @@
 				padding: 10rpx;
 			}
 		}
+		.mod_city{
+			width: 90%;
+			margin: 30rpx auto;
+			background-color: #FFFFFF;
+			padding: 20rpx 10rpx;
+			color: #57C77A;
+			line-height: 50rpx;
+			display: flex;
+			justify-content: space-between;
+			.namebg{
+				background-color: #FAFAFA;
+			}
+			input {
+				width: 90%;
+				font-size: 28rpx;
+				padding: 10rpx;
+			}
+		}
 	}
 
 	.sub {

pages/equipList/search.vue

@@ -4,7 +4,7 @@
 		<view style="position: fixed;z-index: 100;background-color: #FFFFFF;height: 80px;top: 40px;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备搜索"></uni-nav-bar>
 			<view class="search_top_input">
-				<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinp" />
+				<input type="text" value="" placeholder="请输入设备ID" v-model="imports" />
 				<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
 			</view>
 		</view>
@@ -12,7 +12,7 @@
 			<view class="list_item" v-for="(item,index) in eqlistdata" :key="index" @click="historys(item)">
 				<view class="list_item_top">
 					<p class="p1">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+ imgpath[0].path" mode=""></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+ imgpath[0].path" mode=""></image>
 						{{item.device_name==''?"--":item.device_name}}
 					</p>
 					<p :class="[item.is_online?'p2':'p_out']">{{item.is_online?"在线":"离线"}}</p>
@@ -115,10 +115,15 @@
 				})
 			},
 			search() { //搜索
-				this.eqlistdata = []
-				this.page = 1
-				this.eqlist()
-				console.log(1)
+				// this.eqlistdata = []
+				// this.page = 1
+				// this.eqlist()
+				// console.log(1)
+				this.system(this.imports)
+			},
+			system(str){
+				var arr = str.split(",")
+				console.log(arr)
 			},
 			searchinput() {
 				Debounce(() => {

pages/equipMange/index/addusers.vue

@@ -55,6 +55,13 @@
 					</view>
 				</u-form>
 			</view>
+			<view class="hintgroup">
+				<span v-if="TF.nametf">●请输入姓名</span>
+				<span v-if="TF.namelongtf">●姓名长度请在2~10个字符</span>
+				<span v-if="TF.iphonetf">●请输入手机号</span>
+				<span v-if="TF.iphonetftwo">●请输入正确的手机号</span>
+				<span v-if="TF.passTF">●请输入密码</span>
+			</view>
 			<button class="submitbtn" @click="addusers">确 定</button>
 			<u-popup v-model="typesofrole[0].show" mode="bottom" length="30%" class="pop-up">
 				<scroll-view scroll-y="true" class="sheet">
@@ -148,7 +155,14 @@
 					text: "是"
 				}, {
 					text: "否"
-				}]
+				}],
+				TF:{
+					nametf:false,
+					namelongtf:false,
+					iphonetf:false,
+					iphonetftwo:false,
+					passTF:false
+				}
 			}
 		},
 		methods: {
@@ -200,8 +214,42 @@
 						cs_user: this.form.testuser == "是" ? 1 : 0
 					}
 				})
+				if(res){
+					uni.showToast({
+						title: "添加成功",
+						icon: "none"
+					})
+				}
 			},
 			addusers() {
+				if(this.form.name==null){
+					this.TF.nametf = true
+				}else{
+					this.TF.nametf = false
+					if(this.form.name.length<2 || this.form.name.length>10){
+						this.TF.namelongtf = true
+					}else{
+						this.TF.namelongtf = false
+					}
+				}
+				
+				if(this.form.intro==null){
+					this.TF.iphonetf = true
+				}else{
+					this.TF.iphonetf = false
+					var str = /^1[3-9]\d{9}$/.test(this.form.intro)
+					if(!str){
+						this.TF.iphonetftwo = true
+					}else{
+						this.TF.iphonetftwo = false
+					}
+				}
+				if(this.form.passwold==null){
+					console.log(1)
+					this.TF.passTF = true
+				}else{
+					this.TF.passTF = false
+				}
 				if (this.form.name && this.form.intro && this.form.passwold) {
 					this.getaddusers()
 					uni.navigateTo({
@@ -220,7 +268,7 @@
 			this.getThemes()
 		},
 		onReady() {
-			this.$refs.uForm.setRules(this.rules);
+			// this.$refs.uForm.setRules(this.rules);
 		}
 	}
 </script>
@@ -249,7 +297,13 @@
 
 		}
 	}
-
+	.hintgroup{
+		width: 90%;
+		margin: 20rpx auto;
+		color: #FF0000;
+		display: flex;
+		justify-content: space-around;
+	}
 	.submitbtn {
 		width: 95%;
 		position: absolute;

pages/equipMange/index/assignment.vue

@@ -15,7 +15,7 @@
 				<checkbox-group class="che_group" @change="checkboxchange">
 					<label class="equipment" v-for="(items,index) in assignment" :key="index">
 						<view class="equipment_top">
-							<image :src="'http://static.yfpyx.com/bigdata_app'+items.src" mode="" class="equipment_top_img"></image>
+							<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+items.src" mode="" class="equipment_top_img"></image>
 							<span class="equipment_top_name">{{list[items.device_type_id-1].name}}</span>
 							<checkbox :value="String(items.d_id)" :checked="items.device_user==user_info.uid" class="ucheckbox" color="#42b983" />
 						</view>
@@ -33,7 +33,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

pages/equipMange/index/index.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="userlists">
 				<view class="userlist-li" v-for="(item,index) in userlists" :kex="index" @click="userOperation(userlists[index])">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/fourMoodBase/touxiang.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/touxiang.png'" mode=""></image>
 					<p class="userlist-li-city">{{item.username}}</p>
 					<p class="userlist-li-eamil">{{item.mobile}}</p>
 				</view>
@@ -24,7 +24,7 @@
 			新 增 用 户
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

pages/expertDiagnosis/exchangeShare.vue

@@ -11,17 +11,17 @@
 				<view class="invitations_item" v-for="(items,index) in invitation" :key="index" @click="particulars(items)">
 					<view class="invitations_item_left">
 						<image :src="items.img_urls" mode="" v-if="items.img_urls!='' && items.img_urls!=null"></image>
-						<image :src="'http://static.yfpyx.com/projectimg'+defaultimg" mode="" v-else></image>
+						<image :src="'http://www.hnyfwlw.com:8006/projectimg'+defaultimg" mode="" v-else></image>
 					</view>
 					<view class="invitations_item_right">
 						<view class="invitations_item_right_top">
-							<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'" mode="" v-if="Number(items.heat) == 1"></image>
+							<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'" mode="" v-if="Number(items.heat) == 1"></image>
 							<span>{{items.title}}</span>
 						</view>
 						<view class="invitations_item_right_contert" v-html="items.content">
 						</view>
 						<view class="invitations_item_right_bot">
-							<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/expertDiagnosis/d2014837228702eeceb762bc5302b3f.png'" mode=""></image>
+							<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/d2014837228702eeceb762bc5302b3f.png'" mode=""></image>
 							<span>{{items.username}}</span>
 							<p>查看详情</p>
 						</view>
@@ -36,7 +36,7 @@
 			发 帖
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

pages/expertDiagnosis/index.vue

@@ -5,18 +5,18 @@
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="专家诊断"></uni-nav-bar>
 			</view>
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/expertDiagnosis/05571341dbb0771b23d0b271764ac2e.png'" class="expertimages"></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/05571341dbb0771b23d0b271764ac2e.png'" class="expertimages"></image>
 			<view class="expert_details">
 				<view class="details_item" @click="worm">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/expertDiagnosis/6612b1293fd1f45dd7ce6269a954999.png'"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6612b1293fd1f45dd7ce6269a954999.png'"></image>
 					<p>虫情百科</p>
 				</view>
 				<view class="details_item" @click="virus">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/expertDiagnosis/7f34f4eeba4d00819369cfa1b5ecce8.png'"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/7f34f4eeba4d00819369cfa1b5ecce8.png'"></image>
 					<p>病害百科</p>
 				</view>
 				<view class="details_item" @click="exchange">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/expertDiagnosis/aa6a168b9fb72b62b687a2debc04a9f.png'"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/aa6a168b9fb72b62b687a2debc04a9f.png'"></image>
 					<p>交流圈</p>
 				</view>
 			</view>

pages/expertDiagnosis/introduce.vue

@@ -6,7 +6,7 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
 			</view>
 			<view class="img_box">
-				<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/loading-2.gif'" mode="" class="imgbg"></image>
+				<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/loading-2.gif'" mode="" class="imgbg"></image>
 				<image :src="wormcasedata.img_urls" mode="" class="img" @click="examine(wormcasedata.img_urls)"></image>
 			</view>
 			<p class="name">{{wormcasedata.name}}</p>

pages/expertDiagnosis/particulars.vue

@@ -1,17 +1,22 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view style="position: fixed;top: 40px;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
-			<u-swiper :list="list" height="428" @click="examine(list)"></u-swiper>
+		<view style="position: relative;top: 40px;">
+			<view style="position: fixed;z-index: 100;top: 40px;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
+			</view>
+			<!-- <u-swiper :list="list" height="428" @click="examine(list)"></u-swiper> -->
+			<view class="partitlteimg">
+				<image :src="list" mode="" class="img" @click="examine(list)"></image>
+			</view>
 			<view class="quiz">
 				<view class="quiz_username">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'" mode="" v-if="Number(quizdata.heat)==1"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'" mode="" v-if="Number(quizdata.heat)==1"></image>
 					<span>{{quizdata.title}}</span>
 				</view>
 				<view class="quiz_usertime">
 					<view style="display: flex;align-items: center;">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/fourMoodBase/touxiang.png'" mode=""></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/touxiang.png'" mode=""></image>
 						<span>{{quizdata.username}}</span>
 					</view>
 					<view>
@@ -41,7 +46,7 @@
 				</scroll-view>
 			</view>
 		</view>
-		<view class="issue_box" :style="{position: 'absolute',bottom: height+'px'}">
+		<view class="issue_box" :style="{position: 'fixed',bottom: height+'px'}">
 			<view class="issue">
 				<input type="text" v-model="issuedata" @focus="focus" :auto-blur="true" :adjust-position='false' @blur="blur"
 				 @confirm="confirm" />
@@ -122,9 +127,9 @@
 			examine(list){
 				console.log(list)
 				var imgarr =[]
-				for(var i=0;i<list.length;i++){
-					imgarr.unshift(list[i].image)
-				}
+				// for(var i=0;i<list.length;i++){
+					imgarr.unshift(list)
+				// }
 				console.log(imgarr)
 				uni.previewImage({
 					urls: imgarr
@@ -135,20 +140,28 @@
 			this.quizdata = JSON.parse(option.items)
 			console.log(this.quizdata.lower)
 			if (this.quizdata.img_urls == '' || this.quizdata.img_urls == null) {
-				this.list[0].image = 'http://static.yfpyx.com/projectimg' + this.defaultimg
+				this.list = 'http://www.hnyfwlw.com:8006/projectimg' + this.defaultimg
 			} else {
-				this.list[0].image = this.quizdata.img_urls
+				this.list = this.quizdata.img_urls
 			}
 			this.getParticulars(this.quizdata.lower)
 		}
 	}
 </script>
 <style lang="scss">
-	.u-swiper-wrap {
+	// .u-swiper-wrap {
+	// 	width: 95%;
+	// 	margin: 20rpx auto;
+	// }
+	.partitlteimg{
 		width: 95%;
-		margin: 20rpx auto;
+		margin: 80rpx auto 20rpx;
+		height: 428rpx;
+		.img{
+			width: 100%;
+			height: 428rpx;
+		}
 	}
-
 	.quiz {
 		width: 95%;
 		margin: 20rpx auto;
@@ -205,6 +218,7 @@
 		}
 
 		.scroll-view_H {
+			margin-top: 20rpx;
 			height: 600rpx;
 		}
 

pages/expertDiagnosis/postmessage.vue

@@ -9,9 +9,10 @@
 				</view>
 				<view class="post_contert">
 					<textarea v-model="mainbody" placeholder="请输入正文" />
+					<p class="imgvideo_img_title">添加图片</p>
 					<view class="imgvideo_img">
 						<view @click="gainimg" class="imgbg">
-							<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png'" mode="" v-if="!uploadingTF"></image>
+							<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png'" mode="" v-if="!uploadingTF"></image>
 						</view>
 						<view class="uploading" v-if="uploadingTF">
 							<u-icon name="close" class="delete" @click="deletes"></u-icon>
@@ -52,16 +53,36 @@
 					}
 				})
 				console.log(res)
+				if(res){
+					uni.showToast({
+						title: "发帖成功",
+						icon: "none"
+					})
+					setTimeout(()=>{
+						uni.navigateTo({
+							url: './exchangeShare'
+						})
+					},1000)
+				}
 			},
 			post(){
+				if(this.title==''){
+					uni.showToast({
+						title: "请输入标题",
+						icon: "none"
+					})
+				}
+				if(this.mainbody==''){
+					uni.showToast({
+						title: "请输入正文",
+						icon: "none"
+					})
+				}
 				if(this.title!=''&&this.mainbody!=''){
 					let obj ={}
 					obj.title=this.title
 					obj.content=this.mainbody
 					this.getPostmessage(obj)
-					uni.navigateTo({
-						url: './exchangeShare'
-					})
 				}
 			},
 			clickLeft(){
@@ -83,7 +104,7 @@
 			onok(ev){
 				console.log(ev)
 				uni.uploadFile({
-				    url: 'http://182.92.193.64:8002/api/api_gateway?method=pest.pests.pests_img', //仅为示例，非真实的接口地址
+				    url: 'https://wx.hnyfwlw.com/api/api_gateway?method=pest.pests.pests_img', //仅为示例，非真实的接口地址
 					filePath: ev.path,
 				    name: 'img_file',
 				    formData: {
@@ -139,12 +160,18 @@
 			padding: 40rpx 20rpx;
 			background-color: white;
 			width: 100%;
-			height: 660rpx;
+			height: 700rpx;
 			box-sizing: border-box;
 			textarea{
 				width: 90%;
 				margin: 0 auto;
 			}
+			.imgvideo_img_title{
+				width: 90%;
+				margin: 20rpx auto;
+				font-size: 32rpx;
+				color: grey;
+			}
 			.imgvideo_img{
 				width: 250rpx;
 				height: 250rpx;

pages/expertDiagnosis/wormcase.vue

@@ -8,7 +8,7 @@
 			<view class="particulars">
 				<view class="particulars_item" v-for="(item,index) in content" :key="index" @click="introduce(item.id)">
 					<view class="imgs">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="" class="imgbg"></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="" class="imgbg"></image>
 						<image :src="item.img_urls" mode="" class="imgs_img"></image>
 					</view>
 					<p>{{item.name}}</p>
@@ -16,7 +16,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

pages/fourBase/addbase.vue

@@ -49,11 +49,19 @@
 					<span><span style="color: #ff0000;margin: 0;">*</span>设备绑定</span>
 					<u-icon name="arrow-right" class="iconright"></u-icon>
 				</view>
-				<view class="base_id_box">
-					<view class="base_id" v-for="(item,key,index) in base_id" :key="index">
-						<view class="base_id_item" v-for="(items,indexs) in item" :key="indexs">
-							<span>{{key}}</span>
-							<span>{{items}}</span>
+				<view class="base_id_box"  v-if="baseobjtf">
+					<view class="base_id" v-for="(item,index) in base_id" :key="index">
+						<view class="base_id_item">
+							<span>{{item.device_id}}</span>
+							<span>{{item.type_name}}</span>
+						</view>
+					</view>
+				</view>
+				<view class="base_id_box" v-else>
+					<view class="base_id" v-for="items,indexs in baseobj" :key="indexs">
+						<view class="base_id_item">
+							<span>{{items.arr}}</span>
+							<span>{{items.name}}</span>
 						</view>
 					</view>
 				</view>
@@ -73,7 +81,8 @@
 		},
 		data() {
 			return {
-				base_id:{},
+				base_id:[],
+				baseobj:[],
 				baseinfo:{
 					base_name:'',//必传(str)           基地名称
 					base_charge:'',//必传(str)           负责人
@@ -88,6 +97,7 @@
 				},
 				city:'',
 				imgs:"",
+				baseobjtf:true
 			}
 		},
 		methods: {
@@ -102,6 +112,12 @@
 				uni.navigateTo({
 					url:"./index"
 				})
+				uni.removeStorage({
+					key:"typeid"
+				})
+				uni.removeStorage({
+					key:"location"
+				})
 			},
 			binding(){
 				uni.navigateTo({
@@ -176,15 +192,21 @@
 						});
 					}else{
 						console.log(this.baseinfo)
-						this.addbase()
+						if(!this.baseobjtf){
+							var arr = []
+							for(var i=0;i<this.baseobj.length;i++){
+									arr.push(this.baseobj[i].arr)
+							}
+							this.baseinfo.base_equip = arr.join("#")
+						}
+						console.log(this.baseinfo)
+						// this.addbase()
 						uni.removeStorage({
-						    key: 'id',
-						    success: function (res) {
-						       uni.navigateTo({
-						       	url:"./index"
-						       })
-						    }
-						});
+							key:"typeid"
+						})
+						uni.removeStorage({
+							key:"location"
+						})
 					}
 				}
 			},
@@ -199,7 +221,7 @@
 			},
 			onok(ev){
 				uni.uploadFile({
-					url: 'http://182.92.193.64:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+					url: 'https://wx.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
 					filePath: ev.path,
 					name: 'img_file',
 					formData: {
@@ -214,20 +236,49 @@
 			},
 			oncancle(){
 				this.imgs = ''
-			}
+			},
+			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)
+						this.city = ress.data.regeocode.formatted_address
+					}  
+				});
+			},
 		},
 		onLoad() {
 		},
 		onShow(){
 			uni.getStorage({
-			    key: 'id',
+				key:"location",
+				success:(res)=> {
+					console.log(res.data)
+					this.selectaddress(res.data[1],res.data[0])
+					this.baseinfo.lat = res.data[1]
+					this.baseinfo.lng = res.data[0]
+				}
+			})
+			uni.getStorage({
+			    key: 'typeid',
 			    success: (res)=> {
-						this.base_id = JSON.parse(res.data)
-						var arr = []
-						for(var key in this.base_id){
-							arr.push(this.base_id[key].join("#"))
+					this.baseobjtf = false
+					console.log(JSON.parse(res.data))
+					var arr = []
+					for(var key in JSON.parse(res.data)){
+						console.log(key)
+						for(var i=0;i<JSON.parse(res.data)[key].length;i++){
+							var obj={
+								name:key,
+								arr:JSON.parse(res.data)[key][i]
+							}
+							arr.push(obj)
 						}
-						this.baseinfo.base_equip = arr.join("#")
+					}
+					console.log(arr)
+					this.baseobj = arr
 			    }
 			});
 		}
@@ -261,6 +312,7 @@
 	position: absolute;
 	top: 390rpx;
 	width: 100%;
+	margin-bottom: 50rpx;
 	.title{
 		width: 90%;
 		margin: 20rpx auto;

pages/fourBase/allocation.vue

@@ -15,7 +15,7 @@
 				<checkbox-group class="che_group" @change="checkboxchange">
 					<label class="equipment" v-for="(items,indexs) in assignments.children" :key="items.id">
 						<view class="equipment_top">
-							<image :src="'http://static.yfpyx.com/bigdata_app'+assignments.src" mode="" class="equipment_top_img"></image>
+							<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+assignments.src" mode="" class="equipment_top_img"></image>
 							<span class="equipment_top_name">{{assignments.type_name}}</span>
 							<checkbox :value="String(items.type_name)" :checked="items.check" class="ucheckbox" color="#42b983" />
 						</view>
@@ -33,7 +33,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>
@@ -50,29 +50,42 @@
 				current: 0,
 				assignment_items: [],
 				images: [{
-					path: "/image/fourMoodBase/1.png",
-					id: 3
-				}, {
-					path: "/image/fourMoodBase/5.png",
-					id: 5
-				}, {
-					path: "/image/fourMoodBase/2.png",
-					id: 6
-				}, {
-					path: "/image/fourMoodBase/4.png",
-					id: 7
-				},
-				{
-					path: "/image/fourMoodBase/10.png",
-					id: 10
-				}],
+						path: "/image/fourMoodBase/1.png",
+						id: 3
+					}, {
+						path: "/image/fourMoodBase/5.png",
+						id: 5
+					}, {
+						path: "/image/fourMoodBase/2.png",
+						id: 6
+					}, {
+						path: "/image/fourMoodBase/4.png",
+						id: 7
+					},
+					{
+						path: "/image/fourMoodBase/10.png",
+						id: 10
+					}
+				],
 				src: '',
 				obj: {},
-				addtype: [],
-				isTop:false
+				isTop: false,
+				base_id: "",
+				baseidarr: ""
 			}
 		},
 		methods: {
+			async ybase() { //获取基地设备
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=base.bases.base_map_list',
+					data: {
+						base_id: this.base_id
+					}
+				})
+				this.baseidarr = res
+				console.log(res)
+				this.getFourbase()
+			},
 			async getFourbase() { //基地列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=base.bases.base_equip',
@@ -91,8 +104,8 @@
 				this.assignments = this.assignment[this.current]
 				for (let i = 0; i < this.assignments.children.length; i++) {
 					this.assignments.children[i].check = false
-					for (let j = 0; j < this.addtype.length; j++) {
-						if (this.assignments.children[i].type_name == this.addtype[j]) {
+					for (let j = 0; j < this.baseidarr.length; j++) {
+						if (this.assignments.children[i].type_name == this.baseidarr[j].device_id) {
 							this.assignments.children[i].check = true
 							console.log(this.assignments.children[i].check)
 						}
@@ -102,37 +115,26 @@
 			forchange(obj) {
 				for (let i = 0; i < this.assignments.children.length; i++) {
 					this.assignments.children[i].check = false
-				}
-				for (let i = 0; i < this.assignments.children.length; i++) {
-					// this.assignments.children[i].check = false
-					for (let j = 0; j < this.addtype.length; j++) {
-						if (this.assignments.children[i].type_name == this.addtype[j]) {
-							this.assignments.children[i].check = true
-							console.log(this.assignments.children[i].check)
-						}
-					}
-				}
-				for (let key in obj) {
-					for (let i = 0; i < key.length; i++) {
-						for (let j = 0; j < this.assignments.children.length; j++) {
-							if (Number(obj[key][i]) == this.assignments.children[j].type_name) {
-								this.assignments.children[j].check = true
-
+					for (let key in obj) {
+						if(key==this.list[this.current].name){
+							for(let j = 0; j < obj[key].length; j++){
+								if(this.assignments.children[i].type_name == obj[key][j]){
+									this.assignments.children[i].check = true
+								}
 							}
 						}
 					}
 				}
-				this.$forceUpdate()
 			},
 			change(index) {
 				this.current = index
 				this.assignments = this.assignment[index]
-				this.forchange(this.obj)
 				console.log(this.obj)
+				this.forchange(this.obj)
 			},
 			checkboxchange(e, items) {
-				this.obj[this.assignments.type_name] = e.detail.value
-				this.forchange(this.obj)
+				this.obj[this.assignments.type_name] = JSON.parse(JSON.stringify(e.detail.value))
+				console.log(this.obj)
 			},
 			clickLeft() {
 				uni.navigateBack({
@@ -144,14 +146,13 @@
 			},
 			canfirm() {
 				uni.setStorage({
-					key: "id",
-					data: JSON.stringify(this.obj),
-					success: () => {
+					key:"typeid",
+					data:JSON.stringify(this.obj),
+					success:()=>{
 						uni.navigateBack({
-							delta: 1
+							delta:1
 						})
 					}
-
 				})
 			},
 			top() {
@@ -162,12 +163,8 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
-			if (option.type) {
-				this.addtype = option.type.split("#")
-				console.log(this.addtype)
-			}
-			this.getFourbase()
+			this.base_id = option.base_id
+			this.ybase()
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听，可用bindingx代替
 			if (e.scrollTop > 200) { //距离大于200时显示
@@ -183,7 +180,7 @@
 	.utabs {
 		width: 100%;
 		position: fixed;
-		top: 84px;
+		top: 88px;
 		z-index: 100;
 	}
 
@@ -315,11 +312,13 @@
 			background-color: #42b983;
 		}
 	}
+
 	.top {
 		position: fixed;
 		right: 30px;
 		bottom: 100px;
 		z-index: 100;
+
 		image {
 			width: 100rpx;
 			height: 100rpx;

pages/fourBase/basefacility.vue

@@ -8,7 +8,7 @@
 			<view class="ass_list">
 				<view class="equipment" v-for="(items,indexs) in assignments" :key="items.id" v-if="tishiTF" @click="skip(JSON.stringify(items))">
 					<view class="equipment_top">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+items.src" mode="" class="equipment_top_img"></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+items.src" mode="" class="equipment_top_img"></image>
 						<span class="equipment_top_name">{{items.type_name}}</span>
 					</view>
 					<view class="equipment_bot">
@@ -23,7 +23,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

pages/fourBase/city.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<citySelect :getCity="getCity"></citySelect>	
+		<citySelect :getCity="getCityA"></citySelect>	
 	</view>
 </template>
 
@@ -17,8 +17,9 @@
 		},
 		methods: {
 			getCity({
-				city
+				e
 			}){
+				console.log(e)
 				//city 城市名称
 				//name 定位名称
 				if(city.city == undefined){
@@ -31,7 +32,7 @@
 				let prevpage = pages[pages.length - 2]
 				prevpage.$vm.city = add
 				uni.navigateBack({
-					delta:1
+					delta:2
 				})
 			}
 		}

pages/fourBase/index.vue

@@ -30,9 +30,9 @@
 					</view>
 					<u-icon name="more-dot-fill" class="bases_list_xiangqing" @click.native.stop="XQclick(items)"></u-icon>
 					<view class="photoshow">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/fourMoodBase/1.png'" mode=""></image>
-						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/fourMoodBase/3.png'" mode=""></image>
-						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/fourMoodBase/5.png'" mode=""></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/1.png'" mode=""></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/3.png'" mode=""></image>
+						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/5.png'" mode=""></image>
 						<view class="photoshow_num">
 							{{items.num}}
 						</view>
@@ -45,7 +45,7 @@
 			新 增 基 地
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>

pages/fourBase/modification.vue

@@ -49,11 +49,19 @@
 				<span><span style="color: #ff0000;margin: 0;">*</span>设备绑定</span>
 				<u-icon name="arrow-right" class="iconright"></u-icon>
 			</view>
-			<view class="base_id_box">
-				<view class="base_id" v-for="(item,key,index) in base_id" :key="index">
-					<view class="base_id_item" v-for="(items,indexs) in item" :key="indexs">
-						<span>{{key}}</span>
-						<span>{{items}}</span>
+			<view class="base_id_box"  v-if="baseobjtf">
+				<view class="base_id" v-for="(item,index) in base_id" :key="index">
+					<view class="base_id_item">
+						<span>{{item.device_id}}</span>
+						<span>{{item.type_name}}</span>
+					</view>
+				</view>
+			</view>
+			<view class="base_id_box" v-else>
+				<view class="base_id" v-for="items,indexs in baseobj" :key="indexs">
+					<view class="base_id_item">
+						<span>{{items.arr}}</span>
+						<span>{{items.name}}</span>
 					</view>
 				</view>
 			</view>
@@ -73,7 +81,8 @@
 		},
 		data() {
 			return {
-				base_id:{},
+				base_id:[],
+				baseobj:[],
 				baseinfo:{
 					base_name:'',//必传(str)           基地名称
 					base_charge:'',//必传(str)           负责人
@@ -86,7 +95,8 @@
 					lat:'',//必传(str)           纬度
 				},
 				city:'',
-				imgs:""
+				imgs:"",
+				baseobjtf:true
 			}
 		},
 		methods: {
@@ -94,18 +104,42 @@
 			async addbase() { //获取分布位置 
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=base.bases.base_list',
-					data:this.baseinfo
+					data:this.baseinfo,
+					ret:"modify"
+				})
+				console.log(res)
+				if(res){
+					uni.showToast({
+					    title: '修改成功', 
+					    duration: 2000,
+						icon:"none"
+					});
+				}
+			},
+			async ybase() { //获取基地设备
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=base.bases.base_map_list',
+					data: {
+						base_id: this.baseinfo.base_id
+					}
 				})
+				this.base_id = res
 				console.log(res)
 			},
 			clickLeft(){
 				uni.navigateTo({
 					url:"./index"
 				})
+				uni.removeStorage({
+					key:"typeid"
+				})
+				uni.removeStorage({
+					key:"location"
+				})
 			},
 			binding(){
 				uni.navigateTo({
-					url:"./allocation?type="+this.baseinfo.base_equip
+					url:"./allocation?base_id="+this.baseinfo.base_id
 				})
 			},
 			gainimg() { //添加图片
@@ -175,11 +209,20 @@
 							icon:"none"
 						});
 					}else{
+						if(!this.baseobjtf){
+							var arr = []
+							for(var i=0;i<this.baseobj.length;i++){
+									arr.push(this.baseobj[i].arr)
+							}
+							this.baseinfo.base_equip = arr.join("#")
+						}
 						console.log(this.baseinfo)
 						this.addbase()
-						localStorage.removeItem("id")
-						uni.navigateBack({
-							delta:1
+						uni.removeStorage({
+							key:"typeid"
+						})
+						uni.removeStorage({
+							key:"location"
 						})
 					}
 				}
@@ -197,7 +240,7 @@
 			},
 			onok(ev){
 				uni.uploadFile({
-					url: 'http://182.92.193.64:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
+					url: 'https://wx.hnyfwlw.com/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
 					filePath: ev.path,
 					name: 'img_file',
 					formData: {
@@ -221,17 +264,36 @@
 			this.baseinfo.ret = "modify"
 			delete this.baseinfo.id
 			this.selectaddress(this.baseinfo.lat,this.baseinfo.lng)
+			this.ybase()
 		},
 		onShow(){
 			uni.getStorage({
-			    key: 'id',
+				key:"location",
+				success:(res)=> {
+					console.log(res.data)
+					this.selectaddress(res.data[1],res.data[0])
+					this.baseinfo.lat = res.data[1]
+					this.baseinfo.lng = res.data[0]
+				}
+			})
+			uni.getStorage({
+			    key: 'typeid',
 			    success: (res)=> {
-					this.base_id = JSON.parse(res.data)
+					this.baseobjtf = false
+					console.log(JSON.parse(res.data))
 					var arr = []
-					for(var key in this.base_id){
-						arr.push(this.base_id[key].join("#"))
+					for(var key in JSON.parse(res.data)){
+						console.log(key)
+						for(var i=0;i<JSON.parse(res.data)[key].length;i++){
+							var obj={
+								name:key,
+								arr:JSON.parse(res.data)[key][i]
+							}
+							arr.push(obj)
+						}
 					}
-					this.baseinfo.base_equip = arr.join("#")
+					console.log(arr)
+					this.baseobj = arr
 			    }
 			});
 		}
@@ -265,6 +327,7 @@
 	position: absolute;
 	top: 390rpx;
 	width: 100%;
+	margin-bottom: 50rpx;
 	.title{
 		width: 90%;
 		margin: 20rpx auto;

pages/index/index.vue

@@ -3,7 +3,7 @@
 		<u-swiper :list="list" mode="dot" class="index_uswiper" height='300'></u-swiper>
 		<view class="function">
 			<view class="function_item" v-for="(item,index) in functionimg" :key="index" @click="tabfunction(index)">
-				<image :src="'http://static.yfpyx.com/bigdata_app'+item.src" mode=""></image>
+				<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+item.src" mode=""></image>
 				<p>{{item.text}}</p>
 			</view>
 		</view>
@@ -11,7 +11,7 @@
 			<p class="equipment_p">系统设备</p>
 			<view class="equipment_item">
 				<view class="equipment_item_img" v-for="(item,index) in equipmentimg" :key="index" @click="tabequipment(index)">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+item.src" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+item.src" mode=""></image>
 				</view>
 			</view>
 		</view>
@@ -34,7 +34,7 @@
 				loadTF:false,
 				currentPage: 'tabBar1',
 				list: [{
-					image: 'http://static.yfpyx.com/bigdata_app/image/index/11.png'
+					image: 'http://www.hnyfwlw.com:8006/bigdata_app/image/index/11.png'
 				}, ],
 				functionimg: [{
 						src: "/image/index/1.png",
@@ -92,16 +92,6 @@
 			this.getUserlogin()
 		}, 
 		onShow(){
-			this.jurisdiction={
-					cbtf:false,
-					jktf:false,
-					hjtf:false,
-					fztf:false,
-					sytf:false,
-					sbtf:false,
-					sqtf:false,
-					zjtf:false
-				}
 			this.loadTF = false
 			this.getUserlogin()
 		},
@@ -119,6 +109,16 @@
 					data: JSON.stringify(res.myuser_type),
 				})
 				console.log(res.children)
+				this.jurisdiction={
+						cbtf:false,
+						jktf:false,
+						hjtf:false,
+						fztf:false,
+						sytf:false,
+						sbtf:false,
+						sqtf:false,
+						zjtf:false
+					}
 				for(var i=0;i<res.children.length;i++){
 					switch (res.children[i].purview_name){
 						case "测报系统":

pages/login/login.vue

@@ -2,7 +2,7 @@
 	<view style="height: 100vh;">
 		<view class="status_bar"></view>
 		<view class="logo" >
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/login/8eef2e54055a5b072a5dc000919a7ae.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/login/8eef2e54055a5b072a5dc000919a7ae.png'" mode=""></image>
 		</view>
 		<!-- <view class="set" @click="set" v-if="setTF">
 		@longpress="logoTime"
@@ -31,7 +31,7 @@
 			</view>
 		</form>
 		<view class="bg">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/login/850c9307f4ef2d7dc6db1049711ab55.jpg'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/login/850c9307f4ef2d7dc6db1049711ab55.jpg'" mode=""></image>
 		</view>
 		<!-- <view class="setbg" v-if="setbgtf">
 			<view class="mengban" @click.stop="setbgtf = !setbgtf"></view>

pages/monitor/index.vue

@@ -5,7 +5,7 @@
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="监控系统"></uni-nav-bar>
 				<view class="" style="margin-top: -10rpx;">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/monitor/banner.png'" mode="widthFix"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/monitor/banner.png'" mode="widthFix"></image>
 				</view>
 			</view>
 			<view class="contenttf" v-if="contenttf">
@@ -28,7 +28,7 @@
 			</view>
 		</view>
 		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
 	</view>
 </template>
@@ -77,7 +77,7 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=camera.camera_manage.list_camera',
 					data: {
-						page: this.page
+						page: this.page,
 					}
 				})
 				console.log(res)

pages/my/about/about.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="line"></view>
 		<view class="logo-box">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image>
 			<view class="version">
 				<view>
 					云飞物联网

pages/my/index/index.vue

@@ -104,7 +104,7 @@
 							uni.removeStorage({
 								key:"session_key"
 							})
-							uni.navigateTo({
+							uni.reLaunch({
 								url: "../../login/login"
 							})
 						} else if (res.cancel) {

pages/prevention/control.vue

@@ -38,12 +38,12 @@
 				<view class="control_time" v-else>
 					<p class="title_p">开始结束时间</p>
 					<view class="control_off_off" @click="show3 = !show3">
-						<p>开始时间：{{condatas.st}}:00</p>
+						<p>开始时间：{{condatas.st?condatas.st:"00"}}:00</p>
 						<u-picker v-model="show3" mode="time" :params="params" @confirm="confirmFun"></u-picker>
 						<u-icon name="arrow-down-fill" size="12" color="#7F8082"></u-icon>
 					</view>
 					<view class="control_off_off" @click="show4 = !show4">
-						<p>结束时间：{{condatas.et}}:00</p>
+						<p>结束时间：{{condatas.et?condatas.et:"00"}}:00</p>
 						<u-picker v-model="show4" mode="time" :params="params" @confirm="confirmFun2"></u-picker>
 						<u-icon name="arrow-down-fill" size="12" color="#7F8082"></u-icon>
 					</view>
@@ -55,7 +55,7 @@
 							<u-slider v-model="condatas.dattim" min="0" max="100" step="1" active-color="#58C876"></u-slider>
 						</view>
 						<view class="" style="width: 10%;text-align: center;">
-							{{condatas.dattim || 0}}
+							{{condatas.dattim}}
 						</view>
 					</view>
 				</view>
@@ -66,7 +66,7 @@
 							<u-slider v-model="condatas.clt" min="0" max="100" step="1" active-color="#58C876"></u-slider>
 						</view>
 						<view class="" style="width: 10%;text-align: center;">
-							{{condatas.clt || 0}}
+							{{condatas.clt}}
 						</view>
 					</view>
 				</view>
@@ -92,7 +92,10 @@
 	export default {
 		data() {
 			return {
-				condatas: {},
+				condatas: {
+					clt:0,
+					dattim:0
+				},
 				checked1: false,
 				show1: false,
 				show2: false,

pages/prevention/equipmentdetails.vue

@@ -7,12 +7,12 @@
 			</view>
 			<view class="info">
 				<view class="info_item">
-					<image :src="eqinfo.item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/cb/onBg.png':'http://static.yfpyx.com/bigdata_app/image/cb/offBg.png'"
+					<image :src="eqinfo.item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/cb/onBg.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/cb/offBg.png'"
 					 mode="" class="bgi"></image>
 					<p style="font-size: 32rpx;" @click="copy(eqinfo.item.imei)">设备 ID：{{eqinfo.item.imei}}
-					<image src="http://static.yfpyx.com/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
+					<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
 					</p>
-					<p>设备名称：{{eqinfo.item.device_name}}</p>
+					<p>设备名称：{{eqinfo.item.device_name?eqinfo.item.device_name:"无"}}</p>
 					<p>设备型号：{{eqinfo.item.dtype}}</p>
 					<p>最近上报时间：{{eqinfo.item.addtime|timeFormat()}}</p>
 					<p>设备地址：{{eqinfo.item.address}}</p>
@@ -20,19 +20,19 @@
 			</view>
 			<view class="control">
 				<view class="control_item" v-if="kongtf" @click="control">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/8.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/8.png'" mode=""></image>
 					<p>设备控制</p>
 				</view>
 				<view class="control_item" v-if="shujutf" @click="charts">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/10.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/10.png'" mode=""></image>
 					<p>历史数据</p>
 				</view>
 				<view class="control_item" v-if="simtf" @click="sim">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/9.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/9.png'" mode=""></image>
 					<p>SIM卡详情</p>
 				</view>
 				<view class="control_item" @click="repairs">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/environment/7.png'" mode=""></image>
 					<p>一键报修</p>
 				</view>
 			</view>
@@ -42,7 +42,7 @@
 					<view class="realtime_text_item">
 						<view class="realtime_text_item_info" v-for="item,index in olddatas" :key="index">
 							<view class="item_info_img">
-								<image :src="'http://static.yfpyx.com/bigdata_app'+item.icon" mode=""></image>
+								<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode=""></image>
 							</view>
 							<view class="item_info_text">
 								<p>{{item.txt}}</p>
@@ -62,7 +62,11 @@
 	export default {
 		data() {
 			return {
-				eqinfo: {},
+				eqinfo: {
+					item:{
+						
+					}
+				},
 				olddata: {},
 				olddatas: [],
 				newdatesTF: false,
@@ -168,7 +172,7 @@
 				console.log(this.eqinfo.item)
 				var device_id = this.eqinfo.item.equip_id||this.eqinfo.item.device_id
 				uni.navigateTo({
-					url: "../afterSale/addafter?device_id="+ device_id +"&device_type="+ 5
+					url: "../afterSale/addafter?device_id="+ device_id +"&device_type="+ 2
 				})
 			},
 			control() { //设备控制

pages/prevention/index.vue

@@ -13,10 +13,10 @@
 				 </view>
 				 </uni-nav-bar>
 			</view>
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/1.png'" mode="" class="image"></image>
+			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1.png'" mode="" class="image"></image>
 			<view class="prevents">
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
-					<image :src="item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/prevention/6.png':'http://static.yfpyx.com/bigdata_app/image/prevention/7.png'"
+					<image :src="item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
 					 mode="" class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称：{{item.device_name==""?"无":item.device_name}}</p>
@@ -29,8 +29,24 @@
 				</view>
 			</view>
 		</view>
-		<view class="top" v-if="isTop" @click="top">
-			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+		<view class="top">
+			<view class="backtop" @click="top" v-if="isTop">
+				<image src="../../static/images/1.png" mode="" class="img0"></image>
+			</view>
+			<view class="more">
+				<view class="box" @click="online" v-show="filtrateTF">
+					<p>在线</p>
+				</view>
+				<view class="box" @click="offline" v-show="filtrateTF">
+					<p>离线</p>
+				</view>
+				<view class="box" @click="complete" v-show="filtrateTF">
+					<p>全部</p>
+				</view>
+				<view @click="filtrate">
+					<image src="../../static/images/b0bcdb0e3fe8690520f743aa8303bf2.png" mode="" class="img1"></image>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -42,7 +58,9 @@
 				page: 1,
 				size: 10,
 				eqlistdata: [],
-				isTop:false
+				isTop:false,
+				filtrateTF:false,
+				device_status:""
 			}
 		},
 		methods: {
@@ -53,6 +71,7 @@
 						device_type_id: 2,
 						page: this.page,
 						size: this.size,
+						device_status:this.device_status
 					}
 				})
 				this.eqlistdata = this.eqlistdata.concat(res.data)
@@ -73,11 +92,35 @@
 					url: "./equipmentdetails?shebei=" + JSON.stringify(data)
 				})
 			},
+			filtrate(){
+				this.filtrateTF = !this.filtrateTF
+			},
 			top() {
 				uni.pageScrollTo({
 					scrollTop: 0,
 					duration: 500
 				})
+			},
+			online(){
+				this.eqlistdata=[]
+				this.page = 1
+				this.device_status = 1
+				this.eqlist()
+				this.filtrateTF = !this.filtrateTF
+			},
+			offline(){
+				this.eqlistdata=[]
+				this.page = 1
+				this.device_status = 0
+				this.eqlist()
+				this.filtrateTF = !this.filtrateTF
+			},
+			complete(){
+				this.eqlistdata=[]
+				this.page = 1
+				this.device_status = ""
+				this.eqlist()
+				this.filtrateTF = !this.filtrateTF
 			}
 		},
 		onLoad() {
@@ -93,7 +136,7 @@
 			} else { //距离小于200时隐藏
 				this.isTop = false
 			}
-		},
+		}
 	}
 </script>
 
@@ -104,7 +147,7 @@
 
 	.image {
 		position: fixed;
-		top: 85px;
+		top: 83px;
 		width: 100%;
 		height: 160rpx;
 		z-index: 555;
@@ -186,12 +229,31 @@
 	}
 	.top {
 		position: fixed;
-		right: 30px;
-		bottom: 100px;
+		right: 10px;
+		bottom: 40px;
 		z-index: 100;
-		image{
+		image {
 			width: 100rpx;
 			height: 100rpx;
 		}
+		.backtop{
+			display: flex;
+			justify-content: flex-end;
+			margin-bottom: 10rpx;
+		}
+		.more{
+			display: flex;
+		}
+		.box{
+			width: 80rpx;
+			height: 80rpx;
+			background-color: rgba(161,161,161,0.45);
+			border-radius: 50%;
+			text-align: center;
+			line-height: 80rpx;
+			box-sizing: border-box;
+			margin: 14rpx 10rpx 0 0;
+			color: #fff;
+		}
 	}
 </style>

pages/prevention/search.vue

@@ -11,7 +11,7 @@
 			</view>
 			<view class="prevents">
 				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
-					<image :src="item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/prevention/6.png':'http://static.yfpyx.com/bigdata_app/image/prevention/7.png'"
+					<image :src="item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
 					 mode="" class="prevents_item_img"></image>
 					<view class="prevents_item_top">
 						<p>设备名称：{{item.device_name==""?"无":item.device_name}}</p>

pages/prevention/sim.vue

@@ -10,7 +10,7 @@
 					<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
 				</view>
 				<view class="sim_info_title">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/sim1.png'" mode=""></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/cb/sim1.png'" mode=""></image>
 					<p>sim卡查询{{"("+simnew+")"}}</p>
 				</view>
 				<view class="sim_info_text">
@@ -18,10 +18,10 @@
 					<p>ICCID：{{iccid}}</p>
 					<p>状态：{{state}}</p>
 					<p>套餐：{{siminfo.data.data_plan || siminfo.data.totalDataVolume}}MB</p>
-					<p v-if="simnew=='旧'">已用流量：{{siminfo.data.data_usage}}MB</p>
-					<p v-if="simnew=='新'">已用流量：{{siminfo.data.usedDataVolume}}MB</p>
-					<p v-if="simnew=='旧'">剩余流量：{{siminfo.data.data_balance}}MB</p>
-					<p v-if="simnew=='新'">剩余流量：{{siminfo.data.totalDataVolume-siminfo.data.usedDataVolume}}MB</p>
+					<p v-if="simnew=='旧'">已用流量：{{siminfo.data.data_usage.toFixed(2)}}MB</p>
+					<p v-if="simnew=='新'">已用流量：{{siminfo.data.usedDataVolume.toFixed(2)}}MB</p>
+					<p v-if="simnew=='旧'">剩余流量：{{siminfo.data.data_balance.toFixed(2)}}MB</p>
+					<p v-if="simnew=='新'">剩余流量：{{(siminfo.data.totalDataVolume-siminfo.data.usedDataVolume).toFixed(2)}}MB</p>
 					<p v-if="simnew=='旧'">到期时间：{{siminfo.data.outbound_date|timeFormat()}}</p>
 					<p v-if="simnew=='新'">到期时间：{{siminfo.data.ratePlanExpirationDate}}</p>
 				</view>

pages/prevention/ucharts.vue

@@ -5,7 +5,7 @@
 			<view style="position: fixed;z-index: 100;width: 100%;color: #FFFFFF;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="历史数据"></uni-nav-bar>
 			</view>
-			<view class="shuju_one">
+			<view class="shuju_one" v-show="!pickshow&&!picktwoshow">
 				<view class="shuju_one_title">
 					<view :class="titleidnex==index?'title_text_color':'tltle_text'" v-for="(item,index) in titletext" :key="index"
 					 @click="changeindex(index)">
@@ -18,7 +18,7 @@
 				<canvas v-if="canvastishiTF" 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="shuju_two" >
+			<view class="shuju_two" v-show="!pickshow&&!picktwoshow">
 				<view class="canvastishi" v-if="!canvastishiTF">
 					暂无数据
 				</view>
@@ -29,7 +29,7 @@
 				<view class="newtimes">
 					<view class="newtimes_state" @click="pickshow = !pickshow">
 						<view class="oldtimes_left"> 
-							<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/841f87bfd8abb1b09610fa0789f9d8e.png'" mode=""></image>
+							<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/841f87bfd8abb1b09610fa0789f9d8e.png'" mode=""></image>
 							开始时间：{{this.oldtime|timeFormat()}}
 						</view>
 						<view class="oldtimes_left">
@@ -39,7 +39,7 @@
 					</view>
 					<view class="newtimes_end" @click="picktwoshow = !picktwoshow">
 						<view class="oldtimes_left">
-							<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'" mode=""></image>
+							<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png'" mode=""></image>
 							结束时间：{{this.newtime|timeFormat()}}
 						</view>
 						<view class="oldtimes_left">
@@ -137,7 +137,7 @@
 					device_id: null
 				},
 				canvastishiTF:false,
-				pagesum:0
+				pagesum:1
 			}
 		},
 		// 页面加载执行的函数

style/html/h52.html

@@ -38,7 +38,7 @@
 			.direc {
 				width: 150px;
 				height: 150px;
-				background: url('http://static.yfpyx.com/bigdata_app/image/monitor/1.png');
+				background: url('http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/1.png');
 				background-size: 100% auto;
 				background-repeat: no-repeat;
 				position: relative;
@@ -100,7 +100,7 @@
 		</div>
 		<div class="btn-box">
 			<div class="more" ontouchstart="configCamera('move', 8)" ontouchend="stopConfigCamera()">
-				<image src="http://static.yfpyx.com/bigdata_app/image/monitor/3.png" mode="widthFix"></image>
+				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/3.png" mode="widthFix"></image>
 			</div>
 			<div class="direc">
 				<div class="top" ontouchstart="configCamera('move', 0)" ontouchend="stopConfigCamera()">
@@ -120,7 +120,7 @@
 				</div>
 			</div>
 			<div class="less" ontouchstart="configCamera('move', 9)" ontouchend="stopConfigCamera()">
-				<image src="http://static.yfpyx.com/bigdata_app/image/monitor/2.png" mode="widthFix"></image>
+				<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/monitor/2.png" mode="widthFix"></image>
 			</div>
 		</div>
 	</body>
@@ -129,7 +129,7 @@
 	<!-- <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.4.0.js"></script> -->
 	<!-- uni 的 SDK -->
 	<script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
-	<script type="text/javascript" src="http://static.yfpyx.com/bigdata_app/js/ezuikit.js"></script>
+	<script type="text/javascript" src="http://www.hnyfwlw.com:8006/bigdata_app/js/ezuikit.js"></script>
 	<script type="text/javascript">
 		function configCamera(ctrl, movenum) {
 			if (ctrl == "takephoto") {