2021/3/22

App.vue

@@ -1,7 +1,23 @@
 <script>
 	export default {
 		onLaunch: function() {
-
+			uni.getStorage({
+				key: 'session_key',
+				success: (res) => {
+					if(res.data!=""){
+						uni.switchTab({
+							url: "./pages/index/index"
+						})
+						console.log(1)
+					}else{
+						uni.switchTab({
+							url: "./pages/login/login"
+						})
+						console.log(2)
+					}
+					
+				}
+			})
 		},
 		onShow: function() {
 			console.log('App Show')

manifest.json

@@ -105,20 +105,20 @@
                     "key" : "B2EBZ-2UW6P-RDJDG-LCMLE-AIQUS-CGFMJ"
                 }
             }
-        },
-        "devServer" : {
-            // "port": 80,
-            // "disableHostCheck": true,
-            "proxy" : {
-                "/dpc" : {
-                    "target" :"https://apis.map.qq.com",
-                    "changeOrigin" : true,
-                    "secure" : false,
-                    "pathRewrite" : {
-                        "^/dpc" : "/dpc"
-                    }
-                }
-            }
         }
+        // "devServer" : {
+        //     // "port": 80,
+        //     // "disableHostCheck": true,
+        //     "proxy" : {
+        //         "/dpc" : {
+        //             "target" :"https://restapi.amap.com",
+        //             "changeOrigin" : true,
+        //             "secure" : false,
+        //             "pathRewrite" : {
+        //                 "^/dpc" : "/dpc"
+        //             }
+        //         }
+        //     }
+        // }
     }
 }

pages.json

@@ -17,50 +17,40 @@
 			"style": {
 				"navigationBarTitleText": "首页"
 			}
