6/28

components/bazaar-city_list/index.vue

@@ -148,7 +148,7 @@
 			// 获取城市
 			// selectedCity({city}){
 			selectedCity(city){
-				// console.log(city);
+				console.log(city);
 				this.getCity&&this.getCity({city});
 			},
 			// 定位操作

components/equip-item/equip-item.vue

@@ -7,7 +7,7 @@
 			<view class="tag tag-off" ></view>
 		</template>
 		<view class="info">
-			<text class="">设备ID：{{item.imei || item.device_id}}</text>
+			<text class="">设备名称：{{item.device_name==""?"无":item.device_name}}</text>
 			<text v-if="item.is_online==1" class="state on">在线</text>
 			<text v-else  class="state off">离线</text>
 		</view>
@@ -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){

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "云飞智控",
+    "name" : "智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.0.3",
-    "versionCode" : 103,
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

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

pages/afterSale/addafter.vue

@@ -8,19 +8,34 @@
 			<view class="addafter_con">
 				<view class="addafter_con_top">
 					<p>基本信息</p>
-					<input type="number" v-model="adddata.id" placeholder="请填写设备ID" placeholder-style="color: #62BF89;font-size:24rpx"
-					 @blur="addID" />
-					<input type="select" v-model="adddata.type" placeholder="请选择设备类型" placeholder-style="color: #62BF89;font-size:24rpx"
-					 @click="show = true" disabled />
-					<input type="text" v-model="adddata.name" placeholder="请填写联系人名称" placeholder-style="color: #62BF89;font-size:24rpx" />
-					<input type="number" v-model="adddata.phone" placeholder="请填写联系人电话" placeholder-style="color: #62BF89;font-size:24rpx"
-					 @blur="iphone" />
-					<input type="text" v-model="adddata.site" placeholder="请填写联系人地址" placeholder-style="color: #62BF89;font-size:24rpx" />
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #ff0000;">*</span>
+						<input type="number" v-model="adddata.id" placeholder="请填写设备ID" placeholder-style="color: #62BF89;font-size:24rpx"
+						 @blur="addID" />
+					</view>
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #ff0000;">*</span>
+						<input type="select" v-model="adddata.type" placeholder="请选择设备类型" placeholder-style="color: #62BF89;font-size:24rpx"
+						 @click="show = true" disabled />
+					</view>
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #fff;">*</span>
+						<input type="text" v-model="adddata.name" placeholder="请填写联系人名称" placeholder-style="color: #62BF89;font-size:24rpx" />
+					</view>
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #ff0000;">*</span>
+						<input type="number" v-model="adddata.phone" placeholder="请填写联系人电话" placeholder-style="color: #62BF89;font-size:24rpx"
+						 @blur="iphone" />
+					</view>
+					<view class="" style="display: flex;margin-top: 20rpx;">
+						<span style="color: #fff;">*</span>
+						<input type="text" v-model="adddata.site" placeholder="请填写联系人地址" placeholder-style="color: #62BF89;font-size:24rpx" />
+					</view>
 					<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>
@@ -29,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" class="delete" @click="deletes(index)"></u-icon>
@@ -38,7 +56,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>
@@ -81,6 +99,7 @@
 					type:'',
 					type_id:''
 				},
+				loding:false,
 				imageList:[],//图片链接
 				uploadingTF:[false,false,false,false,false,false],//图片的删除
 				selfList:'',//视频链接
@@ -139,8 +158,8 @@
 		},
 		methods: {
 			clickLeft(){//返回
-				uni.navigateTo({
-					url:"./index"
+				uni.navigateBack({
+					delta:1
 				})
 			},
 			gainimg(index){//添加图片
@@ -151,6 +170,7 @@
 				    sourceType: ['album','camera'], //从相册选择
 				    success: (res)=> {
 						this.imgs = res.tempFilePaths[0]
+						this.loding = true
 					}
 				});
 			},
@@ -188,6 +208,11 @@
 			},
 			deletes(index){//删除
 				this.uploadingTF[index]=false
+				if(index==3){
+					this.selfList = ""
+				}else{
+					this.imageList.splice(index,1)
+				}
 				this.$forceUpdate() //强制刷新视图
 			},
 			async getaddafter(data) {//提交数据
@@ -205,6 +230,24 @@
 						    is_pc:0
 					}
 				})
+				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({
@@ -214,31 +257,49 @@
 					}
 				})
 				if(res!=''){
-					this.deviceid=true
-				}else{
 					this.deviceid=false
+				}else{
+					this.deviceid=true
 				}
 			},
 			btn(){//提交按钮
+				this.getID(this.adddata.id)
 				let obj ={}
 				obj.id=this.adddata.id
 				obj.type=this.adddata.type_id
 				obj.text=this.adddata.text
-				obj.imageList=JSON.stringify(this.imageList)
+				if(this.imageList.length==0){
+					obj.imageList=""
+				}else{
+					obj.imageList=JSON.stringify(this.imageList)
+				}
 				obj.site=this.adddata.site
 				obj.name=this.adddata.name
 				obj.phone=this.adddata.phone
-				obj.selfList=JSON.stringify(this.selfList)
-				console.log(obj.imageList)
-				if(this.deviceid && this.adddata.type_id!=''&&this.phoneTF){
-					this.getaddafter(obj)
-				}else{
-					console.log(1)
+				obj.selfList=this.selfList
+				console.log(this.selfList)
+				// 设备号错误
+				if(this.deviceid){
 					uni.showToast({
-					    title: '设备ID和设备类型不能为空',
+					    title: '设备号错误',
 					    duration: 2000,
 						icon:"none"
 					});
+				}else if(this.adddata.type_id ==''){
+					uni.showToast({
+					    title: '设备类型不能为空',
+					    duration: 2000,
+						icon:"none"
+					});
+				}else if(this.phoneTF){
+					uni.showToast({
+					    title: '请输入正确的手机号',
+					    duration: 2000,
+						icon:'none'
+					});
+				}else{
+					console.log(obj)
+					this.getaddafter(obj)
 				}
 			},
 			actionSheetCallback(index) {//选择器选择
@@ -252,6 +313,8 @@
 					    duration: 2000,
 						icon:'none'
 					});
+					this.phoneTF=true
+				}else{
 					this.phoneTF=false
 				}
 			},
@@ -278,6 +341,7 @@
 						this.imageList[this.imgindex]=JSON.parse(uploadFileRes.data).data.src
 						this.$forceUpdate() //强制刷新视图
 						this.uploadingTF[this.imgindex]=true
+						this.loding = false
 				    }
 				});
 				this.imgs = ""
@@ -314,7 +378,7 @@
 				color: #62BF89;
 			}
 			input{
-				margin-top: 20rpx;
+				width: 95%;
 				background-color: #F1FAF5;
 				color: #62BF89;
 				font-size:26rpx;
@@ -369,12 +433,23 @@
 				border: 2rpx dashed #A3DABD;
 				text-align: center;
 				line-height: 160rpx;
-				margin:0 10rpx 20rpx 8rpx;
+				margin:0 8rpx 20rpx 8rpx;
 				position: relative;
 				image{
 					width: 40rpx;
 					height: 32rpx;
 				}
+				.sim_info_loding{
+					width: 100%;
+					height: 160rpx;
+					position: absolute;
+					top: 0;
+					left: 0;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
 				.uploading{
 					width: 100%;
 					height: 160rpx;

pages/afterSale/index.vue

@@ -4,7 +4,7 @@
 		<view style="position: fixed;z-index: 100;top: 44px;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="售后系统" rightIcon="search" @clickRight="search" ></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>
@@ -15,9 +15,9 @@
 					<span>设备 ID：{{item.device_id}}</span>
 				</view>
 				<view class="aftersale_item_con">
-					<p>联系人：{{item.user}}</p>
-					<p>联系电话：{{item.userphone}}</p>
-					<p>位置：{{item.addr}}</p>
+					<p>联系人：{{item.user?item.user:"无"}}</p>
+					<p>联系电话：{{item.userphone?item.userphone:"无"}}</p>
+					<p>位置：{{item.addr?item.addr:"无"}}</p>
 					<p>故障上报时间：{{item.uptime|timeFormat()}}</p>
 				</view>
 				<view class="aftersale_item_operate">
@@ -26,7 +26,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>
@@ -41,7 +41,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,8 +100,11 @@
 				}
 				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) {
+					if (this.faultdata[i].errorimg) {
+						if(!Array.isArray(this.faultdata[i].errorimg)){
+							this.faultdata[i].errorimg = JSON.parse(this.faultdata[i].errorimg)
+						}
+					}else{
 						this.faultdata[i].errorimg = []
 					}
 				}
@@ -175,6 +178,9 @@
 			}
 		},
 		onLoad() { 
+			
+		},
+		onShow(){
 			this.getAftersale()
 		},
 		onReachBottom() {
@@ -222,10 +228,9 @@
 	}
 	.aftersale {
 		width: 100%;
-		// margin-top: 20rpx;
 		position: relative;
 		top: 340rpx;
-
+		margin-bottom: 80rpx;
 		.aftersale_item {
 			width: 90%;
 			margin: 0 auto 30rpx;
@@ -235,7 +240,6 @@
 			box-sizing: border-box;
 			.aftersale_item_title {
 				width: 100%;
-
 				span {
 					margin-left: 16rpx;
 					font-weight: 700;

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/cbd/equip-set/addimg.vue

@@ -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

@@ -140,6 +140,7 @@
 			},
 			//forecast.worm_lamp.device_history_data历史数据列表
 			async historylist() { //历史数据列表
+				this.historylistdata=[]
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
 					data: {
@@ -188,9 +189,7 @@
 						duration: 2000,
 						icon: "none"
 					});
-					uni.navigateBack({
-						delta: 1
-					})
+					this.historylist()
 				}else{
 					uni.showToast({
 						title: '刷新失败',
@@ -308,7 +307,14 @@
 				this.history()
 				this.historylist()
 			},1000)
-		}
+		},
+		onPullDownRefresh() {
+			this.history()
+			this.historylist()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1000)
+		},
 	}
 </script>
 

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

