edit

admin/page/__load__.py

@@ -55,8 +55,8 @@ class Load(Base):
 	def menu(self):
 		parent = [['农场与设备管理', '网站管理', '基础设置'],['', '', '']]
 		child = [
-			[['/farm/farm','/device/gateway','/device/info','/work/work','/work/category','/work/land','/origin/batch','/farm/user','/device/printer','/msg/msg'],['农场列表', '网关管理', '设备管理', '农场农事管理', '农场农事方式', '农场地块管理', '溯源批次管理','农场用户管理','农场打印机','消息提醒']]
+			[['/farm/farm','/device/gateway','/device/info','/work/work','/work/land','/origin/batch','/farm/user','/device/printer','/msg/msg'],['农场列表', '网关管理', '设备管理', '农场农事管理', '农场地块管理', '溯源批次管理','农场用户管理','农场打印机','消息提醒']]
 			,[['/web/set','/web/category','/web/article','/web/menu', 'sms/sms'],['首页内容管理', '文章分类', '发布内容文章', '菜单管理', '短信通知']]
-			,[['/device/type','/hardware/type','/msg/type','/admin/admin','/admin/role','/hardware/hardware', '/admin/log'],['设备类型管理','硬件类型管理', '消息类型设置', '管理员设置', '管理权限设置','硬件设备记录', '系统日志']]
+			,[['/device/type','/hardware/type','/msg/type','/work/category','/admin/admin','/admin/role','/hardware/hardware', '/admin/log'],['设备类型管理','硬件类型管理', '消息类型设置', '农事类型设置', '管理员设置', '管理权限设置','硬件设备记录', '系统日志']]
 			]
 		return (parent,child)

admin/page/work.py

@@ -66,17 +66,12 @@ class category_path(Load):
 			,path = '/work/category'
 			,width = '600'
 			,height = '250'
-			,search = (('label-1','cdate-time-start','cdate-time-end','farm_id-select-','name-input-mlike'), (u'日期范围',u'开始时间',u'截止时间',u'选择农场',u'方式名称'))
-			,thead = (u'所属农场',u'方式名称', u'更新时间')
-			,tbody = ('farm', 'name', 'cdate')
+			,search = (('label-1','cdate-time-start','cdate-time-end','name-input-mlike'), (u'日期范围',u'开始时间',u'截止时间',u'方式名称'))
+			,thead = (u'方式名称', u'更新时间')
+			,tbody = ('name', 'cdate')
 			,state = True
 		)
-		self.data['common']['search_farm_id-select-'] = Demeter.config['setting']['farmList']
 		self.commonList('farm_work_category')
-		if self.data['list']:
-			for key, value in enumerate(self.data['list']):
-				farm = self.service('common').one('farm', id=value['farm_id'])
-				self.data['list'][key]['farm'] = farm['name']
 		self.commonView('list')
 
 class category_update_path(Load):
@@ -85,9 +80,8 @@ class category_update_path(Load):
 	def get(self):
 		self.common(
 			path = '/work/category'
-			,label = (u'所属农场', u'方式名称')
-			,update = ('farm_id-select-required', 'name-input-required')
-			,update_farm_id = Demeter.config['setting']['farmList']
+			,label = (u'方式名称')
+			,update = ('name-input-required')
 		)
 		self.commonOne('farm_work_category')
 		self.commonView('update')

front/api/work.py

@@ -48,9 +48,9 @@ class index_path(Load):
 				land = self.service('common').one('farm_work_land', id=value['land_id'])
 				if land:
 					self.data['list'][key]['land'] = land['name']
-					self.data['list'][key]['name'] = self.data['list'][key]['workdates'] + ' - ' + land['name'] + '/' + category['name']
+					self.data['list'][key]['name'] = self.data['list'][key]['workdates'] + ' / ' + land['name'] + ' - ' + category['name']
 				else:
-					self.data['list'][key]['name'] = self.data['list'][key]['workdates'] + '/' + category['name']
+					self.data['list'][key]['name'] = self.data['list'][key]['workdates'] + ' / ' + category['name']
 		self.out('yes', self.data)
 
 	"""

install.py

@@ -149,6 +149,20 @@ def device():
 			model.name = value['name']
 			model.insert()
 
+	# 初始化农事分类
+	msg_type = (
+		{'name':'施肥'}
+		,{'name':'劳作'}
+		,{'name':'除虫'}
+		)
+	model = Demeter.model('farm_work_category')
+	for value in msg_type:
+		model.name = value['name']
+		info = model.select(type='fetchone')
+		if not info:
+			model.name = value['name']
+			model.insert()
+
 manage()
 web()
 farm()

model/farm_work_category.py

@@ -10,8 +10,9 @@ from __load__ import *
 class Farm_work_category(Model):
 	__table__ = 'farm_work_category'
 	__comment__ = '农事分类表'
-	id = Fields(type='uuid', primaryKey=True, comment='分类ID', uuid='farm_id')
-	farm_id = Fields(type='int', default='setting.farm', comment='园区ID', match='not')
+	#id = Fields(type='uuid', primaryKey=True, comment='分类ID', uuid='farm_id')
+	id = Fields(type='int', primaryKey=True, autoIncrement=True, comment='农事分类ID')
+	#farm_id = Fields(type='int', default='setting.farm', comment='园区ID', match='not')
 	name = Fields(type='varchar(50)', comment='分类名')
 	state = Fields(type='boolean', default='True', comment='数据存在状态')
 	cdate = Fields(type='int', default='time', comment='创建时间')