edit

admin/page/device.py

@@ -120,7 +120,10 @@ class info_path(Load):
 					if type_info:
 						self.data['list'][key]['type'] = type_info['name']
 				info = self.service('common').one('device_gateway', id=value['gateway_id'])
-				self.data['list'][key]['gateway'] = info['name']
+				if info:
+					self.data['list'][key]['gateway'] = info['name']
+				else:
+					self.data['list'][key]['gateway'] = '无'
 				if value['status']:
 					self.data['list'][key]['status'] = '已连接'
 				else:
@@ -267,8 +270,8 @@ class camera_pic_update_path(Load):
 	def get(self):
 		self.common(
 			path = 'camera_pic'
-			,label = (u'摄像头名称', u'摄像头id', u'所属农场', u'选择网关', u'摄像头地址',u'排序')
-			,update = ('name-input-required','hardware_id-input-required','farm_id-select-required-gateway_id','gateway_id-select-required--farm_id','value-text-required','inorder-text-')
+			,label = (u'摄像头名称', u'摄像头id', u'所属农场', u'摄像头地址',u'排序')
+			,update = ('name-input-required','hardware_id-input-required','farm_id-select-required','value-text-required','inorder-text-')
 			,update_farm_id = Demeter.config['setting']['farmList']
 			,update_gateway_id = self.service('common').list('device_gateway')
 		)
@@ -279,6 +282,7 @@ class camera_pic_update_path(Load):
 	def post(self):
 		self.data['update']['hardware_type'] = 6
 		self.data['update']['type_id'] = 0
+		#self.data['update']['gateway_id'] = ''
 		self.commonUpdate('device_info')
 	@Web.auth
 	@Web.setting

front/api/device.py

@@ -74,7 +74,7 @@ class index_path(Load):
 					self.data['device'][key]['unit'] = type['unit']
 
 			self.data['pic'] = []
-			pic = self.service('common').list('device_info', state=True, search={'hardware_type':6, 'gateway_id':id})
+			pic = self.service('common').list('device_info', state=True, search={'hardware_type':6, 'farm_id':self.data['info']['farm_id']})
 			if pic:
 				for key, value in enumerate(pic):
 					pic[key]['cdates'] = Demeter.date(value['cdate'])
@@ -263,7 +263,7 @@ class pic_path(Load):
 			self.data['search_date'] = self.input('search_date')
 
 			search = {}
-			search['gateway_id'] = id
+			#search['gateway_id'] = id
 			search['device_id'] = device
 			if self.data['search_date']:
 				search['cdate-time-start'] = self.data['search_date'] + ' 00:00:00'

front/api/origin.py

@@ -167,7 +167,7 @@ class info_path(Load):
 				self.data['info'] = Origin.get(self, self.data['info'])
 			
 			self.data['pic'] = []
-			pic = self.service('common').list('device_info', state=True, search={'hardware_type':6, 'gateway_id':self.data['gateway_id']})
+			pic = self.service('common').list('device_info', state=True, search={'hardware_type':6, 'farm_id':self.data['info']['farm_id']})
 			if pic:
 				for key, value in enumerate(pic):
 					pic[key]['cdates'] = Demeter.date(value['cdate'])