@@ -7,19 +7,17 @@
 			</view>
 			<p class="tishi" v-if="tishi">暂无数据</p>
 			<view class="timeshow">
-				<view class="timeshow_tate" @click="selecttimestate">
-					{{timestate|timeFormat()}}
-				</view>
-				<view class="timeshow_end" @click="selecttimeend">
-					{{timeend|timeFormat()}}
+				<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)">
+						{{item}}
+					</view>
 				</view>
-				<u-icon name="search" size="36" @click="search"></u-icon>
-				<u-picker mode="time" v-model="timeshow" :params="params" @confirm="confirm"></u-picker>
 			</view>
 			<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">
@@ -29,10 +27,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>
@@ -41,7 +39,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>
@@ -68,7 +66,9 @@
 				flag:1,
 				self:true,
 				isTop:false,
-				resultdata:{}
+				resultdata:{},
+				titletext: ["24小时", "近一个月", "近半年", "近一年"],
+				titleidnex:0
 			}
 		},
 		methods: {
@@ -117,29 +117,9 @@
 			},
 			//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() { //统计
+			async takephoto() { //拍照
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.send_control.admin_device_control',
 					data: {
@@ -192,12 +172,15 @@
 					url: "./results?id="+id
 				})
 			},
-			tongji(id) { //统计
-				this.species(id)
+			tongji(item) { //统计
+				// this.species(id)
+				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) {
@@ -214,33 +197,31 @@
 			clickRight() { //下发拍照指令
 				this.takephoto()
 			},
-			confirm(val){//时间选择框确定按钮
-				var time = val.year+"-"+val.month+"-"+val.day+" "+val.hour+":"+val.minute+":00"
-				if(this.flag==1){
-					this.timestate = +new Date(time)/1000
-				}else if(this.flag==2){
-					this.timeend = +new Date(time)/1000
-				}
-			},
-			selecttimestate(){//开始时间选择
-				this.timeshow = !this.timeshow
-				this.flag = 1
-			},
-			selecttimeend(){//结束时间选择
-				this.timeshow = !this.timeshow
-				this.flag = 2
-			},
-			search(){//按时间搜索
-				this.imglists=[]
-				this.page = 1
-				this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
-				this.self = false
-			},
 			top() {
 				uni.pageScrollTo({
 					scrollTop: 0,
 					duration: 500
 				})
+			},
+			changeindex(index){
+				this.imglists=[]
+				this.page =1
+				this.titleidnex = index
+				var newtime = new Date()
+				this.timeend = +new Date(newtime)/1000
+				if(index == 0){
+					this.timestate = newtime - 60 * 60 * 24*1000
+					this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
+				}else if(index == 1){
+					this.timestate = newtime.setMonth(newtime.getMonth() - 1)
+					this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
+				}else if(index == 2){
+					this.timestate = newtime.setMonth(newtime.getMonth() - 6)
+					this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
+				}else if(index == 3){
+					this.timestate = newtime.setFullYear(newtime.getFullYear() - 1)
+					this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
+				} 
 			}
 		},
 		onLoad(option) {
@@ -251,11 +232,12 @@
 		onShow(){
 			this.timeend = +new Date() / 1000
 			this.timestate = this.timeend - 60 * 60 * 24
+			this.imglists=[]
 			this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
 		},
 		onReachBottom() {
 			this.page++
-			this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
+			this.imglistdata(parseInt(this.timestate/1000),parseInt(this.timeend))
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听，可用bindingx代替
 			if (e.scrollTop > 200) { //距离大于200时显示
@@ -263,7 +245,7 @@
 			} else { //距离小于200时隐藏
 				this.isTop = false
 			}
-		},
+		}
 	}
 </script>
 
@@ -287,7 +269,32 @@
 		display: flex;
 		z-index: 100;
 		padding-top: 10px;
-
+		
+		.shuju_one_title {
+			width: 70%;
+			margin: 0 auto;
+			display: flex;
+		
+			.tltle_text {
+				width: 25%;
+				border: 2rpx solid #B2B2B2;
+				color: #B2B2B2;
+				text-align: center;
+				font-size: 24rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+		
+			.title_text_color {
+				width: 25%;
+				border: 2rpx solid #28AE4F;
+				color: #28AE4F;
+				text-align: center;
+				font-size: 24rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+			}
+		}
 		.timeshow_tate,
 		.timeshow_end {
 			height: 50rpx;

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" style="width: 90%;margin: 0 auto;">
+					<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/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,7 +3,7 @@
 		<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}}
@@ -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>
@@ -39,7 +39,7 @@
 				<u-calendar v-model="cultivate_show" mode="date" @change="timeChange($event,'cultivate')"></u-calendar>
 			</u-popup>
 			<u-popup v-model="yxShow" mode="center" width="600rpx">
-				<u-field label="监测害虫名称" label-width='240' required :error-message="xyErr" v-model="decoy" class="field">
+				<u-field label="监测害虫名称" label-width='240' required :error-message="xyErr" v-model="decoy" :field-style="fieldstyle">
 				</u-field>
 				<view class="btn-box">
 					<u-button @click="yxSubmit" 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>
@@ -75,14 +75,14 @@
 		</view>
 		<view class="tit">
 			<p>实时数据</p>
-			<p class="span" @click="partClicks">历史数据>>></p>
+			<p class="span" @click="partClicks" v-if="equipInfo.type!=4">历史数据>>></p>
 		</view>
 		<view class="newtishi" v-if="!newtishitf">
 			暂无数据
 		</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>
+				<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+item.icon" mode="widthFix"></image>
 				<view class="info-con">
 					<view class="active">
 						{{item.txt}}
@@ -101,6 +101,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,19 +550,21 @@
 			},
 			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){
 					path="/pages/cb/bzy/equip-set/bzyhistoryile"
 				}
 				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) {
@@ -686,11 +694,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 {

pages/cb/index/index.vue

@@ -6,7 +6,7 @@
 				<uni-nav-bar @clickRight="clickRight" @clickLeft="clickLeft" left-icon="back" left-text="返回" right-icon="search"
 				 title="测报系统"></uni-nav-bar>
 				<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':'']">
@@ -20,7 +20,7 @@
 					<template v-for="(item,index) in equipArr[active].list">
 						<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">
 							<view class="date">
-								<p>设备名称：{{item.device_name==""?"无":item.device_name}}</p>
+								<p>设备ID：{{item.imei || item.device_id}}</p>
 								<p>最新上报时间：{{item.addtime|timeFormat}}</p>
 							</view>
 						</equipItem>
@@ -28,8 +28,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>
@@ -70,6 +86,8 @@
 				],
 				device_id: '3', //筛选的设备id
 				isTop: false,
+				filtrateTF:false,
+				device_status:""
 			}
 		},
 		onLoad() {
@@ -158,6 +176,7 @@
 						device_type_id: this.equipArr[act].type,
 						page: this.equipArr[act].pageIndex,
 						page_size: 10,
+						device_status:this.device_status
 					}
 				})
 				console.log(res)
@@ -171,6 +190,7 @@
 						device_type_id: this.equipArr[act].type,
 						page: this.equipArr[act].pageIndex,
 						page_size: 10,
+						device_status:this.device_status
 					}
 				})
 				console.log(res)
