From a1079a2bc902cbe95b2d8d7236122bc35161cc26 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 12 Mar 2021 22:15:15 +0800 Subject: [PATCH] =?UTF-8?q?inspect=E5=AF=BC=E5=87=BA=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/export.py | 4 +++ safesite/templates/inspect.html | 3 +- safesite/views.py | 62 +++++++++++++++++---------------- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/safesite/export.py b/safesite/export.py index f4bd4e04..ea6fe65e 100644 --- a/safesite/export.py +++ b/safesite/export.py @@ -674,6 +674,10 @@ def exportxlsx(a,objs): res.write(output.getvalue()) return res elif a == 'xj':#巡检记录 + if objs.count()>100: + res = HttpResponse() + res.write('数量超过100,请查询后导出!') + return res #查询数据 xjlist = objs.values('id','state','content','creattime','equipment__num','equipment__name','equipment__area__name','user__name','user__ubelongpart__partname','trouble__yhzt','trouble__yhnum','trouble__yhms') wb = load_workbook(dirname + 'safesite/exportemp/xj.xlsx') diff --git a/safesite/templates/inspect.html b/safesite/templates/inspect.html index 26b24288..4617bf35 100644 --- a/safesite/templates/inspect.html +++ b/safesite/templates/inspect.html @@ -183,9 +183,8 @@ } function exportxjexcel() { var querydata = $('#searchxjff').serializeJSON(); - console.log(querydata) let url = 'api/inspect?a=exportexcel&' + parseParams(querydata) - $('
').appendTo('body').submit().remove(); + window.open(url); } function delxj() { var row = $('#xjtable').datagrid('getSelected'); diff --git a/safesite/views.py b/safesite/views.py index dc789505..a2c87f5f 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -4133,7 +4133,7 @@ def apimiss(req): noread = a-b return JsonResponse({'noread': noread}) - +@apicheck_login def apisocert(req): a = req.GET.get('a') if a == 'listall': @@ -4341,7 +4341,7 @@ def guoqi(x): else: return 3 - +@apicheck_login def apisafecert(req): a = req.GET.get('a') if a == 'listall': @@ -4520,7 +4520,7 @@ def apisafecert(req): elif a == 'updateAqzs': updateAqzs() - +@apicheck_login def apipartuser(req): a = req.GET.get('a') if a == 'getall': @@ -4552,7 +4552,7 @@ def apipartuser(req): 'checked': False, 'isPeople': True, 'children': []}) return JsonResponse({"code": 1, "data": lst}) - +@apicheck_login def apiuser(req): a = req.GET.get('a') if a == 'detail': @@ -4638,13 +4638,13 @@ def apiuser(req): user.save() return JsonResponse({'code':1}) - +@apicheck_login def apiduibiao(req): text = req.POST.get('yhms') result = calsim.calsimTojson(text) return JsonResponse({'code': 1, 'data': result}) - +@apicheck_login def apisuggest(req): a = req.GET.get('a') if a == 'add': @@ -5127,7 +5127,7 @@ def apitool(req): - +@apicheck_login def apinotice(req): a = req.GET.get('a') if a == 'add': @@ -5345,7 +5345,7 @@ def apinotice(req): v = exportxlsx('ws', a) return JsonResponse({"code": 1, 'downloadurl': v}) - +@apicheck_login def apioperation(req): a = req.GET.get('a') userid = req.session['userid'] @@ -5801,7 +5801,7 @@ def apioperation(req): return JsonResponse({"code": 1, "data": {'spr1Array': list(spr1Array), 'spr2Array': list(spr2Array)}}) - +@apicheck_login def apifxcs(req): a = req.GET.get('a') if a == 'listall': @@ -5861,7 +5861,7 @@ def apifxcs(req): else: return JsonResponse({"code": 0}) - +@apicheck_login def apioperationspjd(req): a = req.GET.get('a') if a == 'add': @@ -5899,7 +5899,7 @@ def apioperationspjd(req): else: return JsonResponse({"code": 0}) - +@apicheck_login def apiquestion(req): a = req.GET.get('a') userid = req.session['userid'] @@ -6058,7 +6058,7 @@ def apiquestion(req): return JsonResponse({"code": 1}) - +@apicheck_login def apiexampaper(req): a = req.GET.get('a') userid = req.session['userid'] @@ -6184,7 +6184,7 @@ def apiexampaper(req): exampaper=obj, question=Question.objects.get(id=i['id']), score=int(pds)) return JsonResponse({"code": 1}) - +@apicheck_login def apitrainplan(req): a = req.GET.get('a') userid = req.session['userid'] @@ -6241,7 +6241,7 @@ def apitrainplan(req): return JsonResponse({"code": 0, "msg":'无权限删除'}) - +@apicheck_login def apiexamtest(req): a = req.GET.get('a') userid = req.session['userid'] @@ -6522,7 +6522,7 @@ def apiexamtest(req): return JsonResponse({"code":1, "dknum":dknum}) - +@apicheck_login def apiexamtestdetail(req): a = req.GET.get('a') userid = req.session['userid'] @@ -6735,7 +6735,7 @@ def convertseconds(seconds): m, s = divmod(seconds, 60) h, m = divmod(m, 60) return ("%02d:%02d:%02d" % (h, m, s)) - +@apicheck_login def apitrain(req): if req.GET.get('a') == 'listjoin': userid = req.session['userid'] @@ -6773,7 +6773,7 @@ def apitrain(req): return res - +@apicheck_login def apiquestioncat(req): a = req.GET.get('a') userid = req.session['userid'] @@ -6862,7 +6862,7 @@ def apiquestioncat(req): a.save() return JsonResponse({"code": 1}) - +@apicheck_login def apimap(req): a = req.GET.get('a') userid = req.session['userid'] @@ -6880,7 +6880,7 @@ def apimap(req): Map.objects.filter(id=id).update(pic=req.POST.get('pic')) return JsonResponse({"code": 1}) - +@apicheck_login def apiarea(req): a = req.GET.get('a') userid = req.session['userid'] @@ -6969,7 +6969,7 @@ def apimapshow(req): risklevel=None).values('id', 'name', 'polygon', 'risklevel') return JsonResponse({'code': 1, 'data': {'yh': list(yh), 'ws': list(ws), 'zy': list(zy), 'fx': list(fx)}}) - +@apicheck_login def apiequipment(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7047,7 +7047,7 @@ def apiequipment(req): Equipment.objects.filter(id__in=ids).update(checkform=form) return JsonResponse({"code": 1}) - +@apicheck_login def apiinspect(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7180,7 +7180,7 @@ def apiinspect(req): a = Inspect.objects.filter(id=id).values('id', 'state', 'content', 'creattime', 'equipment__num', 'equipment__id', 'equipment__name', 'equipment__area__name', 'user__name', 'user__ubelongpart__partname', 'trouble__yhzt', 'trouble__yhnum', 'trouble__yhms', 'trouble__troubleid', 'type__dickeyname') return HttpResponse(json.dumps(a[0], cls=MyEncoder), content_type="application/json") - +@apicheck_login def apiinspectitem(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7286,7 +7286,7 @@ def apiinspectitem(req): - +@apicheck_login def apiriskact(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7413,6 +7413,7 @@ def apiriskact(req): riskact=obj, taskadd=tasktime, taskexpire=tasktime + timedelta(days=7), istask=1) return JsonResponse({"code": 1}) +@apicheck_login def apimyschedule(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7453,7 +7454,7 @@ def apimyschedule(req): else: return JsonResponse({'code': 0}) - +@apicheck_login def apigridtaskset(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7544,6 +7545,7 @@ def apigridtaskset(req): obj.periodictask.save() return JsonResponse({'code': 1}) +@apicheck_login def apirisk(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7708,7 +7710,7 @@ def apirisk(req): pass return JsonResponse({"code": 1}) - +@apicheck_login def apirisktask(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7821,7 +7823,7 @@ def apirisktask(req): userid=userid), risktask=obj, dotime=nowtime) return JsonResponse({'code': 1}) - +@apicheck_login def apitroublefollowtask(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7870,7 +7872,7 @@ def apitroublefollowtask(req): - +@apicheck_login def apiriskacttask(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7947,7 +7949,7 @@ def apiriskacttask(req): # objs = objs[startnum:endnum] # return HttpResponse(transjson(total,objs),content_type="application/json") - +@apicheck_login def apiriskcheck2(req): a = req.GET.get('a') userid = req.session['userid'] @@ -7997,7 +7999,7 @@ def apiriskcheck2(req): 'risk__result', 'risk__measure1', 'risk__measure2', 'risk__measure3', 'risk__measure4', 'risk__measure5', 'riskacttask', 'riskacttask__taskdo') return HttpResponse(transjson(total, objs), content_type="application/json") - +@apicheck_login def apiriskcheck(req): a = req.GET.get('a') userid = req.session['userid'] @@ -8044,7 +8046,7 @@ def apiriskcheck(req): 'risk__riskact__area__name', 'risk__riskact__place', 'dotime', 'trouble__yhnum', 'user__ubelongpart__partname', 'user__name') return HttpResponse(transjson(total, objs), content_type="application/json") - +@apicheck_login def apireport(req): a = req.GET.get('a') userid = req.session['userid']