edit

front/page/device.py

@@ -93,11 +93,14 @@ class screen_path(Load):
 		self.data['list'] = ({'name':'实时数据监测', 'device':self.data['device']},)
 
 		Device.statBase(self, deviceInfo)
+		"""
 		log_search = {}
 		if device:
 			log_search['device_id'] = device
 		else:
 			log_search['device_id--ins'] = self.data['setting']['farmInfo']['gateways']
+		"""
+		log_search['device_id--ins'] = self.data['setting']['farmInfo']['gateways']
 		log_search['type_id'] = 2
 		log_search['farm_id'] = self.data['setting']['farm']
 		# 获取设备日志
@@ -187,10 +190,13 @@ class screens_path(Load):
 
 		Device.statBase(self, deviceInfo)
 		log_search = {}
+		"""
 		if device:
 			log_search['device_id'] = device
 		else:
 			log_search['device_id--ins'] = devices
+		"""
+		log_search['device_id--ins'] = devices
 		log_search['type_id'] = 2
 		log_search['farm_id--ins'] = farm
 		# 获取设备日志