diff --git a/safesite/export.py b/safesite/export.py
index 15f93f08..d562c156 100644
--- a/safesite/export.py
+++ b/safesite/export.py
@@ -256,6 +256,14 @@ def exportdoc(a,id):
import re
ILLEGAL_CHARACTERS_RE = re.compile(r'[\000-\010]|[\013-\014]|[\016-\037]')
+def placeImg(sheet, imgp, place):
+ try:
+ img = Image(dirname + imgp)
+ if img.format!='mpo':
+ img.width, img.height = (90, 90) #这两个属性分别是对应添加图片的宽高
+ sheet.add_image(img, place)
+ except:
+ pass
def exportxlsx(a,objs,pic=1):
if a =='yh':
wb = load_workbook(dirname + 'safesite/exportemp/yhdc.xlsx')
@@ -735,21 +743,44 @@ def exportxlsx(a,objs,pic=1):
res['Content-Disposition'] = 'attachment;filename='+filename+'.xlsx'
res.write(output.getvalue())
return res
- elif a == 'chekjob':
+ elif a == 'checkjob':
#查询数据
wb = load_workbook(dirname + 'safesite/exportemp/checkjob.xlsx')
sheet = wb.active
for i, x in enumerate(objs):
num = str(i+3)
- sheet['a'+num] = x.num
- sheet['b'+num] = x.name
- if x.cate:
- sheet['c'+num] = x.cate.dickeyname
- sheet['d'+num] = x.type
- if x.area:
- sheet['e'+num] = x.area.name
- sheet['f'+num] = '正常' if x.state==1 else '异常'
- sheet['g'+num] = 'https://safeyun.ctcshe.com/miniprogram/equipment?id='+str(x.id)
+ sheet['a'+num] = x.checktask.checktype.checktitle
+ sheet['b'+num] = x.checktask.get_tasktype_display()
+ sheet['c'+num] = x.checktask.checkplace
+ sheet['d'+num] = x.checktask.checktype.checkcontent
+ sheet['e'+num] = x.starttime
+ sheet['f'+num] = x.endtime
+ sheet['g'+num] = x.checkname.name
+ sheet['h'+num] = x.checkquestion
+ sheet['i'+num] = x.get_taskstate_display()
+ sheet['j'+num] = x.zguser.name if x.zguser else None
+ sheet['k'+num] = x.zgyq
+ sheet['l'+num] = x.zgjg
+ sheet['m'+num] = x.yanshouren.name if x.yanshouren else None
+ sheet['n'+num] = x.yanshou
+ if x.yhtp:
+ x1 = x.yhtp.split('?')
+ lenx1 = len(x1)
+ if lenx1>=1:
+ placeImg(sheet, x1[0], 'o'+num)
+ if lenx1>=2:
+ placeImg(sheet, x1[1], 'p'+num)
+ if lenx1>=3:
+ placeImg(sheet, x1[2], 'q'+num)
+ if x.zghtp:
+ x1 = x.zghtp.split('?')
+ lenx1 = len(x1)
+ if lenx1>=1:
+ placeImg(sheet, x1[0], 'r'+num)
+ if lenx1>=2:
+ placeImg(sheet, x1[1], 's'+num)
+ if lenx1>=3:
+ placeImg(sheet, x1[2], 't'+num)
#开始生成excel
sheet['b1'] = datetime.now().strftime('%Y%m%d%H%M%S')
@@ -762,6 +793,8 @@ def exportxlsx(a,objs,pic=1):
res.write(output.getvalue())
return res
+
+
def exportyjdoc(vl):
doc = DocxTemplate(dirname + "safesite/exportemp/fxbg.docx")
#整理数据
diff --git a/safesite/exportemp/checkjob.xlsx b/safesite/exportemp/checkjob.xlsx
index 01755d33..d5ce3392 100644
Binary files a/safesite/exportemp/checkjob.xlsx and b/safesite/exportemp/checkjob.xlsx differ
diff --git a/safesite/migrations/0388_auto_20210905_1611.py b/safesite/migrations/0388_auto_20210905_1611.py
new file mode 100644
index 00000000..c1ca3770
--- /dev/null
+++ b/safesite/migrations/0388_auto_20210905_1611.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.8 on 2021-09-05 16:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('safesite', '0387_auto_20210826_2028'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='checktask',
+ name='tasktype',
+ field=models.IntegerField(choices=[(1, '每天一次'), (2, '每周一次'), (3, '每月一次'), (4, '每季度一次'), (5, '每半年一次'), (6, '每年一次')], default=1),
+ ),
+ ]
diff --git a/safesite/migrations/0389_auto_20210905_1612.py b/safesite/migrations/0389_auto_20210905_1612.py
new file mode 100644
index 00000000..1c0219c3
--- /dev/null
+++ b/safesite/migrations/0389_auto_20210905_1612.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.8 on 2021-09-05 16:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('safesite', '0388_auto_20210905_1611'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='checkjob',
+ name='taskstate',
+ field=models.IntegerField(choices=[(1, '正在整改中'), (2, '已整改完成'), (3, '任务关闭'), (4, '待执行')], default=1),
+ ),
+ ]
diff --git a/safesite/models.py b/safesite/models.py
index 0cbfc044..7a61c4ed 100644
--- a/safesite/models.py
+++ b/safesite/models.py
@@ -1402,7 +1402,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,已关闭,4,未执行
+ taskstate = models.IntegerField(default=1, choices=taskstate_choice)#执行状态，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过期
diff --git a/safesite/templates/checkjob.html b/safesite/templates/checkjob.html
index 851b4aa0..80366891 100644
--- a/safesite/templates/checkjob.html
+++ b/safesite/templates/checkjob.html
@@ -22,6 +22,7 @@
{% if request|has_permission:'b_checkjob_del' %}
删除
{% endif %}
+ 导出Excel
@@ -32,7 +33,7 @@
data-options="iconCls:'fa-search',resizable:true,modal:true,closed:true,border:false">