@@ -204,11 +224,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: {
@@ -264,13 +320,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,21 +14,21 @@
 			</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>
+						<p>设备名称：{{item.device_name}}</p>
 						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						<p>设备名称：{{item.device_name}}</p>
+						<p>设备 ID：{{item.imei || item.device_id}}</p>
 						<p>最新上报时间：{{item.addtime|timeFormat()}}</p>
 					</view>
 				</view>
 			</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>
@@ -105,8 +105,8 @@
 				}
 			},
 			clickLeft(){
-				uni.navigateTo({
-					url:"./index"
+				uni.navigateBack({
+					delta:1
 				})
 			},
 			top() {

pages/cb/sim/sim.vue

@@ -1,9 +1,12 @@
 <template>
 	<view>
 		<view class="section">
+			<view class="sim_info_loding" v-if="loding">
+				<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>
-				数据sim卡流量
+				<image mode="widthFix" src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/sim1.png"></image>
+				数据sim卡流量{{"("+sim.simnew+")"}}
 			</view>
 			<view class="item">
 				<text>ICCID:</text>
@@ -11,7 +14,7 @@
 			</view>
 			<view class="item">
 				<text>状态:</text>
-				<text>{{sim.account_status|simStatus}}</text>
+				<text>{{sim.account_status}}</text>
 			</view>
 			<view class="item">
 				<text>套餐:</text>
@@ -19,22 +22,26 @@
 			</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>
-				<text>{{sim.expiry_date|timeFormat}}</text>
+				<text v-if="sim.simnew=='新'">{{sim.expiry_date|timeFormat}}</text>
+				<text v-else>{{sim.expiry_date|timeFormat}}</text>
 			</view>
 		</view>
 		<template v-if="showHksimFlag">
 			<view class="section">
+				<view class="sim_info_loding" v-if="loding2">
+					<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>
-					图片sim卡流量
+					<image mode="widthFix" src="http://www.hnyfwlw.com:8006/bigdata_app/image/cb/sim2.png"></image>
+					图片sim卡流量{{"("+hksim.simnew+")"}}
 				</view>
 				<view class="item">
 					<text>ICCID:</text>
@@ -42,7 +49,7 @@
 				</view>
 				<view class="item">
 					<text>状态:</text>
-					<text>{{hksim.account_status|simStatus}}</text>
+					<text>{{hksim.account_status}}</text>
 				</view>
 				<view class="item">
 					<text>套餐:</text>
@@ -58,19 +65,19 @@
 				</view>
 				<view class="item">
 					<text>到期时间:</text>
-					<text>{{hksim.expiry_date|timeFormat}}</text>
+					<text v-if="hksim.simnew=='新'">{{hksim.expiry_date}}</text>
+					<text v-else>{{hksim.expiry_date|timeFormat}}</text>
 				</view>
 				<view class="item">
 					<text>更换ICCID:</text>
-					<u-input v-model="hksiminp" type="text" :custom-style="sty"  />
+					<u-input v-model="hksiminp" type="text" :custom-style="sty" style="z-index: 1;"/>
 				</view>
 				<view class="submit-box">
-					<u-button  @click="submit" type="warning">确定</u-button>
+					<u-button @click="submit" type="warning">确定</u-button>
 				</view>
 				<u-toast ref="toast" />
 			</view>
 		</template>
-		
 	</view>
 </template>
 
@@ -79,13 +86,14 @@
 		data() {
 			return {
 				sim: {
-			        iccid: "",
-			        account_status: 0, //卡状态 0-7 未知 测试期 沉默期 使用中 停机 停机保号 预销号 销号
-			        data_plan: 0, //套餐大小
-			        data_usage: 0, //当月用量
-			        data_balance: 0, //剩余流量
-			        expiry_date: 0, //到期日期
-			      },
+					iccid: "",
+					account_status: 0, //卡状态 0-7 未知 测试期 沉默期 使用中 停机 停机保号 预销号 销号
+					data_plan: 0, //套餐大小
+					data_usage: 0, //当月用量
+					data_balance: 0, //剩余流量
+					expiry_date: 0, //到期日期，
+					simnew:""
+				},
 				showHksimFlag: true, //是否显示hksim卡标识
 				hksim: {
 					iccid: "",
@@ -94,138 +102,223 @@
 					data_usage: 0, //当月用量
 					data_balance: 0, //剩余流量
 					expiry_date: 0, //到期日期
-				  },
-				hksiminp:'',//更换ICCID
-				d_id:'',
-				sty:{
-					'background':'#F7F8FA'
-				}
+					simnew:""
+				},
+				hksiminp: '', //更换ICCID
+				d_id: '',
+				sty: {
+					'background': '#F7F8FA'
+				},
+				loding:false,
+				loding2:false
 			}
 		},
-		onLoad(option){
-			if(Number(option.device_type)==4){
+		onLoad(option) {
+			if (Number(option.device_type) == 4) {
 				this.showHksimFlag = false
 			}
-			this.d_id=option.d_id
+			this.d_id = option.d_id
 			this.lookSIMCode('sim')
 			this.lookSIMCode('hksim')
+			this.loding = true
+			this.loding2 = true
 		},
-		 filters: {
-			simStatus(val) {
-			  switch (val) {
-				case 0:
-				  return "未知";
-				case 1:
-				  return "测试期";
-				case 2:
-				  return "沉默期";
-				case 3:
-				  return "使用中";
-				case 4:
-				  return "停机";
-				case 5:
-				  return "停机保号";
-				case 6:
-				  return "预销号";
-				case 7:
-				  return "销号";
-			  }
-			},
-		  },
 		methods: {
-			async lookSIMCode(flag){
-				let res=await this.$myRequest({
-					url:'/api/api_gateway?method=forecast.send_control.device_sim',
-					data:{
-						d_id:this.d_id,
-						type:flag
+			async lookSIMCode(flag) {
+				let res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.send_control.device_sim',
+					data: {
+						d_id: this.d_id,
+						type: flag
 					}
 				})
-				let res2=await this.$myRequest({
-					url:'/api/api_gateway?method=forecast.send_control.sim_query',
-					data:{
-						iccid:res[0].iccid,
+				let res2 = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.send_control.sim_query',
+					data: {
+						iccid: res[0].iccid,
 					}
 				})
-				
-				// let obj=eval('('+res2.data+')').data
 				let obj = res2.data.data
-				console.log(obj)
-				if(flag=='sim'){
-					this.sim={
-						iccid: res[0].iccid,
-						account_status: obj.account_status, //卡状态 0-7 未知 测试期 沉默期 使用中 停机 停机保号 预销号 销号
-						data_plan: obj.data_plan, //套餐大小
-						data_usage: obj.data_usage, //当月用量
-						data_balance:obj.data_balance, //剩余流量
-						expiry_date:obj.expiry_date, //到期日期
+				if (res2.code == 1) { //企鹏 新
+					var state = ""
+					switch (obj.deviceStatus) {
+						case "ACTIVATION_READY_NAME":
+							state = "可测试"
+							break;
+						case "TEST_READY_NAME":
+							state = "库存"
+							break;
+						case "INVENTORY_NAME":
+							state = "可激活"
+							break;
+						case "ACTIVATION_READY_NAME":
+							state = "已激活"
+							break;
+						case "ACTIVATED_NAME":
+							state = "已停卡"
+							break;
+						case "DEACTIVATED_NAME":
+							state = "已销卡"
+							break;
+						case "RETIRED_NAME":
+							state = "已清除"
+							break;
 					}
-					
-				}else if(flag=='hksim'){
-					this.hksim={
-						iccid: res[0].iccid,
-						account_status: obj.account_status, //卡状态 0-7 未知 测试期 沉默期 使用中 停机 停机保号 预销号 销号
-						data_plan: obj.data_plan, //套餐大小
-						data_usage: obj.data_usage, //当月用量
-						data_balance:obj.data_balance, //剩余流量
-						expiry_date: obj.expiry_date, //到期日期
+					console.log(obj)
+					if (flag == 'sim') {
+						this.sim = {
+							iccid: res[0].iccid,
+							account_status: state,
+							data_plan: obj.totalDataVolume, //套餐大小
+							data_usage: obj.usedDataVolume, //当月用量
+							data_balance: Number(obj.totalDataVolume) - Number(obj.usedDataVolume), //剩余流量
+							expiry_date: obj.ratePlanExpirationDate, //到期日期，
+							simnew:"新"
+						}
+						this.loding = false
+					} else if (flag == 'hksim') {
+						this.hksim = {
+							iccid: res[0].iccid,
+							account_status: state,
+							data_plan: obj.totalDataVolume, //套餐大小
+							data_usage: obj.usedDataVolume, //当月用量
+							data_balance: Number(obj.totalDataVolume) - Number(obj.usedDataVolume), //剩余流量
+							expiry_date: obj.ratePlanExpirationDate, //到期日期
+							simnew:"新"
+						}
+						this.loding2 = false
+					}
+				} else if (res2.code == 2) { //合宙 旧
+					var state = ""
+					switch (obj.account_status) {
+						case 0:
+							state = "未知"
+							break;
+						case 1:
+							state = "测试期"
+							break;
+						case 2:
+							state = "沉默期"
+							break;
+						case 3:
+							state = "使用中"
+							break;
+						case 4:
+							state = "停机"
+							break;
+						case 5:
+							state = "停机保号"
+							break;
+						case 6:
+							state = "预销号"
+							break;
+						case 7:
+							state = "销号"
+							break;
+					}
+					this.simnew = "旧"
+					if (flag == 'sim') {
+						this.sim = {
+							iccid: res[0].iccid,
+							account_status: state, //卡状态 0-7 未知 测试期 沉默期 使用中 停机 停机保号 预销号 销号
+							data_plan: obj.data_plan, //套餐大小
+							data_usage: obj.data_usage, //当月用量
+							data_balance: obj.data_balance, //剩余流量
+							expiry_date: obj.expiry_date, //到期日期
+							simnew:"旧"
+						}
+						this.loding = false
+					} else if (flag == 'hksim') {
+						this.hksim = {
+							iccid: res[0].iccid,
+							account_status: state, //卡状态 0-7 未知 测试期 沉默期 使用中 停机 停机保号 预销号 销号
+							data_plan: obj.data_plan, //套餐大小
+							data_usage: obj.data_usage, //当月用量
+							data_balance: obj.data_balance, //剩余流量
+							expiry_date: obj.expiry_date, //到期日期
+							simnew:"旧"
+						}
+						this.loding2 = false
 					}
 				}
 			},
-			async submit(){
-				let res=await this.$myRequest({
-					url:'/api/api_gateway?method=forecast.send_control.device_sim',
-					data:{
+			async submit() {
+				let res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.send_control.device_sim',
+					data: {
 						d_id: this.d_id,
-						 iccid: this.hksiminp,
-						 type: "change",
+						iccid: this.hksiminp,
+						type: "change",
 					}
 				})
 				this.$refs.toast.show({
 					title: '修改成功!',
 					type: 'success',
-					callback:function(){
+					callback: function() {
 						uni.navigateBack({
 							delta: 1
-						});	
+						});
 					}
-				})	
+				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	page{
-		padding:30rpx;
+	page {
+		padding: 30rpx;
 		box-sizing: border-box;
-		.section{
-			padding:30rpx;
-			box-shadow: 0px 0px 5px 3px rgba(136,136,136,.1);
-			margin-bottom:20rpx;
+
+		.section {
+			padding: 30rpx;
+			box-shadow: 0px 0px 5px 3px rgba(136, 136, 136, .1);
+			margin-bottom: 20rpx;
 			box-sizing: border-box;
-			.item{
-				line-height:56rpx;
-				font-size:26rpx;
-				text:nth-child(1){
-					margin-right:10rpx;
+			position: relative;
+			.sim_info_loding{
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				background-color: rgba(0,0,0,0.3);
+				border-radius: 20rpx;
+				height: 100%;
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				z-index: 10;
+				.img{
+					width: 400rpx;
+					height: 350rpx;
+					
+				}
+			}
+			.item {
+				line-height: 56rpx;
+				font-size: 26rpx;
+
+				text:nth-child(1) {
+					margin-right: 10rpx;
 				}
+
 				display:flex;
 			}
-			.tit{
-				margin-bottom:20rpx;
-				font-size:28rpx;
-				image{
-					width:22rpx;
-					margin-right:10rpx;
-				
+
+			.tit {
+				margin-bottom: 20rpx;
+				font-size: 28rpx;
+
+				image {
+					width: 22rpx;
+					margin-right: 10rpx;
+
 				}
 			}
-			.submit-box{
-				margin-top:20rpx;
+
+			.submit-box {
+				margin-top: 20rpx;
 			}
 		}
 	}
-	
-
 </style>

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

@@ -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>

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/distribution/index.vue

@@ -188,6 +188,7 @@
 			},
 			change(index) {
 				console.log(index)
+				this.device_id = ''
 				this.current = index
 				if (index == 0) {
 					this.type = ''
@@ -202,11 +203,9 @@
 				this.history()
 			},
 			markertap(e) {
-				console.log(e)
-				console.log(this.facilitydatas[e.detail.markerId])
-				this.device_id = this.facilitydatas[e.detail.markerId].device_id
 				this.punctuation_did = this.facilitydatas[e.detail.markerId].d_id
 				this.punctuation_type = this.facilitydatas[e.detail.markerId].device_type_id
+				this.device_id = this.facilitydatas[e.detail.markerId].device_id
 			},
 			serTFs() {
 				this.history()

pages/environment/contros.vue

@@ -5,36 +5,38 @@
 			<view style="position: fixed;z-index: 100;width: 100%;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备控制"></uni-nav-bar>
 			</view>
-			<view class="operation">
-				<p class="operation_title">操作</p>
-				<view class="operation_btn">
-					<button @click="chongqi">重 启</button>
-					<button @click="shengji">升 级</button>
-					<button @click="search">查询时间上传间隔</button>
-				</view>
-			</view>
-			<view class="viewing">
-				<p class="operation_title">显示屏设置</p>
-				<view class="viewing_text">
-					<view class="viewing_text_top">
-						标题文字设置 ：
-						<input type="text" v-model="config.content" />
+			<view class="contros_box">
+				<view class="operation">
+					<p class="operation_title">操作</p>
+					<view class="operation_btn">
+						<button @click="chongqi">重 启</button>
+						<!-- <button @click="shengji">升 级</button> -->
+						<button @click="search">查询时间上传间隔</button>
 					</view>
-					<view class="viewing_text_bot">
-						显示时间设置(min) ：
-						<input type="number" v-model="config.timeout" />
+				</view>
+				<view class="viewing" v-if="led==1">
+					<p class="operation_title">显示屏设置</p>
+					<view class="viewing_text">
+						<view class="viewing_text_top">
+							标题文字设置 ：
+							<input type="text" v-model="config.content" />
+						</view>
+						<view class="viewing_text_bot">
+							<p>显示时间设置(min) :</p>
+							<input type="number" v-model="config.timeout" />
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="timing">
-				<p class="operation_title">上传时间间隔(min)</p>
-				<view class="timing_text">
-					<slider value="1" @change="sliderChange" step="1" min="1" max="360" show-value block-size="18" activeColor="#57C878" />
+				<view class="timing">
+					<p class="operation_title">上传时间间隔(min)</p>
+					<view class="timing_text">
+						<slider value="1" v-model="config.interval" @change="sliderChange" step="1" min="1" max="360" show-value block-size="18" activeColor="#57C878" />
+					</view>
 				</view>
-			</view>
-			<view class="ensure">
-				<view class="ensure_btn" @click="ensure">
-					确 定
+				<view class="ensure">
+					<view class="ensure_btn" @click="ensure">
+						确 定
+					</view>
 				</view>
 			</view>
 		</view>
@@ -48,22 +50,47 @@
 				config: {
 					content: "",
 					timeout: "",
-					interval: ""
+					interval: 1
 				},
-				id: ''
+				id: '',
+				led:0
 			}
 		},
 		methods: {
+			// forecast.send_control.device_control_info 设备配置查询
+			async controsdata(datas) { //提交数据
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.send_control.device_control_info',
+					data: {
+						d_id: this.id,
+						cmd: "config"
+					}
+				})
+				console.log(res)
+				this.config.interval = res.interval
+				this.led = Number(res.led)
+			},
 			//forecast.send_control.device_control  config: {"interval":10,"content":"content","timeout":"1"}
 			async timing(datas) { //提交数据
 				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=weather.weather.qxz_status',
+					url: '/api/api_gateway?method=forecast.send_control.device_control',
 					data: {
 						device_type_id: 5,
 						d_id: this.id,
 						config: JSON.stringify(datas)
 					}
 				})
+				console.log(res)
+				if(res){
+					uni.showToast({
+						title: '指令下发成功!'
+					});
+				}else{
+					uni.showToast({
+						title: '指令下发失败!',
+						icon: "none"
+					});
+				}
 			},
 			//forecast.send_control.admin_device_control
 			async restart(datas) { //重启
@@ -81,7 +108,8 @@
 					});
 				} else {
 					uni.showToast({
-						title: '指令下发失败!'
+						title: '指令下发失败!',
+						icon: "none"
 					});
 				}
 			},
@@ -92,7 +120,7 @@
 					data: {
 						device_type_id: 5,
 						d_id: this.id,
-						control_type: "data"
+						control_type: "interval"
 					}
 				})
 				console.log(res)
@@ -102,7 +130,8 @@
 					});
 				} else {
 					uni.showToast({
-						title: '指令下发失败!'
+						title: '指令下发失败!',
+						icon: "none"
 					});
 				}
 			},
@@ -113,6 +142,7 @@
 			},
 			ensure() { //提交
 				this.timing(this.config)
+				console.log(this.config)
 			},
 			sliderChange(e) { //滑动块
 				this.config.interval = e.detail.value
@@ -120,15 +150,18 @@
 			chongqi() { //重启按钮
 				this.restart('reboot')
 			},
-			shengji() { //升级按钮
-				this.restart('update')
-			},
+			// shengji() { //升级按钮
+			// 	this.restart('update')
+			// },
 			search() { //查询按钮
 				this.uploading()
 			}
 		},
 		onLoad(option) {
 			this.id = option.id
+		},
+		onShow() {
+			this.controsdata()
 		}
 	}
 </script>
@@ -140,22 +173,24 @@
 		margin-bottom: 20rpx;
 		height: 36rpx;
 	}
-
-	.operation {
+	.contros_box{
 		position: absolute;
 		top: 54px;
 		width: 90%;
 		left: 5%;
-
+	}
+	.operation {
+		width: 95%;
 		.operation_btn {
 			display: flex;
 			padding-left: 20rpx;
-
+			box-sizing: border-box;
 			button {
 				font-size: 24rpx;
-				padding: 0 38rpx;
 				background-color: #28AE4F;
 				color: #FFFFFF;
+				box-sizing: border-box;
+				height: 60rpx;
 			}
 
 			button:last-child {
@@ -165,13 +200,9 @@
 	}
 
 	.viewing {
-		position: absolute;
-		top: 124px;
-		width: 90%;
-		left: 5%;
-
+		width: 95%;
+		margin-top: 30rpx;
 		.viewing_text {
-
 			.viewing_text_top,
 			.viewing_text_bot {
 				display: flex;
@@ -181,27 +212,22 @@
 				height: 60rpx;
 				line-height: 60rpx;
 				font-size: 24rpx;
-
 				input {
 					font-size: 24rpx;
-					margin-top: 16rpx;
-					width: 400rpx;
+					margin: 16rpx 0 0 10rpx;
+					width: 380rpx;
 				}
 			}
 		}
 	}
 
 	.timing {
-		position: absolute;
-		top: 234px;
-		width: 90%;
-		left: 5%;
+		width: 95%;
+		margin-top: 30rpx;
 	}
-
 	.ensure {
 		width: 100%;
-		position: absolute;
-		top: 600rpx;
+		margin-top: 30rpx;
 		.ensure_btn {
 			width: 90%;
 			margin: 0 auto;

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.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>
 					</p>
 					<p>设备名称：{{eqinfo.item.equip_name?eqinfo.item.equip_name:"无"}}</p>
 					<p>最近上报时间：{{eqinfo.item.uptime|timeFormat()}}</p>
@@ -19,25 +19,25 @@
 			</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>
 			<view class="realtime">
-				<p class="realtime_title">实时数据</p>
+				<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="item" @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]" @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">
@@ -52,7 +52,7 @@
 		<u-modal v-model="show" :title-style="{color: 'red'}" :mask-close-able="true" title="24小时数据">
 			<p class="tishiTF" v-if="tishiTF">暂无24小时数据</p>
 			<view class="slot-content" v-else>
-				<canvas v-if="canvastishiTF" canvas-id="canvasColumnA" id="canvasColumnA" class="charts" @touchstart="touchLineA($event)"
+				<canvas canvas-id="canvasColumnA" id="canvasColumnA" class="charts" @touchstart="touchLineA($event)"
 				 @touchmove="moveLineA($event)" @touchend="touchEndLineA($event)" disable-scroll=true :style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"></canvas>
 				<view class="maxdata">
 					<view class="maxdata_box">
@@ -93,7 +93,8 @@
 				onedatasMin: 0,
 				onedatasMaxtime:"",
 				onedatasMintime:"",
-				tishiTF:false
+				tishiTF:false,
+				realtimeTF:false
 			}
 		},
 		methods: {
@@ -110,13 +111,20 @@
 					}
 				})
 				this.olddata = res
+				var arr = []
 				for (var key in this.olddata.conf) {
 					if (this.olddata.conf[key].indexOf("#") != -1) {
 						this.olddata.conf[key] = this.olddata.conf[key].replace("#", "(") + ")"
 					}
 					this.olddata.dat[key] = this.olddata.dat[key].split("#")
+					arr.push(this.olddata.dat[key][0])
 				}
-				console.log(this.olddata)
+				console.log(this.olddata.conf)
+				console.log(arr)
+				this.realtimeTF = arr.some(function(item){
+					return item!=""
+				})
+				console.log(this.realtimeTF)
 			},
 			// weather.weather.qxz_data_chart 一天的数据
 			async onehistory() { //设备列表

pages/environment/history.vue

@@ -7,6 +7,15 @@
 			</view>
 			<view class="graph">
 				<view class="canvasbox">
+					<view class="" style="display: flex;justify-content: flex-end;">
+						<view class="schedule" @click="pickertfone=!pickertfone">
+							<p class="schedule_value">{{titletext[indexone]}}</p>
+							<p class="schedule_icon">
+								<u-icon name="arrow-down"></u-icon>
+							</p>
+						</view>
+					</view>
+					<u-picker v-model="pickertfone" mode="selector" @confirm="confirmFun" :default-selector="[indexone]" :range="titletext"></u-picker>
 					<view class="canvastishi" v-if="!canvastishiTF">
 						暂无数据
 					</view>
@@ -17,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">
@@ -27,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">
@@ -41,17 +50,17 @@
 						</view>
 					</view>
 				</view>
-				<view class="condition">
+				<view class="condition" v-if="scrollTF">
 					<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
 						<!-- @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" -->
-						<table class="table">
+						<table class="table" :style="{width:300+240*datalength+'rpx'}">
 							<tr class="tr">
 								<th class="th">日期</th>
-								<th class="th" v-for="key,index in historydatas.conf" :key="'a'+index" v-if="key">{{key.replace("#","(")+")"}}</th>
+								<th class="th" v-for="key,index in historydatas.conf" :key="index" v-if="key">{{key.replace("#","(")+")"}}</th>
 							</tr>
-							<tr class="tr" v-for="(items,index) in historydatas.data" :key="'b'+index" v-if="!forbidden">
+							<tr class="tr" v-for="(items,index) in historydatas.data" :key="index" v-if="!forbidden">
 								<td class="td">{{items.time|timeFormat()}}</td>
-								<td class="td" v-for="keys in items.dat" v-if="keys">{{parseFloat(keys)==-99.99?"N/A":parseFloat(keys)}}</td>
+								<td class="td" v-for="item,indexss in datalength" :key="indexss">{{parseFloat(items.dat["e"+(indexss+1)])==-99.99?"N/A":parseFloat(items.dat["e"+(indexss+1)])}}</td>
 							</tr>
 							<tr class="tr" v-if="forbidden">
 								<td class="td" v-for="item in 10">暂无数据</td>
@@ -88,7 +97,7 @@
 				id: "",
 				begintime: '', //开始时间
 				end: '', //结束时间
-				titletext: ["24小时", "近一个月", "近半年", "近一年"],
+				titletext: [],//折线图数据切换列表数据
 				titleidnex: 0,
 				pickshow: false, //选择时间一
 				picktwoshow: false, //选择时间二
@@ -104,7 +113,12 @@
 				historydatas: [],
 				page: 1,
 				forbidden: false,
-				pagesum: null
+				pagesum: null,
+				datalength:0,
+				scrollTF:true,
+				indexone:0,//折线图数据切换列表下标
+				pickertfone:false,//折线图数据切换列表
+				chartdata:{}//折线图数据
 			}
 		},
 		methods: { //weather.weather.qxz_detail
@@ -120,6 +134,18 @@
 				})
 				this.historydatas = res
 				console.log(res)
