环境数据三刷

pages.json

@@ -7,7 +7,8 @@
 			"path": "pages/timeEnvironment/timeEnvironment",
 			"style": {
 				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "pages/timeVideo/timeVideo",

pages/fertilizer_machine/fertilizer_machine.vue

@@ -218,7 +218,9 @@
 
 				topActive: 0,
 				indexs: 1,
-				inputData1: []
+				inputData1: [],
+				
+				timer:null
 			};
 		},
 		watch: {
@@ -227,11 +229,14 @@
 		onLoad(option) {
 			this.deviceId = option.id
 			this.dataInit()
-      let that = this
+		  let that = this
-      setInterval(function() {
+		  this.timer = setInterval(function() {
-        that.dataInit();
+			that.dataInit();
-        that.getReg();
+			that.getReg();
-      }, 3000);
+		  }, 3000);
+		},
+		onUnload() {
+			clearTimeout(this.timer)
 		},
     onPullDownRefresh() {
         uni.showLoading({

pages/timeEnvironment/timeEnvironment.vue

@@ -250,10 +250,42 @@
 					{ label: '无线传感器无线信号强度', value: 57, countType: 1,unit: 'dBm' },
 					{ label: '无线传感器信噪比（SNR）', value: 58, countType: 1,unit: 'dB' },
 				],
+			
+				timer:null
 			}
 		},
-		onShow() {
+		onLoad() {
-			
+			let that = this
+			this.timer = setInterval(function() {
+				uni.getStorage({
+					key: 'token',
+					success: function(res) {
+						that.getEquipmentInfo(uni.getStorageSync('userid'))
+					},
+					// fail:function(err){
+					// 	uni.reLaunch({
+					// 		url:'/pages/login/login'
+					// 	})
+					// }
+				})		
+			}, 60000);
+		},
+		onUnload() {
+			clearTimeout(this.timer)
+		},
+		onPullDownRefresh() {
+		    let that = this
+			uni.getStorage({
+				key: 'token',
+				success: function(res) {
+					that.getEquipmentInfo(uni.getStorageSync('userid'))
+				},
+				// fail:function(err){
+				// 	uni.reLaunch({
+				// 		url:'/pages/login/login'
+				// 	})
+				// }
+			})	
 		},
 		mounted() {
 			let that = this
@@ -280,7 +312,7 @@
 					url: this.api.sel_eqbyid + userid,
 					method: 'GET'
 				}).then(res => {
-					console.log(res, '根据用户id查询对应的设备数据');
+					// console.log(res, '根据用户id查询对应的设备数据');
 					if (res.code == 200) {
 						
 						this.waterAndFertilizerParamsList = res.data.map((item,index)=>{
@@ -294,13 +326,14 @@
 								url: this.api.getFs_rtdata + "?equipmentId=" + i.deviceId,
 								method: 'post',
 							}).then(res => {
-								console.log(res, '主页查看施肥机实时数据');
+								// console.log(res, '主页查看施肥机实时数据');
 								if(res.code == 200){
 									uni.hideLoading({
 										title: '完成'
 									});
+									uni.stopPullDownRefresh();
 									i.childList= res.data;
-									console.log(this.waterAndFertilizerParamsList);
+									// console.log(this.waterAndFertilizerParamsList);
 								}
 							})
 						})

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -21361,7 +21361,8 @@ var _default = {
     "path": "pages/timeEnvironment/timeEnvironment",
     "style": {
       "navigationBarTitleText": "",
-      "navigationStyle": "custom"
+      "navigationStyle": "custom",
+      "enablePullDownRefresh": true
     }
   }, {
     "path": "pages/timeVideo/timeVideo",

unpackage/dist/dev/mp-weixin/pages/fertilizer_machine/fertilizer_machine.js

@@ -408,7 +408,8 @@ var _default = {
       left1Act: -1,
       topActive: 0,
       indexs: 1,
-      inputData1: []
+      inputData1: [],
+      timer: null
     };
   },
   watch: {},
@@ -416,11 +417,14 @@ var _default = {
     this.deviceId = option.id;
     this.dataInit();
     var that = this;
-    setInterval(function () {
+    this.timer = setInterval(function () {
       that.dataInit();
       that.getReg();
     }, 3000);
   },
+  onUnload: function onUnload() {
+    clearTimeout(this.timer);
+  },
   onPullDownRefresh: function onPullDownRefresh() {
     uni.showLoading({
       title: '加载中...'

unpackage/dist/dev/mp-weixin/pages/timeEnvironment/timeEnvironment.js

@@ -697,10 +697,43 @@ var _default = {
         value: 58,
         countType: 1,
         unit: 'dB'
-      }]
+      }],
+      timer: null
     };
   },
-  onShow: function onShow() {},
+  onLoad: function onLoad() {
+    var that = this;
+    this.timer = setInterval(function () {
+      uni.getStorage({
+        key: 'token',
+        success: function success(res) {
+          that.getEquipmentInfo(uni.getStorageSync('userid'));
+        }
+        // fail:function(err){
+        // 	uni.reLaunch({
+        // 		url:'/pages/login/login'
+        // 	})
+        // }
+      });
+    }, 60000);
+  },
+  onUnload: function onUnload() {
+    clearTimeout(this.timer);
+  },
+  onPullDownRefresh: function onPullDownRefresh() {
+    var that = this;
+    uni.getStorage({
+      key: 'token',
+      success: function success(res) {
+        that.getEquipmentInfo(uni.getStorageSync('userid'));
+      }
+      // fail:function(err){
+      // 	uni.reLaunch({
+      // 		url:'/pages/login/login'
+      // 	})
+      // }
+    });
+  },
   mounted: function mounted() {
     var that = this;
     uni.getStorage({
@@ -727,7 +760,7 @@ var _default = {
         url: this.api.sel_eqbyid + userid,
         method: 'GET'
       }).then(function (res) {
-        console.log(res, '根据用户id查询对应的设备数据');
+        // console.log(res, '根据用户id查询对应的设备数据');
         if (res.code == 200) {
           _this.waterAndFertilizerParamsList = res.data.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -739,13 +772,14 @@ var _default = {
               url: _this.api.getFs_rtdata + "?equipmentId=" + i.deviceId,
               method: 'post'
             }).then(function (res) {
-              console.log(res, '主页查看施肥机实时数据');
+              // console.log(res, '主页查看施肥机实时数据');
               if (res.code == 200) {
                 uni.hideLoading({
                   title: '完成'
                 });
+                uni.stopPullDownRefresh();
                 i.childList = res.data;
-                console.log(_this.waterAndFertilizerParamsList);
+                // console.log(this.waterAndFertilizerParamsList);
               }
             });
           });

unpackage/dist/dev/mp-weixin/pages/timeEnvironment/timeEnvironment.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "",
   "navigationStyle": "custom",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "u-navbar": "/node-modules/uview-ui/components/u-navbar/u-navbar"
   }