zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fengkai bug

This commit is contained in:
caoqianming 2020-08-02 22:27:07 +08:00
parent f69af3c2c4
commit 59a6386b50
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
safesite/exportemp/ks.docx
View File

Binary file not shown.

8
safesite/templates/examhistory.html
View File

@ -40,14 +40,14 @@
$("#user").append(divUserHtml); $("#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) if (data.testdetail[i].question__type == 3)
{ {
var divHtml = ""; var divHtml = "";
divHtml += '<div style="margin-left:30px;padding-bottom:13px">'; divHtml += '<div style="margin-left:30px;padding-bottom:13px">';
divHtml += '<span style="color:blue">' + "【判断题】</span></span>"+"第"+i+"题:" + data.testdetail[i].question__title +'</span>'; divHtml += '<span style="color:blue">' + "【判断题】</span></span>"+"第"+(i+1)+"题:" + data.testdetail[i].question__title +'</span>';
divHtml += '<span style=" margin-left: 40px; color:#d5cc1d;">此题得分：' + data.testdetail[i].iscore + ' 分</span>'; divHtml += '<span style=" margin-left: 40px; color:#d5cc1d;">此题得分：' + data.testdetail[i].iscore + ' 分</span>';
divHtml += '<br />'; divHtml += '<br />';
for (var item in data.testdetail[i].question__answer) { for (var item in data.testdetail[i].question__answer) {
@ -69,7 +69,7 @@
var divHtml = ""; var divHtml = "";
var answrText = ""; var answrText = "";
divHtml += '<div style="margin-left:30px;padding-bottom:13px">'; divHtml += '<div style="margin-left:30px;padding-bottom:13px">';
divHtml += '<span style="color:blue">' + "【多选题】</span></span>" +"第" + i + "题:" + data.testdetail[i].question__title + '</span>'; divHtml += '<span style="color:blue">' + "【多选题】</span></span>" +"第" + (i+1) + "题:" + data.testdetail[i].question__title + '</span>';
divHtml += '<span style=" margin-left: 40px; color:#d5cc1d;">此题得分：' + data.testdetail[i].iscore + ' 分</span>'; divHtml += '<span style=" margin-left: 40px; color:#d5cc1d;">此题得分：' + data.testdetail[i].iscore + ' 分</span>';
divHtml += '<br />'; divHtml += '<br />';
for (var item in data.testdetail[i].question__answer) { for (var item in data.testdetail[i].question__answer) {
@ -94,7 +94,7 @@
var divHtml = ""; var divHtml = "";
var answrText = ""; var answrText = "";
divHtml += '<div style="margin-left:30px;padding-bottom:13px">'; divHtml += '<div style="margin-left:30px;padding-bottom:13px">';
divHtml += '<span style="color:blue">' + "【单选题】</span></span>" + "第" + i + "题:" + data.testdetail[i].question__title + '</span>'; divHtml += '<span style="color:blue">' + "【单选题】</span></span>" + "第" + (i+1) + "题:" + data.testdetail[i].question__title + '</span>';
divHtml += '<span style=" margin-left: 40px; color:#d5cc1d;">此题得分：' + data.testdetail[i].iscore + ' 分</span>'; divHtml += '<span style=" margin-left: 40px; color:#d5cc1d;">此题得分：' + data.testdetail[i].iscore + ' 分</span>';
divHtml += '<br />'; divHtml += '<br />';
for (var item in data.testdetail[i].question__answer) { for (var item in data.testdetail[i].question__answer) {

6
safesite/views.py
View File

@ -2235,7 +2235,8 @@ def charthandle(req):
else: else:
partid = companyid partid = companyid
for i in Partment.objects.filter(Q(partid=partid) | Q(parentid__partid=partid)).order_by('partid'): 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)) first_day, first_day_of_next_month))
b = i.partname b = i.partname
c = x.count() c = x.count()
@ -2256,7 +2257,8 @@ def charthandle(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))
alist = [] alist = []
for i in Partment.objects.filter(Q(partid=partid) | Q(parentid__partid=partid)).order_by('partid'): 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)) first_day, first_day_of_next_month))
b = i.partname b = i.partname
c = x.count() c = x.count()