+				this.datalength=0
+				for(var key in res.conf){
+					if(res.conf[key]!=""){
+						this.datalength++
+					}
+				}
+				console.log(this.datalength)
+				if(this.datalength==0){
+					this.scrollTF = false
+				}else{
+					this.scrollTF = true
+				}
 				this.pagesum = Math.ceil(res.nums / 10) + 1
 				if (res.data.length == 0) {
 					this.forbidden = true
@@ -137,46 +163,51 @@
 					}
 				})
 				console.log(res)
+				this.chartdata = res
 				if (res.data.length == 0) {
 					this.canvastishiTF = false
 				} else {
 					this.canvastishiTF = true
-					var xtitle = []
-					var linearr = []
-					for (var i = 0; i < res.data.length; i++) {
-						var times = new Date(res.data[i].time * 1000)
-						xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes())
-					}
 					for (var key in res.conf) {
-						var obj = {}
-						if (res.conf[key] != "") {
-							var arr = res.conf[key].split("#")
-							if(arr[0].length==2){
-								arr[0]=arr[0]+"    "
-							}else if(arr[0].length==1){
-								arr[0]=arr[0]+"  "
-							}
-							obj.name = arr[0]+"("+arr[1]+")"
-						}
-						var arr = []
-						for (var i = 0; i < res.data.length; i++) {
-							if (parseFloat(res.data[i].dat[key]) != -99.99) {
-								arr.push(parseFloat(res.data[i].dat[key]))
-							}
+						if(res.conf[key]!=""){
+							this.titletext.push(res.conf[key])
 						}
-						obj.data = arr
-						if (obj.name) {
-							linearr.push(obj)
-						}
-						// console.log(linearr)
 					}
-					this.canvastishiTF = linearr.some((item) => {
-						return item.data.length != 0;
-					})
-					console.log(this.canvastishiTF)
-					this.showColumn("canvasColumnA", xtitle, linearr)
+					this.conflist(res,"e1")
 				}
 			},
