From a989bd1d5af0fd5a75782c120d9275276f5797bd Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Wed, 22 Apr 2020 10:00:02 +0800 Subject: [PATCH] shangchuren --- .../migrations/0332_auto_20200421_1354.py | 24 +++++ safesite/models.py | 3 +- safesite/tasks.py | 2 +- safesite/templates/checkdetail.html | 39 ++++---- safesite/templates/checkjobadd.html | 97 +++++++++++-------- safesite/templates/checkjobdetail.html | 28 +++++- safesite/templates/checklist.html | 2 +- safesite/templates/checklistadd.html | 1 - safesite/views.py | 6 +- 9 files changed, 132 insertions(+), 70 deletions(-) create mode 100644 safesite/migrations/0332_auto_20200421_1354.py diff --git a/safesite/migrations/0332_auto_20200421_1354.py b/safesite/migrations/0332_auto_20200421_1354.py new file mode 100644 index 00000000..b39df3cf --- /dev/null +++ b/safesite/migrations/0332_auto_20200421_1354.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.8 on 2020-04-21 13:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0331_auto_20200414_1009'), + ] + + operations = [ + + migrations.AddField( + model_name='checkjob', + name='jctime', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AlterField( + model_name='checkjob', + name='zgtime', + field=models.DateTimeField(blank=True, null=True), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index b3b6da35..c1b88bde 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -1254,7 +1254,8 @@ class Checkjob(models.Model): checktask=models.ForeignKey(Checktask,on_delete=models.CASCADE)#关联任务表 checkname=models.ForeignKey(User,related_name='jianchas',on_delete=models.CASCADE)#检查人员 checkquestion=models.CharField(max_length=1000,null=True)#检查发现的问题 - zgtime=models.DateTimeField(default = timezone.now)#整改期限 + zgtime=models.DateTimeField(null=True, blank=True)#整改时间 + jctime=models.DateTimeField(null=True, blank=True)#检查时间 zguser=models.ForeignKey(User,on_delete=models.CASCADE,null=True,)#整改人 createuser = models.ForeignKey(User,related_name='chuangjian',on_delete=models.CASCADE,null=True)#创建人 createdate = models.DateTimeField(default = timezone.now)#创建时间 diff --git a/safesite/tasks.py b/safesite/tasks.py index 9a9ef7b2..a1f6b72d 100644 --- a/safesite/tasks.py +++ b/safesite/tasks.py @@ -282,7 +282,7 @@ def riskacttask(): @shared_task def checktask(): nowtime = datetime.datetime.now() - for i in Checktask.objects.exclude(deletemark=0): + for i in Checktask.objects.filter(deletemark=1): if i.tasktype==1: if i.checktime: diff --git a/safesite/templates/checkdetail.html b/safesite/templates/checkdetail.html index ebd56dab..28811894 100644 --- a/safesite/templates/checkdetail.html +++ b/safesite/templates/checkdetail.html @@ -13,8 +13,21 @@ 检查表名： {{checktype__checktitle}} - 检查时间： - {{checktime| dateFormat 'yyyy-MM-dd hh:mm:ss'}} + 排查频率： + {{if tasktype==1}} + 每天一次 + {{else if tasktype==2}} + 每周一次 + {{else if tasktype==3}} + 每月一次 + {{else if tasktype==4}} + 每季度一次 + {{else if tasktype==5}} + 每半年一次 + {{else if tasktype==6}} + 每年一次 + {{/if}} + @@ -27,24 +40,12 @@ 执行情况： - {{zxstate==1?'同时执行':'单人执行'}} - + {{zxstate==1?'同时执行':'单人执行'}} + + + 更新时间： + {{checktime| dateFormat 'yyyy-MM-dd hh:mm:ss'}} - 排查频率： - {{if tasktype==1}} - 每天一次 - {{else if tasktype==2}} - 每周一次 - {{else if tasktype==3}} - 每月一次 - {{else if tasktype==4}} - 每季度一次 - {{else if tasktype==5}} - 每半年一次 - {{else if tasktype==6}} - 每年一次 - {{/if}} - diff --git a/safesite/templates/checkjobadd.html b/safesite/templates/checkjobadd.html index 1857b6d7..6e6f15f6 100644 --- a/safesite/templates/checkjobadd.html +++ b/safesite/templates/checkjobadd.html @@ -12,15 +12,6 @@ - - - 检查时间： - - - - - 检查人： @@ -39,6 +30,22 @@ + + 检查时间： + + + + + + + 整改时间： + + + + + 检查问题： @@ -49,6 +56,7 @@ 检查图片: + @@ -63,33 +71,33 @@ - - + + + 整改时间： + + + + + + 整改人： + + + + + + 整改要求： + + + + --> 需要整改： - + @@ -114,7 +122,7 @@ 检查状态： - 已整改完成 + 已整改完成 正在整改中 @@ -123,7 +131,7 @@
+ data-options="label:'涉及人员:',multiline:true,prompt:'没有涉及人员可以不选'"> 选择
@@ -144,27 +152,30 @@ $('#participantnum').textbox('setValue', top.$('#in').attr('total')); } } - + $(function () { - - - + + + $.get('api/checkproject?a=jobdetail&id=' + jobid, function (res) { var data = res.data console.log(data.yhtp) $('#checktaskname').textbox('setValue', data.checktask__checktaskname) $('#checktabtitle').textbox('setValue', data.checkname__name) - $('#starttime').datetimebox('setValue', data.checktask__checktime) $('#checkcontent').textbox('setValue', data.checktask__checktype__checkcontent) $('#checkplace').textbox('setValue', data.checktask__checkplace) $('#checkquestion').textbox('setValue', data.checkquestion) $('#zgjg').textbox('setValue', data.zgjg) + $('#content').textbox('setValue', data.content) + $('#jctime').datetimebox('setValue', data.jctime) + $('#zgtime').datetimebox('setValue', data.zgtime) + var yhtp = data.yhtp; for (var i = 0; i < yhtp.length; i++) { $("#addImage").append('
    • '); } - if (yhtp == []) { $("#addImage").append('无图片') } + if (yhtp == []) { $("#addImage").append('无图片') } // if (data.taskstate == 1) { // $("input[name='taskstate'][value=1]").attr("checked",true); @@ -173,7 +184,7 @@ // $("input[name='taskstate'][value=2]").attr("checked",true); }); }) - + //检查问题上传图片 document.getElementById('file').onchange = function () { var fileObj = this.files[0]; @@ -262,7 +273,7 @@ //if(bspeed==0) time.innerHTML = '上传已取消'; } } - + document.getElementById('file2').onchange = function () { var fileObj = this.files[0]; var url = 'upfile' @@ -348,9 +359,9 @@ } - + function wssubmitForm() { - + var wsdata = $('#wsff').serializeJSON(); var yhtp = new Array(); $(".yhtpimg").each(function () { @@ -386,6 +397,6 @@ }, }); } - + \ No newline at end of file diff --git a/safesite/templates/checkjobdetail.html b/safesite/templates/checkjobdetail.html index 0fb5b980..2797e851 100644 --- a/safesite/templates/checkjobdetail.html +++ b/safesite/templates/checkjobdetail.html @@ -8,12 +8,36 @@
    {{checktask__checktaskname}}
    - + + {{if checktask__tasktype==1}} + + {{else if checktask__tasktype==2}} + + {{else if checktask__tasktype==3}} + + {{else if checktask__tasktype==4}} + + {{else if checktask__tasktype==5}} + + {{else if checktask__tasktype==6}} + + {{/if}} + + + + + + + + + - + + + diff --git a/safesite/templates/checklist.html b/safesite/templates/checklist.html index 4c36c395..a2d3bb85 100644 --- a/safesite/templates/checklist.html +++ b/safesite/templates/checklist.html @@ -37,7 +37,7 @@ { field: 'id', title: 'ID', hidden: true }, { field: 'checktaskname', title: '任务名称', width: 150 }, { field: 'checktype__checktitle', title: '检查表', width: 100 }, - { field: 'checktime', title: '检查时间', width: 300 }, + { field: 'checktime', title: '更新时间', width: 300 }, { field: 'createuser__name', title: '创建人', width: 300 }, { field: 'createdate', title: '创建时间', width: 300 }, diff --git a/safesite/templates/checklistadd.html b/safesite/templates/checklistadd.html index de586162..254bf4c8 100644 --- a/safesite/templates/checklistadd.html +++ b/safesite/templates/checklistadd.html @@ -59,7 +59,6 @@ url: 'api/checkproject?a=checktablist', valueField: 'value', textField: 'text', - panelHeight:'auto', editable: false, }); diff --git a/safesite/views.py b/safesite/views.py index 4dbf3c9d..36db4135 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -7813,7 +7813,7 @@ def checkprojects(req): elif a == 'jobdetail': obj = Checkjob.objects.filter(id=req.GET.get('id')) - obj = obj.values('checktask__checktaskname','zguser','yhtp','checkname__name','zgjg','jobstate','taskstate','checkquestion','checktask__checkplace','checktask__checktype__checkcontent','checkname__username','checktask__checktime')[0] + obj = obj.values('checktask__checktaskname','zguser','yhtp','content','jctime','zgtime','checkname__name','zgjg','jobstate','taskstate','checkquestion','checktask__checkplace','checktask__checktype__checkcontent','checkname__username','checktask__checktime')[0] if obj['yhtp']: obj['yhtp'] = obj['yhtp'].split('?') @@ -7832,6 +7832,8 @@ def checkprojects(req): obj.taskstate =int(data['taskstate']) obj.createuser = User.objects.get(userid=userid) obj.content=data['content'] + obj.jctime=data['jctime'] + obj.zgtime=data['zgtime'] if yhtp: obj.yhtp=yhtp obj.zghtp=zghtp @@ -8001,7 +8003,7 @@ def checkprojects(req): uselist.append(item.name) x = a.values('checktask__checktaskname','starttime','zgjg','checktask__tasktype','endtime','jobstate','zguser__username','checktask__checktype__checkcontent','checktask__checkplace','checktask__checktime' ,'checkname__username','checkname__name', 'checkquestion', 'zgtime', 'zguser__username', 'createuser__username', - 'createdate', 'taskstate','zghtp','content','yhtp','pmpeople', 'zgyq','zgjg', 'yanshou', 'yanshouren__name')[0] + 'createdate', 'taskstate','zghtp','jctime','content','yhtp','pmpeople', 'zgyq','zgjg', 'yanshou', 'yanshouren__name')[0] x['bcfr'] = uselist if x['yhtp']: x['yhtp'] = x['yhtp'].split('?')
    检查人员： {{checkname__username}}检查频率：每天一次每周一次每月一次每季度一次每半年一次每年一次
    检查时间段：{{starttime| dateFormat 'yyyy-MM-dd hh:mm:ss'}}到{{endtime| dateFormat 'yyyy-MM-dd hh:mm:ss'}}
    检查时间：{{checktask__checktime| dateFormat 'yyyy-MM-dd hh:mm:ss'}}{{jctime}}整改时间：{{zgtime}}