3/17

App.vue

@@ -1,7 +1,5 @@
 <script>
 	export default {
-
-
 		onLaunch: function() {
 
 		},
@@ -23,7 +21,18 @@
 		height: 88rpx;
 		width: 100%;
 	}
+<<<<<<< HEAD
 
+=======
+	.status_bar {
+	  height: 88rpx;
+	  width: 100%;
+	  background-color: #FFFFFF;
+	  position: fixed;
+	  top: 0;
+	  z-index: 99999;
+	 }
+>>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
 	@font-face {
 		font-family: "iconfont";
 		src: url('~@/static/font/iconfont.eot?t=1614322974882');

components/highcharts/highcharts.vue

@@ -2,23 +2,15 @@
 	<view class="">
 		<highcharts :options="chartOptions" :style="styles"></highcharts>
 	</view>
-	<!-- <view class="highcharts-container"></view> -->
 </template>
 
 <script>
 	import {
 		Chart
 	} from 'highcharts-vue'
-	import Highcharts from 'highcharts'
-	import HighchartsNoData from 'highcharts/modules/no-data-to-display'
-	HighchartsNoData(Highcharts)
-	// import Highcharts from 'highcharts/highstock';
-	// import HighchartsMore from 'highcharts/highcharts-more';
-	// import HighchartsDrilldown from 'highcharts/modules/drilldown';
-	// import Highcharts3D from 'highcharts/highcharts-3d';
-	// HighchartsMore(Highcharts)
-	// HighchartsDrilldown(Highcharts);
-	// Highcharts3D(Highcharts);
+	// import Highcharts from 'highcharts'
+	// import HighchartsNoData from 'highcharts/modules/no-data-to-display'
+	// HighchartsNoData(Highcharts)
 
 	export default {
 		props: ['chartOptions', 'styles'],

manifest.json

@@ -42,14 +42,13 @@
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_INPUT_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "x86" ]
@@ -61,7 +60,7 @@
                 "geolocation" : {
                     "amap" : {
                         "__platform__" : [ "android" ],
-                        "appkey_ios" : "",
+                        "appkey_ios" : "ed68829a9567cb9e4c9dd45b4b7f65d5",
                         "appkey_android" : "ed68829a9567cb9e4c9dd45b4b7f65d5"
                     }
                 },
@@ -70,39 +69,6 @@
                         "appkey_ios" : "ed68829a9567cb9e4c9dd45b4b7f65d5",
                         "appkey_android" : "ed68829a9567cb9e4c9dd45b4b7f65d5"
                     }
-                },
-                "ad" : {}
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
                 }
             }
         }

pages.json

