””6/19

App.vue

@@ -15,7 +15,7 @@
 	}
 
 	.status_bar {
-		height: 64px;
+		height: 20px;
 		width: 100%;
 		background-color: #FFFFFF;
 		position: fixed;

pages/afterSale/addafter.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备报修"></uni-nav-bar>
 			</view>
@@ -206,6 +206,11 @@
 			},
 			deletes(index){//删除
 				this.uploadingTF[index]=false
+				if(index==3){
+					this.selfList = ""
+				}else{
+					this.imageList.splice(index,1)
+				}
 				this.$forceUpdate() //强制刷新视图
 			},
 			async getaddafter(data) {//提交数据
@@ -223,6 +228,7 @@
 						    is_pc:0
 					}
 				})
+				console.log(res)
 			},
 			async getID(data) {
 				const res = await this.$myRequest({
@@ -243,11 +249,15 @@
 				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)
+				obj.selfList=this.selfList
 				console.log(obj.imageList)
 				// 设备号错误
 				if(this.deviceid){
@@ -270,7 +280,7 @@
 					});
 				}else{
 					console.log(1)
-					// this.getaddafter(obj)
+					this.getaddafter(obj)
 				}
 			},
 			actionSheetCallback(index) {//选择器选择

pages/afterSale/index.vue

@@ -1,8 +1,15 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view style="position: fixed;z-index: 100;top: 64px;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="售后系统" rightIcon="search" @clickRight="search"></uni-nav-bar>
+		<view style="position: fixed;z-index: 100;top: 20px;">
+			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回">
+				<view class="bases_search">
+					<view class="bases_search_text" @click="search">
+						<u-icon name="search" class="search" @click="search"></u-icon>
+						<input type="text" v-model="data.search" placeholder="设备ID搜索" disabled/>
+					</view>
+				</view>
+			</uni-nav-bar>
 		</view>
 		<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/afterSale/dcd7147f4b15d00c5c90006738b8453.png'" class="expertimages"></image>
 		<view class="aftersaleTF" v-if="aftersaleTF">
@@ -196,35 +203,49 @@
 		width: 100%;
 		height: 154rpx;
 		position: fixed;
-		top: 108px;
-		z-index: 100;
-	}
-
-	.aftersale_search {
-		position: fixed;
+		top: 64px;
 		z-index: 100;
-		top: 124rpx;
-		right: 20rpx;
-
-		.sp_icon {
-			font-size: 36rpx;
-			margin-left: 16rpx;
-		}
 	}
-	
 	.aftersaleTF{
 		width: 100%;
 		position: relative;
-		top: 340rpx;
+		top: 300rpx;
 		text-align: center;
 		padding-top: 40rpx;
 		font-size: 20px;
 	}
