shanxingxiugai
This commit is contained in:
parent
4efd33677d
commit
add6f8b46c
|
@ -72,7 +72,7 @@
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "get",
|
type: "get",
|
||||||
async: true, //异步请求(同步请求将会锁住浏览器,用户其他操作必须等待请求完成才可以执行)
|
async: true, //异步请求(同步请求将会锁住浏览器,用户其他操作必须等待请求完成才可以执行)
|
||||||
url: "api/trainfg?a=trainfig&year=" + y, //请求发送
|
url: "api/examtj?a=trainfig&year=" + y, //请求发送
|
||||||
dataType: "json", //返回数据形式为json
|
dataType: "json", //返回数据形式为json
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
//请求成功时执行该函数内容,data即为服务器返回的json对象
|
//请求成功时执行该函数内容,data即为服务器返回的json对象
|
||||||
|
@ -177,7 +177,7 @@
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "get",
|
type: "get",
|
||||||
async: true, //异步请求(同步请求将会锁住浏览器,用户其他操作必须等待请求完成才可以执行)
|
async: true, //异步请求(同步请求将会锁住浏览器,用户其他操作必须等待请求完成才可以执行)
|
||||||
url: "api/trainfg?a=traintype&year=" + y + "&month=" + m, //请求发送
|
url: "api/examtj?a=traintype&year=" + y + "&month=" + m, //请求发送
|
||||||
dataType: "json", //返回数据形式为json
|
dataType: "json", //返回数据形式为json
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
//请求成功时执行该函数内容,data即为服务器返回的json对象
|
//请求成功时执行该函数内容,data即为服务器返回的json对象
|
||||||
|
|
|
@ -157,7 +157,6 @@ urlpatterns = [
|
||||||
path('api/obscount',views.observepic),
|
path('api/obscount',views.observepic),
|
||||||
path('api/riskas',views.apiriskas),
|
path('api/riskas',views.apiriskas),
|
||||||
path('api/trainfg',views.trainfg),
|
path('api/trainfg',views.trainfg),
|
||||||
path('api/examtj',views.examtj),
|
|
||||||
path('api/check_session',views.check_session),
|
path('api/check_session',views.check_session),
|
||||||
|
|
||||||
#path('api/rights/group/<int:groupid>',views.rightsgroup),
|
#path('api/rights/group/<int:groupid>',views.rightsgroup),
|
||||||
|
|
|
@ -6137,10 +6137,11 @@ def trainfg(req):
|
||||||
|
|
||||||
first_day,first_day_of_next_month = gettime(datetime(year,month,1))
|
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))
|
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()
|
count=a.filter(traintype__dickeyid=i.dickeyid).count()
|
||||||
dickeyname=i.dickeyname
|
dickeyname=i.dickeyname
|
||||||
traintypelist.append({'value':count,'name':dickeyname})
|
traintypelist.append({'value':count,'name':dickeyname})
|
||||||
return HttpResponse(json.dumps({'code':1,'data':{'traintypelist':list(traintypelist)}}), content_type='application/json')
|
return HttpResponse(json.dumps({'code':1,'data':{'traintypelist':list(traintypelist)}}), content_type='application/json')
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue