diff --git a/safesite/models.py b/safesite/models.py index 5befb218..3fed51dd 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -1169,6 +1169,7 @@ class RiskActTask(models.Model): # 风险点排查执行记录 istask = models.IntegerField(default=0) # 是否是任务 tasknote = models.TextField('任务检查说明', null=True, blank=True) taskset = models.ForeignKey(GridTaskSet, null=True, blank=True, verbose_name='由哪个设置派发', on_delete=models.SET_NULL) + imgs = models.TextField('现场图片', null=True, blank=True) class Risktask(models.Model): # 风险排查任务清单 id = models.AutoField(primary_key=True) diff --git a/safesite/views.py b/safesite/views.py index 1b215fd6..1a499e51 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -8448,8 +8448,12 @@ def apiriskacttask(req): total = objs.count() return JsonResponse({"code": 1, "todonum": total}) elif a == 'detail': - obj = RiskActTask.objects.filter(pk=req.GET.get('id')) - return JsonResponse({'code':1, 'data':obj.values('id', 'tasknote', 'note')[0]}) + res = RiskActTask.objects.filter(pk=req.GET.get('id')).values('id', 'tasknote', 'note', 'taskdo', 'taskdo2', 'imgs')[0] + if res['imgs']: + res['imgs'] = res['imgs'].split('?') + else: + res['imgs'] = [] + return JsonResponse({'code':1, 'data':json.dumps(res, cls=MyEncoder)}) # elif a == 'listmydone': # groups = Group.objects.filter(users__userid=userid) # objs = Risktask.objects.filter(Q(group__in=groups)|Q(user__userid=userid),usable__in=[0,2]).values('risk__group__groupname','risk__riskact__area__name','risk__riskact__type__dickeyname','risk__riskact__id','risk__tasktype','taskadd','taskexpire','user__userid','usable').annotate(num = Count('risk__group'))