diff --git a/mysite/celery.py b/mysite/celery.py index 8ace69c9..620b96eb 100644 --- a/mysite/celery.py +++ b/mysite/celery.py @@ -43,5 +43,13 @@ app.conf.update( 'schedule': timedelta(minutes=1), #'args': (5, 6) }, + 'updatetzzs-task':{ + 'task': 'safesite.tasks.updateTzzs', + 'schedule': crontab(hour=4, minute=30, day_of_week=1), + }, + 'updateaqzs-task':{ + 'task': 'safesite.tasks.updateAqzs', + 'schedule': crontab(hour=4, minute=30, day_of_week=1), + }, } ) \ No newline at end of file diff --git a/safesite/templates/checkjob.html b/safesite/templates/checkjob.html index d585dbfe..e17d3d70 100644 --- a/safesite/templates/checkjob.html +++ b/safesite/templates/checkjob.html @@ -36,6 +36,7 @@
+检查人员: | -{{checkname__username}} | +{{checkname__username}}/{{checkname__name}} | 检查频率: | {{if checktask__tasktype==1}}每天一次 | diff --git a/safesite/templates/trouble.html b/safesite/templates/trouble.html index ca6ce02e..9709d54a 100644 --- a/safesite/templates/trouble.html +++ b/safesite/templates/trouble.html @@ -58,7 +58,7 @@ - + diff --git a/safesite/views.py b/safesite/views.py index 6398ab5c..37edb09b 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -1979,6 +1979,7 @@ def troublehandle(req): jssj = req.GET.get('jssj') yhqy = req.GET.get('yhqy') zgbm = req.GET.get('zgbm') + fxrname = req.GET.get('fxrname',None) if yhzt != '' and yhzt != None: a = a.filter(yhzt=yhzt) if yhlx: @@ -2006,6 +2007,8 @@ def troublehandle(req): parts = Partment.objects.filter( partlink__contains=','+str(zgbm)+',') | Partment.objects.filter(partid=zgbm) a = a.filter(Q(zgbm__in=parts) | Q(fxbm__in=parts, zgbm=None)) + if fxrname: + a = a.filter(fxr__name=fxrname) total = a.count() startnum, endnum = fenye(req) obj = a.order_by('-fxsj')[startnum:endnum].values('troubleid', 'fxr__userid', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj', 'yhlb__dickeyname', @@ -8258,7 +8261,7 @@ def checkprojects(req): jssj = req.GET.get('jssj')#结束时间 checktabtitle = req.GET.get('checktabtitle')#检查表名 checktaskname = req.GET.get('checktaskname')#任务名称 - + checkername = req.GET.get('checkername', None) if qssj: a = a.filter(starttime__gte=qssj) if jssj: @@ -8267,6 +8270,8 @@ def checkprojects(req): a = a.filter(checktask__checktype__id=checktabtitle) if checktaskname: a = a.filter(checktask__id=checktaskname) + if checkername: + a = a.filter(checkname__name=checkername) total = a.count() startnum, endnum = fenye(req)