孙向锦 / SunvoteEducation

Commit 8e84e6259e5f4a085690ea6b34aa92fb22b6d88d

Authored by jack
1 parent 2db1bb32

1.修复报表页面查询按钮 

2.登陆页面浏览器自动添值
3.修改学生上传模板
Inline Side-by-side
Showing 4 changed files with 25 additions and 12 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
  View file @8e84e62
... ... @@ -72,7 +72,7 @@
72 72 type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
73 73 style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
74 74 <td style="padding-left:10px">
75   - <a href="#" class="search_btn" onclick="tosearch();"><img
  75 + <a class="search_btn" onclick="tosearch();"><img
76 76 width="30px" src="static/images/search.png" /></a>
77 77 <!-- <a style="height:30px;"
78 78 class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
... ...
WebRoot/WEB-INF/jsp/system/index/login.jsp
  View file @8e84e62
... ... @@ -76,12 +76,11 @@ body{
76 76 <div id="loginbox" >
77 77 <div class="name_box">
78 78 <input type="text" id="username1" placeholder="账号" value="" style="opacity:0;position: absolute;top:0;height:0px;z-index:-1" autoComplete="off"/>
  79 + <input type="password" id="password1" placeholder="密 码" value="" style="opacity:0;position: absolute;top:0;height:0px;z-index:-1" autoComplete="off"/>
79 80 <input type="text" id="loginname" value="" placeholder="用户名" autoComplete="off"/>
80 81 <svg t="1554790328236" class="icon_down" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2161" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M863.321996 251.674996 194.108395 251.674996 528.677333 621.186771Z" p-id="2162" fill="#333333"></path></svg>
81 82 </div>
82 83 <div class="psw_box">
83   -
84   - <input type="password" id="password1" placeholder="密 码" value="" style="opacity:0;position: absolute;top:0;height:0px;z-index:-1" autoComplete="off"/>
85 84 <input type="text" id="password" placeholder="密 码" value="" autoComplete="off"/>
86 85 <div class="rember" style="width:50%;float:left;text-align:left;margin-top:10px;display:inline-block;line-height:34px;">
87 86 <input type="checkbox" id="rem_flag"/>
... ... @@ -128,9 +127,17 @@ body{
128 127 $("#loginname").focus();
129 128  
130 129 });
  130 + $("#password").blur(function(){
  131 + if($("#password").val()!=""){
  132 + $("#password").attr("type","password");
  133 + }else{
  134 + $("#password").attr("type","text");
  135 + }
  136 + });
  137 + $("#password").focus(function(){
  138 + $("#password").attr("type","password");
  139 + });
131 140 $("#loginname").focus(function(e){
132   -
133   - $("#password").attr("type","password");
134 141 var _html="";
135 142 var u_list=JSON.parse(storage.getItem('userNameList'));
136 143 console.log(u_list);
... ... @@ -157,6 +164,7 @@ body{
157 164  
158 165 $(document).on('click','.history li',function(){
159 166 var p_list=JSON.parse(storage.getItem('passWordList'));
  167 + $("#password").attr("type","password")
160 168 $("#loginname").val($(this).text());
161 169 $("#password").val(p_list[$(this).index()]);
162 170 $(".history").hide();
... ...
WebRoot/static/files/Template.xls
View file @8e84e62
No preview for this file type
src/com/fh/controller/system/login/LoginController.java
  View file @8e84e62
... ... @@ -584,15 +584,20 @@ public class LoginController extends BaseController {
584 584 */
585 585 @RequestMapping(value = "/logout")
586 586 public ModelAndView logout() throws Exception {
587   - String USERNAME = Jurisdiction.getUsername(); // 当前登录的用户名
588   - logBefore(logger, USERNAME + "退出系统");
589   - FHLOG.save(USERNAME, "退出");
590 587 ModelAndView mv = this.getModelAndView();
591 588 PageData pd = new PageData();
592   - this.removeSession(USERNAME);// 请缓存
593   - // shiro销毁登录
594   - Subject subject = SecurityUtils.getSubject();
595   - subject.logout();
  589 + try{
  590 + String USERNAME = Jurisdiction.getUsername(); // 当前登录的用户名
  591 + logBefore(logger, USERNAME + "退出系统");
  592 + FHLOG.save(USERNAME, "退出");
  593 +
  594 + this.removeSession(USERNAME);// 请缓存
  595 + // shiro销毁登录
  596 + Subject subject = SecurityUtils.getSubject();
  597 + subject.logout();
  598 + }catch(NullPointerException e){
  599 + logBefore(logger, e.toString());
  600 + }
596 601 pd = this.getPageData();
597 602 pd.put("msg", pd.getString("msg"));
598 603 pd = this.setLoginPd(pd); // 设置登录页面的配置参数
... ...