diff --git a/safesite/exportemp/ks.docx b/safesite/exportemp/ks.docx index 07783b64..b3aed00a 100644 Binary files a/safesite/exportemp/ks.docx and b/safesite/exportemp/ks.docx differ diff --git a/safesite/templates/examhistory.html b/safesite/templates/examhistory.html index fdcabb1a..ec8c6d6d 100644 --- a/safesite/templates/examhistory.html +++ b/safesite/templates/examhistory.html @@ -40,14 +40,14 @@ $("#user").append(divUserHtml); - for (var i = 1; i <= data.testdetail.length; i++) { + for (var i = 0; i <= data.testdetail.length; i++) { if (data.testdetail[i].question__type == 3) { var divHtml = ""; divHtml += '
'; - divHtml += '' + "【判断题】"+"第"+i+"题:" + data.testdetail[i].question__title +''; + divHtml += '' + "【判断题】"+"第"+(i+1)+"题:" + data.testdetail[i].question__title +''; divHtml += '此题得分:' + data.testdetail[i].iscore + ' 分'; divHtml += '
'; for (var item in data.testdetail[i].question__answer) { @@ -69,7 +69,7 @@ var divHtml = ""; var answrText = ""; divHtml += '
'; - divHtml += '' + "【多选题】" +"第" + i + "题:" + data.testdetail[i].question__title + ''; + divHtml += '' + "【多选题】" +"第" + (i+1) + "题:" + data.testdetail[i].question__title + ''; divHtml += '此题得分:' + data.testdetail[i].iscore + ' 分'; divHtml += '
'; for (var item in data.testdetail[i].question__answer) { @@ -94,7 +94,7 @@ var divHtml = ""; var answrText = ""; divHtml += '
'; - divHtml += '' + "【单选题】" + "第" + i + "题:" + data.testdetail[i].question__title + ''; + divHtml += '' + "【单选题】" + "第" + (i+1) + "题:" + data.testdetail[i].question__title + ''; divHtml += '此题得分:' + data.testdetail[i].iscore + ' 分'; divHtml += '
'; for (var item in data.testdetail[i].question__answer) { diff --git a/safesite/views.py b/safesite/views.py index 37edb09b..251be338 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -2235,7 +2235,8 @@ def charthandle(req): else: partid = companyid for i in Partment.objects.filter(Q(partid=partid) | Q(parentid__partid=partid)).order_by('partid'): - x = Train.objects.filter(trainpart=i, state=1, deletemark=1, starttime__range=( + parts = Partment.objects.filter(Q(partid=i.partid)|Q(partlink__contains=','+str(i.partid)+',')) + x = Train.objects.filter(trainpart__in=parts, state=1, deletemark=1, starttime__range=( first_day, first_day_of_next_month)) b = i.partname c = x.count() @@ -2256,7 +2257,8 @@ def charthandle(req): first_day, first_day_of_next_month = gettime(datetime(year, month, 1)) alist = [] for i in Partment.objects.filter(Q(partid=partid) | Q(parentid__partid=partid)).order_by('partid'): - x = Drill.objects.filter(drillpart=i, state=1, deletemark=1, starttime__range=( + parts = Partment.objects.filter(Q(partid=i.partid)|Q(partlink__contains=','+str(i.partid)+',')) + x = Drill.objects.filter(drillpart__in=parts, state=1, deletemark=1, starttime__range=( first_day, first_day_of_next_month)) b = i.partname c = x.count()