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

自动抽题-自建加共享

This commit is contained in:
caoqianming 2020-11-18 09:48:58 +08:00
parent 912c4ec1ba
commit e01108df66
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
safesite/templates/examtestadd2.html
View File

@ -94,7 +94,7 @@
}) })
$("#tmfls").combotree({ $("#tmfls").combotree({
url: 'api/questioncat?a=tree3', url: 'api/questioncat?a=tree4',
method: 'get', method: 'get',
multiple: true, multiple: true,
loadFilter: function (rows) { loadFilter: function (rows) {

7
safesite/templates/index.html
View File

@ -171,7 +171,12 @@
<!-- <button type="hidden" id="getb" onclick="test()" /> --> <!-- <button type="hidden" id="getb" onclick="test()" /> -->
<script> <script>
$.messager.show({
title:'提示',
msg:'每晚10点-11点为维护时间,请尽量不在此时间使用',
timeout:5000,
showType:'slide'
});
var openid = $('#userindex').attr('openid'); var openid = $('#userindex').attr('openid');
var nickname = $('#userindex').attr('nickname'); var nickname = $('#userindex').attr('nickname');
var headimgurl = $('#userindex').attr('headimgurl'); var headimgurl = $('#userindex').attr('headimgurl');

14
safesite/views.py
View File

@ -6673,6 +6673,18 @@ def apiquestioncat(req):
parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen') parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen')
return HttpResponse(json.dumps(list(list_items)), content_type="application/json") return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
elif a == 'tree3': elif a == 'tree3':
# 共享分类
groups = g_models.Groupmember.objects.filter(member__partid=companyid).values_list('group__id', flat=True)
companys = g_models.Groupmember.objects.filter(group__id__in=groups).values_list('member__partid', flat=True).distinct()
if companys:
pass
else:
companys = Partment.objects.filter(partid=companyid).values_list('partid', flat=True)
list_items = Questioncat.objects.filter(usecomp__in=companys, deletemark=1, isopen=1).annotate(
parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen')
return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
elif a == 'tree4':
# 自建+共享分类
groups = g_models.Groupmember.objects.filter(member__partid=companyid).values_list('group__id', flat=True) groups = g_models.Groupmember.objects.filter(member__partid=companyid).values_list('group__id', flat=True)
companys = g_models.Groupmember.objects.filter(group__id__in=groups).values_list('member__partid', flat=True).distinct() companys = g_models.Groupmember.objects.filter(group__id__in=groups).values_list('member__partid', flat=True).distinct()
if companys: if companys:
@ -6680,7 +6692,7 @@ def apiquestioncat(req):
else: else:
companys = Partment.objects.filter(partid=companyid).values_list('partid', flat=True) companys = Partment.objects.filter(partid=companyid).values_list('partid', flat=True)
list_items = (Questioncat.objects.filter(usecomp__in=companys, deletemark=1, isopen=1)| Questioncat.objects.filter( list_items = (Questioncat.objects.filter(usecomp__in=companys, deletemark=1, isopen=1)| Questioncat.objects.filter(
usecomp__partid=1, deletemark=1, isopen=1)).annotate( usecomp__partid=companyid, deletemark=1)).distinct().annotate(
parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen') parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen')
return HttpResponse(json.dumps(list(list_items)), content_type="application/json") return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
elif a == 'tree': elif a == 'tree':