+			conflist(res,eindex){
+				var xtitle = []
+				var linearr = []
+				for (var i = 0; i < res.data.length; i++) {
+					var times = new Date(res.data[i].time * 1000)
+					xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes())
+				}
+				var obj = {}
+				obj.name = res.conf[eindex]
+				var arr = []
+					for (var i = 0; i < res.data.length; i++) {
+						if (parseFloat(res.data[i].dat[eindex]) != -99.99) {
+							arr.push(parseFloat(res.data[0].dat[eindex]))
+						}
+					}
+				obj.data = arr
+				if (obj.name) {
+						linearr.push(obj)
+					}
+				this.canvastishiTF = linearr.some((item) => {
+					return item.data.length != 0;
+				})
+				console.log(this.canvastishiTF)
+				this.showColumn("canvasColumnA", xtitle, linearr)
+			},
+			confirmFun(index){
+				console.log(index)
+				this.indexone = index[0]
+				var str = 'e'+(index[0]+1)
+				console.log(str)
+				this.conflist(this.chartdata,str)
+			},
 			pickone(e) { //开始时间
 				this.begintime = +new Date(e.year, e.month - 1, e.day, e.hour, e.minute) / 1000
 				if (this.newtime < this.oldtime) {
@@ -252,7 +283,7 @@
 						line: {
 							type: 'curve'
 						}
-					},
+					}
 				});
 			},
 			touchLineA(e) {
@@ -296,10 +327,8 @@
 			height: 550rpx;
 			position: relative;
 			box-shadow: 0 0 10rpx #bcb9ca;
+			padding-top: 20px;
 			.charts{
-				width: 650upx;
-				height: 400upx;
-				background-color: #FFFFFF;
 			}
 			.canvastishi {
 				font-size: 32rpx;
@@ -309,6 +338,26 @@
 				margin-left: -64rpx;
 				margin-top: -21rpx;
 			}
+			.schedule {
+				display: flex;
+				width: 280rpx;
+				height: 50rpx;
+				border: 2rpx solid #F0F0F0;
+				margin-right: 40rpx;
+				.schedule_value {
+					width: 70%;
+					text-align: center;
+					line-height: 50rpx;
+					font-size: 24rpx;
+				}
+			
+				.schedule_icon {
+					width: 30%;
+					background-color: #F2F2F2;
+					text-align: center;
+					line-height: 50rpx;
+				}
+			}
 		}
 
 		.none_hint {
@@ -412,12 +461,11 @@
 			width: 95%;
 			margin: 20rpx auto;
 			.table{
-				width: 1042px;
+				// width: 10420px;
 			}
 			.tr {
 				display: flex;
 				overflow: hidden;
-
 				.th,
 				.td {
 					display: inline-block;

pages/environment/index.vue

@@ -6,26 +6,41 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="环境监测系统" right-icon="search" @clickRight="clickRight"
 				 size="16"></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>设备 ID：{{item.equip_id}}</p>
+						<p>设备名称：{{item.equip_name==""?"无":item.equip_name}}</p>
 						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						<p>设备名称：{{item.equip_name==""?"无":item.equip_name}}</p>
+						<p>设备 ID：{{item.equip_id}}</p>
 						<p>最新上报时间：{{item.uptime|timeFormat()}}</p>
 					</view>
 				</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>
 
@@ -36,7 +51,9 @@
 				page: 1,
 				size: 10,
 				eqlistdata: [],
-				isTop:false
+				isTop:false,
+				filtrateTF:false,
+				device_status:""
 			}
 		},
 		methods: {
@@ -45,6 +62,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)
@@ -65,11 +83,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() {
@@ -150,12 +192,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,14 +11,14 @@
 			</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'" 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.equip_id}}</p>
-						<p :class="item.is_online==1?'green':'red'" v-text="item.device_status==1?'在线':'离线'"></p>
+						<p>设备名称：{{item.equip_name==""?"无":item.equip_name}}</p>
+						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						<p>设备名称：{{item.equip_name==""?"无":item.equip_name}}</p>
+						<p>设备 ID：{{item.equip_id}}</p>
 						<p>最新上报时间：{{item.uptime|timeFormat()}}</p>
 					</view>
 				</view>

pages/equipList/index.vue

@@ -14,7 +14,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>
@@ -32,7 +32,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/equipList/modification.vue

@@ -64,10 +64,15 @@
 				})
 				console.log(res)
 				if (res==false) {
-					uni.showModal({
+					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({
+					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({
@@ -185,7 +195,6 @@
 			uni.getStorage({
 				key: "location",
 				success: (res) => {
-					// console.log(res);
 					this.moddata.lat = res.data[1]
 					this.moddata.lng = res.data[0]
 					this.selectaddress(this.moddata.lng, this.moddata.lat)

pages/equipList/search.vue

@@ -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>

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: {
@@ -202,6 +216,34 @@
 				})
 			},
 			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 +262,7 @@
 			this.getThemes()
 		},
 		onReady() {
-			this.$refs.uForm.setRules(this.rules);
+			// this.$refs.uForm.setRules(this.rules);
 		}
 	}
 </script>
@@ -249,11 +291,17 @@
 
 		}
 	}
-
+	.hintgroup{
+		width: 90%;
+		margin: 20rpx auto;
+		color: #FF0000;
+		display: flex;
+		justify-content: space-around;
+	}
 	.submitbtn {
 		width: 95%;
 		position: absolute;
-		bottom: -80rpx;
+		bottom: -100rpx;
 		background-color: $uni-color-success;
 		color: white;
 		left: 2.5%;

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,14 +14,14 @@
 			</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>
 			</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/expertDiagnosis/exchangeShare.vue

@@ -4,7 +4,7 @@
 		<view class="" style="position: relative;top: 44px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="交流圈">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/expertDiagnosis/tianjiawenjian.png'" mode="" class="right_icon" @click="postmessage"></image>
+					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/tianjiawenjian.png'" mode="" class="right_icon" @click="postmessage"></image>
 				</uni-nav-bar>
 			</view>
 			<u-action-sheet :list="actionSheetList" v-model="post_show" @click="message"></u-action-sheet>
@@ -12,17 +12,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>
@@ -34,7 +34,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>
@@ -108,13 +108,13 @@
 					})
 				} else if (this.actionSheetList[index].text.includes("我的发帖")) {
 					this.actionSheetList[index].text = "全部发帖"
-					this.pege =1
+					this.page = 1
 					let str = "my"
 					this.invitation = []
 					this.getInvitation(str)
 					this.myTF = true
 				} else if (this.actionSheetList[index].text.includes("全部发帖")) {
-					this.pege =1
+					this.page = 1
 					let str = ""
 					this.invitation = []
 					this.getInvitation(str)
@@ -128,7 +128,7 @@
 				    success: (res)=> {
 				        if (res.confirm) {
 				            this.delInvitation(items)
-							this.pege =1
+							this.page = 1
 							let str = "my"
 							this.invitation = []
 							this.getInvitation(str)

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

@@ -3,15 +3,18 @@
 		<view class="status_bar"></view>
 		<view style="position: fixed;top: 44px;">
 			<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>
+			<!-- <u-swiper :list="list" height="428" @click="examine(list)"></u-swiper> -->
+			<view class="partitlteimg">
+				<image :src="list" mode="" class="" @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>
@@ -55,7 +58,7 @@
 	export default {
 		data() {
 			return {
-				list: [{}],
+				list: "",
 				quizdata: {},
 				commentdata: [],
 				issuedata: '',
@@ -122,9 +125,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 +138,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: 0 auto;
+		height: 428rpx;
+		image{
+			width: 100%;
+			height: 100%;
+		}
 	}
-
 	.quiz {
 		width: 95%;
 		margin: 20rpx auto;

pages/expertDiagnosis/postmessage.vue

@@ -9,14 +9,18 @@
 				</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>
 							<image :src="path" mode="" class="uploading" @click="examine(path)"></image>
 						</view>
+						<view class="toload" v-if="toloadTF">
+							<image src="../../static/images/cb/6286299.gif" mode="" class="toload"></image>
+						</view>
 					</view>
 				</view>
 				<button class="post_btn" @click="post">发布</button>
@@ -38,7 +42,8 @@
 				mainbody:'',
 				uploadingTF:false,
 				url:"",
-				path:""
+				path:"",
+				toloadTF:false
 			}
 		},
 		methods: {
@@ -52,16 +57,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(){
@@ -82,6 +107,7 @@
 			},
 			onok(ev){
 				console.log(ev)
+				this.toloadTF = true
 				uni.uploadFile({
 				    url: 'http://182.92.193.64:8002/api/api_gateway?method=pest.pests.pests_img', //仅为示例，非真实的接口地址
 					filePath: ev.path,
@@ -93,6 +119,7 @@
 						console.log(JSON.parse(uploadFileRes.data).data.src)
 						this.path = JSON.parse(uploadFileRes.data).data.src
 						this.uploadingTF=true
+						this.toloadTF = false
 				    }
 				});
 				this.url = ''
@@ -139,12 +166,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;
@@ -164,6 +197,12 @@
 						height: 50rpx;
 					}
 				}
+				.toload{
+					width: 100%;
+					height: 100%;
+					position: absolute;
+					top: 0;
+				}
 				.uploading{
 					width: 100%;
 					height: 100%;

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

@@ -9,6 +9,9 @@
 				<view class="addimg_add" @click="gainimg">
 					<u-icon name="plus" size="60rpx" color="#A5A6A8"></u-icon>
 					<image :src="baseinfo.base_img" mode="" class="addimg_img"></image>
+					<view class="sim_info_loding" v-if="loding">
+						<image src="../../static/images/cb/6286299.gif" mode="" class="img"></image>
+					</view>
 				</view>
 			</view>
 			<view class="base_text">
@@ -49,11 +52,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 +84,8 @@
 		},
 		data() {
 			return {
-				base_id:{},
+				base_id:[],
+				baseobj:[],
 				baseinfo:{
 					base_name:'',//必传(str)           基地名称
 					base_charge:'',//必传(str)           负责人
@@ -88,6 +100,8 @@
 				},
 				city:'',
 				imgs:"",
+				baseobjtf:true,
+				loding:false
 			}
 		},
 		methods: {
@@ -102,6 +116,8 @@
 				uni.navigateTo({
 					url:"./index"
 				})
+				localStorage.removeItem("typeid")
+				localStorage.removeItem("location")
 			},
 			binding(){
 				uni.navigateTo({
@@ -115,6 +131,7 @@
 						sourceType: ['album', 'camera'], //从相册选择
 						success: (res) => {
 							this.imgs = res.tempFilePaths[0]
+							this.loding = true
 						}
 					})
 			},
@@ -176,15 +193,17 @@
 						});
 					}else{
 						console.log(this.baseinfo)
-						this.addbase()
-						uni.removeStorage({
-						    key: 'id',
-						    success: function (res) {
-						       uni.navigateTo({
-						       	url:"./index"
-						       })
-						    }
-						});
+						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("typeid")
+						localStorage.removeItem("location")
 					}
 				}
 			},