+	.bases_search {
+		width: 60%;
+		background-color: #FFFFFF;
+		position: absolute;
+		top: 10rpx;
+		left: 50%;
+		margin-left: -33%;
+		.bases_search_text {
+			width: 90%;
+			margin: 0 auto;
+			background-color: #F8F8F8;
+			height: 60rpx;
+			border-radius: 30rpx;
+			display: flex;
+			line-height: 60rpx;
+	
+			.search {
+				padding: 0 20rpx;
+				font-size: 34rpx;
+			}
+	
+			input {
+				width: 80%;
+				margin-top: 10rpx;
+				font-size: 28rpx;
+			}
+		}
+	}
 	.aftersale {
 		width: 100%;
-		// margin-top: 20rpx;
 		position: relative;
-		top: 380rpx;
+		top: 300rpx;
 		margin-bottom: 100rpx;
 		.aftersale_item {
 			width: 90%;

pages/afterSale/search.vue

@@ -1,12 +1,19 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view style="position: fixed;z-index: 100;top: 64px;">
+		<!-- <view style="position: fixed;z-index: 100;top: 64px;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"></uni-nav-bar>
 			<view class="search_top_input">
 				<input type="text" value="" placeholder="请输入设备ID"  v-model="imports" @input="searchinp"/>
 				<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
 			</view>
+		</view> -->
+		<view style="position: fixed;z-index: 100;background-color: #FFFFFF;height: 80px;top: 20px;">
+			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备搜索"></uni-nav-bar>
+			<view class="search_top_input">
+				<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinp" />
+				<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
+			</view>
 		</view>
 		<view class="aftersaleinfo" v-if="aftersaleinfotf">
 			暂无此设备信息
@@ -172,13 +179,13 @@
 </script>
 <style lang="scss">
 	.search_top_input{
-		width: 80%;
+		width: 90%;
 		height: 54rpx;
 		background-color: #E4E4E4;
 		border-radius: 27rpx;
 		position: absolute;
-		top: 18rpx;
-		right: 18rpx;
+		top: 100rpx;
+		right: 5%;
 		padding-top: 8rpx;
 		box-sizing: border-box;
 		input {

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="历史数据"></uni-nav-bar>
 			</view>

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="手动添加"></uni-nav-bar>
 			</view>

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="历史数据"></uni-nav-bar>
 			</view>

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

@@ -1,11 +1,11 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="查看图片" rightIcon="camera" @clickRight="clickRight"></uni-nav-bar>
 			</view>
-			<p class="tishi" v-if="tishi">暂无数据</p>
+			<p class="tishi" v-if="tishi">暂无图片</p>
 			<view class="timeshow">
 				<view class="shuju_one_title">
 					<view :class="titleidnex==index?'title_text_color':'tltle_text'" v-for="(item,index) in titletext" :key="index"
@@ -249,6 +249,7 @@
 		onShow(){
 			this.timeend = +new Date() / 1000
 			this.timestate = this.timeend - 60 * 60 * 24
+			this.imglists=[]
 			this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
 		},
 		onReachBottom() {
@@ -280,7 +281,7 @@
 		height: 50rpx;
 		background-color: #FFFFFF;
 		position: fixed;
-		top: 104px;
+		top: 64px;
 		left: 2.5%;
 		display: flex;
 		z-index: 100;
@@ -313,7 +314,7 @@
 	}
 	.imglist {
 		position: absolute;
-		top: 84px;
+		top: 104px;
 		width: 95%;
 		left: 2.5%;
 

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

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

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="害虫统计"></uni-nav-bar>
 			</view>

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

@@ -75,7 +75,7 @@
 		</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">
 			暂无数据
@@ -554,6 +554,8 @@
 					path="/pages/cb/cbd/equip-set/historyfile"
 				}else if(this.type == 7){
 					path="/pages/cb/bzy/equip-set/bzyhistoryile"
+				}else if(this.type == 4){
+					path="/pages/cb/xy/equip-set/xyhistoryile"
 				}
 				uni.navigateTo({
 					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + this.equipInfo.imei + "&device_type="+this.type

pages/cb/index/index.vue

@@ -1,10 +1,16 @@
 <template>
 	<view class="">
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
-				<uni-nav-bar @clickRight="clickRight" @clickLeft="clickLeft" left-icon="back" left-text="返回" right-icon="search"
-				 title="测报系统"></uni-nav-bar>
+				<uni-nav-bar  @clickLeft="clickLeft" left-icon="back" left-text="返回"
+				 ></uni-nav-bar>
+				 <view class="bases_search">
+				 	<view class="bases_search_text" @click="clickRight">
+				 		<u-icon name="search" class="search" @click="search"></u-icon>
+				 		<input type="text" v-model="data.search" placeholder="设备ID搜索" @input="searchinput" disabled/>
+				 	</view>
+				 </view>
 				<view>
 					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/banner.jpg'" mode="widthFix"></image>
 				</view>
@@ -15,7 +21,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="" style="position: absolute;top: 180px;width: 100%;">
+			<view class="" style="position: absolute;top: 170px;width: 100%;">
 				<view class="content">
 					<template v-for="(item,index) in equipArr[active].list">
 						<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">
@@ -231,7 +237,35 @@
 	image {
 		width: 100%;
 	}
-
+	
+	.bases_search {
+		width: 60%;
+		background-color: #FFFFFF;
+		position: absolute;
+		top: 10rpx;
+		left: 50%;
+		margin-left: -33%;
+		.bases_search_text {
+			width: 90%;
+			margin: 0 auto;
+			background-color: #F8F8F8;
+			height: 60rpx;
+			border-radius: 30rpx;
+			display: flex;
+			line-height: 60rpx;
+	
+			.search {
+				padding: 0 20rpx;
+				font-size: 34rpx;
+			}
+	
+			input {
+				width: 80%;
+				margin-top: 10rpx;
+				font-size: 28rpx;
+			}
+		}
+	}
 	.tab-box {
 		display: flex;
 		justify-content: space-around;

pages/cb/index/search.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 44px;">
-			<view style="position: fixed;z-index: 100;padding-top: 20rpx;background-color: #FFFFFF;">
-				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"></uni-nav-bar>
+		<view class="" style="position: relative;top: 20px;">
+			<view style="position: fixed;z-index: 100;background-color: #FFFFFF;height: 80px;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备搜索"></uni-nav-bar>
 				<view class="search_top_input">
 					<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinp" />
 					<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
@@ -161,16 +161,15 @@
 
 <style lang="scss">
 	.search_top_input {
-		width: 80%;
+		width: 90%;
 		height: 54rpx;
 		background-color: #E4E4E4;
 		border-radius: 27rpx;
 		position: absolute;
-		top: 33rpx;
-		right: 18rpx;
+		top: 100rpx;
+		right: 5%;
 		padding-top: 8rpx;
 		box-sizing: border-box;
-	
 		input {
 			width: 85%;
 			// text-indent: 1rem;
@@ -197,7 +196,7 @@
 	.prevents {
 		width: 100%;
 		position: absolute;
-		top: 60px;
+		top: 90px;
 		.prevents_item {
 			width: 95%;
 			margin: 0 auto 30rpx;

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://static.yfpyx.com/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>
@@ -27,14 +30,18 @@
 			</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://static.yfpyx.com/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" />
 				</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,132 +102,222 @@
 					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){
-			this.d_id=option.d_id
+		onLoad(option) {
+			if (Number(option.device_type) == 4) {
+				this.showHksimFlag = false
+			}
+			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
-				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, //到期日期
+				let obj = res2.data.data
+				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;
+				.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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="历史数据"></uni-nav-bar>
 			</view>

pages/disandpests/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="病虫害识别"></uni-nav-bar>
 			</view>

pages/environment/contros.vue

@@ -1,40 +1,42 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<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" v-model="config.interval" @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>
@@ -50,7 +52,8 @@
 					timeout: "",
 					interval: 1
 				},
-				id: ''
+				id: '',
+				led:0
 			}
 		},
 		methods: {
@@ -65,8 +68,7 @@
 				})
 				console.log(res)
 				this.config.interval = res.interval
-				this.config.content = res.content
-				this.config.timeout = res.timeout
+				this.led = Number(res.led)
 			},
 			//forecast.send_control.device_control  config: {"interval":10,"content":"content","timeout":"1"}
 			async timing(datas) { //提交数据
@@ -148,9 +150,9 @@
 			chongqi() { //重启按钮
 				this.restart('reboot')
 			},
-			shengji() { //升级按钮
-				this.restart('update')
-			},
+			// shengji() { //升级按钮
+			// 	this.restart('update')
+			// },
 			search() { //查询按钮
 				this.uploading()
 			}
@@ -171,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 {
@@ -196,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;
@@ -212,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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;width: 100%;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备详情"></uni-nav-bar>
 			</view>
@@ -9,7 +9,7 @@
 				<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'"
 					 mode="" class="bgi"></image>
-					<p style="font-size: 32rpx;" @click="copy(eqinfo.item)">设备 ID：{{eqinfo.item.equip_id||eqinfo.item.device_id}}
+					<p style="font-size: 32rpx;" @click="copy(eqinfo.item)">设备 ID：{{eqinfo.item.equip_id||eqinfo.item.imei}}
 						<image src="http://static.yfpyx.com/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
 					</p>
 					<p>设备名称：{{eqinfo.item.equip_name?eqinfo.item.equip_name:"无"}}</p>
@@ -35,7 +35,7 @@
 				<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'"
 								 mode=""></image>
@@ -76,7 +76,11 @@
 	export default {
 		data() {
 			return {
-				eqinfo: {},
+				eqinfo: {
+					item:{
+						
+					}
+				},
 				olddata: {},
 				olddatas: ["#fba825", "#53d67c", "#008cf2", "#fb504d", "#d87ffc", "#4ec5f0"],
 				city: "",

pages/environment/history.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 10000000;width: 100%;background-color: #000000;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="历史数据"></uni-nav-bar>
 			</view>

pages/environment/index.vue

@@ -1,10 +1,17 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
-				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="环境监测系统" right-icon="search" @clickRight="clickRight"
-				 size="16"></uni-nav-bar>
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"
+				 size="16">
+					<view class="bases_search">
+						<view class="bases_search_text" @click="clickRight">
+							<u-icon name="search" class="search" @click="search"></u-icon>
+							<input type="text" v-model="data.search" placeholder="设备ID搜索" @input="searchinput" disabled/>
+						</view>
+					</view>
+				 </uni-nav-bar>
 			</view>
 			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/1.png'" mode="" class="image"></image>
 			<view class="prevents">
@@ -95,12 +102,39 @@
 
 	.image {
 		position: fixed;
-		top: 103px;
+		top: 65px;
 		width: 100%;
 		height: 160rpx;
 		z-index: 555;
 	}
-
+	.bases_search {
+		width: 60%;
+		background-color: #FFFFFF;
+		position: absolute;
+		top: 10rpx;
+		left: 50%;
+		margin-left: -33%;
+		.bases_search_text {
+			width: 90%;
+			margin: 0 auto;
+			background-color: #F8F8F8;
+			height: 60rpx;
+			border-radius: 30rpx;
+			display: flex;
+			line-height: 60rpx;
+	
+			.search {
+				padding: 0 20rpx;
+				font-size: 34rpx;
+			}
+	
+			input {
+				width: 80%;
+				margin-top: 10rpx;
+				font-size: 28rpx;
+			}
+		}
+	}
 	.prevents {
 		width: 100%;
 		position: absolute;

pages/environment/search.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
-			<view style="position: fixed;z-index: 100;">
-				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"></uni-nav-bar>
+		<view class="" style="position: relative;top: 20px;">
+			<view style="position: fixed;z-index: 100;background-color: #FFFFFF;height: 80px;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备搜索"></uni-nav-bar>
 				<view class="search_top_input">
 					<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinp" />
 					<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
@@ -14,12 +14,12 @@
 					<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="" class="prevents_item_img"></image>
 					<view class="prevents_item_top">
-						<p>设备 ID：{{item.imei}}</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.device_name==""?"无":item.device_name}}</p>
-						<p>最新上报时间：{{item.addtime|timeFormat()}}</p>
+						<p>设备 ID：{{item.equip_id}}</p>
+						<p>最新上报时间：{{item.uptime|timeFormat()}}</p>
 					</view>
 				</view>
 			</view>
@@ -63,7 +63,7 @@
 		methods: {
 			async eqlist() { //设备列表
 				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=forecast.worm_lamp.lamp_list',
+					url: '/api/api_gateway?method=weather.weather.qxz_page',
 					data: {
 						device_type_id: 2,
 						page: this.page,
@@ -71,7 +71,8 @@
 						device_id: this.imports
 					}
 				})
-				this.eqlistdata = this.eqlistdata.concat(res.data)
+				// console.log(res)
+				this.eqlistdata = this.eqlistdata.concat(res.ids)
 				console.log(this.eqlistdata)
 			},
 			clickLeft() {
@@ -95,7 +96,7 @@
 			},
 			eqdetails(data) {
 				uni.navigateTo({
-					url: "./equipmentdetails?shebei=" + JSON.stringify(data)
+					url: "./equipment?shebei=" + JSON.stringify(data)
 				})
 			}
 		}
@@ -104,13 +105,13 @@
 
 <style lang="scss">
 	.search_top_input {
-		width: 80%;
+		width: 90%;
 		height: 54rpx;
 		background-color: #E4E4E4;
 		border-radius: 27rpx;
 		position: absolute;
-		top: 18rpx;
-		right: 18rpx;
+		top: 100rpx;
+		right: 5%;
 		padding-top: 8rpx;
 		box-sizing: border-box;
 		input {
@@ -131,7 +132,7 @@
 	.prevents {
 		width: 100%;
 		position: absolute;
-		top: 54px;
+		top: 84px;
 
 		.prevents_item {
 			width: 95%;

pages/equipList/modification.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="修改名称"></uni-nav-bar>
 			</view>

pages/equipList/search.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view style="position: fixed;top: 44px; z-index: 100;height: 80rpx;background-color: #FFFFFF;padding-top: 10px;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"></uni-nav-bar>
-			<view class="search_bot_input">
-				<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinput" />
+		<view style="position: fixed;z-index: 100;background-color: #FFFFFF;height: 80px;top: 20px;">
+			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备搜索"></uni-nav-bar>
+			<view class="search_top_input">
+				<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinp" />
 				<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
 			</view>
 		</view>
@@ -12,7 +12,7 @@
 			<view class="list_item" v-for="(item,index) in eqlistdata" :key="index" @click="historys(item)">
 				<view class="list_item_top">
 					<p class="p1">
-						<image :src=" 'http://static.yfpyx.com/bigdata_app'+images[indexs-2].path" mode=""></image>
+						<image :src="'http://static.yfpyx.com/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>
@@ -46,31 +46,43 @@
 				imports: '',
 				eqlistdata: [],
 				images: [{
-						path: "/image/fourMoodBase/scd.png",
+						name: "杀虫灯",
+						path: "/image/fourMoodBase/3.png", //
 						id: 2
 					},
 					{
-						path: "/image/fourMoodBase/cbd.png",
+						name: "测报灯",
+						path: "/image/fourMoodBase/1.png",
 						id: 3
 					}, {
-						path: "/image/fourMoodBase/xycb.png",
+						name: "性诱测报",
+						path: "/image/fourMoodBase/6.png",
 						id: 4
 					}, {
-						path: "/image/fourMoodBase/qxz.png",
+						name: "环境监测",
+						path: "/image/fourMoodBase/5.png",
 						id: 5
 					}, {
-						path: "/image/fourMoodBase/jk.png",
+						name: "监控设备",
+						path: "/image/fourMoodBase/2.png",
 						id: 6
 					}, {
-						path: "/image/fourMoodBase/bzy.png",
+						name: "孢子仪",
+						path: "/image/fourMoodBase/4.png",
 						id: 7
+					},
+					{
+						name: "性诱2.0",
+						path: "/image/fourMoodBase/10.png",
+						id: 10
 					}
 				],
 				eqlistdatatf: false, //暂无数据
 				indexs: 2, //设备id
 				page: 1,
 				size: 10,
-				infoalter:false
+				infoalter:false,
+				imgpath:[]
 			}
 		},
 		methods: {
@@ -106,6 +118,7 @@
 				this.eqlistdata = []
 				this.page = 1
 				this.eqlist()
+				console.log(1)
 			},
 			searchinput() {
 				Debounce(() => {
@@ -156,7 +169,10 @@
 		},
 		onLoad(option) {
 			this.indexs = option.id
-			console.log(this.indexs)
+			this.imgpath = this.images.filter((item)=>{
+				return item.id == option.id
+			})
+			console.log(this.imgpath)
 			uni.getStorage({
 				key:"jurisdiction",
 				success:(res)=>{
@@ -165,7 +181,7 @@
 						return item.purview_name == "设备管理"
 					})
 					let items2 = items[0].children.filter((item)=>{
-						return item.purview_name == "分配设备"
+						return item.purview_name == "设备列表"
 					})
 					this.infoalter = items2[0].children.some((item)=>{
 						return item.purview_name == "修改名称" || item.purview_name == "添加位置"
@@ -188,26 +204,25 @@
 </script>
 <style lang="scss">
 	.search_top_input {
-		width: 80%;
+		width: 90%;
 		height: 54rpx;
 		background-color: #E4E4E4;
 		border-radius: 27rpx;
 		position: absolute;
-		top: 18rpx;
-		right: 18rpx;
+		top: 100rpx;
+		right: 5%;
 		padding-top: 8rpx;
 		box-sizing: border-box;
-
 		input {
-			width: 85%;
-			text-indent: 1rem;
+			width: 80%;
+			// text-indent: 1rem;
 			font-size: 26rpx;
+			padding-left: 20px;
 		}
-
-		.icon {
+		.icon{
 			position: absolute;
-			top: 18rpx;
-			right: 32rpx;
+			top: 8rpx;
+			right: 26rpx;
 		}
 	}
 
@@ -224,9 +239,8 @@
 
 		input {
 			width: 85%;
-			// text-indent: 1rem;
+			text-indent: 1rem;
 			font-size: 26rpx;
-			padding-left: 20px;
 		}
 
 		.icon {
@@ -243,7 +257,7 @@
 		top: 100px;
 
 		.list_item {
-			width: 95%;
+			width: 90%;
 			margin: 20rpx auto;
 			padding: 10rpx 20rpx;
 			position: relative;

pages/equipMange/index/addusers.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="用户新增"></uni-nav-bar>
 			</view>

pages/equipMange/index/assignment.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
-			<view style="position: fixed;z-index: 100;top:64px;width: 100%;">
+		<view class="" style="position: relative;top: 20px;">
+			<view style="position: fixed;z-index: 100;top:20px;width: 100%;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备分配"></uni-nav-bar>
 			</view>
 			<view class="utabs">
@@ -230,7 +230,7 @@
 	.utabs {
 		width: 100%;
 		position: fixed;
-		top: 108px;
+		top: 64px;
 		z-index: 100;
 	}
 

pages/equipMange/index/changepasswold.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="修改密码"></uni-nav-bar>
 			</view>

pages/equipMange/index/index.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="">
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
-				<uni-nav-bar left-icon="back" left-text="返回" right-icon="plus" title="用户管理" @clickRight="clickRight" @clickLeft="clickLeft"></uni-nav-bar>
+				<uni-nav-bar left-icon="back" left-text="返回" title="用户管理" @clickLeft="clickLeft"></uni-nav-bar>
 			</view>
 			<view class="uinput-box">
 				<view class="uinputs">
@@ -20,6 +20,9 @@
 				</view>
 			</view>
 		</view> 
+		<view class="addindent" @click="clickRight">
+			新 增 用 户
+		</view>
 		<view class="top" v-if="isTop" @click="top">
 			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
@@ -162,7 +165,7 @@
 		}
 	.uinput-box {
 		position: fixed;
-		top: 108px;
+		top: 64px;
 		z-index: 100;
 		background-color: white;
 		width: 100%;
@@ -186,7 +189,6 @@
 		width: 100%;
 		position: relative;
 		top: 180rpx;
-
 		.userlist-li {
 			width: 46%;
 			height: 270rpx;
@@ -202,6 +204,18 @@
 			}
 		}
 	}
+	.addindent{
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		height: 80rpx;
+		text-align: center;
+		line-height: 80rpx;
+		background-color: #71cd9a;
+		color: #ffffff;
+		font-size: 16px;
+	}
 	.top {
 		position: fixed;
 		right: 30px;

pages/equipMange/index/useroperation.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar left-icon="back" left-text="返回" @clickLeft="clickLeft" title="用户详情"></uni-nav-bar>
 			</view>

pages/expertDiagnosis/exchangeShare.vue

@@ -1,10 +1,9 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<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>
 				</uni-nav-bar>
 			</view>
 			<u-action-sheet :list="actionSheetList" v-model="post_show" @click="message"></u-action-sheet>
@@ -33,6 +32,9 @@
 				</view>
 			</view>
 		</view>
+		<view class="addindent" @click="postmessage">
+			发 帖
+		</view>
 		<view class="top" v-if="isTop" @click="top">
 			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
@@ -108,13 +110,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 +130,7 @@
 				    success: (res)=> {
 				        if (res.confirm) {
 				            this.delInvitation(items)
-							this.pege =1
+							this.page = 1
 							let str = "my"
 							this.invitation = []
 							this.getInvitation(str)
@@ -276,6 +278,19 @@
 			}
 		}
 	}
+	.addindent{
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		height: 80rpx;
+		text-align: center;
+		line-height: 80rpx;
+		background-color: #71cd9a;
+		color: #ffffff;
+		font-size: 16px;
+		z-index: 100;
+	}
 	.top { 
 		position: fixed;
 		right: 30px;

pages/expertDiagnosis/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="专家诊断"></uni-nav-bar>
 			</view>
@@ -116,7 +116,7 @@
 				success:(res)=>{
 					console.log(JSON.parse(res.data))
 					let items = JSON.parse(res.data).filter((item)=>{
-						return item.purview_name == "专家介绍"
+						return item.purview_name == "专家诊断"
 					})
 					this.jurisdiction = items[0].children.some((item)=>{
 						return item.purview_name == "发帖列表"

pages/expertDiagnosis/introduce.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
 			</view>

pages/expertDiagnosis/particulars.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view style="position: fixed;top: 64px;">
+		<view style="position: fixed;top: 20px;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
 			<u-swiper :list="list" height="428" @click="examine(list)"></u-swiper>
 			<view class="quiz">

pages/expertDiagnosis/postmessage.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="发帖"></uni-nav-bar>
 			<view class="post">
 				<view class="post_title">

pages/expertDiagnosis/wormcase.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" :title="title"></uni-nav-bar>
 			</view>

pages/fourBase/addbase.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="新增基地"></uni-nav-bar>
 			</view>

pages/fourBase/allocation.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 44px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备分配"></uni-nav-bar>
 			</view>
@@ -183,7 +183,7 @@
 	.utabs {
 		width: 100%;
 		position: fixed;
-		top: 88px;
+		top: 64px;
 		z-index: 100;
 	}
 

pages/fourBase/basefacility.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="基地设备"></uni-nav-bar>
 			</view>

pages/fourBase/index.vue

@@ -1,15 +1,14 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="四情基地"></uni-nav-bar>
-				<u-icon name="plus-circle" class="tianjia" @click="clickRight"></u-icon>
-			</view>
-			<view class="bases_search">
-				<view class="bases_search_text">
-					<u-icon name="search" class="search" @click="search"></u-icon>
-					<input type="text" v-model="data.search" placeholder="请输入基地名称" @input="searchinput" />
+				<view class="bases_search">
+					<view class="bases_search_text">
+						<u-icon name="search" class="search" @click="search"></u-icon>
+						<input type="text" v-model="data.search" placeholder="请输入基地名称" @input="searchinput" />
+					</view>
 				</view>
 			</view>
 			<view class="bases_none" v-if="base_none">
@@ -42,6 +41,9 @@
 				<u-action-sheet :list="actionSheetList" v-model="post_show" @click="message"></u-action-sheet>
 			</view>
 		</view>
+		<view class="addindent" @click="clickRight">
+			新 增 基 地
+		</view>
 		<view class="top" v-if="isTop" @click="top">
 			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
 		</view>
@@ -233,7 +235,7 @@
 	.bases_search {
 		width: 100%;
 		position: fixed;
-		top: 108px;
+		top: 64px;
 		z-index: 100;
 		background-color: #FFFFFF;
 
@@ -269,7 +271,7 @@
 		width: 100%;
 		position: relative;
 		top: 170rpx;
-
+		margin-bottom:100rpx;
 		.bases_list {
 			width: 90%;
 			margin: 0 auto 20rpx;
@@ -359,4 +361,17 @@
 			height: 100rpx;
 		}
 	}
+	.addindent{
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		height: 80rpx;
+		text-align: center;
+		line-height: 80rpx;
+		background-color: #71cd9a;
+		color: #ffffff;
+		font-size: 16px;
+		z-index: 100;
+	}
 </style>

pages/fourBase/modification.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="基地修改"></uni-nav-bar>
 			</view>

pages/index/index.vue

@@ -15,7 +15,7 @@
 				</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" :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">
@@ -89,16 +89,6 @@
 			}
 		},
 		onLoad() {
-			this.jurisdiction={
-					cbtf:false,
-					jktf:false,
-					hjtf:false,
-					fztf:false,
-					sytf:false,
-					sbtf:false,
-					sqtf:false,
-					zjtf:false
-				}
 			this.getUserlogin()
 		}, 
 		onShow(){

pages/monitor/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<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;">

pages/my/index/index.vue

@@ -11,7 +11,7 @@
 						<p>{{userinfos.email || userinfos.mobile}}</p>
 					</view>
 					<view class="personal_right" @click="userinfo">
-						<uni-icons type="compose" style="color: #FFFFFF;margin-right: 10rpx;"></uni-icons>
+						<uni-icons type="compose" style="margin-right: 10rpx;" color="#FFFFFF"></uni-icons>
 						编辑
 					</view>
 				</view>

pages/prevention/control.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;width: 100%;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备控制"></uni-nav-bar>
 			</view>

pages/prevention/equipmentdetails.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;width: 100%;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备详情"></uni-nav-bar>
 			</view>

pages/prevention/index.vue

@@ -1,10 +1,17 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;">
-				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="防治系统" right-icon="search" @clickRight="clickRight"
-				 size="16"></uni-nav-bar>
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"
+				 size="16">
+				 <view class="bases_search">
+				 	<view class="bases_search_text" @click="clickRight">
+				 		<u-icon name="search" class="search" @click="search"></u-icon>
+				 		<input type="text" v-model="data.search" placeholder="设备ID搜索" disabled/>
+				 	</view>
+				 </view>
+				 </uni-nav-bar>
 			</view>
 			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/1.png'" mode="" class="image"></image>
 			<view class="prevents">
@@ -97,12 +104,40 @@
 
 	.image {
 		position: fixed;
-		top: 108px;
+		top: 65px;
 		width: 100%;
 		height: 160rpx;
 		z-index: 555;
 	}
-
+	
+	.bases_search {
+		width: 60%;
+		background-color: #FFFFFF;
+		position: absolute;
+		top: 10rpx;
+		left: 50%;
+		margin-left: -33%;
+		.bases_search_text {
+			width: 90%;
+			margin: 0 auto;
+			background-color: #F8F8F8;
+			height: 60rpx;
+			border-radius: 30rpx;
+			display: flex;
+			line-height: 60rpx;
+	
+			.search {
+				padding: 0 20rpx;
+				font-size: 34rpx;
+			}
+	
+			input {
+				width: 80%;
+				margin-top: 10rpx;
+				font-size: 28rpx;
+			}
+		}
+	}
 	.prevents {
 		width: 100%;
 		position: absolute;

pages/prevention/search.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
-			<view style="position: fixed;z-index: 100;">
-				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"></uni-nav-bar>
+		<view class="" style="position: relative;top: 20px;">
+			<view style="position: fixed;z-index: 100;background-color: #FFFFFF;height: 80px;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备搜索"></uni-nav-bar>
 				<view class="search_top_input">
 					<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinp" />
 					<u-icon name="search" size="40" class="icon" @click="search"></u-icon>
@@ -14,11 +14,12 @@
 					<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="" 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">
-						最新上报时间：{{item.addtime|timeFormat()}}
+						<p>设备 ID：{{item.imei}}</p>
+						<p>最新上报时间：{{item.addtime|timeFormat()}}</p>
 					</view>
 				</view>
 			</view>
@@ -103,13 +104,13 @@
 
 <style lang="scss">
 	.search_top_input {
-		width: 80%;
+		width: 90%;
 		height: 54rpx;
 		background-color: #E4E4E4;
 		border-radius: 27rpx;
 		position: absolute;
-		top: 18rpx;
-		right: 18rpx;
+		top: 100rpx;
+		right: 5%;
 		padding-top: 8rpx;
 		box-sizing: border-box;
 		input {
@@ -130,8 +131,7 @@
 	.prevents {
 		width: 100%;
 		position: absolute;
-		top: 54px;
-
+		top: 84px;
 		.prevents_item {
 			width: 95%;
 			margin: 0 auto 30rpx;

pages/prevention/sim.vue

@@ -1,23 +1,29 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;width: 100%;">
 				<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>
+					<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}}MB</p>
+					<p v-if="simnew=='新'">已用流量：{{siminfo.data.usedDataVolume}}MB</p>
+					<p v-if="simnew=='旧'">剩余流量：{{siminfo.data.data_balance}}MB</p>
+					<p v-if="simnew=='新'">剩余流量：{{siminfo.data.totalDataVolume-siminfo.data.usedDataVolume}}MB</p>
+					<p v-if="simnew=='旧'">到期时间：{{siminfo.data.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,46 @@
 				}
 				
 			},
-			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(res.data)
+				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() {
 				uni.navigateBack({
@@ -77,6 +116,7 @@
 		onLoad(option) {
 			console.log(option)
 			this.id = option.id
+			this.loding = true
 			this.simid(this.id)
 		}
 	}
@@ -92,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;
@@ -120,3 +177,4 @@
 		}
 	}
 </style>
+

pages/prevention/ucharts.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 64px;">
+		<view class="" style="position: relative;top: 20px;">
 			<view style="position: fixed;z-index: 100;width: 100%;color: #FFFFFF;">
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="历史数据"></uni-nav-bar>
 			</view>

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

@@ -101,5 +101,6 @@
       }
     ]
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }