zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renwu

This commit is contained in:
shilixia 2020-04-16 14:37:41 +08:00
parent 23b8f77b36
commit 43142aac7a
5 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
safesite/models.py
View File

@ -1260,7 +1260,7 @@ class Checkjob(models.Model):
createdate = models.DateTimeField(default = timezone.now)#创建时间
usecomp = models.ForeignKey(Partment,related_name='taskcomps',on_delete=models.CASCADE,null=True,blank=True)#创建公司
deletemark = models.IntegerField(default=1)#是否删除
taskstate = models.IntegerField(default=1)#执行状态，1正在检查，2检查完毕,3,已关闭
taskstate = models.IntegerField(default=1)#执行状态，1正在检查，2检查完毕,3,已关闭,4,未执行
starttime=models.DateTimeField(null=True, blank=True)#任务开始时间
endtime=models.DateTimeField(null=True, blank=True)#任务结束时间
jobstate = models.IntegerField(default=1)#检查任务状态，1可执行，2过期

12
safesite/tasks.py
View File

@ -292,7 +292,7 @@ def checktask():
x=User.objects.get(userid=j.userid)
Checkjob.objects.filter(checktask=i,checkname=x).update(jobstate=2)
Checkjob.objects.create(checktask=i,checkname=x,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
Checkjob.objects.create(checktask=i,checkname=x,taskstate=4,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
i.checktime = nowtime
i.save()
@ -305,7 +305,7 @@ def checktask():
x=User.objects.get(userid=j.userid)
Checkjob.objects.filter(checktask=i,checkname=x).update(jobstate=2)
Checkjob.objects.create(checktask=i,checkname=x,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
Checkjob.objects.create(checktask=i,checkname=x,taskstate=4,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
i.checktime = nowtime
i.save()
@ -318,7 +318,7 @@ def checktask():
x=User.objects.get(userid=j.userid)
Checkjob.objects.filter(checktask=i,checkname=x).update(jobstate=2)
Checkjob.objects.create(checktask=i,checkname=x,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
Checkjob.objects.create(checktask=i,checkname=x,taskstate=4,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
i.checktime = nowtime
i.save()
@ -331,7 +331,7 @@ def checktask():
x=User.objects.get(userid=j.userid)
Checkjob.objects.filter(checktask=i,checkname=x).update(jobstate=2)
Checkjob.objects.create(checktask=i,checkname=x,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
Checkjob.objects.create(checktask=i,checkname=x,taskstate=4,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
i.checktime = nowtime
i.save()
@ -344,7 +344,7 @@ def checktask():
x=User.objects.get(userid=j.userid)
Checkjob.objects.filter(checktask=i,checkname=x).update(jobstate=2)
Checkjob.objects.create(checktask=i,checkname=x,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
Checkjob.objects.create(checktask=i,checkname=x,taskstate=4,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
i.checktime = nowtime
i.save()
@ -357,7 +357,7 @@ def checktask():
x=User.objects.get(userid=j.userid)
Checkjob.objects.filter(checktask=i,checkname=x).update(jobstate=2)
Checkjob.objects.create(checktask=i,checkname=x,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
Checkjob.objects.create(checktask=i,checkname=x,taskstate=4,starttime=nowtime,endtime = endtimes,usecomp=i.usecomp)
i.checktime = nowtime
i.save()

2
safesite/templates/checkjob.html
View File

@ -67,6 +67,7 @@
case 1: return '正在整改中'; break;
case 2: return '已整改完成'; break;
case 3: return '任务关闭'; break;
case 4: return '未执行'; break;
}
}, styler: function (value, row, index) {
switch (value) {
@ -74,6 +75,7 @@
case 1: return 'color:green;font-weight:bold'; break;
case 2: return 'color:red;font-weight:bold'; break;
case 3: return 'color:yellow;font-weight:bold'; break;
case 4: return 'color:black;font-weight:bold'; break;
}}},

15
safesite/templates/checkjobadd.html
View File

@ -63,7 +63,8 @@
<td colspan="2"><ul id="addImage" class="imgul"></ul></td>
</tr>
<!--<tr>
<td>整改时间：</td>
@ -113,8 +114,8 @@
<td>检查状态：</td>
<td>
<input type="radio" name="taskstate" checked="true" value="2">已整改完成</input>
<input type="radio" name="taskstate" value="1">正在整改中</input>
<input type="radio" name="taskstate" value="2">已整改完成</input>
<input type="radio" name="taskstate" checked="true" value="1">正在整改中</input>
</td>
</tr>
@ -151,7 +152,7 @@
$.get('api/checkproject?a=jobdetail&id=' + jobid, function (res) {
var data = res.data
console.log(data)
console.log(data.yhtp)
$('#checktaskname').textbox('setValue', data.checktask__checktaskname)
$('#checktabtitle').textbox('setValue', data.checkname__name)
$('#starttime').datetimebox('setValue', data.checktask__checktime)
@ -159,6 +160,12 @@
$('#checkplace').textbox('setValue', data.checktask__checkplace)
$('#checkquestion').textbox('setValue', data.checkquestion)
$('#zgjg').textbox('setValue', data.zgjg)
var yhtp = data.yhtp;
for (var i = 0; i < yhtp.length; i++) {
$("#addImage").append('<li ><img title="点击放大" style="display:block;" onclick="bigger(this)" class = "yhtpimg" width="120" height="120" filepath="' + yhtp[i] + '" src="http://' + window.location.host + '/' + yhtp[i] + '"/></li>');
}
if (yhtp == []) { $("#addImage").append('<b >无图片</b>') }
// if (data.taskstate == 1) {
// $("input[name='taskstate'][value=1]").attr("checked",true);
// }

27
safesite/views.py
View File

@ -7765,7 +7765,7 @@ def checkprojects(req):
total = a.count()
startnum, endnum = fenye(req)
a = a[startnum:endnum].values('id','checktaskname','checkname__name','tasktype','checkname','checktype__checktitle','checkplace', 'checktime','createuser__name','createdate')
a = a[startnum:endnum].values('id','checktaskname','tasktype','checktype__checktitle','checkplace', 'checktime','createuser__name','createdate')
return HttpResponse(transjson(total, a), content_type="application/json")
elif a == 'listall4':
@ -7794,11 +7794,12 @@ def checkprojects(req):
return HttpResponse(transjson(total, a), content_type="application/json")
elif a == 'listself':
a = Checkjob.objects.filter(usecomp=Partment.objects.get(partid=companyid),taskstate=1,checkname__userid=userid,deletemark=1)
total = a.count()
a = Checkjob.objects.filter(usecomp=Partment.objects.get(partid=companyid),checkname__userid=userid,deletemark=1)
s=a.filter(Q(taskstate=1)|Q(taskstate=4))
total = s.count()
startnum, endnum = fenye(req)
a = a.order_by('-starttime')[startnum:endnum].values('id','checkname__name','checktask__checktaskname','jobstate','starttime','endtime','yanshou','checkquestion','zguser__username','zgtime','checktask__checktype__checktitle','checkname__username', 'taskstate','checktask__checktime','createuser__username','createdate')
a = s.order_by('-starttime')[startnum:endnum].values('id','checkname__name','checktask__checktaskname','jobstate','starttime','endtime','yanshou','checkquestion','zguser__username','zgtime','checktask__checktype__checktitle','checkname__username', 'taskstate','checktask__checktime','createuser__username','createdate')
return HttpResponse(transjson(total, a), content_type="application/json")
elif a == 'listallx':
@ -7812,20 +7813,27 @@ def checkprojects(req):
elif a == 'jobdetail':
obj = Checkjob.objects.filter(id=req.GET.get('id'))
obj = obj.values('checktask__checktaskname','zguser','checkname__name','zgjg','jobstate','taskstate','checkquestion','checktask__checkplace','checktask__checktype__checkcontent','checkname__username','checktask__checktime')[0]
obj = obj.values('checktask__checktaskname','zguser','yhtp','checkname__name','zgjg','jobstate','taskstate','checkquestion','checktask__checkplace','checktask__checktype__checkcontent','checkname__username','checktask__checktime')[0]
if obj['yhtp']:
obj['yhtp'] = obj['yhtp'].split('?')
else:
obj['yhtp'] == []
return JsonResponse({'code': 1, 'data': obj})
elif a == 'addjob':
data = json.loads(req.body.decode('utf-8'))
yhtp = '?'.join(data['yhtp1']) if 'yhtp1' in data else []
zghtp = '?'.join(data['zghtp']) if 'zghtp' in data else []
obj = Checkjob.objects.get(id=req.GET.get('jobid'))
obj.checkquestion = data['checkquestion']
if data['checkquestion']:
obj.checkquestion = data['checkquestion']
obj.zgjg = data['zgjg']
obj.taskstate = data['taskstate']
obj.taskstate =int(data['taskstate'])
obj.createuser = User.objects.get(userid=userid)
obj.content=data['content']
obj.yhtp=yhtp
if yhtp:
obj.yhtp=yhtp
obj.zghtp=zghtp
s=[]
if data['participant']!="":
@ -7904,6 +7912,7 @@ def checkprojects(req):
objs = Checkjob()
objs.checktask=obj
objs.checkname=x
objs.taskstate=4
objs.starttime=starttime
if tasktype==1:
objs.endtime =starttime+ timedelta(days=1)