@@ -208,26 +227,56 @@
 					success: (uploadFileRes) => {
 						this.baseinfo.base_img = JSON.parse(uploadFileRes.data).data.src
 						// this.$forceUpdate() //强制刷新视图
+						this.loding = false
 					}
 				});
 				this.imgs = ''
 			},
 			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
 			    }
 			});
 		}
@@ -248,6 +297,16 @@
 		text-align: center;
 		line-height: 276rpx;
 		color: #A7A8AA;
+		.sim_info_loding{
+			position: absolute;
+			top: 0;
+			left: 50%;
+			margin-left: -25%;
+			image{
+				width: 300rpx;
+				height: 300rpx;
+			}
+		}
 		.addimg_img{
 			position: absolute;
 			top: 0;
@@ -261,6 +320,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,12 @@
 			}
 		},
 		onLoad(option) {
-			console.log(option)
-			if (option.type) {
-				this.addtype = option.type.split("#")
-				console.log(this.addtype)
+			this.base_id = option.base_id
+			if(this.base_id){
+				this.ybase()
+			}else{
+				this.getFourbase()
 			}
-			this.getFourbase()
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听，可用bindingx代替
 			if (e.scrollTop > 200) { //距离大于200时显示
@@ -315,11 +316,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(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/index.vue

@@ -12,13 +12,14 @@
 					<input type="text" v-model="data.search" placeholder="请输入基地名称" @input="searchinput" />
 				</view>
 			</view>
-			<view class="bases">
+			<view class="bases_none" v-if="base_none">
+				暂无数据
+			</view>
+			<view class="bases" v-else>
 				<view class="bases_list" v-for="(items,index) in baselist" :key="index" @click="details(items.id)">
 					<view class="bases_list_bgi">
 						<image :src="items.base_img" mode=""></image>
-						<view class="bgcolor">
-
-						</view>
+						<view class="bgcolor"></view><!-- 黑色蒙版 -->
 					</view>
 					<view class="bases_list_text">
 						<p><span style="margin-right: 30rpx;">{{items.base_name}}</span><span>{{items.base_area}}亩</span></p>
@@ -28,9 +29,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>
@@ -40,7 +41,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>
@@ -71,7 +72,8 @@
 				jurisdiction:{
 					addbase:false,
 					alter:false
-				}
+				},
+				base_none:true//基地列表为空判断
 			}
 		},
 		methods: {
@@ -81,7 +83,11 @@
 					data: this.data
 				})
 				this.baselist = this.baselist.concat(res.data)
