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

Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite

This commit is contained in:
caoqianming 2019-12-25 21:40:12 +08:00
parent 1f77de9c99 771259ac43
commit dcaab016fe
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
safesite/views.py
View File

@ -531,7 +531,6 @@ def init_permission(user,req):
'id': item.menuid, 'id': item.menuid,
'name': item.menuname, 'name': item.menuname,
}) })
print(permission_dict)
req.session['permissions'] = permission_dict req.session['permissions'] = permission_dict
@ -831,7 +830,7 @@ def apirights(req):
allrights = Group.objects.get( allrights = Group.objects.get(
usecomp__partid=companyid, grouptype=0).menulist usecomp__partid=companyid, grouptype=0).menulist
menus = Menu.objects.exclude(menuid__in=[11, 9]).filter(menuid__in=allrights, deletemark=1).order_by( menus = Menu.objects.exclude(menuid__in=[11, 9]).filter(menuid__in=allrights, deletemark=1).order_by(
'menuid').values('menuid', 'menucode', 'parentid', 'url', 'menuname', 'icon').distinct() 'menuid').values('menuid', 'menucode', 'parentid', 'url', 'menuname', 'icon','type').distinct()
for i in menus: for i in menus:
if i['menuid'] in haverights: if i['menuid'] in haverights:
i['checked'] = True i['checked'] = True
@ -846,7 +845,7 @@ def apirights(req):
for i in data: for i in data:
rlist.append(i['id']) rlist.append(i['id'])
Group.objects.filter(groupid=groupid).update( Group.objects.filter(groupid=groupid).update(
menulist=rlist) menulist=list(set(rlist)))
return JsonResponse({"code": 1}) return JsonResponse({"code": 1})
elif a == 'have': elif a == 'have':
userid = req.session['userid'] userid = req.session['userid']
@ -3656,11 +3655,11 @@ def apicompany(req):
y.save() y.save()
part = Partment.objects.get(partid=y.partid) part = Partment.objects.get(partid=y.partid)
Group.objects.create( Group.objects.create(
groupname='超管', grouptype=0, usecomp=part, menulink=menurights) groupname='超管', grouptype=0, usecomp=part, menulist=menurights)
Group.objects.create( Group.objects.create(
groupname='安全员', grouptype=1, usecomp=part, menulink=menurights) groupname='安全员', grouptype=1, usecomp=part, menulist=menurights)
Group.objects.create( Group.objects.create(
groupname='全体用户', grouptype=3, usecomp=part, menulink=menurights) groupname='全体用户', grouptype=3, usecomp=part, menulist=menurights)
z = Group(groupname='主管', grouptype=2, z = Group(groupname='主管', grouptype=2,
usecomp=part, menulist=menurights) usecomp=part, menulist=menurights)
z.save() z.save()
@ -4564,9 +4563,9 @@ def apitool(req):
if req.GET.get('company'): if req.GET.get('company'):
objs = objs.filter(usecomp__partid=req.GET.get('company')) objs = objs.filter(usecomp__partid=req.GET.get('company'))
for i in objs: for i in objs:
menulist = i.menulink.split(',') menulist = i.menulist
menulist.append(menu) menulist.append(menu)
if menu == '30': if menu == 30:
company = Partment.objects.get(partid=req.GET.get('company')) company = Partment.objects.get(partid=req.GET.get('company'))
objs = Map.objects.filter(usecomp=company) objs = Map.objects.filter(usecomp=company)
if objs.exists(): if objs.exists():
@ -4574,8 +4573,7 @@ def apitool(req):
else: else:
Map.objects.create( Map.objects.create(
name='默认地图', pic='/static/safesite/mystatic/images/snc.jpg', usecomp=company, default=1) name='默认地图', pic='/static/safesite/mystatic/images/snc.jpg', usecomp=company, default=1)
newlist = list(set(menulist)) i.menulist = list(set(menulist))
i.menulink = ','.join(newlist)
i.save() i.save()
return JsonResponse({"code": 1}) return JsonResponse({"code": 1})
elif a == 'correction': elif a == 'correction':
@ -4715,10 +4713,20 @@ def apitool(req):
return JsonResponse({"code": 1}) return JsonResponse({"code": 1})
elif a == 'correct_menulist': elif a == 'correct_menulist':
for i in Group.objects.all(): for i in Group.objects.all():
if i.menulink:
i.menulist = list(set(list(filter(None, i.menulink.split(','))))) i.menulist = list(set(list(filter(None, i.menulink.split(',')))))
i.save() i.save()
return JsonResponse({"code": 1}) return JsonResponse({"code": 1})
elif a == 'correct_menuhas':
buttons = Menu.objects.filter(type=2)
for group in Group.objects.all():
menulist = group.menulist
for button in buttons:
if button.parentid.menuid in menulist: #如果菜单在所拥有权限内
menulist.append(button.menuid)
group.menulist = list(set(menulist))
group.save()
return JsonResponse({"code": 1})
def apinotice(req): def apinotice(req):
@ -5875,7 +5883,7 @@ def apiexamtest(req):
a = ExamTest.objects.filter(id=id).values('id', 'num', 'name', 'starttime', 'endtime', 'duration', 'totalscore', a = ExamTest.objects.filter(id=id).values('id', 'num', 'name', 'starttime', 'endtime', 'duration', 'totalscore',
'passscore', 'exampaper__total', 'createtime', 'state', 'exampaper__name', 'createuser__name', 'type', 'qrcode')[0] 'passscore', 'exampaper__total', 'createtime', 'state', 'exampaper__name', 'createuser__name', 'type', 'qrcode')[0]
objs = ExamTestDetail.objects.filter(examtest__id=id).order_by('-score').values( objs = ExamTestDetail.objects.filter(examtest__id=id).order_by('-score').values(
'id', 'user__name', 'user__ubelongpart__partname', 'took', 'score', 'ison', 'passcode') 'id', 'user__name', 'user__ubelongpart__partname', 'took', 'score', 'ison', 'passcode','starttime')
a['cjrydetail'] = list(objs) a['cjrydetail'] = list(objs)
a['ison'] = 1 a['ison'] = 1
tests = ExamTestDetail.objects.filter(examtest__id=id,user__userid=userid)#考试记录 tests = ExamTestDetail.objects.filter(examtest__id=id,user__userid=userid)#考试记录