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

jiexi

This commit is contained in:
shilixia 2019-10-10 17:10:02 +08:00
parent 44fe311c69
commit 7e6288b5aa
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
safesite/mgt/views.py
View File

@ -50,8 +50,11 @@ def transstr(obj,str1,str2):
return keystr
def getdickey(req):
userid = req.session['userid']
companyid = getcompany(userid)
dicclass=req.GET.get('dicclass')
a = Dickey.objects.filter(dicparent=req.GET.get('dicclass'),deletemark=1)
a = Dickey.objects.filter(dicparent=dicclass,deletemark=1)
a = (a.filter(usecomps__contains=',1,')|a.filter(usecomps__contains=','+companyid+',')).exclude(nousecomps__contains=','+companyid+',')
a = a.values('dickeyid','dicparent__dicname','dickeyname','dicparent__dicid','detail').order_by('dickeyid')
return HttpResponse(transstr(a,'dickeyid','dickeyname'),content_type="application/json")
@ -74,7 +77,7 @@ def api(req):
elif a=='listall':
startnum,endnum=fenye(req)
a = Mgtsystem.objects.filter(usecomp=Partment.objects.get(partid=companyid) ,deletemark=1).order_by('id')
a = Mgtsystem.objects.filter(usecomp__partid__in= [1,Partment.objects.get(partid=companyid).partid] ,deletemark=1).order_by('id')
total = a.count()
startnum,endnum=fenye(req)
a = a[startnum:endnum].values('id','mgtname','mgtpath','type__dickeyname','publisdate','createuser__name')

4
safesite/templates/examhistory.html
View File

@ -26,7 +26,6 @@
var id = {{id }};
var html;
alert(id);
$.ajax({
type: "get",
url: "/api/examtestdetail?a=detail",
@ -60,6 +59,7 @@
else {
divHtml += '<div style="color:green;">您的答案正确：' + data.testdetail[i].userchecked + '</div>';
}
divHtml += '<div style="margin-top: 10px;color: #4f3b08;font-size:13px;">' + (data.testdetail[i].question_resolution == undefined ? '本题无解析！' : data.testdetail[i].question_resolution) +'</div>';
}
else if (data.testdetail[i].question__type == 2) {
var divHtml = "";
@ -82,6 +82,7 @@
else {
divHtml += '<div style="color:yellow;">您没有选全答案：' + data.testdetail[i].userchecked + '</div>';
}
divHtml += '<div style="margin-top: 10px;color: #4f3b08;font-size:13px;">' + (data.testdetail[i].question_resolution == undefined ? '本题无解析！' : data.testdetail[i].question_resolution) + '</div>';
}
else {
var divHtml = "";
@ -100,6 +101,7 @@
else {
divHtml += '<div style="color:green;">您的答案正确：' + data.testdetail[i].userchecked + '</div>';
}
divHtml += '<div style="margin-top: 10px;color: #4f3b08;font-size:13px;">' + (data.testdetail[i].question_resolution == undefined ? '本题无解析！' : data.testdetail[i].question_resolution) + '</div>';
}
$("#examtype1").append(divHtml);