From 79a025904d7325754d0cdd307e9ee48836ed68fe Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sat, 15 Feb 2020 18:34:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=86=E4=BA=AB=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/edu/views.py | 8 +++++--- safesite/templates/edulessonadd.html | 3 +-- safesite/templates/edulessonaddwj.html | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/safesite/edu/views.py b/safesite/edu/views.py index 92ada9ba..241ee8e6 100644 --- a/safesite/edu/views.py +++ b/safesite/edu/views.py @@ -71,10 +71,10 @@ def api(req): a = Edulesson.objects.filter(usecomp__partid__in= [1,Partment.objects.get(partid=companyid).partid] ,deletemark=1)#无deletemark if req.GET.get('search',None): search = req.GET.get('search') - a = a.filter(Q(title__contains=search)|Q(desciption__contains=search)) + a = a.filter(Q(title__contains=search)|Q(desciption__contains=search)|Q(cate__name__contains=search)) total = a.count() startnum,endnum=fenye(req) - a = a.order_by('modifytime','downnum')[startnum:endnum].values('id','num','title','user__name','user__ubelongpart__partname','desciption','submittime','type','cate__name','url','downnum','modifytime') + a = a.order_by('-modifytime','-downnum')[startnum:endnum].values('id','num','title','user__name','user__ubelongpart__partname','desciption','submittime','type','cate__name','url','downnum','modifytime') return HttpResponse(transjson(total,a),content_type="application/json") elif a == 'detail': id = req.GET.get('id') @@ -118,7 +118,9 @@ def api(req): obj.deletemark=1 obj.url=data['url'] fileurl = data['url'] - if fileurl.endswith('.doc') or fileurl.endswith('.docx'): + if fileurl.endswith('.mp4'): + obj.type = 1 + elif fileurl.endswith('.doc') or fileurl.endswith('.docx'): obj.type = 2 elif fileurl.endswith('.ppt') or fileurl.endswith('.pptx'): obj.type = 3 diff --git a/safesite/templates/edulessonadd.html b/safesite/templates/edulessonadd.html index a7682e26..1ea4a5c3 100644 --- a/safesite/templates/edulessonadd.html +++ b/safesite/templates/edulessonadd.html @@ -185,7 +185,7 @@ $.ajax({ type: "POST", - url: 'edu/api?a=addwj', + url: 'edu/api?a=add', data: JSON.stringify(edudata), datatype: "json", processData: false, @@ -200,7 +200,6 @@ }, success: function (data) { if (data.code == 1) { - alert("数据保存！"); $('#edutab').datagrid('reload'); $("#dd").dialog("close"); } else { $.messager.alert('提示', '失败!'); } diff --git a/safesite/templates/edulessonaddwj.html b/safesite/templates/edulessonaddwj.html index 8c3aecec..f6f8e697 100644 --- a/safesite/templates/edulessonaddwj.html +++ b/safesite/templates/edulessonaddwj.html @@ -205,7 +205,6 @@ }, success: function (data) { if (data.code == 1) { - alert("数据保存！"); $('#edutab').datagrid('reload'); $("#dd").dialog("close"); } else { $.messager.alert('提示', '失败!'); }