This commit is contained in:
caoqianming 2019-11-10 20:55:32 +08:00
parent fdc649f0be
commit cc3ff02701
4 changed files with 17 additions and 9 deletions

View File

@ -131,7 +131,7 @@
<div class="login-center-input">
<input type="text" name="username" value="" placeholder="请输入您的用户名" onfocus="this.placeholder=''"
onblur="this.placeholder='请输入您的用户名'" />
<div class="login-center-input-text">用户名</div>
<!-- <div class="login-center-input-text">用户名</div> -->
</div>
</div>
<div class="login-center clearfix">
@ -139,7 +139,7 @@
<div class="login-center-input">
<input type="password" name="password" value="" placeholder="请输入您的密码"
onfocus="this.placeholder=''" onblur="this.placeholder='请输入您的密码'" />
<div class="login-center-input-text">密码</div>
<!-- <div class="login-center-input-text">密码</div> -->
</div>
</div>
<p style="color:red;text-align: center">{{msg}}</p>

View File

@ -120,7 +120,8 @@
}; //请求完成
xhr.onerror = function (evt) { $.messager.alert('提示', '失败!文件内容有误');document.getElementById('drfile').value = ''; }; //请求失败
}
$('#usertable').datagrid({ url: 'getuser?a=datagrid' });
$('#usertable').datagrid({ url: 'getuser?a=datagrid' ,pagination: 'true',
pageSize: 20,});
$('#parttree').tree({
url: 'parthandle?a=tree',
animate: true,

View File

@ -157,7 +157,7 @@ urlpatterns = [
path('api/obscount',views.observepic),
path('api/riskas',views.apiriskas),
path('api/trainfg',views.trainfg),
path('api/examtj',views.examtj),
# path('api/examtj',views.examtj),
path('api/check_session',views.check_session),
#path('api/rights/group/<int:groupid>',views.rightsgroup),

View File

@ -34,7 +34,7 @@ logger = logging.getLogger('log')
#分页功能
def fenye(req):
if req.GET.get('page') and req.GET.get('rows'):
if req.GET.get('page',None) and req.GET.get('rows',None):
page=int(req.GET.get('page'))
rows=int(req.GET.get('rows'))
endnum=page*rows
@ -2217,8 +2217,10 @@ def getuser(req):
partid = req.GET.get('partid')
parts=Partment.objects.filter(partlink__contains=','+partid+',')|Partment.objects.filter(partid=partid)
if req.GET.get('a')=='datagrid':
a = User.objects.filter(ubelongpart__in=parts,deletemark=1).exclude(issuper=1).values('userid','empid','name','ubelongpart__partname','ubelongpart__partid','username','openid')
a = User.objects.filter(ubelongpart__in=parts,deletemark=1).exclude(issuper=1)
total = a.count()
startnum,endnum = fenye(req)
a = a[startnum:endnum].values('userid','empid','name','ubelongpart__partname','ubelongpart__partid','username','openid')
return HttpResponse(transjson(total,a),content_type="application/json")
else:
a = User.objects.filter(ubelongpart__in=parts,deletemark=1).exclude(issuper=1).values('userid','name')
@ -2248,8 +2250,10 @@ def getuser(req):
keystr=transstr(a,'userid','name')
return HttpResponse(keystr,content_type="application/json")
else:
a=User.objects.filter(ubelongpart__in = parts,deletemark=1).exclude(issuper=1).order_by('userid').values('userid','empid','name','ubelongpart__partname','ubelongpart__partid','username','openid')
a=User.objects.filter(ubelongpart__in = parts,deletemark=1).exclude(issuper=1)
total = a.count()
startnum,endnum = fenye(req)
a = a.order_by('userid')[startnum:endnum].values('userid','empid','name','ubelongpart__partname','ubelongpart__partid','username','openid')
return HttpResponse(transjson(total,a),content_type="application/json")
@ -3056,7 +3060,10 @@ def minip_px(req):
def mplogin(req):
res = req.body.decode('utf-8')
code = json.loads(res)['code']
try:
code = req.POST.get('code')
except:
code = json.loads(res)['code']
info = requests.get('https://api.weixin.qq.com/sns/jscode2session?appid=wx5c39b569f01c27db&secret=68762892f8df2b4a0b1940c5250a8dc0&js_code='+code+'&grant_type=authorization_code').content.decode('utf-8')
info = json.loads(info)
mpopenid = info['openid']
@ -3066,6 +3073,7 @@ def mplogin(req):
userid = a.userid
username = a.username
req.session['userid'] = userid
# print(req.session,req.COOKIES)
return JsonResponse({"code":1,'userid':userid,'username':username,'mpopenid':mpopenid})
else:
return JsonResponse({"code":0,'mpopenid':mpopenid})
@ -6151,4 +6159,3 @@ def trainfg(req):
traintypelist.append({'value':count,'name':dickeyname})
return HttpResponse(json.dumps({'code':1,'data':{'traintypelist':list(traintypelist)}}), content_type='application/json')