-		}
-	    ,{
-            "path" : "pages/my/about/about",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "关于",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/index/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "测报系统",
-                "enablePullDownRefresh": true,
-				"navigationStyle":"custom"
-            }
-        }
-        ,{
-            "path" : "pages/my/user-info/user-info",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "个人信息",
-                "enablePullDownRefresh": false
-            }
-        }
-        ,{
-            "path" : "pages/my/feedback/feedback",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "反馈",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/search/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"app-plus":{}
-				}
+		}, {
+			"path": "pages/my/about/about",
+			"style": {
+				"navigationBarTitleText": "关于",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/cb/index/index",
+			"style": {
+				"navigationBarTitleText": "测报系统",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/my/user-info/user-info",
+			"style": {
+				"navigationBarTitleText": "个人信息",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/my/feedback/feedback",
+			"style": {
+				"navigationBarTitleText": "反馈",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/search/search",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"app-plus": {}
+			}
 		}, {
 			"path": "pages/my/about/about",
 			"style": {
@@ -491,443 +481,356 @@
 			"style": {
 				"navigationBarTitleText": "监控列表"
 			}
+		}, {
+			"path": "pages/equipMange/index/useroperation",
+			"style": {
+				"navigationBarTitleText": "用户详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/equipMange/index/changepasswold",
+			"style": {
+				"navigationBarTitleText": "更改密码",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/equipMange/index/assignment",
+			"style": {
+				"navigationBarTitleText": "分配设备",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/cb/bzy/equip-set/equip-set",
+			"style": {
+				"navigationBarTitleText": "设备控制",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/cb/xy/equip-set/equip-set",
+			"style": {
+				"navigationBarTitleText": "设备控制",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/cb/sim/sim",
+			"style": {
+				"navigationBarTitleText": "sim卡详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/expertDiagnosis/index",
+			"style": {
+				"navigationBarTitleText": "专家诊断",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/expertDiagnosis/wormcase",
+			"style": {
+				"navigationBarTitleText": "虫情百科",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/expertDiagnosis/exchangeShare",
+			"style": {
+				"navigationBarTitleText": "交流圈",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/expertDiagnosis/particulars",
+			"style": {
+				"navigationBarTitleText": "交流圈详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/expertDiagnosis/postmessage",
+			"style": {
+				"navigationBarTitleText": "发帖",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/afterSale/index",
+			"style": {
+				"navigationBarTitleText": "售后服务",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/afterSale/search",
+			"style": {
+				"navigationBarTitleText": "售后服务搜索",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/expertDiagnosis/introduce",
+			"style": {
+				"navigationBarTitleText": "病虫害介绍",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/afterSale/addafter",
+			"style": {
+				"navigationBarTitleText": "设备报修",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/equipList/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/equipList/search",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/equipList/modification",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/fourBase/index",
+			"style": {
+				"navigationBarTitleText": "四情基地首页",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/fourBase/addbase",
+			"style": {
+				"navigationBarTitleText": "新增基地",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/fourBase/allocation",
+			"style": {
+				"navigationBarTitleText": "设备分配",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/fourBase/basefacility",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/prevention/index",
+			"style": {
+				"navigationBarTitleText": "防治系统",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/prevention/search",
+			"style": {
+				"navigationBarTitleText": "防治系统搜索",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/prevention/equipmentdetails",
+			"style": {
+				"navigationBarTitleText": "防治系统设备详细",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/prevention/sim",
+			"style": {
+				"navigationBarTitleText": "sim卡详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/prevention/control",
+			"style": {
+				"navigationBarTitleText": "设备控制",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/prevention/ucharts",
+			"style": {
+				"navigationBarTitleText": "历史数据",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/environment/index",
+			"style": {
+				"navigationBarTitleText": "环境监测",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/environment/search",
+			"style": {
+				"navigationBarTitleText": "环境监测搜索",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/environment/equipment",
+			"style": {
+				"navigationBarTitleText": "环境监测设备详情",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/environment/contros",
+			"style": {
+				"navigationBarTitleText": "环境监测控制页面",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/environment/onedaythedata",
+			"style": {
+				"navigationBarTitleText": "环境检测24小时数据",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/environment/history",
+			"style": {
+				"navigationBarTitleText": "环境检测历史数据",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/cb/cbd/equip-set/imgpage",
+			"style": {
+				"navigationBarTitleText": "图片列表",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/cb/cbd/equip-set/addimg",
+			"style": {
+				"navigationBarTitleText": "手动添加",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/cb/cbd/equip-set/historyfile",
+			"style": {
+				"navigationBarTitleText": "测报灯历史记录",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/cb/cbd/equip-set/note",
+			"style": {
+				"navigationBarTitleText": "短信预警",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/cb/cbd/equip-set/statistics",
+			"style": {
+				"navigationBarTitleText": "害虫统计",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/cb/bzy/equip-set/bzyhistoryile",
+			"style": {
+				"navigationBarTitleText": "孢子仪历史记录",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/cb/xy/equip-set/xyhistoryile",
+			"style": {
+				"navigationBarTitleText": "性诱设备历史记录",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/disandpests/index",
+			"style": {
+				"navigationBarTitleText": "病虫害识别",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/fourBase/modification",
+			"style": {
+				"navigationBarTitleText": "四情基地编辑基地",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/distribution/index",
+			"style": {
+				"navigationBarTitleText": "设备分布",
+				"enablePullDownRefresh": false
+			}
+
 		}
-        ,{
-            "path" : "pages/equipMange/index/useroperation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "用户详情",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/equipMange/index/changepasswold",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "更改密码",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/equipMange/index/assignment",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "分配设备",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/bzy/equip-set/equip-set",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备控制",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/xy/equip-set/equip-set",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备控制",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/sim/sim",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "sim卡详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/expertDiagnosis/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "专家诊断",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/expertDiagnosis/wormcase",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "虫情百科",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        },{
-            "path" : "pages/expertDiagnosis/exchangeShare",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "交流圈",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/expertDiagnosis/particulars",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "交流圈详情",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/expertDiagnosis/postmessage",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "发帖",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/afterSale/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "售后服务",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/afterSale/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "售后服务搜索",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/expertDiagnosis/introduce",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "病虫害介绍",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/afterSale/addafter",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备报修",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/equipList/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"	
-            }
-            
-        }
-        ,{
-            "path" : "pages/equipList/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/equipList/modification",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/fourBase/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "四情基地首页",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/fourBase/addbase",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "新增基地",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/fourBase/allocation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备分配",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/fourBase/basefacility",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/prevention/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "防治系统",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/prevention/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "防治系统搜索",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/prevention/equipmentdetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "防治系统设备详细",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/prevention/sim",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "sim卡详情",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/prevention/control",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备控制",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/prevention/ucharts",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "历史数据",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/environment/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "环境监测",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/environment/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "环境监测搜索",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/environment/equipment",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "环境监测设备详情",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/environment/contros",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "环境监测控制页面",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/environment/onedaythedata",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "环境检测24小时数据",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/environment/history",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "环境检测历史数据",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/cbd/equip-set/imgpage",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "图片列表",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/cbd/equip-set/addimg",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "手动添加",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/cbd/equip-set/historyfile",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "测报灯历史记录",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/cbd/equip-set/note",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "短信预警",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/cbd/equip-set/statistics",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "害虫统计",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/bzy/equip-set/bzyhistoryile",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "孢子仪历史记录",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/cb/xy/equip-set/xyhistoryile",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "性诱设备历史记录",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/disandpests/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "病虫害识别",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/fourBase/modification",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "四情基地编辑基地",
-                "enablePullDownRefresh": false,
-				"navigationStyle":"custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/distribution/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备分布",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"condition": { //模式配置，仅开发期间生效
 		"current": 3, //当前激活的模式（list 的索引项）
 		"list": [{

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

@@ -48,7 +48,10 @@
 				<view class="pagenumber">
 					<button @click="prev">上一页</button>
 					<view class="pagenumber_page">
-						第{{page}}页
+						第 {{page}} 页
+					</view>
+					<view class="pagenumber_page">
+						共 {{pagesum}} 页
 					</view>
 					<button @click="next" :disabled="forbidden">下一页</button>
 				</view>
@@ -77,6 +80,7 @@
 				titleidnex: 0,
 				device_id: '',
 				page: 1,
+				pagesum:null,
 				historylistdata: [],
 				thdata: ["设备开关", "环境温度(°C)", "环境湿度(%)", "保温仓温度设定温度(°C)", "保温仓温度当前温度(°C)", "电池状态", "雨控状态", "摄像头状态", "信号强度", "电流(mA)",
 					"电压(V)", "设备版本", "上报时间"
@@ -152,6 +156,7 @@
 					}
 				})
 				this.historylistdata = res.data
+				this.pagesum = Math.ceil(res.counts/10+1)
 				if (res.data.length == 0) {
 					this.forbidden = true
 					console.log(res.data.length)
@@ -159,7 +164,7 @@
 					this.forbidden = false
 					console.log(res.data.length)
 				}
-				console.log(this.historylistdata)
+				// console.log(this.historylistdata)
 			},
 			changeindex(index) {
 				this.titleidnex = index
@@ -348,7 +353,6 @@
 		.pagenumber {
 			display: flex;
 			margin: 20rpx auto;
-
 			button {
 				width: 150rpx;
 				height: 50rpx;
@@ -357,10 +361,11 @@
 				text-align: center;
 				background-color: #17BB89;
 				color: #FFFFFF;
+				margin: 0 10rpx;
 			}
 
 			.pagenumber_page {
-				width: 150rpx;
+				width: 100rpx;
 				height: 50rpx;
 				line-height: 50rpx;
 				font-size: 26rpx;

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

@@ -25,8 +25,8 @@
 							<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.at==""?"--":items.d_h_t.at}}</td>
+							<td class="td">{{items.d_h_t.ah==""?"--":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>
@@ -46,7 +46,10 @@
 				<view class="pagenumber">
 					<button @click="prev">上一页</button>
 					<view class="pagenumber_page">
-						第{{page}}页
+						第 {{page}} 页
+					</view>
+					<view class="pagenumber_page">
+						共 {{pagesum}} 页
 					</view>
 					<button @click="next" :disabled="forbidden">下一页</button>
 				</view>
@@ -81,16 +84,12 @@
 				cWidth: '400',
 				cHeight: '400',
 				pixelRatio: 1,
-				canvastishiTF:false
+				canvastishiTF:false,
+				pagesum:null
 			}
 		},
 		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() { //获取图片列表
+			async history() { //历史数据列表折线图
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.device_polyline_data',
 					data: {
@@ -135,7 +134,7 @@
 				}
 			},
 			//forecast.worm_lamp.device_history_data历史数据列表
-			async historylist() { //获取图片列表
+			async historylist() { //历史数据列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
 					data: {
@@ -147,6 +146,8 @@
 					}
 				})
 				this.historylistdata = res.data
+				console.log(res.counts)
+				this.pagesum =Math.ceil(res.counts/10)+1
 				if (res.data.length == 0) {
 					this.forbidden = true
 					console.log(res.data.length)
@@ -351,7 +352,7 @@
 			}
 
 			.pagenumber_page {
-				width: 150rpx;
+				width: 100rpx;
 				height: 50rpx;
 				line-height: 50rpx;
 				font-size: 26rpx;

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

@@ -14,7 +14,7 @@
 				最新上报时间：{{equipInfo.addtime | timeFormat}}
 			</view>
 			<view class="">
-				设备地址：{{city==""?"--":city}}
+				设备地址：{{equipInfo.address?equipInfo.address:"--"}}
 			</view>
 			<view v-if="type==7" @click="setTime(equipInfo.d_id)">
 				<text space="emsp">载玻片、培养液更换时间</text>
@@ -85,6 +85,7 @@
 </template>
 
 <script>
+	import equipState from "../../../static/js/equipState_dict.json"
 	export default {
 		data() {
 			return {
@@ -179,7 +180,7 @@
 							if (this.newState.ws == 1) {
 								if (this.newState.lamp == 1) {
 									blbs = "工作中";
-								} else if (dht.lux == 0) {
+								} else if (equipState.lux == 0) {
 									blbs = "N/A（未检测到传感器）";
 								} else {
 									blbs = "异常";

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

@@ -61,7 +61,10 @@
 				<view class="pagenumber">
 					<button @click="prev">上一页</button>
 					<view class="pagenumber_page">
-						第{{page}}页
+						第 {{page}} 页
+					</view>
+					<view class="pagenumber_page">
+						第 {{pagesum}} 页
 					</view>
 					<button @click="next" :disabled="forbidden">下一页</button>
 				</view>
@@ -98,7 +101,8 @@
 				],
 				forbidden: false,
 				wind_sped: '', //风速
-				wind_drec: ''
+				wind_drec: '',
+				pagesum:null
 			}
 		},
 		methods: {
@@ -107,7 +111,7 @@
 			//    d_id                    必传                            设备id
 			//    start_time              非必传(string 时间戳)           开始时间    (用于时间搜索)
 			//    end_time
-			async history() { //获取图片列表
+			async history() { //历史数据折线图
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.device_polyline_data',
 					data: {
@@ -169,7 +173,7 @@
 				}
 			},
 			//forecast.worm_lamp.device_history_data历史数据列表
-			async historylist() { //获取图片列表
+			async historylist() { //历史数据列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
 					data: {
@@ -181,6 +185,7 @@
 					}
 				})
 				this.historylistdata = res.data
+				this.pagesum =Math.ceil(res.counts/10)+1
 				if (res.data.length == 0) {
 					this.forbidden = true
 				} else {
@@ -423,7 +428,7 @@
 			}
 
 			.pagenumber_page {
-				width: 150rpx;
+				width: 100rpx;
 				height: 50rpx;
 				line-height: 50rpx;
 				font-size: 26rpx;

pages/environment/equipment.vue

@@ -12,7 +12,7 @@
 					<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>
+					<p>地址：{{city==""?"--":city}}</p>
 				</view>
 			</view>
 			<view class="control">
@@ -95,18 +95,15 @@
 				uni.navigateTo({
 					url: "./history?device_id=" + this.eqinfo.item.equip_id
 				})
+			},
+			reverseGeocode(Object,callback){
+				
 			}
 		},
 		onLoad(option) {
 			this.$forceUpdate()
 			this.eqinfo.item = JSON.parse(option.shebei)
 			console.log(this.eqinfo)
-			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) => {
-					this.city = res.data.result.address
-				}
-			})
 			this.history()
 		}
 	}
@@ -124,7 +121,7 @@
 			height: 260rpx;
 			padding: 26rpx 50rpx;
 			position: relative;
-
+			box-sizing: border-box;
 			.bgi {
 				width: 100%;
 				height: 260rpx;

pages/environment/history.vue

@@ -63,6 +63,9 @@
 						<view class="pagenumber_page">
 							第{{page}}页
 						</view>
+						<view class="pagenumber_page">
+							共 {{pagesum}} 页
+						</view>
 						<button @click="next" :disabled="forbidden">下一页</button>
 					</view>
 				</view>
@@ -100,7 +103,8 @@
 				tishiTF: false, //提示
 				historydatas: [],
 				page: 1,
-				forbidden: false
+				forbidden: false,
+				pagesum:null
 			}
 		},
 		methods: { //weather.weather.qxz_detail
@@ -115,7 +119,8 @@
 					}
 				})
 				this.historydatas = res
-				console.log(this.historydatas)
+				console.log(res)
+				this.pagesum =Math.ceil(res.nums/10)+1
 				if (res.data.length == 0) {
 					this.forbidden = true
 				} else {

pages/expertDiagnosis/exchangeShare.vue

@@ -26,6 +26,9 @@
 							<span>{{items.username}}</span>
 							<p>查看详情</p>
 						</view>
+						<view class="delinvit" v-if="myTF" @click.stop="delinvit(items.lower)">
+							删除
+						</view>
 					</view>
 				</view>
 			</view>
@@ -44,15 +47,22 @@
 					text: "我要发帖"
 				}],
 				post_show: false,
-				defaultimg: '/images/expertDiagnosis/img01.png'
+				defaultimg: '/images/expertDiagnosis/img01.png',
+				page:1,
+				myTF:false //判断是全部发帖还是我的fatie
 			}
 		},
 		methods: {
-			async getInvitation() { //获取问题
+			async getInvitation(str) { //获取全部发帖 自己发帖"my"
 				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=pest.pests.pests_heat_rank',
+					url: '/api/api_gateway?method=pest.pests.pests_answers_list',
+					data: {
+						screen:str,
+						page:this.page,
+						page_size:10
+					}
 				})
-				this.invitation = res.data
+				this.invitation = this.invitation.concat(res.data)
 				for (var i = 0; i < this.invitation.length; i++) {
 					var index1 = this.invitation[i].content.indexOf("/>") + 2
 					var index2 = this.invitation[i].content.indexOf('<img')
@@ -61,21 +71,18 @@
 				}
 				console.log(this.invitation)
 			},
-			async getInvitationMy(str) { //获取自己的发帖
+			//pest.pests.del_pests_card删除帖子
+			async delInvitation(data) { //获取全部发帖 自己发帖"my"
 				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=pest.pests.pests_answers_list',
+					url: '/api/api_gateway?method=pest.pests.del_pests_card',
 					data: {
-						screen: str
+						lower:data,
+						card:1  
 					}
 				})
-				this.invitation = res.data
-				for (var i = 0; i < this.invitation.length; i++) {
-					var index1 = this.invitation[i].content.indexOf("/>") + 2
-					var index2 = this.invitation[i].content.indexOf('<img')
-					var str = this.invitation[i].content.slice(index2, index1)
-					this.invitation[i].content = this.invitation[i].content.replace(str, '')
+				if(res.code==200){
+					this.$forceUpdate()
 				}
-				console.log(this.invitation)
 			},
 			clickLeft() {
 				uni.navigateTo({
@@ -97,14 +104,51 @@
 					})
 				} else if (this.actionSheetList[index].text.includes("我的发帖")) {
 					this.actionSheetList[index].text = "全部发帖"
-					this.getInvitationMy("my")
+					this.pege =1
+					let str = "my"
+					this.invitation = []
+					this.getInvitation(str)
+					this.myTF = true
 				} else if (this.actionSheetList[index].text.includes("全部发帖")) {
-					this.getInvitation()
+					this.pege =1
+					let str = ""
+					this.invitation = []
+					this.getInvitation(str)
+					this.myTF = false
 				}
+			},
+			delinvit(items){
+				uni.showModal({
+				    title: '提示',
+				    content: '是否删除该帖子？',
+				    success: (res)=> {
+				        if (res.confirm) {
+				            this.delInvitation(items)
+							this.pege =1
+							let str = "my"
+							this.invitation = []
+							this.getInvitation(str)
+				        } else if (res.cancel) {
+				            console.log('用户点击取消');
+				        }
+				    }
+				});
+				
 			}
 		},
 		onLoad() {
-			this.getInvitation()
+			let str = ""
+			this.getInvitation(str)
+		},
+		onReachBottom(){
+			this.page ++ 
+			if(this.myTF){
+				let str = "my"
+				this.getInvitation(str)
+			}else{
+				let str = ""
+				this.getInvitation(str)
+			}
 		}
 	}
 </script>
@@ -142,7 +186,7 @@
 			.invitations_item_right {
 				width: 71%;
 				position: relative;
-
+				
 				.invitations_item_right_top {
 					width: 100%;
 
@@ -157,7 +201,12 @@
 						font-weight: 700;
 					}
 				}
-
+				.delinvit{
+					position: absolute;
+					right: 0;
+					top: 0;
+					color: #ff0000;
+				}
 				.invitations_item_right_contert {
 					width: 100%;
 					margin: 10rpx 0;

pages/expertDiagnosis/particulars.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view class="" style="position: relative;top: 44px;">
+		<view style="position: fixed;top: 44px;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
 			<u-swiper :list="list" height="428"></u-swiper>
 			<view class="quiz">
@@ -22,27 +22,30 @@
 			</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>
+				<scroll-view class="scroll-view_H" :scroll-y="true" @scrolltolower="scroll" scroll-top="0">
+					<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>
-							<span style="font-size: 26rpx;color:#C1C1C1;">{{item.uptime|timeFormat()}}</span>
+						<view class="comment_unit_con">
+							<p v-html="item.content"></p>
 						</view>
 					</view>
-					<view class="comment_unit_con">
-						<p v-html="item.content"></p>
-					</view>
-				</view>
+				</scroll-view>
 			</view>
-			<view class="issue_box">
-				<view class="issue">
-					<input type="text" v-model="issuedata" />
-					<p @click="issue">发布</p>
-				</view>
+		</view>
+		<view class="issue_box" :style="{position: 'absolute',bottom: height+'px'}">
+			<view class="issue">
+				<input type="text" v-model="issuedata" @focus="focus" :auto-blur="true" :adjust-position='false' @blur="blur"
+				 @confirm="confirm" />
+				<p @click="issue">发布</p>
 			</view>
 		</view>
 	</view>
@@ -57,32 +60,41 @@
 				commentdata: [],
 				issuedata: '',
 				defaultimg: '/images/expertDiagnosis/img01.png',
+				height: 0,
+				page: 1,
 			}
 		},
 		methods: { //
-			async getParticulars(data) {
+			async getParticulars(datas) {//获取评论列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_answers_list',
 					data: {
-						lower: data.lower
+						lower: datas,
+						page: this.page,
+						page_size: 10
 					}
 				})
-				this.commentdata = res.data
-				console.log(this.commentdata)
+				this.commentdata = this.commentdata.concat(res.data)
+				console.log(res.data)
 			},
-			async getDiscuss(data) {
+			async getDiscuss(data) {//发布评论
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_new_idea',
 					data: {
 						lower: data.lower,
-						content: data.content
+						content: data.content,
 					}
 				})
+				if(res.code==200){
+					this.commentdata = []
+					this.page = 1
+					this.getParticulars(this.quizdata.lower)
+				}
 				console.log(res)
 			},
 			clickLeft() {
 				uni.navigateTo({
-					url: "exchangeShare"
+					url: "./exchangeShare"
 				})
 			},
 			issue() { //发布评论
@@ -91,23 +103,33 @@
 				obj.content = this.issuedata
 				if (this.issuedata != '') {
 					this.getDiscuss(obj)
-					uni.navigateTo({
-						url: "particulars?items=" + JSON.stringify(this.quizdata)
-					})
+					this.issuedata = ''
 				}
+
+			},
+			focus(e) {
+				this.height = e.detail.height
+			},
+			blur() {
+				this.height = 0
+			},
+			confirm() {
+				this.issue()
+			},
+			scroll(e) {
+				this.page++
+				this.getParticulars(this.quizdata.lower)
 			}
 		},
 		onLoad(option) {
 			this.quizdata = JSON.parse(option.items)
-			console.log(this.quizdata.img_urls)
+			console.log(this.quizdata.lower)
 			if (this.quizdata.img_urls == '' || this.quizdata.img_urls == null) {
 				this.list[0].image = 'http://static.yfpyx.com/projectimg' + this.defaultimg
 			} else {
 				this.list[0].image = this.quizdata.img_urls
 			}
-			let data = {}
-			data.lower = this.quizdata.lower
-			this.getParticulars(data)
+			this.getParticulars(this.quizdata.lower)
 		}
 	}
 </script>
@@ -124,6 +146,7 @@
 
 		.quiz_username {
 			width: 100%;
+
 			image {
 				width: 40rpx;
 				height: 40rpx;
@@ -171,6 +194,10 @@
 			font-size: 32rpx;
 		}
 
+		.scroll-view_H {
+			height: 600rpx;
+		}
+
 		.comment_unit {
 			.comment_unit_user {
 				display: flex;
@@ -223,8 +250,6 @@
 
 	.issue_box {
 		width: 100%;
-		position: fixed;
-		bottom: 0;
 		background-color: #FFFFFF;
 	}
 

pages/fourBase/index.vue

@@ -32,7 +32,7 @@
 						<image src="../../static/image/fourMoodBase/3.png" mode=""></image>
 						<image src="../../static/image/fourMoodBase/5.png" mode=""></image>
 						<view class="photoshow_num">
-							{{items.num}}+
+							{{items.num}}
 						</view>
 					</view>
 				</view>
@@ -76,6 +76,10 @@
 				console.log(this.baselist)
 				for(var i=0;i<this.baselist.length;i++){
 					var arr = this.baselist[i].base_equip.split("#")
+					if(arr[0]==''){
+						arr.shift(1)
+					}
+					console.log(arr)
 					this.baselist[i].num = arr.length
 				}
 			},

pages/my/index/index.vue

@@ -93,6 +93,9 @@
 							uni.navigateTo({
 								url: "../../login/login"
 							})
+							uni.removeStorage({
+								key:"session_key"
+							})
 						} else if (res.cancel) {
 							console.log('用户点击取消');
 						}

static/js/equipState_dict.json

@@ -0,0 +1,523 @@
+{   
+    "imei":{
+        "name":"设备ID",
+        "unit":"",
+        "desc":"通讯板唯一ID"
+    },
+    "iccid":{
+        "name":"物联网卡",
+        "unit":"",
+        "desc":"用于查询物联网卡的套餐、流量信息等"
+    },
+    "csq":{
+        "name":"信号强度",
+        "unit":"",
+        "desc":""
+    },
+    "lat":{
+        "name":"纬度",
+        "unit":"",
+        "desc":""
+    },
+    "lng":{
+        "name":"经度",
+        "unit":"",
+        "desc":""
+    },
+    "dtype":{
+        "name":"设备类型",
+        "unit":"",
+        "desc":""
+    },
+    "ws":{
+        "name":"工作状态",
+        "unit":"",
+        "value":{
+            "0":"待机",
+            "1":"工作",
+            "2":"工作"
+        },
+        "desc":"工作状态、0 待机， 1 工作"
+    },
+    "dver":{
+        "name":"设备版本",
+        "unit":"",
+        "desc":"设备固件版本"
+    },
+    "vbat":{
+        "name":"电压",
+        "unit":"V",
+        "desc":""
+    },
+    "st":{
+        "name":"开始时间",
+        "unit":"h",
+        "desc":"时控开始时间：0-23"
+    },
+    "et":{
+        "name":"结束时间",
+        "unit":"h",
+        "desc":"时控结束时间：0-23"
+    },
+    "tps":{
+        "name":"温控状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"温控"
+        },
+        "desc":"0-正常，1-保护"
+    },
+    "lps":{
+        "name":"光控状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"光控"
+        },
+        "desc":"0-正常，1-保护"
+    },
+    "rps":{
+        "name":"雨控状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"雨控"
+        },
+        "desc":"0-正常，1-保护"
+    },
+    "dps":{
+        "name":"倾倒状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"保护"
+        },
+        "desc":"0-正常，1-保护"
+    },
+    "collt":{
+        "name":"收集时间",
+        "unit":"",
+        "desc":"收集时间：1-30"
+    },
+    "current":{
+        "name":"功率",
+        "unit":"mA",
+        "desc":"功率：单位mA"
+    },
+    "hrt":{
+        "name":"加热仓温度",
+        "unit":"°C",
+        "desc":"加热仓实时温度"
+    },
+    "hst":{
+        "name":"加热仓设定温度",
+        "unit":"°C",
+        "desc":"加热仓设定温度：70-130"
+    },
+    "at":{
+        "name":"环境温度",
+        "unit":"°C",
+        "desc":""
+    },
+    "ah":{
+        "name":"环境湿度",
+        "unit":"%RH",
+        "desc":""
+    },
+    "stamp":{
+        "name":"时间",
+        "unit":"",
+        "desc":""
+    },
+    "dat_f":{
+        "name":"数据上传间隔",
+        "unit":"",
+        "desc":"数据上传时间间隔"
+    },
+    "rcnt":{
+        "name":"开机次数",
+        "unit":"",
+        "desc":"每次重启加1"
+    },
+    "htim":{
+        "name":"加热时间",
+        "unit":"min",
+        "desc":"加热时间：1-30分钟"
+    },
+    "batStatus":{
+        "name":"电压状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"电量过低"
+        },
+        "desc":"0-正常 1-欠压"
+    },
+    "tt":{
+        "name":"定时时长",
+        "unit":"h",
+        "desc":"定时时间1~10"
+    },
+    "shake":{
+        "name":"震动开关",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"0-关，1-开"
+    },
+    "shake_sec":{
+        "name":"震动时间",
+        "unit":"ms",
+        "desc":"1~20(步长：100ms)"
+    },
+    "ts":{
+        "name":"定时模式",
+        "unit":"",
+        "value":{
+            "0":"光控",
+            "1":"时控"
+        },
+        "desc":"0-光控，1-时控"
+    },
+    "upds":{
+        "name":"上仓门状态",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"1 打开，0 关闭"
+    },
+    "dnds":{
+        "name":"下仓门状态",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"1 打开，0 关闭"
+    },
+    "lamp":{
+        "name":"灯管状态",
+        "unit":"",
+        "value":{
+            "0":"工作",
+            "1":"异常"
+        },
+        "desc":"灯管/工作状态 0 工作 1未工"
+    },
+    "fuse_voltage":{
+        "name":"保险丝电压",
+        "unit":"V",
+        "desc":""
+    },
+    "ds":{
+        "name":"设备开关",
+        "unit":"",
+        "value":{
+            "0":"关机",
+            "1":"开机"
+        },
+        "desc":"0 关机  1 开机"
+    },
+    "bt":{
+        "name":"主板温度",
+        "unit":"°C",
+        "desc":""
+    },
+    "tcs":{
+        "name":"时控开关",
+        "unit":"",
+        "value":{
+            "0":"关机",
+            "1":"开机"
+        },
+        "desc":"0 关闭 1 开启"
+    },
+    "clt_t":{
+        "name":"清虫间隔",
+        "unit":"min",
+        "desc":"清虫时间间隔"
+    },
+    "gps":{
+        "name":"定位方式",
+        "unit":"",
+        "value":{
+            "0":"手动定位",
+            "1":"GPS 定位",
+            "2":"LBS 定位"
+        },
+        "desc":"0 手动定位 1 GPS 定位 2 LBS 定位"
+    },
+    "cv":{
+        "name":"充电电压",
+        "unit":"V",
+        "desc":"充电电压"
+    },
+    "bv":{
+        "name":"电池电压",
+        "unit":"V",
+        "desc":"电池电压"
+    },
+    "ct":{
+        "name":"电击次数",
+        "unit":"",
+        "desc":"电击次数 (最大255)"
+    },
+    "info":{
+        "name":"重启信息",
+        "unit":"",
+        "desc":"1正常 2 socket重连 3 MQTT重连"
+    },
+    "proj":{
+        "name":"设备型号",
+        "unit":"",
+        "desc":"性诱一型或者二型"
+    },
+    "btype":{
+        "name":"电池类型",
+        "unit":"",
+        "value":{
+            "0":"蓄电池",
+            "1":"锂电池"
+        },
+        "desc":"0 蓄电池，1锂电池"
+    },
+    "cs":{
+        "name":"充电状态",
+        "unit":"",
+        "value":{
+            "0":"非充电",
+            "1":"充电"
+        },
+        "desc":"0非充电，1充电"
+    },
+    "bs":{
+        "name":"电池状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"欠压",
+            "2":"过压"
+        },
+        "desc":"0 正常，1欠压， 2过压"
+    },
+    "infr_ct":{
+        "name":"红外计数值",
+        "unit":"",
+        "desc":"性诱红外计数值"
+    },
+    "volt_ct":{
+        "name":"高压计数值",
+        "unit":"",
+        "desc":"性诱高压计数值"
+    },
+    "wind_drec":{
+        "name":"风向",
+        "unit":"",
+        "desc":"性诱风向"
+    },
+    "wind_sped":{
+        "name":"风速",
+        "unit":"",
+        "desc":"性诱风向"
+    },
+    "cold_sw":{
+        "name":"制冷开关",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"制冷机开关 0 关闭， 1 开启"
+    },
+    "wind_sw":{
+        "name":"风机开关",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"风机开关 0 关闭， 1 开启"
+    },
+    "pre_temp":{
+        "name":"保温仓温度",
+        "unit":"℃",
+        "desc":"保温仓当前温度-℃"
+    },
+    "set_temp":{
+        "name":"保温仓设定温度",
+        "unit":"℃",
+        "desc":"保温仓设定温度-℃"
+    },
+    "usb_sta":{
+        "name":"摄像头状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"异常"
+        },
+        "desc":"摄像头状态 0 正常, 1 异常"
+    },
+    "imgres":{
+        "name":"图片分辨率",
+        "unit":"",
+        "desc":"图片分辨率默认为7（最高）"
+    },
+    "staytime":{
+        "name":"已培养时间",
+        "unit":"h",
+        "desc":"已培养时间-小时"
+    },
+    "cul_time":{
+        "name":"孢子培养时间",
+        "unit":"h",
+        "desc":"孢子培养时间-小时"
+    },
+    "coll_time":{
+        "name":"收集时间",
+        "unit":"h",
+        "desc":"收集时间[8-10,14-16]"
+    },
+    "addtime":{
+        "name":"上报时间",
+        "unit":"",
+        "desc":"数据上报时间"
+    },
+    "hs":{
+        "name":"加热状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"加热"
+        },
+        "desc":"测报灯状态0 正常， 1 加热"
+    },
+    "is_online": {
+        "name":"在线状态",
+        "unit": "",
+        "value": {
+            "0": "离线",
+            "1": "在线"
+        },
+        "desc":"设备在线离线状态"
+    },
+    "gs": {
+        "name":"通道状态",
+        "unit": "",
+        "value": {
+            "0": "排水",
+            "1": "落虫"
+        },
+        "desc":"通道状态"
+    },
+    "tph": {
+        "name":"高温保护阀值",
+        "unit": "°C",
+        "desc":"高温保护阀值"
+    },
+    "tpl": {
+        "name":"低温保护阀值",
+        "unit": "°C",
+        "desc":"低温保护阀值"
+    },
+    "boot": {
+        "name":"禁止工作",
+        "unit": "",
+        "value": {
+            "0": "正常",
+            "1": "使能(禁止工作)"
+        },
+        "desc":"禁止工作"
+    },
+    "lux": {
+        "name":"光照强度",
+        "unit": "",
+        "value": {
+            "0": "正常",
+            "1": "使能(禁止工作)"
+        },
+        "desc":"光照强度"
+    },
+    "clt":{
+        "name":"清虫间隔",
+        "unit":"min",
+        "desc":"清虫时间间隔"
+    },
+    "dattim":{
+        "name":"数据上传间隔",
+        "unit":"",
+        "desc":"数据上传时间间隔"
+    },
+    "datt":{
+        "name":"数据上传间隔",
+        "unit":"",
+        "desc":"数据上传时间间隔"
+    },
+    "tbs":{
+        "name":"灯管状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"异常"
+        },
+        "desc":"数据上传时间间隔"
+    },
+    "type":{
+        "name":"设备类型",
+        "unit":"",
+        "value":{
+            "0":"--",
+            "1":"--",
+            "2":"杀虫灯",
+            "3":"测报灯",
+            "4":"性诱器",
+            "5":"气象站",
+            "6":"--",
+            "7":"孢子仪"
+        },
+        "desc":"设备类型"
+    },
+    "simStatus":{
+        "name":"sim卡状态",
+        "unit":"",
+        "value":[
+            {
+                "name": "未知",
+                "val": 0
+            },
+            {
+                "name": "测试期",
+                "val": 1
+            },
+            {
+                "name": "沉默期",
+                "val": 2
+            },
+            {
+                "name": "使用中",
+                "val": 3
+            },
+            {
+                "name": "停机",
+                "val": 4
+            },
+            {
+                "name": "停机保号",
+                "val": 5
+            },
+            {
+                "name": "预销号",
+                "val": 6
+            },
+            {
+                "name": "销号",
+                "val": 7
+            }
+        ],
+        "desc":"sim卡状态"
+    }
+}

unpackage/dist/dev/app-plus/static/js/equipState_dict.json

@@ -0,0 +1,523 @@
+{   
+    "imei":{
+        "name":"设备ID",
+        "unit":"",
+        "desc":"通讯板唯一ID"
+    },
+    "iccid":{
+        "name":"物联网卡",
+        "unit":"",
+        "desc":"用于查询物联网卡的套餐、流量信息等"
+    },
+    "csq":{
+        "name":"信号强度",
+        "unit":"",
+        "desc":""
+    },
+    "lat":{
+        "name":"纬度",
+        "unit":"",
+        "desc":""
+    },
+    "lng":{
+        "name":"经度",
+        "unit":"",
+        "desc":""
+    },
+    "dtype":{
+        "name":"设备类型",
+        "unit":"",
+        "desc":""
+    },
+    "ws":{
+        "name":"工作状态",
+        "unit":"",
+        "value":{
+            "0":"待机",
+            "1":"工作",
+            "2":"工作"
+        },
+        "desc":"工作状态、0 待机， 1 工作"
+    },
+    "dver":{
+        "name":"设备版本",
+        "unit":"",
+        "desc":"设备固件版本"
+    },
+    "vbat":{
+        "name":"电压",
+        "unit":"V",
+        "desc":""
+    },
+    "st":{
+        "name":"开始时间",
+        "unit":"h",
+        "desc":"时控开始时间：0-23"
+    },
+    "et":{
+        "name":"结束时间",
+        "unit":"h",
+        "desc":"时控结束时间：0-23"
+    },
+    "tps":{
+        "name":"温控状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"温控"
+        },
+        "desc":"0-正常，1-保护"
+    },
+    "lps":{
+        "name":"光控状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"光控"
+        },
+        "desc":"0-正常，1-保护"
+    },
+    "rps":{
+        "name":"雨控状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"雨控"
+        },
+        "desc":"0-正常，1-保护"
+    },
+    "dps":{
+        "name":"倾倒状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"保护"
+        },
+        "desc":"0-正常，1-保护"
+    },
+    "collt":{
+        "name":"收集时间",
+        "unit":"",
+        "desc":"收集时间：1-30"
+    },
+    "current":{
+        "name":"功率",
+        "unit":"mA",
+        "desc":"功率：单位mA"
+    },
+    "hrt":{
+        "name":"加热仓温度",
+        "unit":"°C",
+        "desc":"加热仓实时温度"
+    },
+    "hst":{
+        "name":"加热仓设定温度",
+        "unit":"°C",
+        "desc":"加热仓设定温度：70-130"
+    },
+    "at":{
+        "name":"环境温度",
+        "unit":"°C",
+        "desc":""
+    },
+    "ah":{
+        "name":"环境湿度",
+        "unit":"%RH",
+        "desc":""
+    },
+    "stamp":{
+        "name":"时间",
+        "unit":"",
+        "desc":""
+    },
+    "dat_f":{
+        "name":"数据上传间隔",
+        "unit":"",
+        "desc":"数据上传时间间隔"
+    },
+    "rcnt":{
+        "name":"开机次数",
+        "unit":"",
+        "desc":"每次重启加1"
+    },
+    "htim":{
+        "name":"加热时间",
+        "unit":"min",
+        "desc":"加热时间：1-30分钟"
+    },
+    "batStatus":{
+        "name":"电压状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"电量过低"
+        },
+        "desc":"0-正常 1-欠压"
+    },
+    "tt":{
+        "name":"定时时长",
+        "unit":"h",
+        "desc":"定时时间1~10"
+    },
+    "shake":{
+        "name":"震动开关",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"0-关，1-开"
+    },
+    "shake_sec":{
+        "name":"震动时间",
+        "unit":"ms",
+        "desc":"1~20(步长：100ms)"
+    },
+    "ts":{
+        "name":"定时模式",
+        "unit":"",
+        "value":{
+            "0":"光控",
+            "1":"时控"
+        },
+        "desc":"0-光控，1-时控"
+    },
+    "upds":{
+        "name":"上仓门状态",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"1 打开，0 关闭"
+    },
+    "dnds":{
+        "name":"下仓门状态",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"1 打开，0 关闭"
+    },
+    "lamp":{
+        "name":"灯管状态",
+        "unit":"",
+        "value":{
+            "0":"工作",
+            "1":"异常"
+        },
+        "desc":"灯管/工作状态 0 工作 1未工"
+    },
+    "fuse_voltage":{
+        "name":"保险丝电压",
+        "unit":"V",
+        "desc":""
+    },
+    "ds":{
+        "name":"设备开关",
+        "unit":"",
+        "value":{
+            "0":"关机",
+            "1":"开机"
+        },
+        "desc":"0 关机  1 开机"
+    },
+    "bt":{
+        "name":"主板温度",
+        "unit":"°C",
+        "desc":""
+    },
+    "tcs":{
+        "name":"时控开关",
+        "unit":"",
+        "value":{
+            "0":"关机",
+            "1":"开机"
+        },
+        "desc":"0 关闭 1 开启"
+    },
+    "clt_t":{
+        "name":"清虫间隔",
+        "unit":"min",
+        "desc":"清虫时间间隔"
+    },
+    "gps":{
+        "name":"定位方式",
+        "unit":"",
+        "value":{
+            "0":"手动定位",
+            "1":"GPS 定位",
+            "2":"LBS 定位"
+        },
+        "desc":"0 手动定位 1 GPS 定位 2 LBS 定位"
+    },
+    "cv":{
+        "name":"充电电压",
+        "unit":"V",
+        "desc":"充电电压"
+    },
+    "bv":{
+        "name":"电池电压",
+        "unit":"V",
+        "desc":"电池电压"
+    },
+    "ct":{
+        "name":"电击次数",
+        "unit":"",
+        "desc":"电击次数 (最大255)"
+    },
+    "info":{
+        "name":"重启信息",
+        "unit":"",
+        "desc":"1正常 2 socket重连 3 MQTT重连"
+    },
+    "proj":{
+        "name":"设备型号",
+        "unit":"",
+        "desc":"性诱一型或者二型"
+    },
+    "btype":{
+        "name":"电池类型",
+        "unit":"",
+        "value":{
+            "0":"蓄电池",
+            "1":"锂电池"
+        },
+        "desc":"0 蓄电池，1锂电池"
+    },
+    "cs":{
+        "name":"充电状态",
+        "unit":"",
+        "value":{
+            "0":"非充电",
+            "1":"充电"
+        },
+        "desc":"0非充电，1充电"
+    },
+    "bs":{
+        "name":"电池状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"欠压",
+            "2":"过压"
+        },
+        "desc":"0 正常，1欠压， 2过压"
+    },
+    "infr_ct":{
+        "name":"红外计数值",
+        "unit":"",
+        "desc":"性诱红外计数值"
+    },
+    "volt_ct":{
+        "name":"高压计数值",
+        "unit":"",
+        "desc":"性诱高压计数值"
+    },
+    "wind_drec":{
+        "name":"风向",
+        "unit":"",
+        "desc":"性诱风向"
+    },
+    "wind_sped":{
+        "name":"风速",
+        "unit":"",
+        "desc":"性诱风向"
+    },
+    "cold_sw":{
+        "name":"制冷开关",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"制冷机开关 0 关闭， 1 开启"
+    },
+    "wind_sw":{
+        "name":"风机开关",
+        "unit":"",
+        "value":{
+            "0":"关闭",
+            "1":"开启"
+        },
+        "desc":"风机开关 0 关闭， 1 开启"
+    },
+    "pre_temp":{
+        "name":"保温仓温度",
+        "unit":"℃",
+        "desc":"保温仓当前温度-℃"
+    },
+    "set_temp":{
+        "name":"保温仓设定温度",
+        "unit":"℃",
+        "desc":"保温仓设定温度-℃"
+    },
+    "usb_sta":{
+        "name":"摄像头状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"异常"
+        },
+        "desc":"摄像头状态 0 正常, 1 异常"
+    },
+    "imgres":{
+        "name":"图片分辨率",
+        "unit":"",
+        "desc":"图片分辨率默认为7（最高）"
+    },
+    "staytime":{
+        "name":"已培养时间",
+        "unit":"h",
+        "desc":"已培养时间-小时"
+    },
+    "cul_time":{
+        "name":"孢子培养时间",
+        "unit":"h",
+        "desc":"孢子培养时间-小时"
+    },
+    "coll_time":{
+        "name":"收集时间",
+        "unit":"h",
+        "desc":"收集时间[8-10,14-16]"
+    },
+    "addtime":{
+        "name":"上报时间",
+        "unit":"",
+        "desc":"数据上报时间"
+    },
+    "hs":{
+        "name":"加热状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"加热"
+        },
+        "desc":"测报灯状态0 正常， 1 加热"
+    },
+    "is_online": {
+        "name":"在线状态",
+        "unit": "",
+        "value": {
+            "0": "离线",
+            "1": "在线"
+        },
+        "desc":"设备在线离线状态"
+    },
+    "gs": {
+        "name":"通道状态",
+        "unit": "",
+        "value": {
+            "0": "排水",
+            "1": "落虫"
+        },
+        "desc":"通道状态"
+    },
+    "tph": {
+        "name":"高温保护阀值",
+        "unit": "°C",
+        "desc":"高温保护阀值"
+    },
+    "tpl": {
+        "name":"低温保护阀值",
+        "unit": "°C",
+        "desc":"低温保护阀值"
+    },
+    "boot": {
+        "name":"禁止工作",
+        "unit": "",
+        "value": {
+            "0": "正常",
+            "1": "使能(禁止工作)"
+        },
+        "desc":"禁止工作"
+    },
+    "lux": {
+        "name":"光照强度",
+        "unit": "",
+        "value": {
+            "0": "正常",
+            "1": "使能(禁止工作)"
+        },
+        "desc":"光照强度"
+    },
+    "clt":{
+        "name":"清虫间隔",
+        "unit":"min",
+        "desc":"清虫时间间隔"
+    },
+    "dattim":{
+        "name":"数据上传间隔",
+        "unit":"",
+        "desc":"数据上传时间间隔"
+    },
+    "datt":{
+        "name":"数据上传间隔",
+        "unit":"",
+        "desc":"数据上传时间间隔"
+    },
+    "tbs":{
+        "name":"灯管状态",
+        "unit":"",
+        "value":{
+            "0":"正常",
+            "1":"异常"
+        },
+        "desc":"数据上传时间间隔"
+    },
+    "type":{
+        "name":"设备类型",
+        "unit":"",
+        "value":{
+            "0":"--",
+            "1":"--",
+            "2":"杀虫灯",
+            "3":"测报灯",
+            "4":"性诱器",
+            "5":"气象站",
+            "6":"--",
+            "7":"孢子仪"
+        },
+        "desc":"设备类型"
+    },
+    "simStatus":{
+        "name":"sim卡状态",
+        "unit":"",
+        "value":[
+            {
+                "name": "未知",
+                "val": 0
+            },
+            {
+                "name": "测试期",
+                "val": 1
+            },
+            {
+                "name": "沉默期",
+                "val": 2
+            },
+            {
+                "name": "使用中",
+                "val": 3
+            },
+            {
+                "name": "停机",
+                "val": 4
+            },
+            {
+                "name": "停机保号",
+                "val": 5
+            },
+            {
+                "name": "预销号",
+                "val": 6
+            },
+            {
+                "name": "销号",
+                "val": 7
+            }
+        ],
+        "desc":"sim卡状态"
+    }
+}