-				console.log(this.baselist)
+				if(this.baselist.length==0){
+					this.base_none = true
+				}else{
+					this.base_none = false
+				}
 				for (var i = 0; i < this.baselist.length; i++) {
 					var arr = this.baselist[i].base_equip.split("#")
 					if (arr[0] == '') {
@@ -258,12 +264,17 @@
 			}
 		}
 	}
-
+	.bases_none{
+		width: 100%;
+		position: relative;
+		top: 200rpx;
+		font-size: 36rpx;
+		text-align: center;
+	}
 	.bases {
 		width: 100%;
 		position: relative;
 		top: 170rpx;
-
 		.bases_list {
 			width: 90%;
 			margin: 0 auto 20rpx;

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: {
@@ -106,14 +116,26 @@
 					});
 				}
 			},
+			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"
 				})
+				localStorage.removeItem("typeid")
+				localStorage.removeItem("location")
 			},
 			binding(){
 				uni.navigateTo({
-					url:"./allocation?type="+this.baseinfo.base_equip
+					url:"./allocation?base_id="+this.baseinfo.base_id
 				})
 			},
 			gainimg() { //添加图片
@@ -183,9 +205,17 @@
 							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")
+						localStorage.removeItem("typeid")
+						localStorage.removeItem("location")
 					}
 				}
 			},
@@ -226,17 +256,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
 			    }
 			});
 		}
@@ -270,6 +319,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,11 +11,11 @@
 			<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>
-		<u-modal v-model="show" :mask-close-able="true" title="" :show-cancel-button="true" confirm-text="拍病害" cancel-text="拍虫害"
+		<u-modal v-model="show" :mask-close-able="true" title="" :show-cancel-button="true" confirm-text="拍病害" cancel-text="拍虫害" cancel-color="#4BB85F"
 		 content="拍照识别病虫害" @confirm="confirm" @cancel="cancel"></u-modal>
 		<kps-image-cutter @ok="onok" @cancel="oncancle" :url="url" :fixed="false" :blob="true" :maxWidth="500" :maxHeight="380" :height="380"></kps-image-cutter>
 		<view class="loading" v-if="loadTF">
@@ -23,7 +23,6 @@
 		</view>
 	</view>
 </template>
-
 <script>
 	import kpsImageCutter from "@/components/ksp-image-cutter/ksp-image-cutter.vue";
 	export default {
@@ -35,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",
@@ -93,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 +108,16 @@
 					key: 'myuser_type',
 					data: JSON.stringify(res.myuser_type),
 				})
+				this.jurisdiction={
+						cbtf:false,
+						jktf:false,
+						hjtf:false,
+						fztf:false,
+						sytf:false,
+						sbtf:false,
+						sqtf:false,
+						zjtf:false
+					}
 				console.log(res.children)
 				for(var i=0;i<res.children.length;i++){
 					switch (res.children[i].purview_name){
@@ -168,7 +167,6 @@
 					if(this.jurisdiction.zjtf){
 						uni.navigateTo({
 							url: "../expertDiagnosis/index",
-							 
 						})
 					}else{
 						uni.showToast({

pages/login/login.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="status_bar"></view>
 		<view class="logo" @longpress="logoTime">
-			<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">
 			<u-icon name="setting-fill" size="40" color="#72CD9C"></u-icon>
@@ -30,7 +30,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>
@@ -79,10 +79,12 @@
 				isShow: false, //进度条
 				percentNum: 0, //在线下载进度
 				passvalue: false,
-				turnover: true
+				turnover: false
 			}
 		},
 		onLoad() {
+		},
+		onShow() {
 			uni.getStorage({
 				key: 'user_pass',
 				success: (res) => {
@@ -106,10 +108,7 @@
 					this.value = res.data
 				}
 			})
-
 			console.log(this.value)
-		},
-		onShow() {
 			this.getEquipList()
 			uni.getStorage({
 				key: 'turnover',
@@ -117,6 +116,7 @@
 					this.turnover = Number(res.data)
 				}
 			})
+			console.log(this.turnover)
 		},
 		methods: {
 			async getEquipList() {
@@ -160,12 +160,12 @@
 													console.log('用户点击确定');
 													uni.setStorage({
 														key: "turnover",
-														data: '1',
+														data: true,
 													})
 												} else if (res.cancel) {
 													uni.setStorage({
 														key: "turnover",
-														data: '0',
+														data: false,
 													})
 												}
 											}

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">
@@ -25,7 +25,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/my/about/about.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<view class="line"></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>
 					云飞物联网
@@ -40,7 +40,7 @@
 				<text class="tit">公司邮箱</text>
 				<text class="val">hnyf826@163.com</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="line"></view>
 		<view class="part">
 			<view class="info-item" @click="renewal">
@@ -55,9 +55,9 @@
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<view class="bottom">
+		<!-- <view class="bottom">
 			©河南云飞科技发展有限公司
-		</view>
+		</view> -->
 		<u-modal title="升级中请勿随意操作" :show-confirm-button="false" v-model="showA" :content="contentA">
 			<view class="upgradeBox">
 				<u-line-progress v-show="isShow" active-color="#19be6b" :striped="true" :percent="percentNum" :striped-active="true"></u-line-progress>

pages/my/index/index.vue

@@ -19,8 +19,8 @@
 			<view style="background-color: #FFFFFF;margin: 20rpx auto 0;">
 				<view class="AboutUs" @click="about">
 					<u-icon name="moban" custom-prefix="custom-icon" class="icon_left"></u-icon>
-					关于我们
-					<!-- 关于更新 -->
+					<!-- 关于我们 -->
+					关于更新
 					<uni-icons type="arrowright" class="icon_right"></uni-icons>
 				</view>
 			</view>
@@ -101,7 +101,7 @@
 							uni.removeStorage({
 								key:"session_key"
 							})
-							uni.navigateTo({
+							uni.reLaunch({
 								url: "../../login/login"
 							})
 						} else if (res.cancel) {

pages/my/user-info/user-info.vue

@@ -3,7 +3,10 @@
 		<view class="info-item">
 			<text class="tit">头像</text>
 			<view class="avater" @click="gainimg">
-				<image :src="userinfos.image" mode="aspectFill"></image>
+				<image :src="userinfos.image" mode="aspectFill" class="user"></image>
+				<view class="sim_info_loding" v-if="loding">
+					<image src="../../../static/images/cb/6286299.gif" mode="" class="img"></image>
+				</view>
 			</view>
 		</view>
 		<view class="info-item">
@@ -48,7 +51,8 @@
 				imageList: '',
 				compileTF: false,
 				phonehint: false,
-				emailhint: false
+				emailhint: false,
+				loding:false
 			}
 		},
 		methods: {
@@ -59,6 +63,7 @@
 						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 						sourceType: ['album', 'camera'], //从相册选择
 						success: (res) => {
+							this.loding=true
 							uni.uploadFile({
 								url: 'http://182.92.193.64:8002/api/api_gateway?method=base.bases.base_photo', //仅为示例，非真实的接口地址
 								filePath: res.tempFilePaths[0],
@@ -69,6 +74,7 @@
 								success: (uploadFileRes) => {
 									this.userinfos.image = JSON.parse(uploadFileRes.data).data.src
 									this.$forceUpdate() //强制刷新视图
+									this.loding=false
 								}
 							});
 						}
@@ -89,6 +95,7 @@
 						email: this.userinfos.email
 					}
 				})
