diff --git a/safesite/export.py b/safesite/export.py index 69f9800a..58ec0a7a 100644 --- a/safesite/export.py +++ b/safesite/export.py @@ -265,6 +265,10 @@ def exportxlsx(a,objs): row_height = 70 #查询数据 yhobjs = objs.order_by('-troubleid') + if yhobjs.count()>100: + res = HttpResponse() + res.write('数量超过100,请查询后导出!') + return res vl = yhobjs.values('yhnum','fxr__name','yhms','yhzt','fxsj','tbsj','yhlb__dickeyname','yhpg__dickeyname','yhdd','fxbm__partname','yhdj__dickeyname','yhpg__dickeyname', 'jclx__dickeyname','yhlx__dicname','yyfx','zgcs','yhtp','zghtp','zgms','zgbm__partname','zgr__name','zgqx','shr__name','fcr__name') vl=list(vl) diff --git a/safesite/templates/trouble.html b/safesite/templates/trouble.html index 9709d54a..07e74310 100644 --- a/safesite/templates/trouble.html +++ b/safesite/templates/trouble.html @@ -310,7 +310,8 @@ function exportyhexcel() { var querydata = $('#searchyhff').serializeJSON(); let url = 'troublehandle?a=exportexcel&' + parseParams(querydata) - $('
').appendTo('body').submit().remove(); + window.open(url); + // $('
').appendTo('body').submit().remove(); } function delyh() { var row = $('#yhtable').datagrid('getSelected');