diff --git a/safesite/templates/examfigure.html b/safesite/templates/examfigure.html index ab227e46..ca280e04 100644 --- a/safesite/templates/examfigure.html +++ b/safesite/templates/examfigure.html @@ -72,7 +72,7 @@ $.ajax({ type: "get", async: true, //异步请求(同步请求将会锁住浏览器,用户其他操作必须等待请求完成才可以执行) - url: "api/trainfg?a=trainfig&year=" + y, //请求发送 + url: "api/examtj?a=trainfig&year=" + y, //请求发送 dataType: "json", //返回数据形式为json success: function (data) { //请求成功时执行该函数内容,data即为服务器返回的json对象 @@ -177,7 +177,7 @@ $.ajax({ type: "get", async: true, //异步请求(同步请求将会锁住浏览器,用户其他操作必须等待请求完成才可以执行) - url: "api/trainfg?a=traintype&year=" + y + "&month=" + m, //请求发送 + url: "api/examtj?a=traintype&year=" + y + "&month=" + m, //请求发送 dataType: "json", //返回数据形式为json success: function (data) { //请求成功时执行该函数内容,data即为服务器返回的json对象 diff --git a/safesite/urls.py b/safesite/urls.py index 31735cea..37caa876 100644 --- a/safesite/urls.py +++ b/safesite/urls.py @@ -157,7 +157,6 @@ urlpatterns = [ path('api/obscount',views.observepic), path('api/riskas',views.apiriskas), path('api/trainfg',views.trainfg), - path('api/examtj',views.examtj), path('api/check_session',views.check_session), #path('api/rights/group/',views.rightsgroup), diff --git a/safesite/views.py b/safesite/views.py index 58208ee0..d3ad63b3 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -6137,10 +6137,11 @@ def trainfg(req): first_day,first_day_of_next_month = gettime(datetime(year,month,1)) a = Train.objects.filter(usecomp__partid=companyid,deletemark=1,starttime__range=(first_day, first_day_of_next_month)) - for i in Dickey.objects.filter(dicparent_id=8): + for i in Dickey.objects.filter(Q(usecomps__contains=',1,' )|Q(usecomps__contains=','+str(companyid)+','),dicparent_id=8): count=a.filter(traintype__dickeyid=i.dickeyid).count() dickeyname=i.dickeyname traintypelist.append({'value':count,'name':dickeyname}) return HttpResponse(json.dumps({'code':1,'data':{'traintypelist':list(traintypelist)}}), content_type='application/json') + \ No newline at end of file