+				console.log(res)
 			},
 			compile() { //编辑按钮
 				this.compileTF = true
@@ -150,10 +157,28 @@
 					height: 100rpx;
 					border-radius: 50%;
 					overflow: hidden;
-
-					image {
+					position: relative;
+					.user {
 						width: 100%;
 						height: 100%;
+						position: absolute;
+						top: 0;
+						left: 0;
+					}
+					.sim_info_loding{
+						width: 100%;
+						height: 100%;
+						background-color: rgba(0,0,0,0.5);
+						position: absolute;
+						top: 0;
+						left: 0;
+						image{
+							width: 100%;
+							height: 100%;
+							position: absolute;
+							left: 6rpx;
+							top: 6rpx;
+						}
 					}
 				}
 

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>

pages/prevention/equipmentdetails.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.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.dtype}}</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>
@@ -168,7 +168,7 @@
 				console.log(this.eqinfo.item)
 				var device_id = this.eqinfo.item.imei
 				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

@@ -6,24 +6,40 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="防治系统" right-icon="search" @clickRight="clickRight"
 				 size="16"></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>设备 ID：{{item.imei}}</p>
+						<p>设备名称：{{item.device_name==""?"无":item.device_name}}</p>
 						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						<p>设备名称：{{item.device_name==""?"无":item.device_name}}</p>
+						<p>设备 ID：{{item.imei}}</p>
 						<p>最新上报时间：{{item.addtime|timeFormat()}}</p>
 					</view>
 				</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>
@@ -35,7 +51,9 @@
 				page: 1,
 				size: 10,
 				eqlistdata: [],
-				isTop:false
+				isTop:false,
+				filtrateTF:false,
+				device_status:""
 			}
 		},
 		methods: {
@@ -46,6 +64,7 @@
 						device_type_id: 2,
 						page: this.page,
 						size: this.size,
+						device_status:this.device_status
 					}
 				})
 				this.eqlistdata = this.eqlistdata.concat(res.data)
@@ -66,11 +85,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() {
@@ -86,7 +129,7 @@
 			} else { //距离小于200时隐藏
 				this.isTop = false
 			}
-		},
+		}
 	}
 </script>
 
@@ -151,12 +194,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,14 +11,14 @@
 			</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>设备 ID：{{item.imei}}</p>
+						<p>设备名称：{{item.device_name==""?"无":item.device_name}}</p>
 						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						<p>设备名称：{{item.device_name==""?"无":item.device_name}}</p>
+						<p>设备 ID：{{item.imei}}</p>
 						<p>最新上报时间：{{item.addtime|timeFormat()}}</p>
 					</view>
 				</view>
@@ -28,10 +28,7 @@
 </template>
 
 <script>
-	import {
-		Debounce,
-		Throttle
-	} from "../../util/anitthro.js"
+	import {Debounce} from "../../util/anitthro.js"
 	export default {
 		data() {
 			return {

pages/prevention/sim.vue

@@ -6,18 +6,24 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="sim卡详情"></uni-nav-bar>
 			</view>
 			<view class="sim_info">
+				<view class="sim_info_loding" v-if="loding">
+					<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>
-					<p>sim卡查询</p>
+					<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">
 					<p>运营商：{{siminfo.data.carrier}}</p>
 					<p>ICCID：{{iccid}}</p>
-					<p>状态：{{state[siminfo.data.account_status]}}</p>
-					<p>套餐：{{siminfo.data.data_plan}}MB</p>
-					<p>已用流量：{{siminfo.data.data_usage}}MB</p>
-					<p>剩余流量：{{siminfo.data.data_balance}}MB</p>
-					<p>到期时间：{{siminfo.data.outbound_date|timeFormat()}}</p>
+					<p>状态：{{state}}</p>
+					<p>套餐：{{siminfo.data.data_plan || siminfo.data.totalDataVolume}}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>
 			</view>
 		</view>
@@ -39,12 +45,14 @@
 						outbound_date: ""
 					}
 				},
-				state: ['未知', '测试期', '沉默期', '使用中', '停机', '停机保号', '预销号', '销号'],
-				id: ''
+				state:"",
+				id: '',
+				simnew:"",
+				loding:false
 			}
 		},
 		methods: {
-			async simid(data) { //设备列表
+			async simid(data) { //获取sim卡号
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.send_control.device_sim',
 					data: {
@@ -58,15 +66,45 @@
 				}
 				
 			},
-			async simdata(data) { //设备列表
+			async simdata(data) { //获取sim信息
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.send_control.sim_query',
 					data: {
 						iccid: data
 					}
 				})
-				// console.log()
+				if(res.code==1){//企鹏
+					this.simnew = "新"
+					switch (res.data.data.deviceStatus){
+						case "ACTIVATION_READY_NAME":
+							this.state = "可测试"
+							break;
+						case "TEST_READY_NAME":
+							this.state = "库存"
+							break;
+						case "INVENTORY_NAME":
+							this.state = "可激活"
+							break;
+						case "ACTIVATION_READY_NAME":
+							this.state = "已激活"
+							break;
+						case "ACTIVATED_NAME":
+							this.state = "已停卡"
+							break;
+						case "DEACTIVATED_NAME":
+							this.state = "已销卡"
+							break;
+						case "RETIRED_NAME":
+							this.state = "已清除"
+							break;
+					}
+				}else if(res.code==2){//合宙
+					var arr = ['未知', '测试期', '沉默期', '使用中', '停机', '停机保号', '预销号', '销号']
+					this.state = arr[res.data.data.active]
+					this.simnew = "旧"
+				}
 				this.siminfo = res.data
+				this.loding = false
 				console.log(this.siminfo.data)
 			},
 			clickLeft() {
@@ -78,6 +116,7 @@
 		onLoad(option) {
 			console.log(option)
 			this.id = option.id
+			this.loding = true
 			this.simid(this.id)
 		}
 	}
@@ -93,7 +132,24 @@
 		padding: 30rpx 20rpx 50rpx;
 		border-radius: 20rpx;
 		box-sizing: border-box;
-
+		
+		.sim_info_loding{
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			background-color: rgba(0,0,0,0.3);
+			border-radius: 20rpx;
+			height: 100%;
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+			.img{
+				width: 400rpx;
+				height: 350rpx;
+				
+			}
+		}
 		.sim_info_title {
 			width: 100%;
 			display: flex;

pages/prevention/ucharts.vue

@@ -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">

static/h52.html

@@ -42,7 +42,7 @@
 			.direc {
 				width: 400px;
 				height: 400px;
-				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;
@@ -87,7 +87,7 @@
 		<div id="box"></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()">
@@ -107,7 +107,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>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/92c64520-c8f7-11eb-89f8-79a7dcf5e6e8
+https://service.dcloud.net.cn/build/download/383da2d0-d661-11eb-a990-2103d6978d89

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

@@ -42,7 +42,7 @@
 			.direc {
 				width: 400px;
 				height: 400px;
-				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;
@@ -87,7 +87,7 @@
 		<div id="box"></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()">
@@ -107,7 +107,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>

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

@@ -42,7 +42,7 @@
 			.direc {
 				width: 400px;
 				height: 400px;
-				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;
@@ -87,7 +87,7 @@
 		<div id="box"></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()">
@@ -107,7 +107,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>

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

@@ -42,7 +42,7 @@
 			.direc {
 				width: 400px;
 				height: 400px;
-				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;
@@ -87,7 +87,7 @@
 		<div id="box"></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()">
@@ -107,7 +107,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>