@@ -261,8 +261,7 @@
 			"path": "pages/my/index/index",
 			"style": {
 				"navigationBarTitleText": "个人中心",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
+				"enablePullDownRefresh": false
 			}
 
 		}, {
@@ -647,16 +646,6 @@
             
         }
         ,{
-            "path" : "pages/my/index/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "个人中心",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"				
-            }
-            
-        }
-        ,{
             "path" : "pages/equipList/index",
             "style" :                                                                                    
             {
@@ -687,15 +676,6 @@
             
         }
         ,{
-            "path" : "pages/distribution/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备分布",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
             "path" : "pages/fourBase/index",
             "style" :                                                                                    
             {
@@ -955,10 +935,17 @@
             
         }
         ,{
+<<<<<<< HEAD
             "path" : "pages/cb/cbd/equip-set/test/test",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
+=======
+            "path" : "pages/distribution/index",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "设备分布",
+>>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
                 "enablePullDownRefresh": false
             }
             

pages/afterSale/addafter.vue

@@ -1,51 +1,55 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备报修"></uni-nav-bar>
-		</view>
-		<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" />
-				<u-action-sheet :list="actionSheetList" v-model="show" @click="actionSheetCallback"></u-action-sheet>
-			</view>
-			<view class="addafter_con_connect">
-				<image src="../../static/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png" mode=""></image>
-				<image src="../../static/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png" mode=""></image>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备报修"></uni-nav-bar>
 			</view>
-			<view class="addafter_con_bot">
-				<p class="addafter_con_bot_title">保修详情</p>
-				<textarea v-model="adddata.text" placeholder="请描述设备问题" class="textarea" placeholder-style="color: #62BF89;font-size:26rpx" />
-				<p style="color: #808080;font-size: 24rpx;">{{adddata.text.length}}/140</p>
-				<view class="imgvideo">
-					<view class="imgvideo_img" v-for="(item,index) in 3">
-						<view @click="gainimg(index)">
-							<image src="../../static/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png" mode="" v-if="!uploadingTF[index]"></image>
-						</view>
-						<view class="uploading" v-if="uploadingTF[index]">
-							<u-icon name="close" class="delete" @click="deletes(index)"></u-icon>
-							<image :src="imageList[index]" mode="" class="uploading"></image>
-						</view>
-					</view>
-					<view class="imgvideo_video" v-for="(item,index) in 3">
-						<view @click="gainvideo(index)">
-							<image src="../../static/image/afterSale/80314eaa07c32e9c76537a8a8224130.png" mode="" v-if="!uploadingTF[index+3]"></image>
+			<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" />
+					<u-action-sheet :list="actionSheetList" v-model="show" @click="actionSheetCallback"></u-action-sheet>
+				</view>
+				<view class="addafter_con_connect">
+					<image src="../../static/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png" mode=""></image>
+					<image src="../../static/image/afterSale/5d9b8db91f11175aa5277fef40581ab.png" mode=""></image>
+				</view>
+				<view class="addafter_con_bot">
+					<p class="addafter_con_bot_title">保修详情</p>
+					<textarea v-model="adddata.text" placeholder="请描述设备问题" class="textarea" placeholder-style="color: #62BF89;font-size:26rpx" />
+					<p style="color: #808080;font-size: 24rpx;">{{adddata.text.length}}/140</p>
+					<view class="imgvideo">
+						<view class="imgvideo_img" v-for="(item,index) in 3">
+							<view @click="gainimg(index)">
+								<image src="../../static/image/afterSale/eee1e84bb85f6f6ff5c5866a3a42779.png" mode="" v-if="!uploadingTF[index]"></image>
+							</view>
+							<view class="uploading" v-if="uploadingTF[index]">
+								<u-icon name="close" class="delete" @click="deletes(index)"></u-icon>
+								<image :src="imageList[index]" mode="" class="uploading"></image>
+							</view>
 						</view>
-						<view class="uploading" v-if="uploadingTF[index+3]">
-							<u-icon name="close" class="delete" @click="deletes(index+3)"></u-icon>
-							<video :src="BASE_URL+selfList[index]" controls class="uploading"></video>
+						<view class="imgvideo_video" v-for="(item,index) in 3">
+							<view @click="gainvideo(index)">
+								<image src="../../static/image/afterSale/80314eaa07c32e9c76537a8a8224130.png" mode="" v-if="!uploadingTF[index+3]"></image>
+							</view>
+							<view class="uploading" v-if="uploadingTF[index+3]">
+								<u-icon name="close" class="delete" @click="deletes(index+3)"></u-icon>
+								<video :src="BASE_URL+selfList[index]" controls class="uploading"></video>
+							</view>
 						</view>
 					</view>
+					<button @click="btn" :disabled="btnisTorF">提 交</button>
 				</view>
-				<button @click="btn" :disabled="btnisTorF">提 交</button>
-			</view>
+		</view>
+		
 		</view>
 	</view>
 </template>
@@ -312,7 +316,7 @@
 						position: absolute;
 						top: -12rpx;
 						right: -12rpx;
-						font-size: 12rpx;
+						font-size: 36rpx;
 						background-color: #FE0000;
 						border-radius: 50%;
 						color: #ffffff;

pages/afterSale/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
+		<view class="status_bar"></view>
+		<view style="position: fixed;z-index: 100;top: 44px;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="售后系统"></uni-nav-bar>
 		</view>
 		<view class="aftersale_search">
@@ -34,7 +35,7 @@
 			<view class="model_box">
 				<p v-if="faultinfo_tf">{{faultinfo}}</p>
 				<u-swiper :list="faultimg" v-if="faultimg_tf" class="uswiper" height="400" ></u-swiper>
-				<video :src="BASE_URL+faultvideo" controls v-if="faultvideo_tf" style="width: 540rpx;"></video>
+				<video :src="BASE_URL+faultvideo" controls v-if="faultvideo_tf" style="width:90%;"></video>
 			</view>
 		</u-modal>
 	</view>
@@ -152,14 +153,14 @@
 		width: 100%;
 		height: 154rpx;
 		position: fixed;
-		top: 44px;
+		top: 88px;
 		z-index: 100;
 	}
 
 	.aftersale_search {
 		position: fixed;
 		z-index: 100;
-		top: 24rpx;
+		top: 104rpx;
 		right: 20rpx;
 
 		.sp_icon {
@@ -172,7 +173,7 @@
 		width: 100%;
 		// margin-top: 20rpx;
 		position: relative;
-		top: 264rpx;
+		top: 340rpx;
 
 		.aftersale_item {
 			width: 90%;
@@ -249,7 +250,9 @@
 		width: 90%;
 		.model_box {
 			width: 90%;
-			margin: 20rpx auto 48rpx;
+			margin: 40rpx auto 48rpx;
+			display: flex;
+			justify-content: center;
 		}
 	}
 </style>

pages/afterSale/search.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
+		<view class="status_bar"></view>
+		<view style="position: fixed;z-index: 100;top: 44px;">
 			<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"/>
@@ -33,7 +34,7 @@
 			<view class="model_box">
 				<p v-if="faultinfo_tf">{{faultinfo}}</p>
 				<u-swiper :list="faultimg" v-if="faultimg_tf" class="uswiper" height="400" ></u-swiper>
-				<video :src="BASE_URL+faultvideo" controls v-if="faultvideo_tf" style="width: 540rpx;"></video>
+				<video :src="BASE_URL+faultvideo" controls v-if="faultvideo_tf" style="width: 90%;"></video>
 			</view>
 		</u-modal>
 	</view>
@@ -142,6 +143,7 @@
 		top: 18rpx;
 		right: 18rpx;
 		padding-top: 8rpx;
+		box-sizing: border-box;
 		input{
 			width: 85%;
 			text-indent: 1rem;
@@ -157,7 +159,7 @@
 		width: 100%;
 		// margin-top: 20rpx;
 		position: relative;
-		top: 112rpx;
+		top: 98px;
 	
 		.aftersale_item {
 			width: 90%;
@@ -165,7 +167,7 @@
 			box-shadow: 0 0 10rpx #bcb9ca;
 			padding: 30rpx 20rpx 20rpx;
 			position: relative;
-	
+			box-sizing: border-box;
 			.aftersale_item_title {
 				width: 100%;
 	
@@ -234,6 +236,8 @@
 		.model_box {
 			width: 90%;
 			margin: 20rpx auto 48rpx;
+			display: flex;
+			justify-content: center;
 		}
 	}
 </style>

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

@@ -1,5 +1,7 @@
 <template>
 	<view>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
 		<view style="position: fixed;z-index: 100;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="历史数据"></uni-nav-bar>
 		</view>
@@ -47,6 +49,7 @@
 				<button @click="next" :disabled="forbidden">下一页</button>
 			</view>
 		</view>
+		</view>
 	</view>
 </template>
 

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

@@ -1,49 +1,51 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="查看图片"></uni-nav-bar>
-		</view>
-		<view class="shuju_one">
-			<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 class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="历史数据"></uni-nav-bar>
+			</view>
+			<view class="shuju_one">
+				<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>
+				<highcharts :chartOptions="options" :styles="styles" ref="simpleChart"></highcharts>
 			</view>
-			<highcharts :chartOptions="options" :styles="styles" ref="simpleChart"></highcharts>
-		</view>
-		<view class="condition">
-			<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
-				<!-- @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" -->
-				<table class="table">
-					<tr class="tr">
-						<th class="th" v-for="(item,index) in thdata" :key="'a'+index">{{item}}</th>
-					</tr>
-					<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
-						<td class="td">{{items.d_h_t.at}}</td>
-						<td class="td">{{items.d_h_t.ah}}</td>
-						<td class="td">{{items.d_h_t.hrt}}</td>
-						<td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td>
-						<td class="td">{{items.d_h_t.tps==0?"正常":"温控"}}</td>
-						<td class="td">{{items.d_h_t.lamp==0?"灭":"亮"}}</td>
-						<td class="td">{{items.d_h_t.csq}}</td>
-						<td class="td">{{items.d_h_t.current}}</td>
-						<td class="td">{{items.d_h_t.vbat}}</td>
-						<td class="td">{{items.d_h_t.lat}}</td>
-						<td class="td">{{items.d_h_t.lng}}</td>
-						<td class="td">{{items.d_h_t.addtime|timeFormat()}}</td>
-					</tr>
-					<tr class="tr" v-if="forbidden">
-						<td class="td" v-for="item in 13">暂无数据</td>
-					</tr>
-				</table>
-			</scroll-view>
-			<view class="pagenumber">
-				<button @click="prev">上一页</button>
-				<view class="pagenumber_page">
-					第{{page}}页
+			<view class="condition">
+				<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
+					<table class="table">
+						<tr class="tr">
+							<th class="th" v-for="(item,index) in thdata" :key="'a'+index">{{item}}</th>
+						</tr>
+						<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
+							<td class="td">{{items.d_h_t.at}}</td>
+							<td class="td">{{items.d_h_t.ah}}</td>
+							<td class="td">{{items.d_h_t.hrt}}</td>
+							<td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td>
+							<td class="td">{{items.d_h_t.tps==0?"正常":"温控"}}</td>
+							<td class="td">{{items.d_h_t.lamp==0?"灭":"亮"}}</td>
+							<td class="td">{{items.d_h_t.csq}}</td>
+							<td class="td">{{items.d_h_t.current}}</td>
+							<td class="td">{{items.d_h_t.vbat}}</td>
+							<td class="td">{{items.d_h_t.lat}}</td>
+							<td class="td">{{items.d_h_t.lng}}</td>
+							<td class="td">{{items.d_h_t.addtime|timeFormat()}}</td>
+						</tr>
+						<tr class="tr" v-if="forbidden">
+							<td class="td" v-for="item in 13">暂无数据</td>
+						</tr>
+					</table>
+				</scroll-view>
+				<view class="pagenumber">
+					<button @click="prev">上一页</button>
+					<view class="pagenumber_page">
+						第{{page}}页
+					</view>
+					<button @click="next" :disabled="forbidden">下一页</button>
 				</view>
-				<button @click="next" :disabled="forbidden">下一页</button>
 			</view>
 		</view>
 	</view>
@@ -52,7 +54,7 @@
 <script>
 	import highcharts from "@/components/highcharts/highcharts"
 	var newtime = +new Date()
-	var strrttime = newtime - 24*60*60*1000
+	var strrttime = newtime - 24 * 60 * 60 * 1000
 	export default {
 		data() {
 			return {
@@ -61,8 +63,8 @@
 					height: "400rpx"
 				},
 				options: {
-					lang:{
-						noData:"暂无数据"
+					lang: {
+						noData: "暂无数据"
 					},
 					chart: {
 						type: 'spline', //指定图表的类型，默认是折线图（line）
@@ -111,8 +113,7 @@
 							},
 						}
 					},
-					series: [
-						{
+					series: [{
 							name: "温度(°C)",
 							data: [],
 							color: "#00E29D"
@@ -129,41 +130,41 @@
 						}
 					],
 				},
-				d_id:'',
-				start_time:strrttime,
-				end_time:newtime,
-				historydatas:[],
+				d_id: '',
+				start_time: strrttime,
+				end_time: newtime,
+				historydatas: [],
 				titletext: ["24小时", "近一个月", "近半年", "近一年"],
 				titleidnex: 0,
-				device_id:'',
-				page:1,
-				historylistdata:[],
+				device_id: '',
+				page: 1,
+				historylistdata: [],
 				thdata: ["环境温度(°C)", "环境湿度(%)", "加热仓温度(°C)", "雨控状态", "温控状态", "灯管状态", "信号强度", "电流(mA)", "电压(V)", "经度", "纬度", "上报时间"],
-				forbidden:false
+				forbidden: false
 			}
 		},
 		methods: {
 			//forecast.worm_lamp.device_polyline_data 历史数据折线图
-			 // device_type_id          必传（string）                  设备类型  3虫情测报灯 7孢子仪 4智能性诱 2杀虫灯  9糖醋测报灯  10测报灯rtu
-			 //    d_id                    必传                            设备id
-			 //    start_time              非必传(string 时间戳)           开始时间    (用于时间搜索)
-			 //    end_time
-			 async history() { //获取图片列表
-			 	const res = await this.$myRequest({
-			 		url: '/api/api_gateway?method=forecast.worm_lamp.device_polyline_data',
-			 		data: {
-			 			device_type_id:3,
-						d_id:this.d_id,
-						start_time :parseInt(this.start_time/1000),
-						end_time:parseInt(this.end_time/1000)
-			 		}
-			 	})
-			 	this.historydatas = res
-			 	console.log(this.historydatas)
+			// device_type_id          必传（string）                  设备类型  3虫情测报灯 7孢子仪 4智能性诱 2杀虫灯  9糖醋测报灯  10测报灯rtu
+			//    d_id                    必传                            设备id
+			//    start_time              非必传(string 时间戳)           开始时间    (用于时间搜索)
+			//    end_time
+			async history() { //获取图片列表
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.device_polyline_data',
+					data: {
+						device_type_id: 3,
+						d_id: this.d_id,
+						start_time: parseInt(this.start_time / 1000),
+						end_time: parseInt(this.end_time / 1000)
+					}
+				})
+				this.historydatas = res
+				console.log(this.historydatas)
 				this.options.series[0].data = []
 				this.options.series[1].data = []
 				this.options.series[2].data = []
-				for(var i=0;i<res.length;i++){
+				for (var i = 0; i < res.length; i++) {
 					var arr1 = []
 					arr1.push(res[i].addtime * 1000 + 8 * 3600000, Number(res[i].temperature))
 					this.options.series[0].data.push(arr1)
@@ -174,6 +175,7 @@
 					arr3.push(res[i].addtime * 1000 + 8 * 3600000, Number(res[i].others))
 					this.options.series[2].data.push(arr3)
 				}
+<<<<<<< HEAD
 				console.log(this.options.series)
 			 },
 			 //forecast.worm_lamp.device_history_data历史数据列表
@@ -181,65 +183,73 @@
 			 	const res = await this.$myRequest({
 			 		url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
 			 		data: {
+=======
+			},
+			//forecast.worm_lamp.device_history_data历史数据列表
+			async historylist() { //获取图片列表
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
+					data: {
+>>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
 						device_type_id: 3,
 						device_id: this.device_id,
-						start_time: parseInt(this.start_time/1000),
-						end_time: parseInt(this.end_time/1000),
+						start_time: parseInt(this.start_time / 1000),
+						end_time: parseInt(this.end_time / 1000),
 						page: this.page
-			 		}
-			 	})
+					}
+				})
 				this.historylistdata = res.data
-				if(res.data.length == 0){
-					this.forbidden =true
+				if (res.data.length == 0) {
+					this.forbidden = true
 					console.log(res.data.length)
-				}else{
-					this.forbidden =false
+				} else {
+					this.forbidden = false
 					console.log(res.data.length)
 				}
 				console.log(this.historylistdata)
 			},
-			 changeindex(index){
-				 this.titleidnex = index
-				 var now = new Date()
-				 this.$forceUpdate()
-				 if(index==0){
-					 this.start_time = strrttime
-					 this.history()
-					 this.historylist()
-				 }else if(index == 1){
-					 var oldtime = now.setMonth(now.getMonth() - 1)
-					 this.start_time = parseInt(oldtime)
-					 this.history()
-					 this.historylist()
-				 }else if(index == 2){
-					 var oldtime = now.setMonth(now.getMonth() - 6)
-					 this.start_time = parseInt(oldtime)
-					 this.history()
-					 this.historylist()
-				 }else if(index == 3){
-					 var oldtime = now.setFullYear(now.getFullYear() - 1)
-					 this.start_time = parseInt(oldtime)
-					 this.history()
-					 this.historylist()
-				 }
-			 },
-			 prev(){//上一页
-				 if(this.page > 1){
-					 this.page--
-					 this.historylist()
-				 }
-			 },
-			 next(){//下一页
-				 this.page++
-				 this.historylist()
-			 },
-			 clickLeft(){
-				 uni.navigateBack({
-				 	delta:1
-				 })
-			 }
+			changeindex(index) {
+				this.titleidnex = index
+				var now = new Date()
+				this.$forceUpdate()
+				if (index == 0) {
+					this.start_time = strrttime
+					this.history()
+					this.historylist()
+				} else if (index == 1) {
+					var oldtime = now.setMonth(now.getMonth() - 1)
+					this.start_time = parseInt(oldtime)
+					this.history()
+					this.historylist()
+				} else if (index == 2) {
+					var oldtime = now.setMonth(now.getMonth() - 6)
+					this.start_time = parseInt(oldtime)
+					this.history()
+					this.historylist()
+				} else if (index == 3) {
+					var oldtime = now.setFullYear(now.getFullYear() - 1)
+					this.start_time = parseInt(oldtime)
+					this.history()
+					this.historylist()
+				}
+			},
+			prev() { //上一页
+				if (this.page > 1) {
+					this.page--
+					this.historylist()
+				}
+			},
+			next() { //下一页
+				this.page++
+				this.historylist()
+			},
+			clickLeft() {
+				uni.navigateBack({
+					delta: 1
+				})
+			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			this.d_id = option.d_id
 			this.device_id = option.device_id
 			this.history()
@@ -284,6 +294,7 @@
 			}
 		}
 	}
+
 	.condition {
 		position: absolute;
 		top: 600rpx;
@@ -293,14 +304,15 @@
 		left: 5%;
 		box-shadow: 0 0 10rpx #bcb9ca;
 		margin-bottom: 30rpx;
-		
+
 		.scroll-X {
 			width: 95%;
 			margin: 20rpx auto;
+
 			.tr {
 				display: flex;
 				overflow: hidden;
-	
+
 				.th,
 				.td {
 					display: inline-block;
@@ -313,11 +325,11 @@
 				}
 			}
 		}
-	
+
 		.pagenumber {
 			display: flex;
 			margin: 20rpx auto;
-	
+
 			button {
 				width: 150rpx;
 				height: 50rpx;
@@ -327,7 +339,7 @@
 				background-color: #17BB89;
 				color: #FFFFFF;
 			}
-	
+
 			.pagenumber_page {
 				width: 150rpx;
 				height: 50rpx;

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

@@ -1,5 +1,7 @@
 <template>
 	<view>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
 		<view style="position: fixed;z-index: 100;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="查看图片"></uni-nav-bar>
 		</view>
@@ -27,6 +29,7 @@
 				</view>
 			</view>
 		</view>
+		</view>
 	</view>
 </template>
 

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

@@ -1,71 +1,75 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="短信预警"></uni-nav-bar>
-		</view>
-		<view class="earlywarning">
-			<view class="kind">
-				<view class="kind_top">
-					<p class="kind_top_title">目标种类预警</p>
-					<u-switch v-model="checked1" size="30" style="margin-top: 6rpx;" active-color="#58C876" ></u-switch>
-				</view>
-				<view class="kind_bot">
-					<p class="kind_bot_title">害虫种类数量设置：</p>
-					<input type="number" v-model="form.pestCategoryNum" :disabled="!checked1"/>
-				</view>
-				<p class="hint">（每天害虫种类数量达到此数量时，短信预警）</p>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="短信预警"></uni-nav-bar>
 			</view>
-			<view class="kind">
-				<view class="kind_top">
-					<p class="kind_top_title">指定害虫数量预警</p>
-					<u-switch v-model="checked2" size="30" style="margin-top: 6rpx;" active-color="#58C876"></u-switch>
-				</view>
-				<view class="kind_bot">
-					<p class="kind_bot_title">害虫种类：</p>
-					<view class="input" @click="pickertf = !pickertf" >
-						<input type="text" v-model="selector[form.appointPestName]" :disabled="!checked2"/>
-						<u-icon name="arrow-down" class="icon"></u-icon>
-						<u-picker v-model="pickertf" mode="selector" @confirm="confirmFun2" :default-selector="[form.appointPestName]" :range="selector"></u-picker>
+			<view class="earlywarning">
+				<view class="kind">
+					<view class="kind_top">
+						<p class="kind_top_title">目标种类预警</p>
+						<u-switch v-model="checked1" size="30" style="margin-top: 6rpx;" active-color="#58C876"></u-switch>
 					</view>
+					<view class="kind_bot">
+						<p class="kind_bot_title">害虫种类数量设置：</p>
+						<input type="number" v-model="form.pestCategoryNum" :disabled="!checked1" />
+					</view>
+					<p class="hint">（每天害虫种类数量达到此数量时，短信预警）</p>
 				</view>
-				<view class="kind_bot">
-					<p class="kind_bot_title">害虫数量：</p>
-					<input type="number" v-model="form.appointPestNum" :disabled="!checked2"/>
-				</view>
-				<p class="hint">（每天指定害虫数量达到此数量时，短信预警）</p>
-			</view>
-			<view class="kind">
-				<view class="kind_top">
-					<p class="kind_top_title">害虫数量总和预警</p>
-					<u-switch v-model="checked3" size="30" style="margin-top: 6rpx;" active-color="#58C876"></u-switch>
-				</view>
-				<view class="kind_bot">
-					<p class="kind_bot_title">害虫总和数量设置：</p>
-					<input type="number" v-model="form.pestTotalNum" :disabled="!checked3"/>
+				<view class="kind">
+					<view class="kind_top">
+						<p class="kind_top_title">指定害虫数量预警</p>
+						<u-switch v-model="checked2" size="30" style="margin-top: 6rpx;" active-color="#58C876"></u-switch>
+					</view>
+					<view class="kind_bot">
+						<p class="kind_bot_title">害虫种类：</p>
+						<view class="input" @click="pickertf = !pickertf">
+							<input type="text" v-model="selector[form.appointPestName]" :disabled="!checked2" />
+							<u-icon name="arrow-down" class="icon"></u-icon>
+							<u-picker v-model="pickertf" mode="selector" @confirm="confirmFun2" :default-selector="[form.appointPestName]"
+							 :range="selector"></u-picker>
+						</view>
+					</view>
+					<view class="kind_bot">
+						<p class="kind_bot_title">害虫数量：</p>
+						<input type="number" v-model="form.appointPestNum" :disabled="!checked2" />
+					</view>
+					<p class="hint">（每天指定害虫数量达到此数量时，短信预警）</p>
 				</view>
-				<p class="hint">（每天害虫数量总和达到此数量时，短信预警）</p>
-			</view>
-			<view class="kind">
-				<view class="kind_top">
-					<p class="kind_top_title">综合预警</p>
-					<u-switch v-model="checked4" size="30" style="margin-top: 6rpx;" active-color="#58C876"></u-switch>
+				<view class="kind">
+					<view class="kind_top">
+						<p class="kind_top_title">害虫数量总和预警</p>
+						<u-switch v-model="checked3" size="30" style="margin-top: 6rpx;" active-color="#58C876"></u-switch>
+					</view>
+					<view class="kind_bot">
+						<p class="kind_bot_title">害虫总和数量设置：</p>
+						<input type="number" v-model="form.pestTotalNum" :disabled="!checked3" />
+					</view>
+					<p class="hint">（每天害虫数量总和达到此数量时，短信预警）</p>
 				</view>
-				<view class="kind_bot">
-					<p class="kind_bot_title">每天检测害虫种类及数量，短信预警</p>
+				<view class="kind">
+					<view class="kind_top">
+						<p class="kind_top_title">综合预警</p>
+						<u-switch v-model="checked4" size="30" style="margin-top: 6rpx;" active-color="#58C876"></u-switch>
+					</view>
+					<view class="kind_bot">
+						<p class="kind_bot_title">每天检测害虫种类及数量，短信预警</p>
+					</view>
 				</view>
-			</view>
-			<view class="kind">
-				<view class="kind_top">
-					<p class="kind_top_title">信息接受</p>
+				<view class="kind">
+					<view class="kind_top">
+						<p class="kind_top_title">信息接受</p>
+					</view>
+					<view class="kind_bot">
+						<p class="kind_bot_title">信息接受手机号：</p>
+						<input type="number" v-model="form.phone" @blur="phonereg" />
+					</view>
+					<p class="hint" v-if="phonetf">请输入正确的手机号</p>
 				</view>
-				<view class="kind_bot">
-					<p class="kind_bot_title">信息接受手机号：</p>
-					<input type="number" v-model="form.phone"  @blur="phonereg"/>
+				<view class="tijiao" @click="btn">
+					确 定
 				</view>
-				<p class="hint" v-if="phonetf">请输入正确的手机号</p>
-			</view>
-			<view class="tijiao" @click="btn">
-				确 定
 			</view>
 		</view>
 	</view>
@@ -80,12 +84,12 @@
 				checked2: false,
 				checked3: false,
 				checked4: false,
-				pickertf:false,
+				pickertf: false,
 				device_id: '',
-				conf:"",
-				form:{},
-				phonetf:false,
-				selector:[]
+				conf: "",
+				form: {},
+				phonetf: false,
+				selector: []
 			}
 		},
 		methods: {
@@ -94,87 +98,87 @@
 					url: '/api/api_gateway?method=forecast.forecast_system.cbd_msg_conf',
 					data: {
 						device_id: this.device_id,
-						conf:this.conf
+						conf: this.conf
 					}
 				})
 				this.form = JSON.parse(res)
 				console.log(this.form)
 				//种类
-				if(this.form.pestCategory == "on"){
+				if (this.form.pestCategory == "on") {
 					this.checked1 = true
-				}else{
+				} else {
 					this.checked1 = false
 				}
 				//pestTotal 总和开关
-				if(this.form.pestTotal == "on"){
+				if (this.form.pestTotal == "on") {
 					this.checked3 = true
-				}else{
+				} else {
 					this.checked3 = false
 				}
 				//pestWarn综合预警
-				if(this.form.pestWarn == "on"){
+				if (this.form.pestWarn == "on") {
 					this.checked4 = true
-				}else{
+				} else {
 					this.checked4 = false
 				}
 				//appointPest指定害虫
-				if(this.form.appointPest == "on"){
+				if (this.form.appointPest == "on") {
 					this.checked2 = true
-				}else{
+				} else {
 					this.checked2 = false
 				}
 			},
-			btn(){
-				if(this.checked1 == true){
+			btn() {
+				if (this.checked1 == true) {
 					this.form.pestCategory = "on"
-				}else{
+				} else {
 					this.form.pestCategory = "off"
 				}
 				//pestTotal 总和开关
-				if(this.checked3 == true){
+				if (this.checked3 == true) {
 					this.form.pestTotal = "on"
-				}else{
+				} else {
 					this.form.pestTotal = "off"
 				}
 				//pestWarn综合预警
-				if(this.checked4 == true){
+				if (this.checked4 == true) {
 					this.form.pestWarn = "on"
-				}else{
+				} else {
 					this.form.pestWarn = "off"
 				}
 				//appointPest指定害虫
-				if(this.checked2 == true){
+				if (this.checked2 == true) {
 					this.form.appointPest = "on"
-				}else{
+				} else {
 					this.form.appointPest = "off"
 				}
 				// console.log(this.form)
 				this.conf = JSON.stringify(this.form)
 				this.notealloc()
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			},
-			phonereg(){
-				if(/^1[23456789]\d{9}$/.test(this.form.phone)){
+			phonereg() {
+				if (/^1[23456789]\d{9}$/.test(this.form.phone)) {
 					this.phonetf = false
-				}else{
+				} else {
 					this.phonetf = true
 				}
 			},
-			confirmFun2(index){
+			confirmFun2(index) {
 				this.form.appointPestName = index
 			},
-			clickLeft(){
+			clickLeft() {
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			}
 		},
 		onLoad(option) {
 			this.device_id = option.device_id
 			this.notealloc()
-			for(var key in cbddatas){
+			for (var key in cbddatas) {
 				this.selector[key] = cbddatas[key]
 			}
 		}
@@ -212,25 +216,29 @@
 					color: #A7A7A7;
 					margin-right: 10rpx;
 				}
-				input{
+
+				input {
 					border: 2rpx solid #E4E4E4;
 					font-size: 26rpx;
 					width: 55%;
 					padding-left: 10rpx;
 				}
-				.input{
+
+				.input {
 					position: relative;
 					width: 55%;
-					input{
+
+					input {
 						width: 100%;
 					}
-					.icon{
+
+					.icon {
 						position: absolute;
 						top: 10rpx;
 						right: 0;
 					}
 				}
-				
+
 			}
 
 			.hint {

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

@@ -1,37 +1,40 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="害虫统计"></uni-nav-bar>
-		</view>
-		<view class="statistics">
-			<view class="top_text">
-				<view :class="topindex==index?'title_text_color':'tltle_text'" v-for="(item,index) in toptext" :key="index" @click="changeindex(index)">
-					{{item}}
-				</view>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="害虫统计"></uni-nav-bar>
 			</view>
-			<view class="shuju_one">
-				<view class="shuju_one_title">
-					<p>害虫趋势统计</p>
-					<view class="schedule_box">
-						<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>
-						<u-picker v-model="pickertfone" mode="selector" @confirm="confirmFun" :default-selector="[indexone]" :range="titletext"></u-picker>
-						<view class="schedule" @click="pickertftwo=!pickertftwo">
-							<p class="schedule_value">{{wormdata[indextwo]}}</p>
-							<p class="schedule_icon">
-								<u-icon name="arrow-down"></u-icon>
-							</p>
-							<u-picker v-model="pickertftwo" mode="selector" @confirm="confirmFun2" :default-selector="[indextwo]" :range="wormdata"></u-picker>
+			<view class="statistics">
+				<view class="top_text">
+					<view :class="topindex==index?'title_text_color':'tltle_text'" v-for="(item,index) in toptext" :key="index" @click="changeindex(index)">
+						{{item}}
+					</view>
+				</view>
+				<view class="shuju_one">
+					<view class="shuju_one_title">
+						<p>害虫趋势统计</p>
+						<view class="schedule_box">
+							<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>
+							<u-picker v-model="pickertfone" mode="selector" @confirm="confirmFun" :default-selector="[indexone]" :range="titletext"></u-picker>
+							<view class="schedule" @click="pickertftwo=!pickertftwo">
+								<p class="schedule_value">{{wormdata[indextwo]}}</p>
+								<p class="schedule_icon">
+									<u-icon name="arrow-down"></u-icon>
+								</p>
+								<u-picker v-model="pickertftwo" mode="selector" @confirm="confirmFun2" :default-selector="[indextwo]" :range="wormdata"></u-picker>
+							</view>
 						</view>
 					</view>
+					<highcharts :chartOptions="options" :styles="styles" ref="simpleChart"></highcharts>
+					<p class="tishi" v-if="!tishi">暂无数据</p>
+					<highcharts :chartOptions="optiontwos" :styles="styletwos" ref="simpleChart" v-if="tishitf"></highcharts>
 				</view>
-				<highcharts :chartOptions="options" :styles="styles" ref="simpleChart"></highcharts>
-				<p class="tishi" v-if="!tishi">暂无数据</p>
-				<highcharts :chartOptions="optiontwos" :styles="styletwos" ref="simpleChart" v-if="tishitf"></highcharts>
 			</view>
 		</view>
 	</view>

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

@@ -513,7 +513,7 @@
 <style lang='scss'>
 	page {
 		padding: 20rpx;
-
+		box-sizing: border-box;
 		.info {
 			padding: 20rpx 40rpx;
 			color: #fff;
@@ -523,6 +523,8 @@
 			background-repeat: no-repeat;
 			background-color: #0DC6B6;
 			background-position: top left;
+			box-sizing: border-box;
+			width: 100%;
 		}
 
 		.on {
@@ -540,7 +542,6 @@
 			font-size: 28rpx;
 			color: #666;
 			line-height: 50rpx;
-
 			image {
 				width: 52rpx;
 			}

pages/cb/index/index.vue

@@ -1,27 +1,30 @@
 <template>
-	<view class="">	
-		<uni-nav-bar @clickRight="clickRight" @clickLeft="clickLeft" left-icon="back" left-text="返回"  right-icon="search" title="测报灯系统"></uni-nav-bar>
-		<view>
-			<image src="../../../static/image/cb/banner.jpg" mode="widthFix"></image>
-		</view>
-		<view class="tab-box">
-			<view 
-			v-for="(item,index) in equipArr" 
-			:key="item.type" 
-			@click="tabClick(index)" 
-			:class="['tab-item',active==index?'active':'']">
-			<text>{{item.name}}</text>
-			<text class="bottom-line"></text>
+	<view class="">
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<uni-nav-bar @clickRight="clickRight" @clickLeft="clickLeft" left-icon="back" left-text="返回"  right-icon="search" title="测报灯系统"></uni-nav-bar>
+			<view>
+				<image src="../../../static/image/cb/banner.jpg" mode="widthFix"></image>
+			</view>
+			<view class="tab-box">
+				<view 
+				v-for="(item,index) in equipArr" 
+				:key="item.type" 
+				@click="tabClick(index)" 
+				:class="['tab-item',active==index?'active':'']">
+				<text>{{item.name}}</text>
+				<text class="bottom-line"></text>
+				</view>
+			</view>
+			<view class="content">
+				<template v-for="(item,index) in equipArr[active].list" >
+					<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">
+						<view class="date">
+							最新上报时间：{{item.status_time|timeFormat}}
+						</view>
+					</equipItem>
+				</template>
 			</view>
-		</view>
-		<view class="content">
-			<template v-for="(item,index) in equipArr[active].list" >
-				<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">
-					<view class="date">
-						最新上报时间：{{item.status_time|timeFormat}}
-					</view>
-				</equipItem>
-			</template>
 		</view>
 	</view>
 </template>

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

@@ -1,74 +1,77 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="查看图片"></uni-nav-bar>
-		</view>
-		<view class="shuju_one">
-			<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 class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="历史数据"></uni-nav-bar>
 			</view>
-			<highcharts :chartOptions="options" :styles="styles" ref="simpleChart"></highcharts>
-		</view>
-		<view class="wind">
-			<p class="wind_titie">风速、风向</p>
-			<view class="wind_text">
-				<view class="wind_speed">
-					<image src="../../../../static/image/cb/xy/1c24243bb184e84ffd13540367569ba.png" mode=""></image>
-					<p>风速：{{wind_sped}}(m/s)</p>
+			<view class="shuju_one">
+				<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>
-				<view class="wind_direction">
-					<image src="../../../../static/image/cb/xy/c44ae038324e1040a1eaa702e6d71a5.png" mode=""></image>
-					<p>风速：{{wind_drec}}</p>
+				<highcharts :chartOptions="options" :styles="styles" ref="simpleChart"></highcharts>
+			</view>
+			<view class="wind">
+				<p class="wind_titie">风速、风向</p>
+				<view class="wind_text">
+					<view class="wind_speed">
+						<image src="../../../../static/image/cb/xy/1c24243bb184e84ffd13540367569ba.png" mode=""></image>
+						<p>风速：{{wind_sped}}(m/s)</p>
+					</view>
+					<view class="wind_direction">
+						<image src="../../../../static/image/cb/xy/c44ae038324e1040a1eaa702e6d71a5.png" mode=""></image>
+						<p>风速：{{wind_drec}}</p>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="condition">
-			<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
-				<!-- @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" -->
-				<table class="table">
-					<tr class="tr">
-						<th class="th" v-for="(item,index) in thdata" :key="'a'+index">{{item}}</th>
-					</tr>
-					<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
-						<td class="td">{{items.d_h_t.proj}}</td>
-						<td class="td">{{items.d_h_t.ds==0?"关":"开"}}</td>
-						<td class="td">{{items.d_h_t.ws==0?"待机":"工作"}}</td>
-						<td class="td">{{items.d_h_t.at}}</td>
-						<td class="td">{{items.d_h_t.ah}}</td>
-						<td class="td">{{items.d_h_t.cv}}</td>
-						<td class="td">{{items.d_h_t.bv}}</td>
-						<td class="td">{{items.d_h_t.bs}}</td>
-						<td class="td">{{items.d_h_t.cs?"正常":"充电"}}</td>
-						<td class="td">{{items.d_h_t.infr_ct}}</td>
-						<td class="td">{{items.d_h_t.csq}}</td>
-						<td class="td">{{items.d_h_t.dver}}</td>
-						<td class="td">{{items.d_h_t.addtime|timeFormat()}}</td>
-					</tr>
-					<tr class="tr" v-if="forbidden">
-						<td class="td" v-for="item in 13">暂无数据</td>
-					</tr>
-				</table>
-			</scroll-view>
-			<view class="pagenumber">
-				<button @click="prev">上一页</button>
-				<view class="pagenumber_page">
-					第{{page}}页
+			<view class="condition">
+				<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
+					<!-- @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" -->
+					<table class="table">
+						<tr class="tr">
+							<th class="th" v-for="(item,index) in thdata" :key="'a'+index">{{item}}</th>
+						</tr>
+						<tr class="tr" v-for="(items,indexs) in historylistdata" :key="'b'+indexs" v-if="!forbidden">
+							<td class="td">{{items.d_h_t.proj}}</td>
+							<td class="td">{{items.d_h_t.ds==0?"关":"开"}}</td>
+							<td class="td">{{items.d_h_t.ws==0?"待机":"工作"}}</td>
+							<td class="td">{{items.d_h_t.at}}</td>
+							<td class="td">{{items.d_h_t.ah}}</td>
+							<td class="td">{{items.d_h_t.cv}}</td>
+							<td class="td">{{items.d_h_t.bv}}</td>
+							<td class="td">{{items.d_h_t.bs}}</td>
+							<td class="td">{{items.d_h_t.cs?"正常":"充电"}}</td>
+							<td class="td">{{items.d_h_t.infr_ct}}</td>
+							<td class="td">{{items.d_h_t.csq}}</td>
+							<td class="td">{{items.d_h_t.dver}}</td>
+							<td class="td">{{items.d_h_t.addtime|timeFormat()}}</td>
+						</tr>
+						<tr class="tr" v-if="forbidden">
+							<td class="td" v-for="item in 13">暂无数据</td>
+						</tr>
+					</table>
+				</scroll-view>
+				<view class="pagenumber">
+					<button @click="prev">上一页</button>
+					<view class="pagenumber_page">
+						第{{page}}页
+					</view>
+					<button @click="next" :disabled="forbidden">下一页</button>
 				</view>
-				<button @click="next" :disabled="forbidden">下一页</button>
 			</view>
 		</view>
 	</view>
 </template>
 <style lang="scss">
-	
+
 </style>
 <script>
 	import highcharts from "@/components/highcharts/highcharts"
 	var newtime = +new Date()
-	var strrttime = newtime - 24*60*60*1000
+	var strrttime = newtime - 24 * 60 * 60 * 1000
 	export default {
 		data() {
 			return {
@@ -77,8 +80,8 @@
 					height: "400rpx"
 				},
 				options: {
-					lang:{
-						noData:"暂无数据"
+					lang: {
+						noData: "暂无数据"
 					},
 					chart: {
 						type: 'spline', //指定图表的类型，默认是折线图（line）
@@ -127,8 +130,7 @@
 							},
 						}
 					},
-					series: [
-						{
+					series: [{
 							name: "温度(°C)",
 							data: [],
 							color: "#00E29D"
@@ -140,66 +142,68 @@
 						}
 					],
 				},
-				d_id:'',
-				start_time:strrttime,
-				end_time:newtime,
-				historydatas:[],
+				d_id: '',
+				start_time: strrttime,
+				end_time: newtime,
+				historydatas: [],
 				titletext: ["24小时", "近一个月", "近半年", "近一年"],
 				titleidnex: 0,
-				device_id:'',
-				page:1,
-				historylistdata:[],
-				thdata: ["型号", "设备开关", "工作状态","环境温度(°C)", "环境湿度(%)", "充电电压(V)", "电池电压(V)", "电池状态","充电状态","红外计数值","信号强度",  "版本号", "上报时间"],
-				forbidden:false,
-				wind_sped:'',//风速
-				wind_drec:''
+				device_id: '',
+				page: 1,
+				historylistdata: [],
+				thdata: ["型号", "设备开关", "工作状态", "环境温度(°C)", "环境湿度(%)", "充电电压(V)", "电池电压(V)", "电池状态", "充电状态", "红外计数值", "信号强度", "版本号",
+					"上报时间"
+				],
+				forbidden: false,
+				wind_sped: '', //风速
+				wind_drec: ''
 			}
 		},
 		methods: {
 			//forecast.worm_lamp.device_polyline_data 历史数据折线图
-			 // device_type_id          必传（string）                  设备类型  3虫情测报灯 7孢子仪 4智能性诱 2杀虫灯  9糖醋测报灯  10测报灯rtu
-			 //    d_id                    必传                            设备id
-			 //    start_time              非必传(string 时间戳)           开始时间    (用于时间搜索)
-			 //    end_time
-			 async history() { //获取图片列表
-			 	const res = await this.$myRequest({
-			 		url: '/api/api_gateway?method=forecast.worm_lamp.device_polyline_data',
-			 		data: {
-			 			device_type_id:4,
-						d_id:this.d_id,
-						start_time :parseInt(this.start_time/1000),
-						end_time:parseInt(this.end_time/1000)
-			 		}
-			 	})
-			 	this.historydatas = res
-			 	console.log(this.historydatas)
+			// device_type_id          必传（string）                  设备类型  3虫情测报灯 7孢子仪 4智能性诱 2杀虫灯  9糖醋测报灯  10测报灯rtu
+			//    d_id                    必传                            设备id
+			//    start_time              非必传(string 时间戳)           开始时间    (用于时间搜索)
+			//    end_time
+			async history() { //获取图片列表
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.device_polyline_data',
+					data: {
+						device_type_id: 4,
+						d_id: this.d_id,
+						start_time: parseInt(this.start_time / 1000),
+						end_time: parseInt(this.end_time / 1000)
+					}
+				})
+				this.historydatas = res
+				console.log(this.historydatas)
 				this.options.series[0].data = []
 				this.options.series[1].data = []
-				if(res.length==0){
+				if (res.length == 0) {
 					this.wind_sped = "--"
 					this.wind_drec = "--"
-				}else{
+				} else {
 					this.wind_sped = res[0].others.wind_sped
 					console.log(res[0].others.wind_drec)
-					if(22<res[0].others.wind_drec&&67<res[0].others.wind_drec){
+					if (22 < res[0].others.wind_drec && 67 < res[0].others.wind_drec) {
 						this.wind_drec = "东北"
-					}else if(67<res[0].others.wind_drec&&112>res[0].others.wind_drec){
+					} else if (67 < res[0].others.wind_drec && 112 > res[0].others.wind_drec) {
 						this.wind_drec = "东"
-					}else if(112<res[0].others.wind_drec&&157>res[0].others.wind_drec){
+					} else if (112 < res[0].others.wind_drec && 157 > res[0].others.wind_drec) {
 						this.wind_drec = "东南"
-					}else if(157<res[0].others.wind_drec&&202>res[0].others.wind_drec){
+					} else if (157 < res[0].others.wind_drec && 202 > res[0].others.wind_drec) {
 						this.wind_drec = "南"
-					}else if(202<res[0].others.wind_drec&&247>res[0].others.wind_drec){
+					} else if (202 < res[0].others.wind_drec && 247 > res[0].others.wind_drec) {
 						this.wind_drec = "西南"
-					}else if(247<res[0].others.wind_drec&&292>res[0].others.wind_drec){
+					} else if (247 < res[0].others.wind_drec && 292 > res[0].others.wind_drec) {
 						this.wind_drec = "西"
-					}else  if(292<res[0].others.wind_drec&&337>res[0].others.wind_drec){
+					} else if (292 < res[0].others.wind_drec && 337 > res[0].others.wind_drec) {
 						this.wind_drec = "西北"
-					}else {
+					} else {
 						this.wind_drec = "北"
 					}
 				}
-				for(var i=0;i<res.length;i++){
+				for (var i = 0; i < res.length; i++) {
 					var arr1 = []
 					arr1.push(res[i].addtime * 1000 + 8 * 3600000, Number(res[i].temperature))
 					this.options.series[0].data.push(arr1)
@@ -207,78 +211,78 @@
 					arr2.push(res[i].addtime * 1000 + 8 * 3600000, Number(res[i].humidity))
 					this.options.series[1].data.push(arr2)
 				}
-			 },
-			 //forecast.worm_lamp.device_history_data历史数据列表
-			 async historylist() { //获取图片列表
-			 	const res = await this.$myRequest({
-			 		url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
-			 		data: {
+			},
+			//forecast.worm_lamp.device_history_data历史数据列表
+			async historylist() { //获取图片列表
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
+					data: {
 						device_type_id: 4,
 						device_id: this.device_id,
-						start_time: parseInt(this.start_time/1000),
-						end_time: parseInt(this.end_time/1000),
+						start_time: parseInt(this.start_time / 1000),
+						end_time: parseInt(this.end_time / 1000),
 						page: this.page
-			 		}
-			 	})
+					}
+				})
 				this.historylistdata = res.data
-				if(res.data.length == 0){
-					this.forbidden =true
-				}else{
-					this.forbidden =false
+				if (res.data.length == 0) {
+					this.forbidden = true
+				} else {
+					this.forbidden = false
 				}
-				for(var i=0;i<this.historylistdata.length;i++){
-					if(res.data[i].d_h_t.bs==0){
+				for (var i = 0; i < this.historylistdata.length; i++) {
+					if (res.data[i].d_h_t.bs == 0) {
 						this.historylistdata[i].d_h_t.bs = "正常"
-					}else if(res.data[i].d_h_t.bs==1){
+					} else if (res.data[i].d_h_t.bs == 1) {
 						this.historylistdata[i].d_h_t.bs = "欠压"
-					}else if(res.data[i].d_h_t.bs==2){
+					} else if (res.data[i].d_h_t.bs == 2) {
 						this.historylistdata[i].d_h_t.bs = "超压"
 					}
 				}
 				console.log(this.historylistdata)
 			},
-			 changeindex(index){
-				 this.titleidnex = index
-				 var now = new Date()
-				 this.$forceUpdate()
-				 if(index==0){
-					 this.start_time = strrttime
-					 this.history()
-					 this.historylist()
-				 }else if(index == 1){
-					 var oldtime = now.setMonth(now.getMonth() - 1)
-					 this.start_time = parseInt(oldtime)
-					 this.history()
-					 this.historylist()
-				 }else if(index == 2){
-					 var oldtime = now.setMonth(now.getMonth() - 6)
-					 this.start_time = parseInt(oldtime)
-					 this.history()
-					 this.historylist()
-				 }else if(index == 3){
-					 var oldtime = now.setFullYear(now.getFullYear() - 1)
-					 this.start_time = parseInt(oldtime)
-					 this.history()
-					 this.historylist()
-				 }
-			 },
-			 prev(){//上一页
-				 if(this.page > 1){
-					 this.page--
-					 this.historylist()
-				 }
-			 },
-			 next(){//下一页
-				 this.page++
-				 this.historylist()
-			 },
-			 clickLeft(){
-				 uni.navigateBack({
-				 	delta:1
-				 })
-			 }
+			changeindex(index) {
+				this.titleidnex = index
+				var now = new Date()
+				this.$forceUpdate()
+				if (index == 0) {
+					this.start_time = strrttime
+					this.history()
+					this.historylist()
+				} else if (index == 1) {
+					var oldtime = now.setMonth(now.getMonth() - 1)
+					this.start_time = parseInt(oldtime)
+					this.history()
+					this.historylist()
+				} else if (index == 2) {
+					var oldtime = now.setMonth(now.getMonth() - 6)
+					this.start_time = parseInt(oldtime)
+					this.history()
+					this.historylist()
+				} else if (index == 3) {
+					var oldtime = now.setFullYear(now.getFullYear() - 1)
+					this.start_time = parseInt(oldtime)
+					this.history()
+					this.historylist()
+				}
+			},
+			prev() { //上一页
+				if (this.page > 1) {
+					this.page--
+					this.historylist()
+				}
+			},
+			next() { //下一页
+				this.page++
+				this.historylist()
+			},
+			clickLeft() {
+				uni.navigateBack({
+					delta: 1
+				})
+			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			this.d_id = option.d_id
 			this.device_id = option.device_id
 			this.history()
@@ -301,7 +305,7 @@
 			width: 70%;
 			margin: 0 auto;
 			display: flex;
-			
+
 			.tltle_text {
 				width: 25%;
 				border: 2rpx solid #B2B2B2;
@@ -323,31 +327,38 @@
 			}
 		}
 	}
-	.wind{
+
+	.wind {
 		position: absolute;
 		top: 600rpx;
 		width: 90%;
 		left: 5%;
 		box-shadow: 0 0 10rpx #bcb9ca;
 		padding: 20rpx;
-		.wind_titie{
+
+		.wind_titie {
 			border-left: 6rpx solid #26D696;
 			height: 34rpx;
 			padding-left: 20rpx;
 		}
-		.wind_text{
+
+		.wind_text {
 			display: flex;
-			.wind_speed,.wind_direction{
+
+			.wind_speed,
+			.wind_direction {
 				width: 50%;
 				text-align: center;
 				margin-top: 30rpx;
-				image{
+
+				image {
 					width: 160rpx;
 					height: 130rpx;
 				}
 			}
 		}
 	}
+
 	.condition {
 		position: absolute;
 		top: 900rpx;
@@ -357,14 +368,15 @@
 		left: 5%;
 		box-shadow: 0 0 10rpx #bcb9ca;
 		margin-bottom: 30rpx;
-		
+
 		.scroll-X {
 			width: 95%;
 			margin: 20rpx auto;
+
 			.tr {
 				display: flex;
 				overflow: hidden;
-	
+
 				.th,
 				.td {
 					display: inline-block;
@@ -377,11 +389,11 @@
 				}
 			}
 		}
-	
+
 		.pagenumber {
 			display: flex;
 			margin: 20rpx auto;
-	
+
 			button {
 				width: 150rpx;
 				height: 50rpx;
@@ -391,7 +403,7 @@
 				background-color: #17BB89;
 				color: #FFFFFF;
 			}
-	
+
 			.pagenumber_page {
 				width: 150rpx;
 				height: 50rpx;
@@ -402,4 +414,3 @@
 		}
 	}
 </style>
-

pages/disandpests/index.vue

@@ -1,33 +1,36 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="病虫害识别"></uni-nav-bar>
-		</view>
-		<view class="image_box">
-			<image :src="path" mode="" class="image"></image>
-		</view>
-		<view class="recognition" v-if="datasTF">
-			<p class="recognition_title">{{name}}</p>
-			<view :class="tishi?'recognition_img':'recognition_img_two'">
-				<image :src="path2" mode="" @error="error"></image>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" title="病虫害识别"></uni-nav-bar>
 			</view>
-			<button class="recognition_details" v-if="tishi" @click="examine">查看详情</button>
-			<button class="recognition_details" v-if="!tishi" @click="show=!show">再拍一张</button>
-		</view>
-		<view class="datas" v-else>
-			<p class="datas_title">{{name}}</p>
-			<view v-for="(item,index) in preventionArr" :key="index" class="prevention">
-				<view class="prevention_title">
-					<u-icon name="play-right-fill" size="24" color="#55A92D"></u-icon>
-					<p>{{regexptitle[index]}}:</p>
+			<view class="image_box">
+				<image :src="path" mode="" class="image"></image>
+			</view>
+			<view class="recognition" v-if="datasTF">
+				<p class="recognition_title">{{name}}</p>
+				<view :class="tishi?'recognition_img':'recognition_img_two'">
+					<image :src="path2" mode="" @error="error"></image>
 				</view>
-				<p class="prevention_con">{{item}}</p>
+				<button class="recognition_details" v-if="tishi" @click="examine">查看详情</button>
+				<button class="recognition_details" v-if="!tishi" @click="show=!show">再拍一张</button>
 			</view>
-			<button class="recognition_details" v-if="tishi" @click="examine">查看图片</button>
+			<view class="datas" v-else>
+				<p class="datas_title">{{name}}</p>
+				<view v-for="(item,index) in preventionArr" :key="index" class="prevention">
+					<view class="prevention_title">
+						<u-icon name="play-right-fill" size="24" color="#55A92D"></u-icon>
+						<p>{{regexptitle[index]}}:</p>
+					</view>
+					<p class="prevention_con">{{item}}</p>
+				</view>
+				<button class="recognition_details" v-if="tishi" @click="examine">查看图片</button>
+			</view>
+			<u-modal v-model="show" :mask-close-able="true" title="" :show-cancel-button="true" confirm-text="拍病害" cancel-text="拍虫害"
+			 content="拍照识别病虫害" @confirm="confirm" @cancel="cancel"></u-modal>
+			<kps-image-cutter @ok="onok" @cancel="oncancle" :url="url" :fixed="false" :blob="false" :maxWidth="500" :maxHeight="500"></kps-image-cutter>
 		</view>
-		<u-modal v-model="show" :mask-close-able="true" title="" :show-cancel-button="true" confirm-text="拍病害" cancel-text="拍虫害"
-		 content="拍照识别病虫害" @confirm="confirm" @cancel="cancel"></u-modal>
-		<kps-image-cutter @ok="onok" @cancel="oncancle" :url="url" :fixed="false" :blob="false" :maxWidth="500" :maxHeight="500"></kps-image-cutter>
 	</view>
 </template>
 
@@ -166,7 +169,7 @@
 			error() {
 				this.path2 = "../../static/image/e1cd85dc59139760f43ddbac15136f2.png"
 			},
-			optionverify(data){
+			optionverify(data) {
 				if (data == null) {
 					this.name = "识别失败，请换张图片"
 					this.tishi = false
@@ -202,23 +205,24 @@
 </script>
 
 <style lang="scss">
-	
-	.image_box{
+	.image_box {
 		position: absolute;
 		top: 44px;
 		width: 100%;
 		height: 400rpx;
+
 		.image {
 			width: 100%;
 			height: 400rpx;
 		}
 	}
+
 	.recognition {
 		position: absolute;
 		top: 254px;
 		width: 100%;
 		height: 800rpx;
-		
+
 		.recognition_title {
 			width: 100%;
 			text-align: center;
@@ -274,11 +278,13 @@
 		top: 284px;
 		width: 95%;
 		left: 2.5%;
-		.datas_title{
+
+		.datas_title {
 			font-size: 32rpx;
 			font-weight: 700;
 			margin-left: 30rpx;
 		}
+
 		.recognition_details {
 			width: 400rpx;
 			height: 80rpx;
@@ -289,21 +295,25 @@
 			color: #FFFFFF;
 		}
 	}
-	.prevention{
+
+	.prevention {
 		font-size: 28rpx;
 		color: #919191;
 		width: 95%;
-		margin:  20rpx auto;
-		.prevention_title{
+		margin: 20rpx auto;
+
+		.prevention_title {
 			display: flex;
-			p{
+
+			p {
 				margin-left: 20rpx;
 				color: #000000;
 				font-size: 28rpx;
 				font-weight: 700;
 			}
 		}
-		.prevention_con{
+
+		.prevention_con {
 			padding-left: 6%;
 		}
 	}

pages/distribution/index.vue

@@ -8,17 +8,22 @@
 				</view>
 			</view>
 			<view class="page-section page-section-gap">
-				<map style="width: 100%; height: 85vh;" scale="3" :latitude="latitude" :longitude="longitude" :markers="covers"
-				 :enable-zoom="true" @markertap="markertap" :include-points="covers">
+				<map :style="style" scale="3" :latitude="latitude" :longitude="longitude" :markers="covers" :enable-zoom="true"
+				 @markertap="markertap" :include-points="covers">
 				</map>
 			</view>
 		</view>
 		<view class="particulars">
-			<view class="particulars_par" @click="eqinfo">
-				查看详情
+			<view class="search_btn_top">
+				已点击设备：{{punctuation_id || "无"}}
 			</view>
-			<view class="particulars_ser" @click="serTF=!serTF">
-				搜索
+			<view class="search_btn_bot">
+				<view class="particulars_par" @click="eqinfo">
+					查看详情
+				</view>
+				<view class="particulars_ser" @click="serTFs">
+					搜索
+				</view>
 			</view>
 		</view>
 		<view class="distri_ser" v-if="serTF">
@@ -71,31 +76,31 @@
 				current: 0,
 				icon: [{
 						id: '', //全部
-						url: "../../static/image/distribution/f38c3024bf12cd5777348593e7e5daf.png"
+						url: "../../static/image/distribution/7610e3983eb33ed5b9ad72ebdfc8ed2.png"
 					},
 					{
 						id: 2, //杀虫灯
-						url: "../../static/image/distribution/70f9fc043155ddaca85c847df2c670c.png"
+						url: "../../static/image/distribution/1bd535eb7dbb0809940030d40c64b4c.png"
 					},
 					{
 						id: 3, //测报灯
-						url: "../../static/image/distribution/621d60f8f64bbe1462e47b4a26635eb.png"
+						url: "../../static/image/distribution/0b551e50be351dbc14f0dd6470e3443.png"
 					},
 					{
 						id: 4, //性诱测报
-						url: "../../static/image/distribution/b7f317cb75082eac43ee4dd84e5156e.png"
+						url: "../../static/image/distribution/e19abf8bb442aefd6208f9c4687b57d.png"
 					},
 					{
 						id: 5, //环境检测
-						url: "../../static/image/distribution/3a4b76ff573ebed04f29b408986cb56.png"
+						url: "../../static/image/distribution/8325b1b6079456ce43f952ce13d2919.png"
 					},
 					{
 						id: 6, //监控设备
-						url: "../../static/image/distribution/c792f8b4befeaa06824f988ac8c9ddc.png"
+						url: "../../static/image/distribution/2eb9e550709430a1bd8178568c14785.png"
 					},
 					{
 						id: 7, //孢子仪
-						url: "../../static/image/distribution/14b9bc2ef553b53872389c22a537baf.png"
+						url: "../../static/image/distribution/54a96e2b0ad4efeecbd4a7b5e6deda3.png"
 					},
 				],
 				type: '', //设备类型
@@ -105,7 +110,11 @@
 				punctuationTF: false, //判断是否以点击标点
 				punctuation_id: "", //点击标点的id
 				punctuation_did: '',
-				punctuation_type: ''
+				punctuation_type: '',
+				style: {
+					width: "100%",
+					height: "80vh",
+				}
 			}
 		},
 		onLoad() {
@@ -126,7 +135,8 @@
 					obj.latitude = res[i].lat
 					obj.longitude = res[i].lng
 					obj.id = [res[i].device_id, res[i].d_id, res[i].device_type_id]
-					obj.title = res[i].device_name
+					obj.title = res[i].device_name || res[i].device_id
+					// obj.width = 25
 					for (var j = 0; j < this.icon.length; j++) {
 						if (res[i].device_type_id == this.icon[j].id) {
 							obj.iconPath = this.icon[j].url
@@ -172,10 +182,15 @@
 					this.serTF = !this.serTF
 				}
 			},
-			btnF() { //确定
+			serTFs() {
+				this.serTF = !this.serTF
+				this.style.height = "63vh"
+			},
+			btnF() { //取消
 				this.serTF = !this.serTF
+				this.style.height = "80vh"
 			},
-			btnT() { //取消
+			btnT() { //确定
 				this.search()
 			},
 			eqinfo() { //设备信息
@@ -229,36 +244,48 @@
 	.utabs {
 		width: 100%;
 		position: fixed;
-		top: 44px;
+		top: 0px;
 		z-index: 100;
 		background-color: #FFFFFF;
 	}
 
+	.page-section {
+		margin-top: 44px;
+	}
 	.particulars {
+		width: 100%;
+		height: 160rpx;
 		position: absolute;
-		bottom: 0rpx;
-		right: 0rpx;
-		width: 160rpx;
-		text-align: center;
-		color: #FFFFFF;
-
-		.particulars_par {
-			background-color: #35A478;
-			height: 60rpx;
-			padding: 10rpx 20rpx;
+		bottom: 0;
+		.search_btn_top {
 			width: 100%;
+			height: 80rpx;
+			line-height: 80rpx;
+			font-size: 32rpx;
+			padding-left: 30rpx;
 			box-sizing: border-box;
-			font-size: 24rpx;
+		}
+		.search_btn_bot {
+			width: 100%;
+			display: flex;
+		}
+		.particulars_par {
+			background-color: #F1F1F1;
+			text-align: center;
+			width: 50%;
+			height: 80rpx;
+			line-height: 80rpx;
+			font-size: 28rpx;
 		}
 
 		.particulars_ser {
-			margin-top: 10rpx;
-			background-color: #35A478;
-			height: 60rpx;
-			padding: 10rpx 20rpx;
-			width: 100%;
-			box-sizing: border-box;
-			font-size: 24rpx;
+			background-color: #57C87B;
+			text-align: center;
+			width: 50%;
+			height: 80rpx;
+			line-height: 80rpx;
+			font-size: 28rpx;
+			color: #FFFFFF;
 		}
 	}
 
@@ -279,6 +306,7 @@
 			border-radius: 30rpx;
 			padding: 10rpx 20rpx;
 			box-sizing: border-box;
+
 			input {
 				width: 90%;
 				font-size: 28rpx;
@@ -329,6 +357,7 @@
 	.search_btn {
 		width: 100%;
 		display: flex;
+
 		.btn_f,
 		.btn_t {
 			width: 50%;
@@ -348,3 +377,4 @@
 		}
 	}
 </style>
+

pages/environment/contros.vue

@@ -1,38 +1,41 @@
 <template>
 	<view>
-		<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 class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<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>
-		<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="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">
+				<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">
+						显示时间设置(min) ：
+						<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" @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>
@@ -42,12 +45,12 @@
 	export default {
 		data() {
 			return {
-				config:{
-					content:"",
-					timeout:"",
-					interval:""
+				config: {
+					content: "",
+					timeout: "",
+					interval: ""
 				},
-				id:''
+				id: ''
 			}
 		},
 		methods: {
@@ -57,8 +60,8 @@
 					url: '/api/api_gateway?method=weather.weather.qxz_status',
 					data: {
 						device_type_id: 5,
-						d_id:this.id ,
-						config:JSON.stringify(datas)
+						d_id: this.id,
+						config: JSON.stringify(datas)
 					}
 				})
 			},
@@ -68,17 +71,17 @@
 					url: '/api/api_gateway?method=forecast.send_control.admin_device_control',
 					data: {
 						device_type_id: 5,
-						d_id:this.id,
-						cmd:datas
+						d_id: this.id,
+						cmd: datas
 					}
 				})
-				if(res == true){
+				if (res == true) {
 					uni.showToast({
-					    title: '指令下发成功!'
+						title: '指令下发成功!'
 					});
-				}else{
+				} else {
 					uni.showToast({
-					    title: '指令下发失败!'
+						title: '指令下发失败!'
 					});
 				}
 			},
@@ -88,89 +91,98 @@
 					url: '/api/api_gateway?method=forecast.send_control.get_device_config',
 					data: {
 						device_type_id: 5,
-						d_id:this.id,
-						control_type :"data"
+						d_id: this.id,
+						control_type: "data"
 					}
 				})
 				console.log(res)
-				if(res == true){
+				if (res == true) {
 					uni.showToast({
-					    title: '指令下发成功!'
+						title: '指令下发成功!'
 					});
-				}else{
+				} else {
 					uni.showToast({
-					    title: '指令下发失败!'
+						title: '指令下发失败!'
 					});
 				}
 			},
-			clickLeft(){//返回
+			clickLeft() { //返回
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			},
-			ensure(){//提交
+			ensure() { //提交
 				this.timing(this.config)
 			},
-			sliderChange(e){//滑动块
+			sliderChange(e) { //滑动块
 				this.config.interval = e.detail.value
 			},
-			chongqi(){//重启按钮
+			chongqi() { //重启按钮
 				this.restart('reboot')
 			},
-			shengji(){//升级按钮
+			shengji() { //升级按钮
 				this.restart('update')
 			},
-			search(){//查询按钮
+			search() { //查询按钮
 				this.uploading()
 			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			this.id = option.id
 		}
 	}
 </script>
 
 <style lang="scss">
-	.operation_title{
+	.operation_title {
 		border-left: 6rpx solid #28AE4F;
 		padding-left: 20rpx;
 		margin-bottom: 20rpx;
 		height: 36rpx;
 	}
-	.operation{
+
+	.operation {
 		position: absolute;
 		top: 54px;
 		width: 90%;
 		left: 5%;
-		.operation_btn{
+
+		.operation_btn {
 			display: flex;
 			padding-left: 20rpx;
-			button{
+
+			button {
 				font-size: 24rpx;
-				padding:0 38rpx;
+				padding: 0 38rpx;
 				background-color: #28AE4F;
 				color: #FFFFFF;
 			}
-			button:last-child{
+
+			button:last-child {
 				width: 360rpx !important;
 			}
 		}
 	}
-	.viewing{
+
+	.viewing {
 		position: absolute;
 		top: 124px;
 		width: 90%;
 		left: 5%;
-		.viewing_text{
-			.viewing_text_top,.viewing_text_bot{
-				display:flex;
+
+		.viewing_text {
+
+			.viewing_text_top,
+			.viewing_text_bot {
+				display: flex;
 				background-color: #F7F8FA;
 				padding-left: 20rpx;
 				margin-bottom: 20rpx;
 				height: 60rpx;
 				line-height: 60rpx;
 				font-size: 24rpx;
-				input{
+
+				input {
 					font-size: 24rpx;
 					margin-top: 16rpx;
 					width: 400rpx;
@@ -178,17 +190,19 @@
 			}
 		}
 	}
-	.timing{
+
+	.timing {
 		position: absolute;
 		top: 234px;
 		width: 90%;
 		left: 5%;
 	}
-	.ensure{
+
+	.ensure {
 		width: 100%;
 		position: absolute;
-		bottom: 30rpx;
-		.ensure_btn{
+		top: 600rpx;
+		.ensure_btn {
 			width: 90%;
 			margin: 0 auto;
 			height: 60rpx;

pages/environment/equipment.vue

@@ -1,43 +1,46 @@
 <template>
 	<view>
-		<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="info">
-			<view class="info_item">
-				<image :src="eqinfo.item.is_online==1?'../../static/image/cb/onBg.png':'../../static/image/cb/offBg.png'" mode=""
-				 class="bgi"></image>
-				<p style="font-size: 32rpx;">设备 ID：{{eqinfo.item.equip_id}}</p>
-				<p>设备名称：{{eqinfo.item.equip_name?eqinfo.item.equip_name:"无"}}</p>
-				<p>最近上报时间：{{eqinfo.item.uptime|timeFormat()}}</p>
-				<p>地址：{{city?city:"---"}}</p>
-			</view>
-		</view>
-		<view class="control">
-			<view class="control_item" @click="control">
-				<image src="../../static/image/prevention/8.png" mode=""></image>
-				<p>设备控制</p>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<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="control_item" @click="information">
-				<image src="../../static/image/environment/9.png" mode=""></image>
-				<p>24小时数据</p>
+			<view class="info">
+				<view class="info_item">
+					<image :src="eqinfo.item.is_online==1?'../../static/image/cb/onBg.png':'../../static/image/cb/offBg.png'" mode=""
+					 class="bgi"></image>
+					<p style="font-size: 32rpx;">设备 ID：{{eqinfo.item.equip_id}}</p>
+					<p>设备名称：{{eqinfo.item.equip_name?eqinfo.item.equip_name:"无"}}</p>
+					<p>最近上报时间：{{eqinfo.item.uptime|timeFormat()}}</p>
+					<p>地址：{{city?city:"---"}}</p>
+				</view>
 			</view>
-			<view class="control_item" @click="charts">
-				<image src="../../static/image/environment/10.png" mode=""></image>
-				<p>历史数据</p>
+			<view class="control">
+				<view class="control_item" @click="control">
+					<image src="../../static/image/prevention/8.png" mode=""></image>
+					<p>设备控制</p>
+				</view>
+				<view class="control_item" @click="information">
+					<image src="../../static/image/environment/9.png" mode=""></image>
+					<p>24小时数据</p>
+				</view>
+				<view class="control_item" @click="charts">
+					<image src="../../static/image/environment/10.png" mode=""></image>
+					<p>历史数据</p>
+				</view>
 			</view>
-		</view>
-		<view class="realtime">
-			<p class="realtime_title">实时数据</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">
-						<view class="item_info_img" :style="{'background-color':olddatas[Math.floor(Math.random()*(5-0+1))]}">
-							<image :src="'../../static/image/environment/icon_'+olddata.dat[index][1]+'.png'" mode=""></image>
-						</view>
-						<view class="item_info_text">
-							<p>{{item}}</p>
-							<p style="margin-top: 20rpx;">{{parseFloat(olddata.dat[index][0]) == -99.99 ?'N/A':parseFloat(olddata.dat[index])}}</p>
+			<view class="realtime">
+				<p class="realtime_title">实时数据</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">
+							<view class="item_info_img" :style="{'background-color':olddatas[Math.floor(Math.random()*(5-0+1))]}">
+								<image :src="'../../static/image/environment/icon_'+olddata.dat[index][1]+'.png'" mode=""></image>
+							</view>
+							<view class="item_info_text">
+								<p>{{item}}</p>
+								<p style="margin-top: 20rpx;">{{parseFloat(olddata.dat[index][0]) == -99.99 ?'N/A':parseFloat(olddata.dat[index])}}</p>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -101,7 +104,6 @@
 			uni.request({
 				url: '/https://apis.map.qq.com/ws/geocoder/v1/?location='+this.eqinfo.item.lat+","+this.eqinfo.item.lng+'&key=B2EBZ-2UW6P-RDJDG-LCMLE-AIQUS-CGFMJ',
 				success: (res) => {
-					console.log(res)
 					this.city = res.data.result.address
 				}
 			})

pages/environment/history.vue

@@ -1,66 +1,68 @@
 <template>
 	<view>
-		<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="graph">
-			<highcharts :chartOptions="options" :styles="styles" ref="simpleChart"></highcharts>
-			<!-- <p class="none_hint">暂无数据</p> -->
-			<view class="selecttimes">
-				<view class="newtimes">
-					<view class="newtimes_state" @click="pickshow = !pickshow">
-						<view class="oldtimes_left">
-							<image src="../../static/image/prevention/841f87bfd8abb1b09610fa0789f9d8e.png" mode=""></image>
-							开始时间：{{this.begintime|timeFormat()}}
-						</view>
-						<view class="oldtimes_left">
-							<u-icon name="arrow-down"></u-icon>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<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="graph">
+				<highcharts :chartOptions="options" :styles="styles" ref="simpleChart"></highcharts>
+				<!-- <p class="none_hint">暂无数据</p> -->
+				<view class="selecttimes">
+					<view class="newtimes">
+						<view class="newtimes_state" @click="pickshow = !pickshow">
+							<view class="oldtimes_left">
+								<image src="../../static/image/prevention/841f87bfd8abb1b09610fa0789f9d8e.png" mode=""></image>
+								开始时间：{{this.begintime|timeFormat()}}
+							</view>
+							<view class="oldtimes_left">
+								<u-icon name="arrow-down"></u-icon>
+							</view>
+							<u-picker mode="time" v-model="pickshow" :params="params" @confirm="pickone"></u-picker>
 						</view>
-						<u-picker mode="time" v-model="pickshow" :params="params" @confirm="pickone"></u-picker>
-					</view>
-					<view class="newtimes_end" @click="picktwoshow = !picktwoshow">
-						<view class="oldtimes_left">
-							<image src="../../static/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png" mode=""></image>
-							结束时间：{{this.end|timeFormat()}}
+						<view class="newtimes_end" @click="picktwoshow = !picktwoshow">
+							<view class="oldtimes_left">
+								<image src="../../static/image/prevention/1acfe2751c01d3786cdc49b83d7e505.png" mode=""></image>
+								结束时间：{{this.end|timeFormat()}}
+							</view>
+							<view class="oldtimes_left">
+								<u-icon name="arrow-down"></u-icon>
+							</view>
+							<u-picker mode="time" v-model="picktwoshow" :params="params" @confirm="picktwo"></u-picker>
 						</view>
-						<view class="oldtimes_left">
-							<u-icon name="arrow-down"></u-icon>
+						<p class="tishi" v-if="tishiTF">请选择正确的结束时间</p>
+						<view class="btnser" @click="serter">
+							搜 索
 						</view>
-						<u-picker mode="time" v-model="picktwoshow" :params="params" @confirm="picktwo"></u-picker>
-					</view>
-					<p class="tishi" v-if="tishiTF">请选择正确的结束时间</p>
-					<view class="btnser" @click="serter">
-						搜 索
 					</view>
 				</view>
-			</view>
-			<view class="condition">
-				<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
-					<!-- @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" -->
-					<table class="table">
-						<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>
-						</tr>
-						<tr class="tr" v-for="(items,index) in historydatas.data" :key="'b'+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>
-						</tr>
-						<tr class="tr" v-if="forbidden">
-							<td class="td" v-for="item in 10">暂无数据</td>
-						</tr>
-					</table>
-				</scroll-view>
-				<view class="pagenumber">
-					<button @click="prev">上一页</button>
-					<view class="pagenumber_page">
-						第{{page}}页
+				<view class="condition">
+					<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
+						<!-- @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" -->
+						<table class="table">
+							<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>
+							</tr>
+							<tr class="tr" v-for="(items,index) in historydatas.data" :key="'b'+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>
+							</tr>
+							<tr class="tr" v-if="forbidden">
+								<td class="td" v-for="item in 10">暂无数据</td>
+							</tr>
+						</table>
+					</scroll-view>
+					<view class="pagenumber">
+						<button @click="prev">上一页</button>
+						<view class="pagenumber_page">
+							第{{page}}页
+						</view>
+						<button @click="next" :disabled="forbidden">下一页</button>
 					</view>
-					<button @click="next" :disabled="forbidden">下一页</button>
 				</view>
 			</view>
 		</view>
-
 	</view>
 </template>
 
@@ -75,8 +77,8 @@
 					height: "400rpx"
 				},
 				options: {
-					lang:{
-						noData:"暂无数据"
+					lang: {
+						noData: "暂无数据"
 					},
 					chart: {
 						type: 'spline', //指定图表的类型，默认是折线图（line）

pages/environment/index.vue

@@ -1,18 +1,23 @@
 <template>
 	<view>
-		<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>
-		</view>
-		<image src="../../static/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?'../../static/image/prevention/6.png':'../../static/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.is_online==1?'在线':'离线'"></p>
-				</view>
-				<view class="prevents_item_bot">
-					最新上报时间：{{item.uptime|timeFormat()}}
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="环境监测系统" right-icon="search" @clickRight="clickRight"
+				 size="16"></uni-nav-bar>
+			</view>
+			<image src="../../static/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?'../../static/image/prevention/6.png':'../../static/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.is_online==1?'在线':'离线'"></p>
+					</view>
+					<view class="prevents_item_bot">
+						最新上报时间：{{item.uptime|timeFormat()}}
+					</view>
 				</view>
 			</view>
 		</view>
@@ -23,9 +28,9 @@
 	export default {
 		data() {
 			return {
-				page:1,
-				size:10,
-				eqlistdata:[],
+				page: 1,
+				size: 10,
+				eqlistdata: [],
 			}
 		},
 		methods: {
@@ -33,29 +38,29 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=weather.weather.qxz_page',
 					data: {
-						page:this.page,
+						page: this.page,
 					}
 				})
-				this.eqlistdata=this.eqlistdata.concat(res.ids) 
+				this.eqlistdata = this.eqlistdata.concat(res.ids)
 				console.log(res.ids)
 			},
-			clickRight(){
+			clickRight() {
 				uni.navigateTo({
-					url:"./search"
+					url: "./search"
 				})
 			},
-			clickLeft(){
+			clickLeft() {
 				uni.switchTab({
-					url:"../index/index"
+					url: "../index/index"
 				})
 			},
-			eqdetails(data){
+			eqdetails(data) {
 				uni.navigateTo({
-					url:"./equipment?shebei="+JSON.stringify(data)
+					url: "./equipment?shebei=" + JSON.stringify(data)
 				})
 			}
 		},
-		onLoad(){
+		onLoad() {
 			this.eqlist()
 		},
 		onReachBottom() {
@@ -66,54 +71,62 @@
 </script>
 
 <style lang="scss">
-/deep/.uni-icons{
-	font-size: 40rpx !important;
-}
-.image{
-	position: fixed;
-	top: 43px;
-	width: 100%;
-	height: 140rpx;
-	z-index: 555;
-}
-.prevents{
-	width: 100%;
-	position: absolute;
-	top: 244rpx;
-	.prevents_item{
-		width: 95%;
-		margin: 0 auto 30rpx;
-		border-radius: 10rpx;
-		box-shadow: 0 0 10rpx #bcb9ca;
-		padding: 20rpx 40rpx 20rpx 80rpx;
-		box-sizing: border-box;
-		position: relative;
-		.prevents_item_img{
-			width: 30rpx;
-			height: 50rpx;
-			position: absolute;
-			top: -4rpx;
-			left: 30rpx;
-		}
-		.prevents_item_top{
-			display: flex;
-			justify-content: space-between;
-			height: 60rpx;
-			border-bottom: 2rpx solid #F4F4F4;
-			line-height: 60rpx;
-			font-size: 26rpx;
-			.red{
-				color: #ff0000;
+	/deep/.uni-icons {
+		font-size: 40rpx !important;
+	}
+
+	.image {
+		position: fixed;
+		top: 83px;
+		width: 100%;
+		height: 140rpx;
+		z-index: 555;
+	}
+
+	.prevents {
+		width: 100%;
+		position: absolute;
+		top: 244rpx;
+
+		.prevents_item {
+			width: 95%;
+			margin: 0 auto 30rpx;
+			border-radius: 10rpx;
+			box-shadow: 0 0 10rpx #bcb9ca;
+			padding: 20rpx 40rpx 20rpx 80rpx;
+			box-sizing: border-box;
+			position: relative;
+
+			.prevents_item_img {
+				width: 30rpx;
+				height: 50rpx;
+				position: absolute;
+				top: -4rpx;
+				left: 30rpx;
+			}
+
+			.prevents_item_top {
+				display: flex;
+				justify-content: space-between;
+				height: 60rpx;
+				border-bottom: 2rpx solid #F4F4F4;
+				line-height: 60rpx;
+				font-size: 26rpx;
+
+				.red {
+					color: #ff0000;
+				}
+
+				.green {
+					color: #7DBB91;
+				}
 			}
-			.green{
-				color: #7DBB91;
+
+			.prevents_item_bot {
+				margin-top: 20rpx;
+				font-size: 26rpx;
+				color: #BDBDBD;
 			}
 		}
-		.prevents_item_bot{
-			margin-top: 20rpx;
-			font-size: 26rpx;
-			color: #BDBDBD;
-		}
 	}
-}
 </style>

pages/environment/onedaythedata.vue

@@ -1,31 +1,34 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;width: 100%;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="24小时数据"></uni-nav-bar>
-		</view>
-		<view class="nonedata" v-if="olddata.length == 0">
-			暂无数据
-		</view>
-		<view class="datatimes" v-if="olddata.length != 0">
-			<view class="datatimes_box" v-for="(item,index) in olddata" :key="index">
-				<view class="datatimes_title" @click="textshowtf(index)">
-					<p class="datatimes_title_headline">{{item.ekey}}</p>
-					<p class="datatimes_title_chunk">{{item.enum[1]+item.enum[2]}}</p>
-				</view>
-				<view class="datatimes_text" v-show="textshow[index]">
-					<view class="datatimes_text_max">
-						<view class="">
-							<p>最大值</p>
-							<p>{{item.max=-99.99?"N/A":item.max}}</p>
-						</view>
-						<p>{{item.maxtime|timeFormat()}}</p>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;width: 100%;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="24小时数据"></uni-nav-bar>
+			</view>
+			<view class="nonedata" v-if="olddata.length == 0">
+				暂无数据
+			</view>
+			<view class="datatimes" v-if="olddata.length != 0">
+				<view class="datatimes_box" v-for="(item,index) in olddata" :key="index">
+					<view class="datatimes_title" @click="textshowtf(index)">
+						<p class="datatimes_title_headline">{{item.ekey}}</p>
+						<p class="datatimes_title_chunk">{{item.enum[1]+item.enum[2]}}</p>
 					</view>
-					<view class="datatimes_text_min">
-						<view class="">
-							<p>最小值</p>
-							<p>{{item.min==-99.99?"N/A":item.min}}</p>
+					<view class="datatimes_text" v-show="textshow[index]">
+						<view class="datatimes_text_max">
+							<view class="">
+								<p>最大值</p>
+								<p>{{item.max=-99.99?"N/A":item.max}}</p>
+							</view>
+							<p>{{item.maxtime|timeFormat()}}</p>
+						</view>
+						<view class="datatimes_text_min">
+							<view class="">
+								<p>最小值</p>
+								<p>{{item.min==-99.99?"N/A":item.min}}</p>
+							</view>
+							<p>{{item.mintime|timeFormat()}}</p>
 						</view>
-						<p>{{item.mintime|timeFormat()}}</p>
 					</view>
 				</view>
 			</view>
@@ -57,9 +60,9 @@
 				this.textshow[index] = !this.textshow[index]
 				this.$forceUpdate()
 			},
-			clickLeft(){
+			clickLeft() {
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			}
 		},
@@ -70,7 +73,7 @@
 </script>
 
 <style lang="scss">
-	.nonedata{
+	.nonedata {
 		position: absolute;
 		top: 54px;
 		width: 90%;
@@ -78,6 +81,7 @@
 		text-align: center;
 		font-size: 32rpx;
 	}
+
 	.datatimes {
 		position: absolute;
 		top: 54px;
@@ -105,7 +109,7 @@
 		}
 
 		.datatimes_text {
-			width: 100%;
+			width: 88%;
 			padding-left: 12%;
 
 			.datatimes_text_max,
@@ -118,6 +122,7 @@
 				font-size: 24rpx;
 				justify-content: space-between;
 				align-items: center;
+				box-sizing: border-box;
 			}
 		}
 	}

pages/environment/search.vue

@@ -1,21 +1,25 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<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 class="prevents">
-			<view class="prevents_item" v-for="item,index in eqlistdata" :key="index" @click="eqdetails(item)">
-				<image :src="item.is_online==1?'../../static/image/prevention/6.png':'../../static/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>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" 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 class="prevents_item_bot">
-					最新上报时间：{{item.uptime|timeFormat()}}
+			</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?'../../static/image/prevention/6.png':'../../static/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>
+					</view>
+					<view class="prevents_item_bot">
+						最新上报时间：{{item.uptime|timeFormat()}}
+					</view>
 				</view>
 			</view>
 		</view>
@@ -30,28 +34,27 @@
 	export default {
 		data() {
 			return {
-				imports:'',
-				eqlistdata:[],
-				page:1,
-				size:10,
-				show:false,
-				value:'',
-				options1:[
-					{
-						text:"杀虫灯",
-						id:2
+				imports: '',
+				eqlistdata: [],
+				page: 1,
+				size: 10,
+				show: false,
+				value: '',
+				options1: [{
+						text: "杀虫灯",
+						id: 2
 					},
 					{
-						text:"虫情测报",
-						id:3
+						text: "虫情测报",
+						id: 3
 					},
 					{
-						text:"孢子仪",
-						id:7
+						text: "孢子仪",
+						id: 7
 					},
 					{
-						text:"性诱设备",
-						id:4
+						text: "性诱设备",
+						id: 4
 					},
 				]
 			}
@@ -61,37 +64,42 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=weather.weather.qxz_page',
 					data: {
-						device_id:this.imports
+						device_id: this.imports
 					}
 				})
-				this.eqlistdata=this.eqlistdata.concat(res.ids) 
+				this.eqlistdata = this.eqlistdata.concat(res.ids)
 				console.log(this.eqlistdata)
 			},
-			clickLeft(){
+			clickLeft() {
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			},
-			search(){
-				this.eqlistdata=[]
+			search() {
+				this.eqlistdata = []
 				this.eqlist()
 			},
-			searchinp(){
+			searchinp() {
 				Debounce(() => {
-					this.eqlistdata=[]
+					this.eqlistdata = []
 					this.eqlist()
 				}, 1000)()
 			},
-			actionSheetCallback(index) {//选择框
+			actionSheetCallback(index) { //选择框
 				this.value = this.options1[index].text;
 				// this.id = this.options1[index].id
+			},
+			eqdetails(data) {
+				uni.navigateTo({
+					url: "./equipment?shebei=" + JSON.stringify(data)
+				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-.search_top_input{
+	.search_top_input {
 		width: 80%;
 		height: 54rpx;
 		background-color: #E4E4E4;
@@ -101,51 +109,59 @@
 		right: 18rpx;
 		padding-top: 8rpx;
 		box-sizing: border-box;
-		input{
+
+		input {
 			width: 85%;
 			text-indent: 1rem;
 			font-size: 26rpx;
 		}
-		.icon{
+
+		.icon {
 			position: absolute;
 			top: 8rpx;
 			right: 26rpx;
 		}
 	}
 
-	.prevents{
+	.prevents {
 		width: 100%;
 		position: absolute;
 		top: 54px;
-		.prevents_item{
+
+		.prevents_item {
 			width: 95%;
 			margin: 0 auto 30rpx;
 			border-radius: 10rpx;
 			box-shadow: 0 0 10rpx #bcb9ca;
 			padding: 20rpx 40rpx 20rpx 80rpx;
 			position: relative;
-			.prevents_item_img{
+			box-sizing: border-box;
+			.prevents_item_img {
 				width: 30rpx;
 				height: 50rpx;
 				position: absolute;
 				top: -4rpx;
 				left: 30rpx;
 			}
-			.prevents_item_top{
+
+			.prevents_item_top {
 				display: flex;
 				justify-content: space-between;
 				height: 60rpx;
 				border-bottom: 2rpx solid #F4F4F4;
 				line-height: 60rpx;
 				font-size: 26rpx;
-				.red{
+
+				.red {
 					color: #ff0000;
 				}
-				.green{
+
+				.green {
 					color: #7DBB91;
 				}
 			}
-			.prevents_item_bot{
+
+			.prevents_item_bot {
 				margin-top: 20rpx;
 				font-size: 26rpx;
 				color: #BDBDBD;
@@ -153,4 +169,3 @@
 		}
 	}
 </style>
-

pages/equipList/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;width: 100%;">
+		<view class="status_bar"></view>
+		<view style="position: fixed;top:44px;z-index: 100;width: 100%;">
 			<uni-nav-bar right-icon="search" title="设备列表" @clickRight="clickRight"></uni-nav-bar>
 		</view>
 		<view class="utabs_box">
@@ -122,7 +123,7 @@
 	.utabs_box{
 		width: 100%;
 		position: fixed;
-		top: 44px;
+		top: 88px;
 		background-color: #FFFFFF;
 		z-index: 100;
 		.utabs {
@@ -133,8 +134,7 @@
 	.list{
 		width: 100%;
 		background-color: #FDFDFD;
-		position: absolute;
-		top: 180rpx;
+		margin-top: 280rpx;
 		margin-bottom: 100rpx;
 		.list_item{
 			width: 90%;

pages/equipList/search.vue

@@ -1,10 +1,11 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;height: 160rpx;background-color: #FFFFFF;">
+		<view class="status_bar"></view>
+		<view style="position: fixed;top: 44px; z-index: 100;height: 160rpx;background-color: #FFFFFF;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" style="margin-top: 36rpx;"></uni-nav-bar>
 			<view class="">
 				<view class="search_top_input">
-					<input type="text" v-model="value" placeholder="请选择设备类型" disabled @click="show = true"/>
+					<input type="text" v-model="value" placeholder="请选择设备类型" disabled @click="show = true" />
 					<u-icon name="arrow-down-fill" size="20" class="icon" @click="show = true"></u-icon>
 					<u-action-sheet :list="options1" v-model="show" @click="actionSheetCallback"></u-action-sheet>
 				</view>
@@ -86,10 +87,10 @@
 						id: 7
 					}
 				],
-				eqlistdatatf: false,//暂无数据
-				show: false,//选择框
-				value:'',//选择框值
-				indexs:2//设备id
+				eqlistdatatf: false, //暂无数据
+				show: false, //选择框
+				value: '', //选择框值
+				indexs: 2 //设备id
 			}
 		},
 		methods: {
@@ -108,17 +109,17 @@
 					this.eqlistdatatf = false
 				}
 			},
-			clickLeft() {//返回
+			clickLeft() { //返回
 				uni.switchTab({
 					url: "./index"
 				})
 			},
-			search() {//搜索
+			search() { //搜索
 				this.eqlist()
 			},
-			actionSheetCallback(index) {//选择框
+			actionSheetCallback(index) { //选择框
 				this.value = this.options1[index].text;
-				this.indexs = index+2
+				this.indexs = index + 2
 			}
 		}
 	}
@@ -133,7 +134,7 @@
 		top: 18rpx;
 		right: 18rpx;
 		padding-top: 8rpx;
-
+		box-sizing: border-box;
 		input {
 			width: 85%;
 			text-indent: 1rem;
@@ -156,7 +157,7 @@
 		top: 44px;
 		right: 18rpx;
 		padding-top: 8rpx;
-
+		box-sizing: border-box;
 		input {
 			width: 85%;
 			text-indent: 1rem;
@@ -174,7 +175,7 @@
 		width: 100%;
 		background-color: #FDFDFD;
 		position: absolute;
-		top: 160rpx;
+		top: 260rpx;
 
 		.list_item {
 			width: 95%;
@@ -182,6 +183,8 @@
 			padding: 10rpx 20rpx;
 			position: relative;
 			background-color: #FFFFFF;
+			box-sizing: border-box;
+			box-shadow: 0 0 10rpx #bcb9ca;
 
 			.list_item_top {
 				display: flex;
@@ -253,4 +256,4 @@
 			text-align: center;
 		}
 	}
-</style>
+</style>

pages/equipMange/index/addusers.vue

@@ -1,67 +1,70 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;top: 0;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="用户新增"></uni-nav-bar>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="用户新增"></uni-nav-bar>
+			</view>
+			<view class="addusers">
+				<u-form :model="form" ref="uForm" class="uForm">
+					<view class="uFormbg">
+						<u-form-item label="姓名" left-icon="account" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
+						 prop="name" required>
+							<u-input v-model="form.name" :clearable="clearable" input-align="right" placeholder="请输入姓名" />
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="电话" left-icon="phone" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
+						 prop="intro" required>
+							<u-input v-model="form.intro" :clearable="clearable" input-align="right" placeholder="请输入电话" />
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="密码" left-icon="lock" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
+						 prop="passwold" required>
+							<u-input v-model="form.passwold" type="password" :clearable="clearable" input-align="right" placeholder="请输入密码" />
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="角色类型" left-icon="account-fill" :left-icon-style="lefticonstyle" label-width="160rpx"
+						 :border-bottom="borderbottom">
+							<u-input v-model="form.typesofrole" type="select" :clearable="clearable" @click="typesofrole[0].show = true"
+							 input-align="right" placeholder="请选择角色类型" :select-open="typesofrole[0].show" />
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="主题" left-icon="calendar" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
+							<u-input v-model="form.theme" :clearable="clearable" type="select" @click="theme_show = true" input-align="right"
+							 placeholder="请选择主题" :select-open="theme_show" />
+							<u-action-sheet :list="theme" v-model="theme_show" @click="themes" scroll-y="true"></u-action-sheet>
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="用户类型" left-icon="grid" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
+							<u-input v-model="form.usersofrole" type="select" :clearable="clearable" @click="usersofrole_show = true"
+							 input-align="right" :placeholder="usersofrole[0].text" :select-open="usersofrole_show" />
+							<u-action-sheet :list="usersofrole" v-model="usersofrole_show" @click="usersofroles"></u-action-sheet>
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="测试用户" left-icon="eye" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
+							<u-input v-model="form.testuser" type="select" :clearable="clearable" @click="testuser_show = true" input-align="right"
+							 :placeholder="testuser[0].text" :select-open="testuser_show" />
+							<u-action-sheet :list="testuser" v-model="testuser_show" @click="testusers"></u-action-sheet>
+						</u-form-item>
+					</view>
+				</u-form>
+			</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">
+					<view class="sheet-text" v-for="(item,index) in typesofrole[1]" :key="index">
+						<p @click="typesofroles(item.role_name,item.role_id)">{{item.role_name}}</p>
+					</view>
+				</scroll-view>
+				<button @click="typesofrole[0].show = false">取消</button>
+			</u-popup>
 		</view>
-		<view class="addusers">
-			<u-form :model="form" ref="uForm" class="uForm">
-				<view class="uFormbg">
-					<u-form-item label="姓名" left-icon="account" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
-					 prop="name" required>
-						<u-input v-model="form.name" :clearable="clearable" input-align="right" placeholder="请输入姓名" />
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="电话" left-icon="phone" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
-					 prop="intro" required>
-						<u-input v-model="form.intro" :clearable="clearable" input-align="right" placeholder="请输入电话" />
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="密码" left-icon="lock" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
-					 prop="passwold" required>
-						<u-input v-model="form.passwold" type="password" :clearable="clearable" input-align="right" placeholder="请输入密码" />
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="角色类型" left-icon="account-fill" :left-icon-style="lefticonstyle" label-width="160rpx"
-					 :border-bottom="borderbottom">
-						<u-input v-model="form.typesofrole" type="select" :clearable="clearable" @click="typesofrole[0].show = true"
-						 input-align="right" placeholder="请选择角色类型" :select-open="typesofrole[0].show"/>
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="主题" left-icon="calendar" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
-						<u-input v-model="form.theme" :clearable="clearable"  type="select" @click="theme_show = true" input-align="right" placeholder="请选择主题"
-						  :select-open="theme_show"/>
-						<u-action-sheet :list="theme" v-model="theme_show" @click="themes" scroll-y="true"></u-action-sheet>
-					</u-form-item>
-				</view> 
-				<view class="uFormbg">
-					<u-form-item label="用户类型" left-icon="grid" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
-						<u-input v-model="form.usersofrole" type="select" :clearable="clearable" @click="usersofrole_show = true"
-						 input-align="right" :placeholder="usersofrole[0].text" :select-open="usersofrole_show"/>
-						<u-action-sheet :list="usersofrole" v-model="usersofrole_show" @click="usersofroles"></u-action-sheet>
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="测试用户" left-icon="eye" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
-						<u-input v-model="form.testuser" type="select" :clearable="clearable" @click="testuser_show = true" input-align="right"
-						 :placeholder="testuser[0].text" :select-open="testuser_show" />
-						<u-action-sheet :list="testuser" v-model="testuser_show" @click="testusers"></u-action-sheet >
-					</u-form-item>
-				</view>
-			</u-form>
-		</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">
-				<view class="sheet-text" v-for="(item,index) in typesofrole[1]" :key="index">
-					<p @click="typesofroles(item.role_name,item.role_id)">{{item.role_name}}</p>
-				</view>
-			</scroll-view>
-			<button @click="typesofrole[0].show = false">取消</button>
-		</u-popup>
 	</view>
 </template>
 <style lang="scss">
@@ -239,6 +242,7 @@
 				margin: 20rpx 0;
 				background-color: #F7F8FA;
 				box-sizing: border-box;
+
 				.u-form-item {
 					padding: 0 10rpx;
 				}
@@ -250,7 +254,7 @@
 	.submitbtn {
 		width: 95%;
 		position: absolute;
-		bottom: 80rpx;
+		bottom: -80rpx;
 		background-color: $uni-color-success;
 		color: white;
 		left: 2.5%;

pages/equipMange/index/assignment.vue

@@ -1,33 +1,36 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;top: 0;width: 100%;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备分配"></uni-nav-bar>
-		</view>
-		<view class="utabs">
-			<view style="width: 95%;margin: 0 auto;">
-				<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" item-width="140" font-size="24" gutter="20"
-				 bar-width="60" active-color="#42b983"></u-tabs>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;top:44px;width: 100%;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备分配"></uni-nav-bar>
+			</view>
+			<view class="utabs">
+				<view style="width: 95%;margin: 0 auto;">
+					<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" item-width="140" font-size="24" gutter="20"
+					 bar-width="60" active-color="#42b983"></u-tabs>
+				</view>
+			</view>
+			<view class="ass_list">
+				<checkbox-group class="che_group" @change="checkboxchange">
+					<label class="equipment" v-for="(items,index) in assignment" :key="index">
+						<view class="equipment_top">
+							<image :src="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>
+						<view class="equipment_bot">
+							<p class="equipment_bot_id">设备ID：{{items.device_id}}</p>
+							<p class="equipment_bot_name">设备名称：{{items.device_name}}</p>
+							<view class="equipment_state">在线</view>
+						</view>
+					</label>
+				</checkbox-group>
+			</view>
+			<view class="allocbtn">
+				<button @click="cancel" class="cancel">取消分配</button>
+				<button @click="canfirm" class="canfirm">确定分配</button>
 			</view>
-		</view>
-		<view class="ass_list">
-			<checkbox-group class="che_group" @change="checkboxchange">
-				<label class="equipment" v-for="(items,index) in assignment" :key="index">
-					<view class="equipment_top">
-						<image :src="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>
-					<view class="equipment_bot">
-						<p class="equipment_bot_id">设备ID：{{items.device_id}}</p>
-						<p class="equipment_bot_name">设备名称：{{items.device_name}}</p>
-						<view class="equipment_state">在线</view>
-					</view>
-				</label>
-			</checkbox-group>
-		</view>
-		<view class="allocbtn">
-			<button @click="cancel" class="cancel">取消分配</button>
-			<button @click="canfirm" class="canfirm">确定分配</button>
 		</view>
 	</view>
 </template>
@@ -231,7 +234,7 @@
 	.utabs {
 		width: 100%;
 		position: fixed;
-		top: 44px;
+		top: 88px;
 		z-index: 100;
 	}
 

pages/equipMange/index/changepasswold.vue

@@ -1,34 +1,40 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;top: 0;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="修改密码"></uni-nav-bar>
-		</view>
-		<u-form :model="form" ref="uForm" class="uForm">
-			<view class="uFormbg">
-				<u-form-item label="原始密码" left-icon="lock" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
-				 prop="name">
-					<u-input v-model="form.oldpass" :clearable="clearable" input-align="right" placeholder="请输入原始密码" :type="type" @blur="oldpassblur"/>
-				</u-form-item>
-			</view>
-			<p class="tishi" v-if="oldpassisnull">请输入原始密码!</p>
-			<view class="uFormbg">
-				<u-form-item label="新密码" left-icon="lock" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
-				 prop="name">
-					<u-input v-model="form.newpass" :clearable="clearable" input-align="right" placeholder="请输入新密码" :type="type" @blur="newpassblur"/>
-				</u-form-item>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="修改密码"></uni-nav-bar>
 			</view>
-			<p class="tishi" v-if="passisnull">请输入新密码!</p>
-			<view class="uFormbg">
-				<u-form-item label="确认新密码" left-icon="lock" :left-icon-style="lefticonstyle" label-width="200rpx" :border-bottom="borderbottom"
-				 prop="name">
-					<u-input v-model="form.newpasstwo" :clearable="clearable" input-align="right" placeholder="请再次输入新密码" :type="type" @blur="tnewpassblur"/>
-				</u-form-item>
+			<u-form :model="form" ref="uForm" class="uForm">
+				<view class="uFormbg">
+					<u-form-item label="原始密码" left-icon="lock" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
+					 prop="name">
+						<u-input v-model="form.oldpass" :clearable="clearable" input-align="right" placeholder="请输入原始密码" :type="type"
+						 @blur="oldpassblur" />
+					</u-form-item>
+				</view>
+				<p class="tishi" v-if="oldpassisnull">请输入原始密码!</p>
+				<view class="uFormbg">
+					<u-form-item label="新密码" left-icon="lock" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
+					 prop="name">
+						<u-input v-model="form.newpass" :clearable="clearable" input-align="right" placeholder="请输入新密码" :type="type"
+						 @blur="newpassblur" />
+					</u-form-item>
+				</view>
+				<p class="tishi" v-if="passisnull">请输入新密码!</p>
+				<view class="uFormbg">
+					<u-form-item label="确认新密码" left-icon="lock" :left-icon-style="lefticonstyle" label-width="200rpx" :border-bottom="borderbottom"
+					 prop="name">
+						<u-input v-model="form.newpasstwo" :clearable="clearable" input-align="right" placeholder="请再次输入新密码" :type="type"
+						 @blur="tnewpassblur" />
+					</u-form-item>
+				</view>
+				<p class="tishi" v-if="tpassisnull">请输入新密码</p>
+				<p class="tishi" v-if="passisdif">两次输入密码不一致!</p>
+			</u-form>
+			<view class="confirm">
+				<button @click="confirm">确定</button>
 			</view>
-			<p class="tishi" v-if="tpassisnull">请输入新密码</p>
-			<p class="tishi" v-if="passisdif">两次输入密码不一致!</p>
-		</u-form>
-		<view class="confirm">
-			<button @click="confirm">确定</button>
 		</view>
 	</view>
 </template>
@@ -48,10 +54,10 @@
 				lefticonstyle: {
 					'color': '#57C878'
 				},
-				oldpassisnull:false,//旧密码为空提示
-				passisdif: false,//俩次密码不一致提示
-				tpassisnull:false,//第二次新密码为空提示
-				passisnull:false,//第一次新密码为空提示
+				oldpassisnull: false, //旧密码为空提示
+				passisdif: false, //俩次密码不一致提示
+				tpassisnull: false, //第二次新密码为空提示
+				passisnull: false, //第一次新密码为空提示
 				type: 'password'
 			}
 		},
@@ -72,36 +78,36 @@
 					}
 				})
 			},
-			confirm(){//确定按钮
-			if(!(this.passisdif&&this.tpassisnull&&this.oldpassisnull&&this.passisnull)){
+			confirm() { //确定按钮
+				if (!(this.passisdif && this.tpassisnull && this.oldpassisnull && this.passisnull)) {
 					this.changepwd()
-			}
-				
+				}
+
 			},
-			newpassblur(){//第一次新密码框提示
-				if(this.form.newpass==""){
-					this.passisnull=true
-				}else{
-					this.passisnull=false
+			newpassblur() { //第一次新密码框提示
+				if (this.form.newpass == "") {
+					this.passisnull = true
+				} else {
+					this.passisnull = false
 				}
 			},
-			tnewpassblur(){//第二次新密码框提示
-				if(this.form.newpasstwo==""){
-					this.tpassisnull=true
-				}else{
-					this.tpassisnull=false
-					if(this.form.newpass!=this.form.newpasstwo){
-						this.passisdif=true
-					}else{
-						this.passisdif=false
+			tnewpassblur() { //第二次新密码框提示
+				if (this.form.newpasstwo == "") {
+					this.tpassisnull = true
+				} else {
+					this.tpassisnull = false
+					if (this.form.newpass != this.form.newpasstwo) {
+						this.passisdif = true
+					} else {
+						this.passisdif = false
 					}
 				}
 			},
-			oldpassblur(){//原始密码框提示
-				if(this.form.oldpass==""){
-					this.oldpassisnull=true
-				}else{
-					this.oldpassisnull=false
+			oldpassblur() { //原始密码框提示
+				if (this.form.oldpass == "") {
+					this.oldpassisnull = true
+				} else {
+					this.oldpassisnull = false
 				}
 			}
 		},
@@ -115,8 +121,7 @@
 	.uForm {
 		width: 100%;
 		position: relative;
-		top: 44px;
-
+		top: 54px;
 		.uFormbg {
 			width: 90%;
 			background-color: #f3f3f3;

pages/equipMange/index/index.vue

@@ -1,9 +1,14 @@
 <template>
 	<view class="">
+<<<<<<< HEAD
 		<view class="">
 			<view class="status_bar">
 				
 			</view>
+=======
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+>>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
 			<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>
 			</view>

pages/equipMange/index/useroperation.vue

@@ -1,80 +1,84 @@
 <template>
 	<view class="">
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar left-icon="back" left-text="返回" @clickLeft="clickLeft" title="用户详情"></uni-nav-bar>
-		</view>
-		<view class="useroperations">
-			<u-form :model="user_meg" ref="uForm" class="uForm">
-				<view class="uFormbg">
-					<u-form-item label="姓名" left-icon="account" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
-					 prop="name">
-						<u-input v-model="user_meg.username" :clearable="clearable" input-align="right" disabled />
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="电话" left-icon="phone" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
-					 prop="intro">
-						<u-input v-model="user_meg.mobile" :clearable="clearable" input-align="right" :disabled="alterTF" :class="{'uuinput':alterTF==false}" 
-						@blur="bluechange(user_meg.mobile)"/>
-					</u-form-item>
-					<p class="tishi" v-if="tishitf">手机格式错误</p>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="主题" left-icon="calendar" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
-					 prop="passwold">
-						<u-input v-model="theme_items" :clearable="clearable" input-align="right" :disabled="alterTF"
-						 :class="{'uuinput':alterTF==false}" type="selete" @click="theme_show = !alterTF" />
-						<u-action-sheet :list="theme" v-model="theme_show" @click="themes" scroll-y="true"></u-action-sheet>
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="用户类型" left-icon="grid" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
-						<u-input v-model="users_type[user_meg.user_type-1].text" :clearable="clearable" input-align="right" disabled />
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="用户角色" left-icon="account-fill" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
-						<u-input v-model="user_meg.role_name" :clearable="clearable" input-align="right" placeholder="请选择主题" :disabled="alterTF"
-						 :class="{'uuinput':alterTF==false}" @click="users_type_show = !alterTF" />
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="是否可用" left-icon="order" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
-						<u-input v-model="tf" :clearable="clearable" input-align="right" disabled />
-					</u-form-item>
-				</view>
-				<view class="uFormbg">
-					<u-form-item label="创建时间" left-icon="clock" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
-						<u-input :clearable="clearable" input-align="right" disabled :value="user_meg.addtime|timeFormat()" />
-					</u-form-item>
-				</view>
-			</u-form>
-		</view>
-		<view class="operation_group">
-			<view class="group_one" v-if="btnTF">
-				<view class="group_one_top">
-					<button type="default" @click="recharge">充值</button>
-					<button type="default" @click="compile">编辑</button>
-					<button type="default" @click="forbidden" v-if="forbiddenTF" style="background-color: red;">禁用</button>
-					<button type="default" @click="forbidden" v-else>可用</button>
-					<button type="default" @click="changePassword">修改密码</button>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar left-icon="back" left-text="返回" @clickLeft="clickLeft" title="用户详情"></uni-nav-bar>
+			</view>
+			<view class="useroperations">
+				<u-form :model="user_meg" ref="uForm" class="uForm">
+					<view class="uFormbg">
+						<u-form-item label="姓名" left-icon="account" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
+						 prop="name">
+							<u-input v-model="user_meg.username" :clearable="clearable" input-align="right" disabled />
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="电话" left-icon="phone" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
+						 prop="intro">
+							<u-input v-model="user_meg.mobile" :clearable="clearable" input-align="right" :disabled="alterTF" :class="{'uuinput':alterTF==false}"
+							 @blur="bluechange(user_meg.mobile)" />
+						</u-form-item>
+						<p class="tishi" v-if="tishitf">手机格式错误</p>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="主题" left-icon="calendar" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom"
+						 prop="passwold">
+							<u-input v-model="theme_items" :clearable="clearable" input-align="right" :disabled="alterTF" :class="{'uuinput':alterTF==false}"
+							 type="selete" @click="theme_show = !alterTF" />
+							<u-action-sheet :list="theme" v-model="theme_show" @click="themes" scroll-y="true"></u-action-sheet>
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="用户类型" left-icon="grid" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
+							<u-input v-model="users_type[user_meg.user_type-1].text" :clearable="clearable" input-align="right" disabled />
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="用户角色" left-icon="account-fill" :left-icon-style="lefticonstyle" label-width="160rpx"
+						 :border-bottom="borderbottom">
+							<u-input v-model="user_meg.role_name" :clearable="clearable" input-align="right" placeholder="请选择主题" :disabled="alterTF"
+							 :class="{'uuinput':alterTF==false}" @click="users_type_show = !alterTF" />
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="是否可用" left-icon="order" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
+							<u-input v-model="tf" :clearable="clearable" input-align="right" disabled />
+						</u-form-item>
+					</view>
+					<view class="uFormbg">
+						<u-form-item label="创建时间" left-icon="clock" :left-icon-style="lefticonstyle" label-width="160rpx" :border-bottom="borderbottom">
+							<u-input :clearable="clearable" input-align="right" disabled :value="user_meg.addtime|timeFormat()" />
+						</u-form-item>
+					</view>
+				</u-form>
+			</view>
+			<view class="operation_group">
+				<view class="group_one" v-if="btnTF">
+					<view class="group_one_top">
+						<button type="default" @click="recharge">充值</button>
+						<button type="default" @click="compile">编辑</button>
+						<button type="default" @click="forbidden" v-if="forbiddenTF" style="background-color: red;">禁用</button>
+						<button type="default" @click="forbidden" v-else>可用</button>
+						<button type="default" @click="changePassword">修改密码</button>
+					</view>
+					<view class="group_one_bot">
+						<button type="default" @click="assignment">分配设备</button>
+					</view>
 				</view>
-				<view class="group_one_bot">
-					<button type="default" @click="assignment">分配设备</button>
+				<view class="group_two" v-else>
+					<button type="default" @click="modification" :disabled="tijiaotf">确定</button>
 				</view>
 			</view>
-			<view class="group_two" v-else>
-				<button type="default" @click="modification" :disabled="tijiaotf">确定</button>
-			</view>
+			<u-popup v-model="users_type_show" mode="bottom" length="40%" class="pop-up">
+				<scroll-view scroll-y="true" class="sheet">
+					<view class="sheet-text" v-for="(item,index) in roles" :key="index">
+						<p @click="typesofroles(index)">{{item.text}}</p>
+					</view>
+				</scroll-view>
+				<button @click="users_type_show = false">取消</button>
+			</u-popup>
 		</view>
-		<u-popup v-model="users_type_show" mode="bottom" length="40%" class="pop-up">
-			<scroll-view scroll-y="true" class="sheet">
-				<view class="sheet-text" v-for="(item,index) in roles" :key="index">
-					<p @click="typesofroles(index)">{{item.text}}</p>
-				</view>
-			</scroll-view>
-			<button @click="users_type_show = false">取消</button>
-		</u-popup>
 	</view>
 </template>
 
@@ -105,15 +109,15 @@
 				alterTF: true,
 				theme: [],
 				theme_show: false,
-				theme_items:'--',
+				theme_items: '--',
 				roles: [],
-				roles_id:null,
-				tishitf:false,
-				tijiaotf:false
+				roles_id: null,
+				tishitf: false,
+				tijiaotf: false
 			}
 		},
 		methods: {
-			async getForbidden() {//获取用户的使用状态
+			async getForbidden() { //获取用户的使用状态
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=user.login.users_statu_updata',
 					data: {
@@ -138,110 +142,110 @@
 					this.forbiddenTF = false
 				}
 			},
-			async getGroup() {//获取用户的主题信息
+			async getGroup() { //获取用户的主题信息
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.warning_record.rolemanage_view'
 				})
 				for (var i = 0; i < res.data.length; i++) {
-					let obj ={}
+					let obj = {}
 					obj.text = res.data[i].role_describe
-					obj.id=res.data[i].id
+					obj.id = res.data[i].id
 					this.theme.push(obj)
-					if(this.user_meg.user_group_id==res.data[i].id){//根据主题id更改主题
-						this.theme_items=res.data[i].role_describe
+					if (this.user_meg.user_group_id == res.data[i].id) { //根据主题id更改主题
+						this.theme_items = res.data[i].role_describe
 					}
 				}
 			},
-			async getThemes() {//获取用户角色
+			async getThemes() { //获取用户角色
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=user.perms.role_list'
 				})
 				for (var i = 0; i < res.length; i++) {
-					let obj ={}
+					let obj = {}
 					obj.text = res[i].role_name
-					obj.id=res[i].role_id
+					obj.id = res[i].role_id
 					this.roles.push(obj)
 				}
 			},
-			compile() {//编辑按钮
+			compile() { //编辑按钮
 				this.btnTF = !this.btnTF
 				this.alterTF = false
 			},
-			forbidden() {//禁用按钮
+			forbidden() { //禁用按钮
 				this.getForbidden()
 			},
-			themes(index) {//主题下拉框
+			themes(index) { //主题下拉框
 				this.theme_items = this.theme[index].text;
 				this.user_meg.user_group_id_index = this.theme[index].id;
 			},
-			async getModification() {//修改用户
+			async getModification() { //修改用户
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=user.login.users_info_updata',
 					data: {
 						uid: this.user_meg.uid,
 						mobile: this.user_meg.mobile,
-						user_group_id:this.user_meg.user_group_id_index || '',
+						user_group_id: this.user_meg.user_group_id_index || '',
 						user_type: this.user_meg.user_type,
-						role_id:this.roles_id || this.user_meg.role_id 
+						role_id: this.roles_id || this.user_meg.role_id
 					},
 				})
 			},
-			modification() {//修改用户确认按钮
+			modification() { //修改用户确认按钮
 				this.getModification()
 				this.btnTF = true
 				this.alterTF = true
 			},
-			typesofroles(idnex){//主题下拉框选项按钮
+			typesofroles(idnex) { //主题下拉框选项按钮
 				this.user_meg.role_name = this.roles[idnex].text
 				this.users_type_show = false
-				this.roles_id=this.roles[idnex].id
+				this.roles_id = this.roles[idnex].id
 			},
-			bluechange(str){//手机号框失去焦点时检测手机号
-				let regexp=/^1[23456789]\d{9}$/
-				this.tishitf=!regexp.test(str)
-				if(regexp.test(str)){
-					this.tijiaotf=!regexp.test(str)
-				}else{
-					this.tijiaotf=regexp.test(str)
+			bluechange(str) { //手机号框失去焦点时检测手机号
+				let regexp = /^1[23456789]\d{9}$/
+				this.tishitf = !regexp.test(str)
+				if (regexp.test(str)) {
+					this.tijiaotf = !regexp.test(str)
+				} else {
+					this.tijiaotf = regexp.test(str)
 				}
-				
+
 			},
-			clickLeft(){//返回上一页按钮
+			clickLeft() { //返回上一页按钮
 				uni.navigateTo({
-				    url: './index'
+					url: './index'
 				});
 			},
-			changePassword(){//修改密码
+			changePassword() { //修改密码
 				uni.navigateTo({
-				    url: './changepasswold?item='+JSON.stringify(this.user_meg)
+					url: './changepasswold?item=' + JSON.stringify(this.user_meg)
 				});
 			},
-			assignment(){//分配设备
+			assignment() { //分配设备
 				uni.navigateTo({
-				    url: './assignment?item='+JSON.stringify(this.user_meg)
+					url: './assignment?item=' + JSON.stringify(this.user_meg)
 				});
 			},
-			async getRecharge() {//修改用户
+			async getRecharge() { //修改用户
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=user.login.user_add_package_time',
 					data: {
 						uid: this.user_meg.uid,
-						user_test:1
+						user_test: 1
 					},
 				})
 			},
-			recharge(){//充值按钮
+			recharge() { //充值按钮
 				uni.showModal({
-				    title: '提示',
-				    content: '是否向该用户充值一年费用?',
-				    success: function (res) {
-				        if (res.confirm) {
+					title: '提示',
+					content: '是否向该用户充值一年费用?',
+					success: function(res) {
+						if (res.confirm) {
 							this.getRecharge()
-				            console.log('用户点击确定');
-				        } else if (res.cancel) {
-				            console.log('用户点击取消');
-				        }
-				    }
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
 				});
 			}
 		},
@@ -276,11 +280,13 @@
 				background-color: #f3f3f3;
 				margin-top: 20rpx;
 			}
-			.tishi{
+
+			.tishi {
 				text-align: center;
 				font-size: 24rpx;
 				color: red;
 			}
+
 			.u-form-item {
 				width: 95%;
 				height: 80rpx;
@@ -340,15 +346,16 @@
 		}
 
 	}
+
 	.pop-up {
 		.sheet {
 			background-color: white;
 			height: 400rpx;
 			overflow: hidden;
-	
+
 			.sheet-text {
 				height: 80rpx;
-	
+
 				p {
 					text-align: center;
 					height: 80rpx;
@@ -357,9 +364,9 @@
 					font-size: 16px;
 				}
 			}
-	
+
 		}
-	
+
 		button {
 			color: black;
 			position: absolute;

pages/expertDiagnosis/exchangeShare.vue

@@ -1,28 +1,31 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="交流圈">
-				<image src="../../static/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>
-		<view class="invitations">
-			<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="$imghost+defaultimg" mode="" v-else></image>
-				</view>
-				<view class="invitations_item_right">
-					<view class="invitations_item_right_top">
-						<image src="../../static/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 class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="交流圈">
+					<image src="../../static/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>
+			<view class="invitations">
+				<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="$imghost+defaultimg" mode="" v-else></image>
 					</view>
-					<view class="invitations_item_right_bot">
-						<image src="../../static/image/expertDiagnosis/d2014837228702eeceb762bc5302b3f.png" mode=""></image>
-						<span>{{items.username}}</span>
-						<p>查看详情</p>
+					<view class="invitations_item_right">
+						<view class="invitations_item_right_top">
+							<image src="../../static/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="../../static/image/expertDiagnosis/d2014837228702eeceb762bc5302b3f.png" mode=""></image>
+							<span>{{items.username}}</span>
+							<p>查看详情</p>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -35,17 +38,17 @@
 			return {
 				// pest.pests.pests_heat_rank
 				invitation: [],
-				actionSheetList:[{
-					text:"我的发帖"
-				},{
-					text:"我要发帖"
+				actionSheetList: [{
+					text: "我的发帖"
+				}, {
+					text: "我要发帖"
 				}],
-				post_show:false,
-				defaultimg: '/images/expertDiagnosis/img01.png'
+				post_show: false,
+				defaultimg: '/images/expertDiagnosis/img01.png'
 			}
 		},
 		methods: {
-			async getInvitation() {//获取问题
+			async getInvitation() { //获取问题
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_heat_rank',
 				})
@@ -58,11 +61,11 @@
 				}
 				console.log(this.invitation)
 			},
-			async getInvitationMy(str) {//获取自己的发帖
+			async getInvitationMy(str) { //获取自己的发帖
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_answers_list',
-					data:{
-						screen:str
+					data: {
+						screen: str
 					}
 				})
 				this.invitation = res.data
@@ -79,23 +82,23 @@
 					url: 'index'
 				})
 			},
-			particulars(items){//详情页
+			particulars(items) { //详情页
 				uni.navigateTo({
-					url:"particulars?items="+JSON.stringify(items)
+					url: "particulars?items=" + JSON.stringify(items)
 				})
 			},
-			postmessage(){//发帖
-				this.post_show=true
+			postmessage() { //发帖
+				this.post_show = true
 			},
-			message(index){
-				if(this.actionSheetList[index].text.includes("我要发帖")){
+			message(index) {
+				if (this.actionSheetList[index].text.includes("我要发帖")) {
 					uni.navigateTo({
-						url:"./postmessage"
+						url: "./postmessage"
 					})
-				}else if(this.actionSheetList[index].text.includes("我的发帖")){
-					this.actionSheetList[index].text="全部发帖"
+				} else if (this.actionSheetList[index].text.includes("我的发帖")) {
+					this.actionSheetList[index].text = "全部发帖"
 					this.getInvitationMy("my")
-				}else if(this.actionSheetList[index].text.includes("全部发帖")){
+				} else if (this.actionSheetList[index].text.includes("全部发帖")) {
 					this.getInvitation()
 				}
 			}

pages/expertDiagnosis/index.vue

@@ -1,48 +1,51 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"  title="专家诊断"></uni-nav-bar>
-		</view>
-		<image src="../../static/image/expertDiagnosis/05571341dbb0771b23d0b271764ac2e.png" class="expertimages"></image>
-		<view class="expert_details">
-			<view class="details_item" @click="worm">
-				<image src="../../static/image/expertDiagnosis/6612b1293fd1f45dd7ce6269a954999.png" ></image>
-				<p>虫情百科</p>
-			</view>
-			<view class="details_item" @click="virus">
-				<image src="../../static/image/expertDiagnosis/7f34f4eeba4d00819369cfa1b5ecce8.png" ></image>
-				<p>病毒百科</p>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="专家诊断"></uni-nav-bar>
 			</view>
-			<view class="details_item" @click="exchange">
-				<image src="../../static/image/expertDiagnosis/aa6a168b9fb72b62b687a2debc04a9f.png" ></image>
-				<p>交流圈</p>
+			<image src="../../static/image/expertDiagnosis/05571341dbb0771b23d0b271764ac2e.png" class="expertimages"></image>
+			<view class="expert_details">
+				<view class="details_item" @click="worm">
+					<image src="../../static/image/expertDiagnosis/6612b1293fd1f45dd7ce6269a954999.png"></image>
+					<p>虫情百科</p>
+				</view>
+				<view class="details_item" @click="virus">
+					<image src="../../static/image/expertDiagnosis/7f34f4eeba4d00819369cfa1b5ecce8.png"></image>
+					<p>病毒百科</p>
+				</view>
+				<view class="details_item" @click="exchange">
+					<image src="../../static/image/expertDiagnosis/aa6a168b9fb72b62b687a2debc04a9f.png"></image>
+					<p>交流圈</p>
+				</view>
 			</view>
-		</view>
-		<view class="cooperation">
-			<view class="cooperation_item">
-				<p class="cooperation_item_title">合作单位</p>
-				<view class="zooid">
-					<view class="zooid_item" v-for="(item,index) in cooperation_unit" :key="index">
-						<image :src="item.img_urls" mode=""></image>
-						<p>{{item.name}}</p>
+			<view class="cooperation">
+				<view class="cooperation_item">
+					<p class="cooperation_item_title">合作单位</p>
+					<view class="zooid">
+						<view class="zooid_item" v-for="(item,index) in cooperation_unit" :key="index">
+							<image :src="item.img_urls" mode=""></image>
+							<p>{{item.name}}</p>
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="cooperation_item">
-				<p class="cooperation_item_title">合作院校</p>
-				<view class="zooid">
-					<view class="zooid_item" v-for="(item,index) in cooperation_academy" :key="index">
-						<image :src="item.img_urls" mode=""></image>
-						<p>{{item.name}}</p>
+				<view class="cooperation_item">
+					<p class="cooperation_item_title">合作院校</p>
+					<view class="zooid">
+						<view class="zooid_item" v-for="(item,index) in cooperation_academy" :key="index">
+							<image :src="item.img_urls" mode=""></image>
+							<p>{{item.name}}</p>
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="cooperation_item">
-				<p class="cooperation_item_title">合作专家</p>
-				<view class="zooid">
-					<view class="zooid_item" v-for="(item,index) in cooperation_specialist" :key="index">
-						<image :src="item.img_urls" mode=""></image>
-						<p>{{item.name}}</p>
+				<view class="cooperation_item">
+					<p class="cooperation_item_title">合作专家</p>
+					<view class="zooid">
+						<view class="zooid_item" v-for="(item,index) in cooperation_specialist" :key="index">
+							<image :src="item.img_urls" mode=""></image>
+							<p>{{item.name}}</p>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -53,50 +56,50 @@
 	export default {
 		data() {
 			return {
-				cooperation_academy:[],//合作院校信息
-				cooperation_unit:[],//合作单位信息
-				cooperation_specialist :[],//合作专家信息
+				cooperation_academy: [], //合作院校信息
+				cooperation_unit: [], //合作单位信息
+				cooperation_specialist: [], //合作专家信息
 			}
 		},
 		methods: {
 			async getCooperation(code) {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_expert',
-					data:{
-						code:code
+					data: {
+						code: code
 					}
 				})
 				console.log(res)
-				if(code==1){
-					this.cooperation_unit=res.data
-				}else if(code==2){
-					this.cooperation_academy=res.data
-				}else if(code==3){
-					this.cooperation_specialist=res.data
+				if (code == 1) {
+					this.cooperation_unit = res.data
+				} else if (code == 2) {
+					this.cooperation_academy = res.data
+				} else if (code == 3) {
+					this.cooperation_specialist = res.data
 				}
 			},
-			clickLeft(){
+			clickLeft() {
 				uni.switchTab({
-					url:"../index/index"
+					url: "../index/index"
 				})
 			},
-			worm(){
+			worm() {
 				uni.navigateTo({
-					url:"./wormcase?name="+'虫情百科',
+					url: "./wormcase?name=" + '虫情百科',
 				});
 			},
-			virus(){
+			virus() {
 				uni.navigateTo({
-					url:"./wormcase?name="+'病毒百科',
+					url: "./wormcase?name=" + '病毒百科',
 				});
 			},
-			exchange(){
+			exchange() {
 				uni.navigateTo({
-					url:"./exchangeShare"
+					url: "./exchangeShare"
 				});
 			}
 		},
-		onLoad(){
+		onLoad() {
 			this.getCooperation(1)
 			this.getCooperation(2)
 			this.getCooperation(3)
@@ -105,51 +108,61 @@
 </script>
 
 <style lang="scss">
-.expertimages{
-	width: 100%;
-	height: 154rpx;
-	margin-top: 88rpx;
-}
-.expert_details{
-	width: 100%;
-	height: 120rpx;
-	display: flex;
-	justify-content: space-around;
-	margin: 20rpx 0 30rpx;
-	.details_item{
-		width: 20%;
-		padding: 10rpx 20rpx;
-		text-align: center;
-		font-size: 24rpx;
-		image{
-			width: 70%;
-			height: 84rpx;
+	.expertimages {
+		width: 100%;
+		height: 154rpx;
+		margin-top: 88rpx;
+	}
+
+	.expert_details {
+		width: 100%;
+		height: 120rpx;
+		display: flex;
+		justify-content: space-around;
+		margin: 20rpx 0 30rpx;
+
+		.details_item {
+			width: 20%;
+			padding: 10rpx 20rpx;
+			text-align: center;
+			font-size: 24rpx;
+
+			image {
+				width: 70%;
+				height: 84rpx;
+			}
 		}
 	}
-}
-.cooperation{
+
+	.cooperation {
 		width: 100%;
 		margin: 20rpx 0 60rpx;
-		.cooperation_item{
+
+		.cooperation_item {
 			width: 95%;
 			margin: 20rpx auto;
-			.cooperation_item_title{
+
+			.cooperation_item_title {
 				border-left: 8rpx solid #18B566;
 				text-indent: 16rpx;
 			}
-			.zooid{
+
+			.zooid {
 				width: 100%;
 				display: flex;
 				flex-wrap: wrap;
 				margin-top: 20rpx;
-				.zooid_item{
+
+				.zooid_item {
 					width: 22%;
 					margin: 10rpx;
-					image{
+
+					image {
 						width: 100%;
 						height: 154rpx;
 					}
-					p{
+
+					p {
 						font-size: 24rpx;
 						text-align: center;
 						margin: 10rpx 0;

pages/expertDiagnosis/introduce.vue

@@ -1,16 +1,19 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"  title="详情"></uni-nav-bar>
-		</view>
-		<image :src="wormcasedata.img_urls" mode="" style="width: 100%;height: 320rpx;margin-top: 88rpx;"></image>
-		<p class="name">{{wormcasedata.name}}</p>
-		<view v-for="(item,index) in preventionArr" :key="index" class="prevention">
-			<view class="prevention_title">
-				<u-icon name="play-right-fill" size="24" color="#55A92D"></u-icon>
-				<p>{{regexptitle[index]}}:</p>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
+			</view>
+			<image :src="wormcasedata.img_urls" mode="" style="width: 100%;height: 320rpx;margin-top: 88rpx;"></image>
+			<p class="name">{{wormcasedata.name}}</p>
+			<view v-for="(item,index) in preventionArr" :key="index" class="prevention">
+				<view class="prevention_title">
+					<u-icon name="play-right-fill" size="24" color="#55A92D"></u-icon>
+					<p>{{regexptitle[index]}}:</p>
+				</view>
+				<p class="prevention_con">{{item}}</p>
 			</view>
-			<p class="prevention_con">{{item}}</p>
 		</view>
 	</view>
 </template>
@@ -19,80 +22,84 @@
 	export default {
 		data() {
 			return {
-				wormcasedata:{},
-				unititle:'',
-				wormdata:{//虫子数据
-					
+				wormcasedata: {},
+				unititle: '',
+				wormdata: { //虫子数据
+
 				},
-				disease:{//病害数据
-					
+				disease: { //病害数据
+
 				},
-				preventionArr:[],
-				regexptitle:[]
+				preventionArr: [],
+				regexptitle: []
 			}
 		},
 		methods: {
 			async getIntroduce(data) {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_info',
-					data:{
-						pest_id:data
+					data: {
+						pest_id: data
 					}
 				})
 				console.log(res)
-				this.wormcasedata=res
+				this.wormcasedata = res
 				var regex2 = /\[(.+?)\]/g; // [] 中括号
-				var str=this.wormcasedata.prevention
-				var arr=str.match(regex2)
-				var arrindex=[]
-				for(var i=0;i<arr.length;i++){
+				var str = this.wormcasedata.prevention
+				var arr = str.match(regex2)
+				var arrindex = []
+				for (var i = 0; i < arr.length; i++) {
 					arrindex.push(str.indexOf(arr[i]))
 				}
-				for(var i=0;i<arr.length;i++){
-					this.preventionArr.push(str.slice(arrindex[i]+arr[i].length,arrindex[i+1]))
+				for (var i = 0; i < arr.length; i++) {
+					this.preventionArr.push(str.slice(arrindex[i] + arr[i].length, arrindex[i + 1]))
 				}
-				for(var i=0;i<arr.length;i++){
-					arr[i]=arr[i].slice(1,arr[i].length-1)
+				for (var i = 0; i < arr.length; i++) {
+					arr[i] = arr[i].slice(1, arr[i].length - 1)
 				}
-				this.regexptitle=arr
+				this.regexptitle = arr
 			},
-			clickLeft(){
+			clickLeft() {
 				uni.navigateTo({
-					url:"./wormcase?name="+this.unititle
+					url: "./wormcase?name=" + this.unititle
 				})
 			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			console.log(option)
-			this.unititle=option.title
+			this.unititle = option.title
 			this.getIntroduce(option.id)
 		}
 	}
 </script>
 
 <style lang="scss">
-	.name{
+	.name {
 		font-size: 34rpx;
 		font-weight: 700;
 		width: 95%;
 		margin: 20rpx auto 0;
 	}
-.prevention{
-	font-size: 28rpx;
-	color: #919191;
-	width: 95%;
-	margin:  20rpx auto;
-	.prevention_title{
-		display: flex;
-		p{
-			margin-left: 20rpx;
-			color: #000000;
-			font-size: 28rpx;
-			font-weight: 700;
+
+	.prevention {
+		font-size: 28rpx;
+		color: #919191;
+		width: 95%;
+		margin: 20rpx auto;
+
+		.prevention_title {
+			display: flex;
+
+			p {
+				margin-left: 20rpx;
+				color: #000000;
+				font-size: 28rpx;
+				font-weight: 700;
+			}
+		}
+
+		.prevention_con {
+			padding-left: 6%;
 		}
 	}
-	.prevention_con{
-		padding-left: 6%;
-	}
-}
 </style>

pages/expertDiagnosis/particulars.vue

@@ -1,45 +1,48 @@
 <template>
 	<view>
-		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
-		<u-swiper :list="list" height="428"></u-swiper>
-		<view class="quiz">
-			<view class="quiz_username">
-				<image src="../../static/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="../../static/image/fourMoodBase/touxiang.png" mode=""></image>
-					<span>{{quizdata.username}}</span>
-				</view>
-				<view>
-					<span>{{quizdata.adtime|timeFormat()}}</span>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
+			<u-swiper :list="list" height="428"></u-swiper>
+			<view class="quiz">
+				<view class="quiz_username">
+					<image src="../../static/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png" mode="" v-if="Number(quizdata.heat)==1"></image>
+					<span>{{quizdata.title}}</span>
 				</view>
-			</view>
-			<view class="quiz_usercontert" v-html="quizdata.content"></view>
-		</view>
-		<view class="comment">
-			<p class="comment_title">评论</p>
-			<view class="comment_unit" v-for="(item,index) in commentdata" :key="index">
-				<view class="comment_unit_user">
-					<view class="username">
-						<image :src="item.image" mode=""></image>
-						<span style="font-size: 26rpx;color:#C1C1C1;">{{item.username}}</span>
-						<p v-if="Number(item.user_type) == 1">专家</p>
+				<view class="quiz_usertime">
+					<view style="display: flex;align-items: center;">
+						<image src="../../static/image/fourMoodBase/touxiang.png" mode=""></image>
+						<span>{{quizdata.username}}</span>
 					</view>
 					<view>
-						<span style="font-size: 26rpx;color:#C1C1C1;">{{item.uptime|timeFormat()}}</span>
+						<span>{{quizdata.adtime|timeFormat()}}</span>
 					</view>
 				</view>
-				<view class="comment_unit_con">
-					<p v-html="item.content"></p>
+				<view class="quiz_usercontert" v-html="quizdata.content"></view>
+			</view>
+			<view class="comment">
+				<p class="comment_title">评论</p>
+				<view class="comment_unit" v-for="(item,index) in commentdata" :key="index">
+					<view class="comment_unit_user">
+						<view class="username">
+							<image :src="item.image" mode=""></image>
+							<span style="font-size: 26rpx;color:#C1C1C1;">{{item.username}}</span>
+							<p v-if="Number(item.user_type) == 1">专家</p>
+						</view>
+						<view>
+							<span style="font-size: 26rpx;color:#C1C1C1;">{{item.uptime|timeFormat()}}</span>
+						</view>
+					</view>
+					<view class="comment_unit_con">
+						<p v-html="item.content"></p>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="issue_box">
-			<view class="issue">
-				<input type="text" v-model="issuedata"/>
-				<p @click="issue">发布</p>
+			<view class="issue_box">
+				<view class="issue">
+					<input type="text" v-model="issuedata" />
+					<p @click="issue">发布</p>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -52,11 +55,11 @@
 				list: [{}],
 				quizdata: {},
 				commentdata: [],
-				issuedata:'',
-				defaultimg: '/images/expertDiagnosis/img01.png',
+				issuedata: '',
+				defaultimg: '/images/expertDiagnosis/img01.png',
 			}
 		},
-		methods: {//
+		methods: { //
 			async getParticulars(data) {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_answers_list',
@@ -72,7 +75,7 @@
 					url: '/api/api_gateway?method=pest.pests.pests_new_idea',
 					data: {
 						lower: data.lower,
-						content:data.content
+						content: data.content
 					}
 				})
 				console.log(res)
@@ -82,14 +85,14 @@
 					url: "exchangeShare"
 				})
 			},
-			issue(){//发布评论
+			issue() { //发布评论
 				let obj = {}
 				obj.lower = this.quizdata.lower
-				obj.content=this.issuedata
-				if(this.issuedata!=''){
+				obj.content = this.issuedata
+				if (this.issuedata != '') {
 					this.getDiscuss(obj)
 					uni.navigateTo({
-						url:"particulars?items="+JSON.stringify(this.quizdata)
+						url: "particulars?items=" + JSON.stringify(this.quizdata)
 					})
 				}
 			}
@@ -97,9 +100,9 @@
 		onLoad(option) {
 			this.quizdata = JSON.parse(option.items)
 			console.log(this.quizdata.img_urls)
-			if(this.quizdata.img_urls =='' || this.quizdata.img_urls ==null){
-				this.list[0].image = 'http://static.yfpyx.com/projectimg'+this.defaultimg
-			}else{
+			if (this.quizdata.img_urls == '' || this.quizdata.img_urls == null) {
+				this.list[0].image = 'http://static.yfpyx.com/projectimg' + this.defaultimg
+			} else {
 				this.list[0].image = this.quizdata.img_urls
 			}
 			let data = {}
@@ -121,14 +124,14 @@
 
 		.quiz_username {
 			width: 100%;
-
 			image {
 				width: 40rpx;
 				height: 40rpx;
 				vertical-align: middle;
 				margin-right: 20rpx;
 			}
-			span{
+
+			span {
 				font-weight: 700;
 				font-size: 32rpx;
 			}
@@ -147,8 +150,9 @@
 			}
 
 			span {
-				font-size: 12rpx;
+				font-size: 24rpx;
 				color: #C1C1C1;
+				font-weight: 700;
 			}
 		}
 
@@ -172,6 +176,7 @@
 				display: flex;
 				justify-content: space-between;
 				margin-top: 20rpx;
+
 				.username {
 					display: flex;
 					align-items: center;
@@ -182,7 +187,8 @@
 						margin-right: 20rpx;
 						border-radius: 50%;
 					}
-					p{
+
+					p {
 						width: 60rpx;
 						height: 30rpx;
 						color: white;
@@ -199,8 +205,10 @@
 
 			.comment_unit_con {
 				padding-left: 60rpx;
+
 				/deep/p {
 					margin-top: 20rpx;
+
 					img {
 						margin-top: 20rpx;
 						display: block;
@@ -212,24 +220,28 @@
 			}
 		}
 	}
-	.issue_box{
+
+	.issue_box {
 		width: 100%;
 		position: fixed;
 		bottom: 0;
 		background-color: #FFFFFF;
 	}
-	.issue{
+
+	.issue {
 		width: 95%;
 		margin: 0 auto;
 		display: flex;
 		padding-bottom: 20rpx;
-		input{
+
+		input {
 			width: 90%;
 			background-color: #F3F3F3;
 			height: 60rpx;
 			text-indent: 1em;
 		}
-		p{
+
+		p {
 			width: 10%;
 			text-align: right;
 			line-height: 60rpx;

pages/expertDiagnosis/postmessage.vue

@@ -1,15 +1,18 @@
 <template>
 	<view>
-		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="发帖"></uni-nav-bar>
-		<view class="post">
-			<view class="post_title">
-				<input type="text" placeholder="请输入标题" v-model="title" />
-			</view>
-			<view class="post_contert">
-				<textarea v-model="mainbody" placeholder="请输入正文" />
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="发帖"></uni-nav-bar>
+			<view class="post">
+				<view class="post_title">
+					<input type="text" placeholder="请输入标题" v-model="title" />
 				</view>
+				<view class="post_contert">
+					<textarea v-model="mainbody" placeholder="请输入正文" />
+					</view>
 			<button class="post_btn" @click="post">发布</button>
 		</view>
+		</view>
 	</view>
 </template>
 

pages/expertDiagnosis/wormcase.vue

@@ -1,32 +1,38 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"  :title="title"></uni-nav-bar>
-		</view>
-		<view class="particulars">
-			<view class="particulars_item" v-for="(item,index) in content" :key="index" @click="introduce(item.id)">
-				<image :src="item.img_urls" mode="" class="imgs"></image>
-				<p>{{item.name}}</p>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" :title="title"></uni-nav-bar>
+			</view>
+			<view class="particulars">
+				<view class="particulars_item" v-for="(item,index) in content" :key="index" @click="introduce(item.id)">
+					<image :src="item.img_urls" mode="" class="imgs"></image>
+					<p>{{item.name}}</p>
+				</view>
 			</view>
 		</view>
 	</view>
 </template>
 <style lang="scss">
-	.particulars{
+	.particulars {
 		width: 100%;
 		position: relative;
 		top: 88rpx;
 		display: flex;
 		flex-wrap: wrap;
-		.particulars_item{
+
+		.particulars_item {
 			width: 50%;
 			padding: 20rpx;
 			box-sizing: border-box;
-			.imgs{
+
+			.imgs {
 				width: 100%;
 				height: 220rpx;
 			}
-			p{
+
+			p {
 				font-size: 24rpx;
 			}
 		}
@@ -36,11 +42,11 @@
 	export default {
 		data() {
 			return {
-				title:'',
-				content:[],
-				data:{
-					code:null,
-					page:null
+				title: '',
+				content: [],
+				data: {
+					code: null,
+					page: null
 				}
 			}
 		},
@@ -48,33 +54,33 @@
 			async getCooperation(data) {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_search',
-					data:{
-						code:data.code,
-						page:data.page
+					data: {
+						code: data.code,
+						page: data.page
 					}
 				})
-				this.content=this.content.concat(res.data)
+				this.content = this.content.concat(res.data)
 			},
-			clickLeft(){
+			clickLeft() {
 				uni.navigateTo({
-					url:"./index"
+					url: "./index"
 				})
 			},
-			introduce(id){
+			introduce(id) {
 				uni.navigateTo({
-					url:"./introduce?id="+id+"&title="+this.title
+					url: "./introduce?id=" + id + "&title=" + this.title
 				})
 			}
 		},
-		onLoad(option){
-			this.title=option.name
-			if(option.name=="虫情百科"){
-				this.data.code=2
-				this.data.page=1
+		onLoad(option) {
+			this.title = option.name
+			if (option.name == "虫情百科") {
+				this.data.code = 2
+				this.data.page = 1
 				this.getCooperation(this.data)
-			}else{
-				this.data.code=1
-				this.data.page=1
+			} else {
+				this.data.code = 1
+				this.data.page = 1
 				this.getCooperation(this.data)
 			}
 		},

pages/fourBase/addbase.vue

@@ -1,41 +1,43 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="新增基地"></uni-nav-bar>
-		</view>
-		<view class="addimg">
-			<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>
-		</view>
-		<view class="base_text">
-			<p class="title">基地信息</p>
-			<view class="base_text_item1">
-				<u-icon name="fangzi" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span><span style="color: #ff0000;margin: 0;">*</span>基地名称</span>
-				<input type="text" v-model="baseinfo.base_name" placeholder="请输入基地名称" />
-			</view>
-			<view class="base_text_item1">
-				<u-icon name="ren1" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span><span style="color: #ff0000;margin: 0;">*</span>负责人</span>
-				<input type="text" v-model="baseinfo.base_charge " placeholder="请输入基地负责人" />
-			</view>
-			<view class="base_text_item1">
-				<u-icon name="lianxidianhua" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span><span style="color: #ff0000;margin: 0;">*</span>联系电话</span>
-				<input type="text" v-model="baseinfo.base_phone" placeholder="请输入联系电话" @blur="yanzheng"/>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="新增基地"></uni-nav-bar>
 			</view>
-			<view class="base_text_item1">
-				<u-icon name="mianji" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span><span style="color: #ff0000;margin: 0;">*</span>面积(亩)</span>
-				<input type="number" v-model="baseinfo.base_area" placeholder="请输入基地面积" />
+			<view class="addimg">
+				<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>
 			</view>
-			<view class="base_text_item2">
-				<u-icon name="miaoshu" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span>基地描述</span>
-				<textarea v-model="baseinfo.base_describe " maxlength="80" auto-height class="textarea" placeholder="请输入基地描述(不能大于80字)" />
+			<view class="base_text">
+				<p class="title">基地信息</p>
+				<view class="base_text_item1">
+					<u-icon name="fangzi" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span><span style="color: #ff0000;margin: 0;">*</span>基地名称</span>
+					<input type="text" v-model="baseinfo.base_name" placeholder="请输入基地名称" />
+				</view>
+				<view class="base_text_item1">
+					<u-icon name="ren1" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span><span style="color: #ff0000;margin: 0;">*</span>负责人</span>
+					<input type="text" v-model="baseinfo.base_charge " placeholder="请输入基地负责人" />
+				</view>
+				<view class="base_text_item1">
+					<u-icon name="lianxidianhua" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span><span style="color: #ff0000;margin: 0;">*</span>联系电话</span>
+					<input type="text" v-model="baseinfo.base_phone" placeholder="请输入联系电话" @blur="yanzheng" />
+				</view>
+				<view class="base_text_item1">
+					<u-icon name="mianji" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span><span style="color: #ff0000;margin: 0;">*</span>面积(亩)</span>
+					<input type="number" v-model="baseinfo.base_area" placeholder="请输入基地面积" />
 				</view>
+				<view class="base_text_item2">
+					<u-icon name="miaoshu" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span>基地描述</span>
+					<textarea v-model="baseinfo.base_describe " maxlength="80" auto-height class="textarea" placeholder="请输入基地描述(不能大于80字)" />
+					</view>
 			<view class="base_text_item1" @click="map">
 				<u-icon name="Frame1" custom-prefix="custom-icon" class="icon"></u-icon>
 				<span><span style="color: #ff0000;margin: 0;">*</span>基地定位</span>
@@ -59,6 +61,7 @@
 				确 定
 			</view>
 		</view>
+		</view>
 	</view>
 </template>
 <style lang="scss">
@@ -196,10 +199,14 @@
 					}else{
 						console.log(this.baseinfo)
 						this.addbase()
-						localStorage.removeItem("id")
-						uni.navigateBack({
-							delta:1
-						})
+						uni.removeStorage({
+						    key: 'id',
+						    success: function (res) {
+						       uni.navigateTo({
+						       	url:"./index"
+						       })
+						    }
+						});
 					}
 				}
 			},
@@ -216,14 +223,18 @@
 		onLoad() {
 		},
 		onShow(){
-			// this.base_id=JSON.parse(localStorage.getItem("id"))
-			if(localStorage.getItem("id")!=null){
-				var arr = []
-				for(var key in this.base_id){
-					arr.push(this.base_id[key].join("#"))
-				}
-				this.baseinfo.base_equip = arr.join("#")
-			}
+			uni.getStorage({
+			    key: 'id',
+			    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.baseinfo.base_equip = arr.join("#")
+			    }
+			});
+			
 		}
 	}
 </script>
@@ -298,7 +309,7 @@
 			color: #5FBBA0;
 		}
 		span{
-			margin: 0 20rpx;
+			margin: 0 10rpx;
 		}
 		input{
 			position: absolute;
@@ -338,7 +349,7 @@
 	.btn{
 		width: 90%;
 		position: fixed;
-		bottom: 0;
+		bottom: 10rpx;
 		right: 5%;
 		text-align: center;
 		height: 70rpx;

pages/fourBase/allocation.vue

@@ -1,33 +1,36 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备分配"></uni-nav-bar>
-		</view>
-		<view class="utabs">
-			<view style="width: 95%;margin: 0 auto;">
-				<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" item-width="140" font-size="24" gutter="20"
-				 bar-width="60" active-color="#42b983"></u-tabs>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备分配"></uni-nav-bar>
+			</view>
+			<view class="utabs">
+				<view style="width: 95%;margin: 0 auto;">
+					<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" item-width="140" font-size="24" gutter="20"
+					 bar-width="60" active-color="#42b983"></u-tabs>
+				</view>
+			</view>
+			<view class="ass_list">
+				<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="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>
+						<view class="equipment_bot">
+							<p class="equipment_bot_id">设备ID：{{items.id}}</p>
+							<p class="equipment_bot_name">设备名称：{{items.type_name}}</p>
+							<view class="equipment_state">在线</view>
+						</view>
+					</label>
+				</checkbox-group>
+			</view>
+			<view class="allocbtn">
+				<button @click="cancel" class="cancel">取消分配</button>
+				<button @click="canfirm" class="canfirm">确定分配</button>
 			</view>
-		</view>
-		<view class="ass_list">
-			<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="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>
-					<view class="equipment_bot">
-						<p class="equipment_bot_id">设备ID：{{items.id}}</p>
-						<p class="equipment_bot_name">设备名称：{{items.type_name}}</p>
-						<view class="equipment_state">在线</view>
-					</view>
-				</label>
-			</checkbox-group>
-		</view>
-		<view class="allocbtn">
-			<button @click="cancel" class="cancel">取消分配</button>
-			<button @click="canfirm" class="canfirm">确定分配</button>
 		</view>
 	</view>
 </template>
@@ -58,7 +61,7 @@
 				}],
 				src: '',
 				obj: {},
-				addtype:[]
+				addtype: []
 			}
 		},
 		methods: {
@@ -78,8 +81,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.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)
 						}
@@ -92,8 +95,8 @@
 				}
 				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.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)
 						}
@@ -118,7 +121,6 @@
 				console.log(this.obj)
 			},
 			checkboxchange(e, items) {
-				console.log(e.detail.value)
 				this.obj[this.assignments.type_name] = e.detail.value
 				this.forchange(this.obj)
 			},
@@ -131,15 +133,21 @@
 				this.clickLeft()
 			},
 			canfirm() {
-				localStorage.setItem("id",JSON.stringify(this.obj))
-				uni.navigateBack({
-					delta:1
+				uni.setStorage({
+					key: "id",
+					data: JSON.stringify(this.obj),
+					success: () => {
+						uni.navigateBack({
+							delta: 1
+						})
+					}
+
 				})
 			},
 		},
 		onLoad(option) {
 			console.log(option)
-			if(option.type){
+			if (option.type) {
 				this.addtype = option.type.split("#")
 				console.log(this.addtype)
 			}
@@ -152,7 +160,7 @@
 	.utabs {
 		width: 100%;
 		position: fixed;
-		top: 44px;
+		top: 88px;
 		z-index: 100;
 	}
 
@@ -241,7 +249,7 @@
 				}
 
 				.equipment_bot_name {
-					font-size: 10px;
+					font-size: 24rpx;
 				}
 
 				.equipment_state {

pages/fourBase/index.vue

@@ -1,23 +1,17 @@
 <template>
 	<view>
-		<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="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="四情基地"></uni-nav-bar>
+				<u-icon name="plus-circle" class="tianjia" @click="clickRight"></u-icon>
 			</view>
-		</view>
-		<view class="bases">
-			<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="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>
+<<<<<<< HEAD
 				<view class="bases_list_text">
 					<p><span style="margin-right: 30rpx;">{{items.base_name}}</span><span>{{items.base_area}}㎡</span></p>
 					<p style="font-size: 24rpx;">联系人：{{items.base_charge}}</p>
@@ -31,10 +25,35 @@
 					<image src="../../static/image/fourMoodBase/qxz.png" mode=""></image>
 					<view class="photoshow_num">
 						6+
+=======
+			</view>
+			<view class="bases">
+				<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>
+					<view class="bases_list_text">
+						<p><span style="margin-right: 30rpx;">{{items.base_name}}</span><span>{{items.base_area}}㎡</span></p>
+						<p style="font-size: 24rpx;">联系人：{{items.base_charge}}</p>
+						<p style="font-size: 24rpx;">联系电话：{{items.base_phone}}</p>
+						<p style="font-size: 24rpx;">地址：{{items.base_name}}</p>
+					</view>
+					<u-icon name="more-dot-fill" class="bases_list_xiangqing" @click.native.stop="XQclick(items)"></u-icon>
+					<view class="photoshow">
+						<image src="../../static/image/fourMoodBase/测报灯.png" mode=""></image>
+						<image src="../../static/image/fourMoodBase/杀虫灯.png" mode=""></image>
+						<image src="../../static/image/fourMoodBase/环境监测.png" mode=""></image>
+						<view class="photoshow_num">
+							{{items.num}}+
+						</view>
+>>>>>>> 1c31f0ba3e58f06f275858f2857f9f7f3e3fafc8
 					</view>
 				</view>
+				<u-action-sheet :list="actionSheetList" v-model="post_show" @click="message"></u-action-sheet>
 			</view>
-			<u-action-sheet :list="actionSheetList" v-model="post_show" @click="message"></u-action-sheet>
 		</view>
 	</view>
 </template>
@@ -53,14 +72,14 @@
 					page: 1
 				},
 				baselist: [],
-				actionSheetList:[{
-					text:"编辑基地"
-				},{
-					text:"删除基地"
+				actionSheetList: [{
+					text: "编辑基地"
+				}, {
+					text: "删除基地"
 				}],
-				post_show:false,
-				delid:"",
-				facilitynum:""
+				post_show: false,
+				delid: "",
+				facilitynum: ""
 			}
 		},
 		methods: {
@@ -71,66 +90,70 @@
 				})
 				this.baselist = this.baselist.concat(res.data)
 				console.log(this.baselist)
+				for(var i=0;i<this.baselist.length;i++){
+					var arr = this.baselist[i].base_equip.split("#")
+					this.baselist[i].num = arr.length
+				}
 			},
 			async delbase() { //基地列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=base.bases.base_list',
-					data:{
-						ret:"del",
-						base_id:this.delid.id
+					data: {
+						ret: "del",
+						base_id: this.delid.id
 					}
 				})
 			},
-			clickLeft(){//返回主页
+			clickLeft() { //返回主页
 				uni.switchTab({
-					url:"../index/index"
+					url: "../index/index"
 				})
 			},
-			clickRight(){//添加基地
+			clickRight() { //添加基地
 				uni.navigateTo({
-					url:"./addbase"
+					url: "./addbase"
 				})
 			},
-			searchinput() {//搜索
-				this.data.page=1
+			searchinput() { //搜索
+				this.data.page = 1
 				this.baselist = []
 				Debounce(() => {
 					this.getFourbase()
 				}, 1000)()
 			},
-			search(){//搜索按钮
-				this.data.page=1
+			search() { //搜索按钮
+				this.data.page = 1
 				this.baselist = []
 				this.getFourbase()
 				this.$forceUpdate()
 			},
-			details(id){//详情页
+			details(id) { //详情页
 				uni.navigateTo({
-					url:"./basefacility?id="+id
+					url: "./basefacility?id=" + id
 				})
 			},
-			XQclick(item){//编辑
-				this.post_show=!this.post_show
+			XQclick(item) { //编辑
+				this.post_show = !this.post_show
 				this.delid = item
 			},
-			message(index){//编辑或者删除
+			message(index) { //编辑或者删除
 				console.log(index)
-				if(index==1){
+				if (index == 1) {
 					console.log(this.delid.id)
 					uni.showModal({
-					    title: '提示',
-					    content: '确定要删除该基地吗？',
-					    success:(res)=>{
-					        if (res.confirm) {
-					           this.delbase()
-					        } else if (res.cancel) {
-					            console.log('用户点击取消');
-					        }
-					    }
+						title: '提示',
+						content: '确定要删除该基地吗？',
+						success: (res) => {
+							if (res.confirm) {
+								this.delbase()
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
 					});
-				}else{
+				} else {
 					uni.navigateTo({
-						url:"./modification?id="+JSON.stringify(this.delid)
+						url: "./modification?id=" + JSON.stringify(this.delid)
 					})
 				}
 				this.$forceUpdate()
@@ -139,11 +162,11 @@
 		onLoad() {
 			this.getFourbase()
 		},
-		onReachBottom() {//滑动到底部加载
+		onReachBottom() { //滑动到底部加载
 			this.data.page++
 			this.getFourbase()
 		},
-		onShow(){
+		onShow() {
 			this.$forceUpdate()
 		}
 	}
@@ -155,13 +178,15 @@
 		right: 24rpx;
 		font-size: 38rpx;
 	}
-	.bases_search{
+
+	.bases_search {
 		width: 100%;
 		position: fixed;
-		top: 44px;
+		top: 88px;
 		z-index: 100;
 		background-color: #FFFFFF;
-		.bases_search_text{
+
+		.bases_search_text {
 			width: 90%;
 			margin: 0 auto;
 			background-color: #F8F8F8;
@@ -169,21 +194,25 @@
 			border-radius: 30rpx;
 			display: flex;
 			line-height: 60rpx;
-			.search{
-				padding:0  20rpx ;
+
+			.search {
+				padding: 0 20rpx;
 				font-size: 34rpx;
 			}
-			input{
+
+			input {
 				width: 80%;
 				margin-top: 10rpx;
 				font-size: 28rpx;
 			}
 		}
 	}
+
 	.bases {
 		width: 100%;
 		position: relative;
 		top: 170rpx;
+
 		.bases_list {
 			width: 90%;
 			margin: 0 auto 20rpx;
@@ -191,12 +220,13 @@
 			position: relative;
 
 			.bases_list_bgi {
-				.bgcolor{
+				.bgcolor {
 					width: 100%;
 					height: 276rpx;
-					background-color: rgba(0,0,0,0.3);
+					background-color: rgba(0, 0, 0, 0.3);
 					border-radius: 25rpx;
 				}
+
 				image {
 					position: absolute;
 					top: 0;
@@ -215,11 +245,13 @@
 				z-index: 10;
 				padding: 40rpx;
 				color: #FFFFFF;
-				p{
+
+				p {
 					margin-bottom: 10rpx;
 				}
 			}
-			.bases_list_xiangqing{
+
+			.bases_list_xiangqing {
 				position: absolute;
 				top: 20rpx;
 				right: 20rpx;
@@ -227,7 +259,8 @@
 				font-size: 26rpx;
 				color: #FFFFFF;
 			}
-			.photoshow{
+
+			.photoshow {
 				width: 160rpx;
 				height: 34rpx;
 				display: flex;
@@ -237,12 +270,14 @@
 				background-color: #a7a8a0;
 				border-radius: 18rpx;
 				padding: 4rpx;
-				image{
+
+				image {
 					width: 32rpx;
 					height: 32rpx;
 					margin-right: 4rpx;
 				}
-				.photoshow_num{
+
+				.photoshow_num {
 					width: 50rpx;
 					height: 30rpx;
 					border: 1px solid #FFFFFF;
@@ -255,4 +290,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/fourBase/modification.vue

@@ -1,41 +1,43 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="基地修改"></uni-nav-bar>
-		</view>
-		<view class="addimg">
-			<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>
-		</view>
-		<view class="base_text">
-			<p class="title">基地信息</p>
-			<view class="base_text_item1">
-				<u-icon name="fangzi" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span><span style="color: #ff0000;margin: 0;">*</span>基地名称</span>
-				<input type="text" v-model="baseinfo.base_name" placeholder="请输入基地名称" />
-			</view>
-			<view class="base_text_item1">
-				<u-icon name="ren1" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span><span style="color: #ff0000;margin: 0;">*</span>负责人</span>
-				<input type="text" v-model="baseinfo.base_charge " placeholder="请输入基地负责人" />
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="基地修改"></uni-nav-bar>
 			</view>
-			<view class="base_text_item1">
-				<u-icon name="lianxidianhua" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span><span style="color: #ff0000;margin: 0;">*</span>联系电话</span>
-				<input type="text" v-model="baseinfo.base_phone" placeholder="请输入联系电话" />
-			</view>
-			<view class="base_text_item1">
-				<u-icon name="mianji" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span><span style="color: #ff0000;margin: 0;">*</span>面积(亩)</span>
-				<input type="number" v-model="baseinfo.base_area" placeholder="请输入基地面积" />
+			<view class="addimg">
+				<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>
 			</view>
-			<view class="base_text_item2">
-				<u-icon name="miaoshu" custom-prefix="custom-icon" class="icon"></u-icon>
-				<span>基地描述</span>
-				<textarea v-model="baseinfo.base_describe " maxlength="80" auto-height class="textarea" placeholder="请输入基地描述(不能大于80字)" />
+			<view class="base_text">
+				<p class="title">基地信息</p>
+				<view class="base_text_item1">
+					<u-icon name="fangzi" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span><span style="color: #ff0000;margin: 0;">*</span>基地名称</span>
+					<input type="text" v-model="baseinfo.base_name" placeholder="请输入基地名称" />
+				</view>
+				<view class="base_text_item1">
+					<u-icon name="ren1" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span><span style="color: #ff0000;margin: 0;">*</span>负责人</span>
+					<input type="text" v-model="baseinfo.base_charge " placeholder="请输入基地负责人" />
+				</view>
+				<view class="base_text_item1">
+					<u-icon name="lianxidianhua" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span><span style="color: #ff0000;margin: 0;">*</span>联系电话</span>
+					<input type="text" v-model="baseinfo.base_phone" placeholder="请输入联系电话" />
 				</view>
+				<view class="base_text_item1">
+					<u-icon name="mianji" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span><span style="color: #ff0000;margin: 0;">*</span>面积(亩)</span>
+					<input type="number" v-model="baseinfo.base_area" placeholder="请输入基地面积" />
+				</view>
+				<view class="base_text_item2">
+					<u-icon name="miaoshu" custom-prefix="custom-icon" class="icon"></u-icon>
+					<span>基地描述</span>
+					<textarea v-model="baseinfo.base_describe " maxlength="80" auto-height class="textarea" placeholder="请输入基地描述(不能大于80字)" />
+					</view>
 			<view class="base_text_item1" @click="map">
 				<u-icon name="Frame1" custom-prefix="custom-icon" class="icon"></u-icon>
 				<span><span style="color: #ff0000;margin: 0;">*</span>基地定位</span>
@@ -59,6 +61,7 @@
 				确 定
 			</view>
 		</view>
+		</view>
 	</view>
 </template>
 <script>
@@ -219,14 +222,17 @@
 			console.log(this.baseinfo)
 		},
 		onShow(){
-			this.base_id=JSON.parse(localStorage.getItem("id"))
-			if(localStorage.getItem("id")!=null){
-				var arr = []
-				for(var key in this.base_id){
-					arr.push(this.base_id[key].join("#"))
-				}
-				this.baseinfo.base_equip = arr.join("#")
-			}
+			uni.getStorage({
+			    key: 'id',
+			    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.baseinfo.base_equip = arr.join("#")
+			    }
+			});
 		}
 	}
 </script>
@@ -301,7 +307,7 @@
 			color: #5FBBA0;
 		}
 		span{
-			margin: 0 20rpx;
+			margin: 0 10rpx;
 		}
 		input{
 			position: absolute;
@@ -313,7 +319,7 @@
 		}
 		.iconright{
 			position: absolute;
-			right: 20rpx;
+			right: 10rpx;
 			top: 28rpx;
 			color: #B5B6B8;
 			font-size: 24rpx;
@@ -341,7 +347,7 @@
 	.btn{
 		width: 90%;
 		position: fixed;
-		bottom: 0;
+		bottom: 10rpx;
 		right: 5%;
 		text-align: center;
 		height: 70rpx;

pages/index/index.vue

@@ -81,7 +81,7 @@
 		},
 		onLoad() {
 			
-		},
+		}, 
 		onShow(){
 			this.loadTF = false
 		},

pages/login/login.vue

@@ -1,5 +1,6 @@
 <template>
 	<view style="height: 100vh;">
+		<view class="status_bar"></view>
 		<view class="logo">
 			<image src="../../static/image/login/8eef2e54055a5b072a5dc000919a7ae.png" mode=""></image>
 		</view>
@@ -79,8 +80,9 @@
 		width: 100%;
 		height: 340rpx;
 		text-align: center;
-		padding-top: 120rpx;
-
+		margin-top: 120rpx;
+		display: flex;
+		align-items: center;
 		image {
 			width: 280rpx;
 			margin: 0 auto;

pages/monitor/detail.vue

@@ -1,32 +1,35 @@
 <template>
 	<view class="">
-		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="监控详情"></uni-nav-bar>
-		<view class="" style="height:400px">
-			<view id="myPlayer"></view>
-		</view>
-		<view class="btn-box">
-			<view class="more" @touchstart="configCamera('move', 8)" @touchend="stopConfigCamera()">
-				<image :src="moreSrc" mode="widthFix"></image>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="监控详情"></uni-nav-bar>
+			<view class="" style="height:400px">
+				<view id="myPlayer"></view>
 			</view>
-			<view class="direc">
-				<view class="top"  @touchstart="configCamera('move', 0)" @touchend="stopConfigCamera()">
-
+			<view class="btn-box">
+				<view class="more" @touchstart="configCamera('move', 8)" @touchend="stopConfigCamera()">
+					<image :src="moreSrc" mode="widthFix"></image>
 				</view>
-				<view class="bottom"  @touchstart="configCamera('move', 1)" @touchend="stopConfigCamera()">
+				<view class="direc">
+					<view class="top" @touchstart="configCamera('move', 0)" @touchend="stopConfigCamera()">
 
-				</view>
-				<view class="photo"  @touchstart="configCamera('takephoto', '')" >
+					</view>
+					<view class="bottom" @touchstart="configCamera('move', 1)" @touchend="stopConfigCamera()">
 
-				</view>
-				<view class="left"  @touchstart="configCamera('move', 2)" @touchend="stopConfigCamera()">
+					</view>
+					<view class="photo" @touchstart="configCamera('takephoto', '')">
 
-				</view>
-				<view class="right"  @touchstart="configCamera('move', 6)" @touchend="stopConfigCamera()">
+					</view>
+					<view class="left" @touchstart="configCamera('move', 2)" @touchend="stopConfigCamera()">
+
+					</view>
+					<view class="right" @touchstart="configCamera('move', 6)" @touchend="stopConfigCamera()">
 
+					</view>
+				</view>
+				<view class="less" @touchstart="configCamera('move', 9)" @touchend="stopConfigCamera()">
+					<image :src="lessSrc" mode="widthFix"></image>
 				</view>
-			</view>
-			<view class="less" @touchstart="configCamera('move', 9)" @touchend="stopConfigCamera()">
-				<image :src="lessSrc" mode="widthFix"></image>
 			</view>
 		</view>
 	</view>

pages/monitor/index.vue

@@ -1,23 +1,25 @@
 <template>
 	<view class="">
-		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="监控系统"></uni-nav-bar>
-		<view class="">
-			<image src="../../static/image/monitor/banner.png" mode="widthFix"></image>
-		</view>
-		<view class="content">
-			<template v-for="(item,index) in listArr">
-				<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">
-					<view class="type-name">
-						<view class="iconfont icon-jiankong"></view>
-						<text>
-							监控
-						</text>
-					</view>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="监控系统"></uni-nav-bar>
+			<view class="">
+				<image src="../../static/image/monitor/banner.png" mode="widthFix"></image>
+			</view>
+			<view class="content">
+				<template v-for="(item,index) in listArr">
+					<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">
+						<view class="type-name">
+							<view class="iconfont icon-jiankong"></view>
+							<text>
+								监控
+							</text>
+						</view>
 
-				</equipItem>
-			</template>
+					</equipItem>
+				</template>
+			</view>
 		</view>
-
 	</view>
 </template>
 

pages/my/index/index.vue

@@ -1,10 +1,7 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<uni-nav-bar title="个人中心" style="border: 0rpx;"></uni-nav-bar>
-		</view>
 		<view class="subject">
-			<view style="width: 100%;background-color: #FFFFFF;position: relative;top: 98rpx;">
+			<view style="width: 100%;background-color: #FFFFFF;position: relative;">
 				<view class="personal">
 					<view class="personal_left">
 						<image :src="userinfos.image" mode=""></image>
@@ -19,20 +16,13 @@
 					</view>
 				</view>
 			</view>
-			<view style="background-color: #FFFFFF;margin: 115rpx auto 0;">
+			<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>
-			<!-- <view style="background-color: #FFFFFF;">
-				<view class="opinion" @click="feedback">
-					<u-icon name="yijian2" custom-prefix="custom-icon" class="icon_left"></u-icon>
-					意见反馈
-					<uni-icons type="arrowright" class="icon_right"></uni-icons>
-				</view>
-			</view> -->
 			<view style="background-color: #FFFFFF;">
 				<view class="quit" @click="outto">
 					<u-icon name="tuichu" custom-prefix="custom-icon" class="icon_left"></u-icon>
@@ -122,7 +112,7 @@
 <style lang="scss">
 	.subject {
 		width: 100%;
-		height: 93vh;
+		height: 100vh;
 		background-color: #F9F9F9;
 	}
 
@@ -131,7 +121,7 @@
 		margin: 0 auto;
 		display: flex;
 		padding: 20rpx 0 40rpx;
-
+		box-sizing: border-box;
 		.personal_left {
 			width: 18%;
 			margin-right: 30rpx;

pages/prevention/control.vue

@@ -1,87 +1,90 @@
 <template>
 	<view>
-		<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="control">
-			<view class="control_restart">
-				<p class="title_p">管理员操作</p>
-				<view class="control_restart_but">
-					<button @click="restart">重启</button>
-					<button @click="upgrade">升级</button>
-				</view>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<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="control_off">
-				<p class="title_p">设备开关</p>
-				<view class="control_off_off">
-					<p>{{condatas.ds == 1? "开机":"关机"}}</p>
-					<u-switch v-model="checked1" size="30" style="margin-top: 14rpx;" active-color="#58C876" @change="checkedTF"></u-switch>
-				</view>
-			</view>
-			<view class="control_mo">
-				<p class="title_p">定时模式</p>
-				<view class="control_off_off" @click="show1 = !show1">
-					<p>{{condatas.timctrl==1 ? "时控":"光控"}}</p>
-					<u-icon name="arrow-down-fill" size="12" color="#7F8082"></u-icon>
+			<view class="control">
+				<view class="control_restart">
+					<p class="title_p">管理员操作</p>
+					<view class="control_restart_but">
+						<button @click="restart">重启</button>
+						<button @click="upgrade">升级</button>
+					</view>
 				</view>
-				<u-action-sheet :list="options1" v-model="show1" @click="actionSheetCallback"></u-action-sheet>
-			</view>
-			<view class="control_time" v-if="condatas.timctrl== 0">
-				<p class="title_p">定时时长(h)</p>
-				<view class="control_off_off" @click="show2 = !show2">
-					<p>{{condatas.tt==0?'常亮':condatas.tt}}</p>
-					<u-icon name="arrow-down-fill" size="12" color="#7F8082"></u-icon>
+				<view class="control_off">
+					<p class="title_p">设备开关</p>
+					<view class="control_off_off">
+						<p>{{condatas.ds == 1? "开机":"关机"}}</p>
+						<u-switch v-model="checked1" size="30" style="margin-top: 14rpx;" active-color="#58C876" @change="checkedTF"></u-switch>
+					</view>
 				</view>
-			</view>
-			<view class="control_time" v-else>
-				<p class="title_p">开始结束时间</p>
-				<view class="control_off_off" @click="show3 = !show3">
-					<p>开始时间：{{condatas.st}}: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 class="control_mo">
+					<p class="title_p">定时模式</p>
+					<view class="control_off_off" @click="show1 = !show1">
+						<p>{{condatas.timctrl==1 ? "时控":"光控"}}</p>
+						<u-icon name="arrow-down-fill" size="12" color="#7F8082"></u-icon>
+					</view>
+					<u-action-sheet :list="options1" v-model="show1" @click="actionSheetCallback"></u-action-sheet>
 				</view>
-				<view class="control_off_off" @click="show4 = !show4">
-					<p>结束时间：{{condatas.et}}: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 class="control_time" v-if="condatas.timctrl== 0">
+					<p class="title_p">定时时长(h)</p>
+					<view class="control_off_off" @click="show2 = !show2">
+						<p>{{condatas.tt==0?'常亮':condatas.tt}}</p>
+						<u-icon name="arrow-down-fill" size="12" color="#7F8082"></u-icon>
+					</view>
 				</view>
-			</view>
-			<view class="control_interval">
-				<p class="title_p">上传时间间隔(min)</p>
-				<view class="slider">
-					<view class="" style="width: 90%;padding-top: 18rpx;">
-						<u-slider v-model="condatas.dattim" min="0" max="100" step="1" active-color="#58C876"></u-slider>
+				<view class="control_time" v-else>
+					<p class="title_p">开始结束时间</p>
+					<view class="control_off_off" @click="show3 = !show3">
+						<p>开始时间：{{condatas.st}}: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="" style="width: 10%;text-align: center;">
-						{{condatas.dattim}}
+					<view class="control_off_off" @click="show4 = !show4">
+						<p>结束时间：{{condatas.et}}: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>
 				</view>
-			</view>
-			<view class="control_timing">
-				<p class="title_p">自清虫定时(min)</p>
-				<view class="slider">
-					<view class="" style="width: 90%;padding-top: 18rpx;">
-						<u-slider v-model="condatas.clt" min="0" max="100" step="1" active-color="#58C876"></u-slider>
+				<view class="control_interval">
+					<p class="title_p">上传时间间隔(min)</p>
+					<view class="slider">
+						<view class="" style="width: 90%;padding-top: 18rpx;">
+							<u-slider v-model="condatas.dattim" min="0" max="100" step="1" active-color="#58C876"></u-slider>
+						</view>
+						<view class="" style="width: 10%;text-align: center;">
+							{{condatas.dattim}}
+						</view>
 					</view>
-					<view class="" style="width: 10%;text-align: center;">
-						{{condatas.clt}}
+				</view>
+				<view class="control_timing">
+					<p class="title_p">自清虫定时(min)</p>
+					<view class="slider">
+						<view class="" style="width: 90%;padding-top: 18rpx;">
+							<u-slider v-model="condatas.clt" min="0" max="100" step="1" active-color="#58C876"></u-slider>
+						</view>
+						<view class="" style="width: 10%;text-align: center;">
+							{{condatas.clt}}
+						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-		<view class="ensure">
-			<view class="ensure_btn" @click="ensure">
-				确 定
+			<view class="ensure">
+				<view class="ensure_btn" @click="ensure">
+					确 定
+				</view>
 			</view>
+			<u-popup v-model="show2" mode="bottom" length="30%" class="pop-up">
+				<scroll-view scroll-y="true" class="sheet">
+					<view class="sheet-text" v-for="(item,index) in options2" :key="index">
+						<p @click="typesofroles(index)">{{item.text}}</p>
+					</view>
+				</scroll-view>
+				<button @click="show2 = false">取消</button>
+			</u-popup>
 		</view>
-		<u-popup v-model="show2" mode="bottom" length="30%" class="pop-up">
-			<scroll-view scroll-y="true" class="sheet">
-				<view class="sheet-text" v-for="(item,index) in options2" :key="index">
-					<p @click="typesofroles(index)">{{item.text}}</p>
-				</view>
-			</scroll-view>
-			<button @click="show2 = false">取消</button>
-		</u-popup>
 	</view>
 </template>
 
@@ -172,17 +175,17 @@
 					url: '/api/api_gateway?method=forecast.send_control.admin_device_control',
 					data: {
 						d_id: data.d_id,
-						device_type_id:2,
+						device_type_id: 2,
 						cmd: data.cmd
 					}
 				})
-				if(res == true){
+				if (res == true) {
 					uni.showToast({
-					    title: '指令下发成功!'
+						title: '指令下发成功!'
 					});
-				}else{
+				} else {
 					uni.showToast({
-					    title: '指令下发失败!'
+						title: '指令下发失败!'
 					});
 				}
 			},
@@ -192,7 +195,7 @@
 					url: '/api/api_gateway?method=forecast.send_control.device_control',
 					data: {
 						d_id: this.d_id,
-						device_type_id:2,
+						device_type_id: 2,
 						config: data
 					}
 				})
@@ -216,27 +219,27 @@
 					this.condatas.ds = 0
 				}
 			},
-			confirmFun(e){//开始时间
+			confirmFun(e) { //开始时间
 				this.condatas.st = Number(e.hour)
 			},
-			confirmFun2(e){//结束时间
+			confirmFun2(e) { //结束时间
 				this.condatas.et = Number(e.hour)
 			},
-			restart(){//重启
+			restart() { //重启
 				let obj = {
-					d_id:this.d_id,
-					cmd:'reboot'
+					d_id: this.d_id,
+					cmd: 'reboot'
 				}
 				this.reorup(obj)
 			},
-			upgrade(){//升级
+			upgrade() { //升级
 				let obj = {
-					d_id:this.d_id,
-					cmd:'update'
+					d_id: this.d_id,
+					cmd: 'update'
 				}
 				this.reorup(obj)
 			},
-			ensure(){ 
+			ensure() {
 				let str = JSON.stringify(this.condatas)
 				console.log(str)
 				this.controlby(str)
@@ -339,11 +342,13 @@
 			height: 80rpx;
 		}
 	}
-	.ensure{
+
+	.ensure {
 		width: 100%;
 		position: absolute;
 		bottom: 30rpx;
-		.ensure_btn{
+
+		.ensure_btn {
 			width: 90%;
 			margin: 0 auto;
 			height: 60rpx;

pages/prevention/equipmentdetails.vue

@@ -1,43 +1,47 @@
 <template>
 	<view>
-		<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="info">
-			<view class="info_item">
-				<image :src="eqinfo.item.device_status==1?'../../static/image/cb/onBg.png':'../../static/image/cb/offBg.png'" mode="" class="bgi"></image>
-				<p style="font-size: 32rpx;">设备 ID：{{eqinfo.item.device_id}}</p>
-				<p>设备名称：{{eqinfo.item.device_name}}</p>
-				<p>设备型号：{{eqinfo.item.dver_num}}</p>
-				<p>最近上报时间：{{eqinfo.item.status_time|timeFormat()}}</p>
-				<p>设备地址：{{eqinfo.item.address}}</p>
-			</view>
-		</view>
-		<view class="control">
-			<view class="control_item" @click="control">
-				<image src="../../static/image/prevention/8.png" mode=""></image>
-				<p>设备控制</p>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<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="control_item" @click="charts">
-				<image src="../../static/image/prevention/9.png" mode=""></image>
-				<p>历史数据</p>
+			<view class="info">
+				<view class="info_item">
+					<image :src="eqinfo.item.device_status==1?'../../static/image/cb/onBg.png':'../../static/image/cb/offBg.png'" mode=""
+					 class="bgi"></image>
+					<p style="font-size: 32rpx;">设备 ID：{{eqinfo.item.device_id}}</p>
+					<p>设备名称：{{eqinfo.item.device_name}}</p>
+					<p>设备型号：{{eqinfo.item.dver_num}}</p>
+					<p>最近上报时间：{{eqinfo.item.status_time|timeFormat()}}</p>
+					<p>设备地址：{{eqinfo.item.address}}</p>
+				</view>
 			</view>
-			<view class="control_item" @click="sim">
-				<image src="../../static/image/prevention/10.png" mode=""></image>
-				<p>SIM卡详情</p>
+			<view class="control">
+				<view class="control_item" @click="control">
+					<image src="../../static/image/prevention/8.png" mode=""></image>
+					<p>设备控制</p>
+				</view>
+				<view class="control_item" @click="charts">
+					<image src="../../static/image/prevention/9.png" mode=""></image>
+					<p>历史数据</p>
+				</view>
+				<view class="control_item" @click="sim">
+					<image src="../../static/image/prevention/10.png" mode=""></image>
+					<p>SIM卡详情</p>
+				</view>
 			</view>
-		</view>
-		<view class="realtime">
-			<p class="realtime_title">实时数据</p>
-			<view class="realtime_text">
-				<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="item.icon" mode=""></image>
-						</view>
-						<view class="item_info_text">
-							<p>{{item.txt}}</p>
-							<p style="margin-top: 20rpx;">{{item.value}}</p>
+			<view class="realtime">
+				<p class="realtime_title">实时数据</p>
+				<view class="realtime_text">
+					<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="item.icon" mode=""></image>
+							</view>
+							<view class="item_info_text">
+								<p>{{item.txt}}</p>
+								<p style="margin-top: 20rpx;">{{item.value}}</p>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -64,7 +68,7 @@
 					{
 						icon: '../../static/image/cb/icon05.png',
 						txt: '工作状态',
-						value: this.olddata.ws == 1 ? "工作":"待机"
+						value: this.olddata.ws == 1 ? "工作" : "待机"
 					},
 					{
 						icon: '../../static/image/prevention/44.png',
@@ -143,26 +147,26 @@
 					delta: 1
 				})
 			},
-			sim(){//sim卡详情
+			sim() { //sim卡详情
 				// uni.navigateTo({
 				// 	url:"./sim?id="+this.eqinfo.item.d_id
 				// })
 				uni.showToast({
-				    title: '此功能暂未开放',
-				    duration: 2000,
-					icon:"none"
+					title: '此功能暂未开放',
+					duration: 2000,
+					icon: "none"
 				});
 			},
-			control(){//设备控制
+			control() { //设备控制
 				uni.navigateTo({
-					url:"./control?id="+this.eqinfo.item.d_id 
+					url: "./control?id=" + this.eqinfo.item.d_id
 				})
 			},
-			charts(){//历史数据
+			charts() { //历史数据
 				uni.navigateTo({
-					url:"./ucharts?d_id="+this.eqinfo.item.d_id+"&device_id="+this.eqinfo.item.device_id
+					url: "./ucharts?d_id=" + this.eqinfo.item.d_id + "&device_id=" + this.eqinfo.item.device_id
 				})
-			} 
+			}
 		},
 		onLoad(option) {
 			this.$forceUpdate()
@@ -178,7 +182,7 @@
 		width: 100%;
 		position: absolute;
 		top: 44px;
-		
+
 		.info_item {
 			width: 90%;
 			margin: 0 auto;
@@ -186,6 +190,7 @@
 			padding: 26rpx 50rpx;
 			position: relative;
 			box-sizing: border-box;
+
 			.bgi {
 				width: 100%;
 				height: 260rpx;
@@ -213,9 +218,11 @@
 		text-align: center;
 		padding: 0 30rpx;
 		box-sizing: border-box;
+
 		.control_item {
 			width: 120rpx;
 			height: 120rpx;
+
 			image {
 				width: 70rpx;
 				height: 70rpx;
@@ -226,26 +233,29 @@
 			}
 		}
 	}
+
 	.realtime {
 		width: 100%;
 		position: absolute;
 		top: 500rpx;
-		.realtime_title{
+
+		.realtime_title {
 			font-weight: 700;
 			width: 90%;
 			margin: 0 auto;
 		}
+
 		.realtime_text {
 			width: 90%;
 			margin: 0 auto;
-	
+
 			.realtime_text_item {
 				width: 100%;
 				display: flex;
 				justify-content: space-between;
 				flex-wrap: wrap;
 				margin-bottom: 50rpx;
-	
+
 				.realtime_text_item_info {
 					width: 48%;
 					box-shadow: 0 0 10rpx #bcb9ca;
@@ -253,25 +263,26 @@
 					display: flex;
 					padding: 20rpx 20rpx;
 					box-sizing: border-box;
+
 					.item_info_img {
 						width: 30%;
 						text-align: center;
 						margin-right: 30rpx;
-	
+
 						image {
 							width: 64rpx;
 							height: 64rpx;
 							margin-top: 10rpx;
 						}
 					}
-	
+
 					.item_info_text {
 						font-size: 24rpx;
-	
+
 					}
 				}
 			}
 		}
-	
+
 	}
 </style>

pages/prevention/index.vue

@@ -1,18 +1,23 @@
 <template>
 	<view>
-		<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>
-		</view>
-		<image src="../../static/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.device_status==1?'../../static/image/prevention/6.png':'../../static/image/prevention/7.png'" mode="" class="prevents_item_img"></image>
-				<view class="prevents_item_top">
-					<p>设备 ID：{{item.device_id}}</p>
-					<p :class="item.device_status==1?'green':'red'" v-text="item.device_status==1?'在线':'离线'"></p>
-				</view>
-				<view class="prevents_item_bot">
-					最新上报时间：{{item.status_time|timeFormat()}}
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="防治系统" right-icon="search" @clickRight="clickRight"
+				 size="16"></uni-nav-bar>
+			</view>
+			<image src="../../static/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.device_status==1?'../../static/image/prevention/6.png':'../../static/image/prevention/7.png'"
+					 mode="" class="prevents_item_img"></image>
+					<view class="prevents_item_top">
+						<p>设备 ID：{{item.device_id}}</p>
+						<p :class="item.device_status==1?'green':'red'" v-text="item.device_status==1?'在线':'离线'"></p>
+					</view>
+					<view class="prevents_item_bot">
+						最新上报时间：{{item.status_time|timeFormat()}}
+					</view>
 				</view>
 			</view>
 		</view>
@@ -23,9 +28,9 @@
 	export default {
 		data() {
 			return {
-				page:1,
-				size:10,
-				eqlistdata:[],
+				page: 1,
+				size: 10,
+				eqlistdata: [],
 			}
 		},
 		methods: {
@@ -34,30 +39,30 @@
 					url: '/api/api_gateway?method=forecast.worm_lamp.lamp_list',
 					data: {
 						device_type_id: 2,
-						page:this.page,
-						size:this.size,
+						page: this.page,
+						size: this.size,
 					}
 				})
-				this.eqlistdata=this.eqlistdata.concat(res.data) 
+				this.eqlistdata = this.eqlistdata.concat(res.data)
 				console.log(this.eqlistdata)
 			},
-			clickLeft(){
+			clickLeft() {
 				uni.switchTab({
-					url:"../index/index"
+					url: "../index/index"
 				})
 			},
-			clickRight(){
+			clickRight() {
 				uni.navigateTo({
-					url:"./search"
+					url: "./search"
 				})
 			},
-			eqdetails(data){
+			eqdetails(data) {
 				uni.navigateTo({
-					url:"./equipmentdetails?shebei="+JSON.stringify(data)
+					url: "./equipmentdetails?shebei=" + JSON.stringify(data)
 				})
 			}
 		},
-		onLoad(){
+		onLoad() {
 			this.eqlist()
 		},
 		onReachBottom() {
@@ -68,54 +73,62 @@
 </script>
 
 <style lang="scss">
-/deep/.uni-icons{
-	font-size: 40rpx !important;
-}
-.image{
-	position: fixed;
-	top: 44px;
-	width: 100%;
-	height: 140rpx;
-	z-index: 555;
-}
-.prevents{
-	width: 100%;
-	position: absolute;
-	top: 244rpx;
-	.prevents_item{
-		width: 95%;
-		margin: 0 auto 30rpx;
-		border-radius: 10rpx;
-		box-shadow: 0 0 10rpx #bcb9ca;
-		padding: 20rpx 40rpx 20rpx 80rpx;
-		position: relative;
-		box-sizing: border-box;
-		.prevents_item_img{
-			width: 30rpx;
-			height: 50rpx;
-			position: absolute;
-			top: -4rpx;
-			left: 30rpx;
-		}
-		.prevents_item_top{
-			display: flex;
-			justify-content: space-between;
-			height: 60rpx;
-			border-bottom: 2rpx solid #F4F4F4;
-			line-height: 60rpx;
-			font-size: 26rpx;
-			.red{
-				color: #ff0000;
+	/deep/.uni-icons {
+		font-size: 40rpx !important;
+	}
+
+	.image {
+		position: fixed;
+		top: 88px;
+		width: 100%;
+		height: 140rpx;
+		z-index: 555;
+	}
+
+	.prevents {
+		width: 100%;
+		position: absolute;
+		top: 244rpx;
+
+		.prevents_item {
+			width: 95%;
+			margin: 0 auto 30rpx;
+			border-radius: 10rpx;
+			box-shadow: 0 0 10rpx #bcb9ca;
+			padding: 20rpx 40rpx 20rpx 80rpx;
+			position: relative;
+			box-sizing: border-box;
+
+			.prevents_item_img {
+				width: 30rpx;
+				height: 50rpx;
+				position: absolute;
+				top: -4rpx;
+				left: 30rpx;
+			}
+
+			.prevents_item_top {
+				display: flex;
+				justify-content: space-between;
+				height: 60rpx;
+				border-bottom: 2rpx solid #F4F4F4;
+				line-height: 60rpx;
+				font-size: 26rpx;
+
+				.red {
+					color: #ff0000;
+				}
+
+				.green {
+					color: #7DBB91;
+				}
 			}
-			.green{
-				color: #7DBB91;
+
+			.prevents_item_bot {
+				margin-top: 20rpx;
+				font-size: 26rpx;
+				color: #BDBDBD;
 			}
 		}
-		.prevents_item_bot{
-			margin-top: 20rpx;
-			font-size: 26rpx;
-			color: #BDBDBD;
-		}
 	}
-}
 </style>

pages/prevention/search.vue

@@ -1,21 +1,25 @@
 <template>
 	<view>
-		<view style="position: fixed;z-index: 100;">
-			<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 class="prevents">
-			<view class="prevents_item" v-for="item,index in eqlistdata" :key="index">
-				<image :src="item.device_status==1?'../../static/image/prevention/6.png':'../../static/image/prevention/7.png'" mode="" class="prevents_item_img"></image>
-				<view class="prevents_item_top">
-					<p>设备 ID：{{item.device_id}}</p>
-					<p :class="item.device_status==1?'green':'red'" v-text="item.device_status==1?'在线':'离线'"></p>
+		<view class="status_bar"></view>
+		<view class="" style="position: relative;top: 44px;">
+			<view style="position: fixed;z-index: 100;">
+				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" 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 class="prevents_item_bot">
-					最新上报时间：{{item.status_time|timeFormat()}}
+			</view>
+			<view class="prevents">
+				<view class="prevents_item" v-for="item,index in eqlistdata" :key="index">
+					<image :src="item.device_status==1?'../../static/image/prevention/6.png':'../../static/image/prevention/7.png'"
+					 mode="" class="prevents_item_img"></image>
+					<view class="prevents_item_top">
+						<p>设备 ID：{{item.device_id}}</p>
+						<p :class="item.device_status==1?'green':'red'" v-text="item.device_status==1?'在线':'离线'"></p>
+					</view>
+					<view class="prevents_item_bot">
+						最新上报时间：{{item.status_time|timeFormat()}}
+					</view>
 				</view>
 			</view>
 		</view>
@@ -30,28 +34,27 @@
 	export default {
 		data() {
 			return {
-				imports:'',
-				eqlistdata:[],
-				page:1,
-				size:10,
-				show:false,
-				value:'',
-				options1:[
-					{
-						text:"杀虫灯",
-						id:2
+				imports: '',
+				eqlistdata: [],
+				page: 1,
+				size: 10,
+				show: false,
+				value: '',
+				options1: [{
+						text: "杀虫灯",
+						id: 2
 					},
 					{
-						text:"虫情测报",
-						id:3
+						text: "虫情测报",
+						id: 3
 					},
 					{
-						text:"孢子仪",
-						id:7
+						text: "孢子仪",
+						id: 7
 					},
 					{
-						text:"性诱设备",
-						id:4
+						text: "性诱设备",
+						id: 4
 					},
 				]
 			}
@@ -62,30 +65,30 @@
 					url: '/api/api_gateway?method=forecast.worm_lamp.lamp_list',
 					data: {
 						device_type_id: 2,
-						page:this.page,
-						size:this.size,
-						device_id:this.imports
+						page: this.page,
+						size: this.size,
+						device_id: this.imports
 					}
 				})
-				this.eqlistdata=this.eqlistdata.concat(res.data) 
+				this.eqlistdata = this.eqlistdata.concat(res.data)
 				console.log(this.eqlistdata)
 			},
-			clickLeft(){
+			clickLeft() {
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			},
-			search(){
-				this.eqlistdata=[]
+			search() {
+				this.eqlistdata = []
 				this.eqlist()
 			},
-			searchinp(){
+			searchinp() {
 				Debounce(() => {
-					this.eqlistdata=[]
+					this.eqlistdata = []
 					this.eqlist()
 				}, 1000)()
 			},
-			actionSheetCallback(index) {//选择框
+			actionSheetCallback(index) { //选择框
 				this.value = this.options1[index].text;
 				// this.id = this.options1[index].id
 			}
@@ -94,7 +97,7 @@
 </script>
 
 <style lang="scss">
-.search_top_input{
+	.search_top_input {
 		width: 80%;
 		height: 54rpx;
 		background-color: #E4E4E4;
@@ -103,51 +106,59 @@
 		top: 18rpx;
 		right: 18rpx;
 		padding-top: 8rpx;
-		input{
+		box-sizing: border-box;
+		input {
 			width: 85%;
 			text-indent: 1rem;
 			font-size: 26rpx;
 		}
-		.icon{
+
+		.icon {
 			position: absolute;
 			top: 8rpx;
 			right: 26rpx;
 		}
 	}
 
-	.prevents{
+	.prevents {
 		width: 100%;
 		position: absolute;
 		top: 54px;
-		.prevents_item{
+
+		.prevents_item {
 			width: 95%;
 			margin: 0 auto 30rpx;
 			border-radius: 10rpx;
 			box-shadow: 0 0 10rpx #bcb9ca;
 			padding: 20rpx 40rpx 20rpx 80rpx;
 			position: relative;
-			.prevents_item_img{
+			box-sizing: border-box;
+			.prevents_item_img {
 				width: 30rpx;
 				height: 50rpx;
 				position: absolute;
 				top: -4rpx;
 				left: 30rpx;
 			}
-			.prevents_item_top{
+
+			.prevents_item_top {
 				display: flex;
 				justify-content: space-between;
 				height: 60rpx;
 				border-bottom: 2rpx solid #F4F4F4;
 				line-height: 60rpx;
 				font-size: 26rpx;
-				.red{
+
+				.red {
 					color: #ff0000;
 				}
-				.green{
+
+				.green {
 					color: #7DBB91;
 				}
 			}
-			.prevents_item_bot{
+
+			.prevents_item_bot {
 				margin-top: 20rpx;
 				font-size: 26rpx;
 				color: #BDBDBD;

unpackage/cache/apk/apkurl

@@ -1 +0,0 @@
-https://service.dcloud.net.cn/build/download/2d2b6a30-85fd-11eb-93c7-f7121e53c36b

unpackage/cache/certdata

@@ -1,3 +0,0 @@
-andrCertfile=D:/HBuilderX.2.9.8.20201110.full/HBuilderX/plugins/app-safe-pack/Test.keystore
-andrCertAlias=test
-andrCertPass=ep/Tdjka4Y7WYqDB6/S7dw==

unpackage/cache/wgt/__UNI__7580508/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>

unpackage/cache/wgt/__UNI__7580508/static/data/cbd_pest_library.js

@@ -1,336 +0,0 @@
-// 害虫库
-var insect_dict = {'1':'金龟子',
-'2':'夜蛾',
-'3':'二点委夜蛾',
-'4':'梨剑纹夜蛾',
-'5':'杨扇舟蛾',
-'6':'舟蛾',
-'7':'旋幽夜蛾',
-'8':'蝼蛄',
-'9':'步甲',
-'10':'螟蛾',
-'11':'毛黄鳃金龟',
-'12':'尺蛾',
-'13':'剑纹夜蛾',
-'14':'粉缘钻夜蛾',
-'15':'夜蛾科',
-'16':'七星瓢虫',
-'17':'棉铃虫',
-'18':'蜻蜓',
-'19':'蚊',
-'20':'东方粘虫',
-'21':'叶蝉',
-'22':'春尺蠖',
-'23':'雄性春尺蠖',
-'24':'杨小舟蛾',
-'25':'甘蓝夜蛾',
-'26':'小地老虎',
-'27':'两点尼夜蛾',
-'28':'柳阴翅斑螟',
-'29':'桑褶翅尺蛾',
-'30':'宽胫夜蛾',
-'31':'尺蠖',
-'32':'一点钻夜蛾',
-'33':'天蛾',
-'34':'裳夜蛾',
-'35':'灯蛾',
-'36':'美国白蛾',
-'37':'八字白眉天蛾',
-'38':'陌夜蛾',
-'39':'豆天蛾',
-'40':'麦蛾',
-'41':'围连环夜蛾',
-'42':'亚美尺蛾',
-'43':'梨星毛虫',
-'44':'银锭夜蛾',
-'45':'黄臀灯蛾',
-'46':'大螟',
-'47':'燕尾舟蛾',
-'48':'榆津尺蛾',
-'49':'朽木夜蛾',
-'50':'黄地老虎',
-'51':'白钩粘夜蛾',
-'52':'桃蛀螟',
-'53':'甜菜夜蛾',
-'54':'斜纹夜蛾',
-'55':'蚀夜蛾',
-'56':'淡银锭夜蛾',
-'57':'齿美冬夜蛾',
-'58':'一点金刚钻',
-'59':'胡桃豹夜蛾',
-'60':'桑剑纹夜蛾',
-'61':'蓝目天蛾',
-'62':'黑绒绢金龟',
-'63':'烟青虫',
-'64':'暗黑鳃金龟',
-'65':'中华绒金龟',
-'66':'八字地老虎',
-'67':'榆绿天蛾',
-'68':'红星雪灯蛾',
-'69':'雀纹天蛾',
-'70':'铜绿丽金龟',
-'71':'水龟虫',
-'72':'曲线尼夜蛾',
-'73':'粘虫',
-'74':'瘦银锭夜蛾',
-'75':'红天蛾',
-'76':'鳃金龟',
-'77':'大黑鳃金龟',
-'78':'大地老虎',
-'79':'玉米螟',
-'80':'赤角盲蝽',
-'81':'槐尺蛾',
-'82':'银纹夜蛾',
-'83':'天牛',
-'84':'乏夜蛾',
-'85':'丁香天蛾',
-'86':'构月天蛾',
-'87':'虎甲',
-'88':'劳氏粘虫',
-'89':'白薯天蛾',
-'90':'广鹿蛾',
-'91':'二十八星瓢虫',
-'92':'腮金龟',
-'93':'人纹污夜蛾',
-'94':'叩甲',
-'95':'楸蠹野螟',
-'96':'丝绵木金星尺蛾',
-'97':'红缘灯蛾',
-'98':'黄褐丽金龟',
-'99':'螟蛾科',
-'100':'红棕灰夜蛾',
-'101':'黑绒绢金龟',
-'102':'广鹿灯蛾',
-'103':'蝽',
-'104':'蜂',
-'105':'大造桥虫',
-'106':'童剑纹夜蛾',
-'107':'晃剑纹夜蛾',
-'108':'钩粘虫',
-'109':'直影夜蛾',
-'110':'毛黄绢金龟',
-'111':'乌氏小尾天蚕蛾',
-'112':'褐边绿刺蛾',
-'113':'广鹿舟蛾',
-'114':'颜倾城',
-'115':'龙虱',
-'116':'双带盘瓢虫',
-'117':'槲犹冬夜蛾',
-'118':'洋槐天蛾',
-'119':'弧角散纹夜蛾',
-'120':'黄脉天蛾',
-'121':'葡萄天蛾',
-'122':'桃六点天蛾',
-'123':'异色瓢虫',
-'124':'榆黄足毒蛾',
-'125':'客来夜蛾',
-'126':'桦尺蛾',
-'127':'草地螟',
-'128':'细条纹野螟',
-'129':'污灯蛾属',
-'130':'杨二尾舟蛾',
-'131':'克什杆野螟',
-'132':'筱客来夜蛾',
-'133':'栗六点天蛾',
-'134':'紫光盾天蛾',
-'135':'款冬玉米螟',
-'136':'草蛉',
-'137':'亚麻篱灯蛾',
-'138':'扁连环夜蛾',
-'139':'圣蜣螂',
-'140':'白钩粘虫',
-'141':'苇实夜蛾',
-'142':'姬蜂',
-'143':'秘夜蛾',
-'144':'织网夜蛾',
-'145':'深色白眉天蛾',
-'146':'短扇舟蛾',
-'147':'白须天蛾',
-'148':'歌梦尼夜蛾',
-'149':'海安夜蛾',
-'150':'满丫纹夜蛾',
-'151':'蟋蟀',
-'152':'双斑青步甲',
-'153':'白条夜蛾',
-'154':'蟪蛄',
-'155':'负子蝽',
-'156':'脊青步甲',
-'157':'宽斑青步甲',
-'158':'稻从卷叶螟',
-'159':'淡剑夜蛾',
-'160':'甜菜白带野螟',
-'161': '樗蚕', 
-'162': '蒙古寒蝉',
-'163': '中带三角夜蛾', 
-'164': '蝗虫', 
-'165': '多色异丽金龟', 
-'166': '白色小卷蛾', 
-'167': '狭边青步甲',
-'168': '棉卷叶野螟', 
-'169': '豆荚野螟', 
-'170': '麻小食心虫', 
-'171': '星斑虎甲', 
-'172': '黄缘龙虱',
-'173': '无斑弧丽金龟', 
-'174': '白额鹰翅天蛾',
-'175': '日本真龙虱', 
-'176': '山东云斑螟',
-'177': '小文夜蛾', 
-'178': '三条蛀野螟', 
-'179': '榆掌舟蛾', 
-'180': '刺槐掌舟蛾', 
-'181': '星绒天蛾', 
-'182': '杨剑舟蛾', 
-'183': '刀夜蛾',
-'184': '红节天蛾', 
-'185': '星白雪灯蛾', 
-'186': '桃剑纹夜蛾', 
-'187': '谐夜蛾', 
-'188': '小剑纹夜蛾', 
-'189': '鸣鸣蝉', 
-'190': '姬夜蛾',
-'191': '落叶松毛虫', 
-'192': '苹六点天蛾', 
-'193': '四斑绢野螟', 
-'194': '甘薯天蛾', 
-'195': '小线角木蠹蛾', 
-'196': '三斑蕊夜蛾', 
-'197': '白雪灯蛾', 
-'198': '黄刺蛾', 
-'199': '茶翅蝽',
-'200': '杨树枯叶蛾',
-"201": "标瑙夜蛾",
-"202": "瓜绢野螟",
-"203": "稻绿蝽",
-"204": "杨雪毒蛾",
-"205": "榆白边舟蛾",
-"206": "扁刺蛾",
-"207": "绒黏夜蛾",
-"208": "庸肖毛翅夜蛾",
-"209": "中华婪步甲",
-"210": "褐黄前锹甲",
-"211": "旱柳原野螟",
-"212": "巨影夜蛾",
-"213": "食蚜蝇",
-"214": "双斑葬甲",
-"215": "黄毒蛾",
-"216": "婪步甲",
-"217": "土甲",
-"218": "中华真地鳖",
-"219": "紫线夜蛾",
-"220": "小黄鳃金龟",
-"221": "中华真土鳖",
-"222": "云斑虎甲",
-"223": "中华黧尺蛾",
-"224": "中华绿刺蛾",
-"225": "巨豹纹尺蛾",
-"226": "多斑豹蠹蛾",
-"227": "桑尺蛾",
-"228": "灰直纹螟",
-"229": "中国绿刺蛾",
-"230": "云杉梢斑螟",
-"231": "桑绢野螟",
-"232": "黄杨绢野螟",
-"233": "突背斑红蝽",
-"234": "高粱条螟",
-"235": "小麦负泥虫",
-"236": "苹掌舟蛾",
-"237": "绒粘夜蛾",
-"238": "灰白灯蛾",
-"239": "隐丫纹夜蛾",
-"240": "满纹夜蛾",
-"241": "黑剑狼夜蛾",
-"242": "蜣螂",
-"243": "福婆鳃金龟",
-"244": "雨尺蛾",
-"245": "优美苔蛾",
-"246": "黄斑野螟",
-"247": "疆夜蛾",
-"248": "六点天蛾",
-"249": "斜线夜蛾",
-"250": "石榴巾夜蛾",
-"251": "绒星天蛾",
-"252": "霜天蛾",
-"253": "大田鳖",
-"254": "灰双纹螟",
-"255": "青尺蛾",
-"256": "二线绿尺蛾",
-"257": "散纹夜蛾",
-"258": "红双线尺蛾",
-"259": "胞短栉夜蛾",
-"260": "飞虱科",
-"261": "桃多斑野螟",
-"262": "甜菜青野螟",
-"263": "核桃鹰翅天蛾",
-"264": "角顶尺蛾",
-"265": "葡萄缺角天蛾",
-"266": "绿尾大蚕蛾",
-"267": "杨褐枯叶蝶",
-"268": "双云尺蛾",
-"269": "斑拟兜夜蛾",
-"270": "阿莎尺蛾",
-"271": "榄绿岐角螟",
-"272": "青革土蝽",
-"273": "核桃美舟蛾",
-"274": "斑点卷叶螟",
-"275": "黄褐箩纹蛾",
-"276": "白环红天蛾",
-"277": "白腹网丛螟",
-"278": "枯叶蛾",
-"279": "丹日明夜蛾",
-"280": "仿白边舟蛾",
-"281": "槐羽舟蛾",
-"282": "草地贪夜蛾",
-"283": "环夜蛾",
-"284": "尘尺蛾",
-"285": "黄二星舟蛾",
-"286": "榆木蠹蛾",
-"287": "水黾",
-"288": "银装冬夜蛾",
-"289": "饰奇尺蛾",
-"290": "枯叶蝶",
-"291": "步甲",
-"292": "阔胸禾犀金龟",
-"293": "眼斑钩蛾",
-"294": "三开蜣螂",
-"295": "金星步甲",
-"296": "残夜蛾",
-"297": "野蚕蛾",
-"298": "芦苇豹蠹蛾",
-"299": "华晓扁犀金龟",
-"300": "灰胸突鳃金龟",
-"301": "龟纹瓢虫",
-"302": "麻皮蝽",
-"303": "斑须蝽",
-"304": "斜斑虎甲",
-"305": "地鳖",
-"306": "叶甲",
-"307": "燕夜蛾",
-"308": "黑纹北灯蛾",
-"309": "网夜蛾",
-"310": "棘翅夜蛾",
-"311": "规尺蛾",
-"312": "苜蓿银纹夜蛾",
-"313": "拟扇舟蛾",
-"314": "丁目大蚕蛾",
-"315": "金黄蛾",
-"316": "黄星雪灯蛾",
-"317": "暗纹紫褐螟",
-"318": "白眉天蛾",
-"319": "黄板盘瓢虫",
-"320": "玫岐角螟",
-"321":"枯黄贡尺蛾",
-"322":"小豆长喙天蛾",
-"323":"橙拟灯蛾",
-"324":"粉蝶灯蛾",
-"325":"纹散丽灯蛾",
-"326":"雪尾尺蛾",
-"327":"鹰翅天蛾",
-"328":"波纹蛾",
-"329":"黑条灰灯蛾",
-"330":"八点灰灯蛾",
-"331":"间纹弦夜蛾",
-"332":"缤夜蛾",
-}
-
-export default insect_dict

unpackage/cache/wgt/__UNI__7580508/static/h5.html

@@ -1,177 +0,0 @@
-<!DOCTYPE html>
-<html lang=zh-CN>
-	<head>
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="divport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
-		<title>监控详情页</title>
-		<meta name="Copyright" content="helang">
-		<link rel="shortcut icon" type="image/png" href="/uniapp-extend/static/logo.png">
-		<meta name="keywords" content="黄河爱浪,WEB前端河浪,jQuery插件开发者河浪">
-		<meta name="description" content="公众号:web-7258,QQ:1846492969,邮箱:helang.love@qq.com">
-		<style type="text/css">
-			body {
-				margin: 0;
-				background-color: #f3f3f3;
-			}
-
-			/* iframe {
-				width: 375px;
-				height: 667px;
-				background-color: #fff;
-				box-sizing: content-box;
-				border: none;
-			} */
-			.btn-box {
-				margin-top: 20px;
-				display: flex;
-				flex-direction: row;
-				justify-content: space-around;
-				align-items: center;
-			}
-
-			.more,
-			.less {
-				flex: 1
-			}
-
-			img {
-				width: 100%;
-			}
-
-			.direc {
-				width: 150px;
-				height: 150px;
-				background: url('./image/monitor/1.png');
-				background-size: 100% auto;
-				background-repeat: no-repeat;
-				position: relative;
-			}
-
-			.direc div {
-				width: 50px;
-				height: 50px;
-				position: absolute;
-			}
-
-			.top {
-				top: 0;
-				left: 50px
-			}
-
-			.bottom {
-				bottom: 0;
-				left: 50px
-			}
-
-			.left {
-				left: 0;
-				top: 50px
-			}
-
-			.right {
-				right: 0;
-				top: 50px
-			}
-		
-		</style>
-		<script type="text/javascript" src="./js/ezuikit.js"></script>
-
-	</head>
-	<body>
-		<div id="myPlayer"></div>
-		<div class="btn-box">
-			<div class="more" ontouchstart="configCamera('move', 8)" ontouchend="stopConfigCamera()">
-				<image src="./image/monitor/3.png" mode="widthFix"></image>
-			</div>
-			<div class="direc">
-				<div class="top" ontouchstart="configCamera('move', 0)" ontouchend="stopConfigCamera()">
-
-				</div>
-				<div class="bottom" ontouchstart="configCamera('move', 1)" ontouchend="stopConfigCamera()">
-
-				</div>
-				<!-- <div class="photo" ontouchstart="configCamera('takephoto', '')">
-
-				</div> -->
-				<div class="left" ontouchstart="configCamera('move', 2)" ontouchend="stopConfigCamera()">
-
-				</div>
-				<div class="right" ontouchstart="configCamera('move', 6)" ontouchend="stopConfigCamera()">
-
-				</div>
-			</div>
-			<div class="less" ontouchstart="configCamera('move', 9)" ontouchend="stopConfigCamera()">
-				<image src="./image/monitor/2.png" mode="widthFix"></image>
-			</div>
-		</div>
-		
-	</body>
-	<script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-	<script type="text/javascript">
-		var obj = JSON.parse(localStorage.getItem('obj'))
-		var accessToken = obj.accessToken
-		var device_id = obj.device_id
-		alert(accessToken)
-		alert(device_id)
-		//上下左右和拍照
-		function configCamera(ctrl, movenum) {
-			if (ctrl == "takephoto") {
-				$.ajax({
-					type: "POST",
-					url: "http://182.92.193.64:8002/api/api_gateway?method=camera.camera_manage.camera_takephoto",
-					data: {
-						device_id: device_id,
-					}
-				}).then((res) => {
-
-					if (res.data.data) {
-						var data = JSON.parse(res.data.data);
-						var picUrl = data.data.picUrl;
-					} else {
-						console.log(res.data.message)
-					}
-				});
-			} else {
-				//上下左右、放大、缩小
-				$.ajax({
-					type: "POST",
-					url: "http://182.92.193.64:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
-					data: {
-						device_id: device_id,
-						ctrl: ctrl,
-						movenum: movenum,
-					}
-				}).then((res) => {
-
-				})
-			}
-		}
-
-		function stopConfigCamera() {
-			$.ajax({
-				type: "POST",
-				url: "http://182.92.193.64:8002/api/api_gateway?method=camera.camera_manage.ctrl_camera",
-				data: {
-					device_id: device_id,
-					ctrl: "stop",
-				},
-			});
-		}
-		$(function() {
-			setTimeout(() => {
-				var url = "ezopen://open.ys7.com/" + device_id + "/1.hd.live"
-				var player = new EZUIKit.EZUIPlayer({
-					id: 'myPlayer',
-					url: url,
-					autoplay: true,
-					accessToken: accessToken,
-					decoderPath: 'js/',
-					width: 600,
-					height: 400,
-				});
-				player.play();
-			}, 500)
-		})
-	</script>
-</html>