From 523cd6b3fb0e5c506acd532deea5b07be5348fb6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 25 Aug 2021 07:55:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/models.py | 5 +++-- safesite/templates/checkjobadd.html | 10 ++++++++-- safesite/views.py | 5 +++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/safesite/models.py b/safesite/models.py index 26be5e9c..a445e5e1 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -899,7 +899,7 @@ class Trainuser(models.Model): # 培训人员记录 checked = models.IntegerField(default=0) qdsj = models.DateTimeField(null=True, blank=True) jsqd = models.DateTimeField(verbose_name='结束签到时间',null=True,blank=True) - isnew = models.IntegerField(default=0) + isnew = models.IntegerField(default=0, verbose_name='是否新参加') opinion = models.TextField('建议想法', null=True, blank=True) score = models.IntegerField('评价总体打分', null=True, blank=True) @@ -1381,7 +1381,8 @@ class Checkjob(models.Model): checkname=models.ForeignKey(User,related_name='jianchas',on_delete=models.CASCADE)#检查人员 checkquestion=models.TextField(null=True)#检查发现的问题 zgtime=models.DateTimeField(null=True, blank=True)#整改时间 - jctime=models.DateTimeField(null=True, blank=True)#检查时间 + jctime=models.DateTimeField(null=True, blank=True)#检查开始时间 + jctim2 = 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/templates/checkjobadd.html b/safesite/templates/checkjobadd.html index 39f2c54e..f3b7492a 100644 --- a/safesite/templates/checkjobadd.html +++ b/safesite/templates/checkjobadd.html @@ -31,13 +31,19 @@ - 检查时间： + 检查开始： - + + 检查结束： + + + + diff --git a/safesite/views.py b/safesite/views.py index 863a38cd..1f1beb74 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -8721,8 +8721,9 @@ def checkprojects(req): obj.taskstate =int(data['taskstate']) obj.createuser = User.objects.get(userid=userid) obj.content=data['content'] - obj.jctime=datetime.now() - obj.zgtime=datetime.now() + obj.jctime = datetime.now() + obj.jctim2 = data['jctime2'] + obj.zgtime = datetime.now() if yhtp: obj.yhtp=yhtp obj.zghtp=zghtp From d74cd4ae2851648a15de1a5b327504b655c5f5f0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Aug 2021 08:11:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=9D=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/templates/checkjobadd.html | 54 ++++++++++++++--------------- safesite/views.py | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/safesite/templates/checkjobadd.html b/safesite/templates/checkjobadd.html index f3b7492a..6a2ad301 100644 --- a/safesite/templates/checkjobadd.html +++ b/safesite/templates/checkjobadd.html @@ -7,38 +7,38 @@
- + - + - + - + - + - + - + - + @@ -73,7 +73,7 @@ - + - + - + @@ -125,7 +125,7 @@ - +
任务名称：任务名称 - +
检查人：检查人 - +
检查地点：检查地点 - +
检查内容：检查内容 - +
检查开始：检查开始
检查结束：检查结束 @@ -47,13 +47,13 @@
检查问题：检查记录
检查图片:检查图片
整改期限：整改期限 @@ -81,33 +81,33 @@
需要整改：需要整改
整改图片:整改图片
检查状态：检查状态 已整改完成 @@ -166,9 +166,8 @@ $.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) + $('#checktask__checktaskname').textbox('setValue', data.checktask__checktaskname) + $('#checkname__name').textbox('setValue', data.checkname__name) $('#checkcontent').textbox('setValue', data.checktask__checktype__checkcontent) $('#checkplace').textbox('setValue', data.checktask__checkplace) $('#checkquestion').textbox('setValue', data.checkquestion) @@ -178,9 +177,10 @@ $('#zgtime').datetimebox('setValue', data.zgtime) var yhtp = data.yhtp; + if(yhtp!=null){ for (var i = 0; i < yhtp.length; i++) { $("#addImage").append('
    • '); - } + }} if (yhtp == []) { $("#addImage").append('无图片') } // if (data.taskstate == 1) { @@ -199,7 +199,7 @@ if (fileObj.size / 1024 > 500) { //大于500k，进行压缩上传 $("#file").after('图片大于500k,正在压缩...'); photoCompress(fileObj, {}, function (base64Codes) { - //console.log("压缩后：" + base.length / 1024 + " " + base); + //console.log("压缩后" + base.length / 1024 + " " + base); var bl = convertBase64UrlToBlob(base64Codes); form.append("upfile", bl, fileObj.name); // 文件对象 xhr = new XMLHttpRequest(); // XMLHttpRequest 对象 @@ -275,7 +275,7 @@ speed = speed.toFixed(1); //剩余时间 var resttime = ((evt.total - evt.loaded) / bspeed).toFixed(1); - time.innerHTML = '，速度：' + speed + units + '，剩余时间：' + resttime + 's'; + time.innerHTML = '，速度' + speed + units + '，剩余时间' + resttime + 's'; //if(bspeed==0) time.innerHTML = '上传已取消'; } } @@ -287,7 +287,7 @@ if (fileObj.size / 1024 > 500) { //大于500k，进行压缩上传 $("#file2").after('图片大于500k,正在压缩...'); photoCompress(fileObj, {}, function (base64Codes) {//quality: 0.2 - //console.log("压缩后：" + base.length / 1024 + " " + base); + //console.log("压缩后" + base.length / 1024 + " " + base); var bl = convertBase64UrlToBlob(base64Codes); form.append("upfile", bl, fileObj.name); // 文件对象 xhr = new XMLHttpRequest(); // XMLHttpRequest 对象 @@ -358,7 +358,7 @@ speed = speed.toFixed(1); //剩余时间 var resttime = ((evt.total - evt.loaded) / bspeed).toFixed(1); - time.innerHTML = '，速度：' + speed + units + '，剩余时间：' + resttime + 's'; + time.innerHTML = '，速度' + speed + units + '，剩余时间' + resttime + 's'; if (bspeed == 0) time.innerHTML = '上传已取消'; } diff --git a/safesite/views.py b/safesite/views.py index 520c61c8..e9f35eae 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -8731,9 +8731,9 @@ def checkprojects(req): obj.taskstate =int(data['taskstate']) obj.createuser = User.objects.get(userid=userid) obj.content=data['content'] - obj.jctime = datetime.now() + obj.jctime = data['jctime'] obj.jctim2 = data['jctime2'] - obj.zgtime = datetime.now() + obj.zgtime = data['zgtime'] if yhtp: obj.yhtp=yhtp obj.zghtp=zghtp