edit

admin/page/device.py

@@ -106,6 +106,18 @@ class info_path(Load):
 		for value in self.data['common']['search_gateway_id-select---farm_id']:
 			gateway[value['id']] = value
 
+		farm_list = {}
+		for value in self.data['common']['search_farm_id-select--gateway_id']:
+			farm_list[value['id']] = value
+
+		device_type = {}
+		for value in self.data['common']['search_type_id-select-']:
+			device_type[value['id']] = value
+
+		hardware_type = {}
+		for value in self.data['common']['search_hardware_type-select-']:
+			hardware_type[value['id']] = value
+
 		"""
 		if self.data['common']['search_hardware_type-select-']:
 			del self.data['common']['search_hardware_type-select-'][0]
@@ -117,11 +129,11 @@ class info_path(Load):
 		self.commonList('device_info', order='inorder asc, type_id asc,udate asc,hardware_id asc')
 		if self.data['list']:
 			for key, value in enumerate(self.data['list']):
-				farm = self.service('common').one('farm', id=value['farm_id'])
+				farm = farm_list[value['farm_id']]
 				self.data['list'][key]['farm'] = farm['name']
 				self.data['list'][key]['type'] = '无'
 				if value['type_id'] > 0:
-					type_info = self.service('common').one('device_type', id=value['type_id'])
+					type_info = device_type[value['type_id']]
 					if type_info:
 						self.data['list'][key]['type'] = type_info['name']
 				info = gateway[value['gateway_id']]
@@ -160,8 +172,9 @@ class info_path(Load):
 					else:
 						self.data['list'][key]['value'] = '已断开'
 
-				hardware_type = self.service('common').one('hardware_type', id=value['hardware_type'])
-				self.data['list'][key]['hardware_type'] = hardware_type['name']
+				if value['hardware_type'] in hardware_type:
+					hardware_type_value = hardware_type[value['hardware_type']]
+					self.data['list'][key]['hardware_type'] = hardware_type_value['name']
 
 
 		self.commonView('list')