孙向锦 / SunvoteEducation

Commit 52213f1eb23fce07c1384086415c8a341668b532

Authored by jack
1 parent 7a1343ba

1.修改密码 

2.练习列表 页   标题 增加班级显示
3.报表主页  上周  下周逻辑
Inline Side-by-side
Showing 4 changed files with 24 additions and 14 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
  View file @52213f1
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 <c:forEach items="${varList}" var="var" varStatus="vs"> 90 <c:forEach items="${varList}" var="var" varStatus="vs">
91 <tr> 91 <tr>
92 <td><input type="checkbox" name='ids' id="ids" value="${var.HOMEWORK_ID}"/>${vs.index+1}</td> 92 <td><input type="checkbox" name='ids' id="ids" value="${var.HOMEWORK_ID}"/>${vs.index+1}</td>
93 - <td ><a onclick="view('<%=basePath%>homework/goView.do?homework_id=${var.HOMEWORK_ID}')">${var.NAME}</a></td> 93 + <td ><a onclick="view('<%=basePath%>homework/goView.do?homework_id=${var.HOMEWORK_ID}')">${var.NAME}(${myelfun:findClassName(var.CLASS_ID)})</a></td>
94 <td >${var.CREATE_DATE}</td> 94 <td >${var.CREATE_DATE}</td>
95 <td >${var.COMPLETE_DATE}</td> 95 <td >${var.COMPLETE_DATE}</td>
96 <td >${myelfun:findClassName(var.CLASS_ID)}</td> 96 <td >${myelfun:findClassName(var.CLASS_ID)}</td>
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
  View file @52213f1
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 </style> 40 </style>
41 </head> 41 </head>
42 42
43 -<body style="background:#fff;height:auto;"> 43 +<body style="background:#fff;height:auto;">${pd }
44 <div class="box_header"> 44 <div class="box_header">
45 <div class="head_box_l"> 45 <div class="head_box_l">
46 <p> 46 <p>
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
  View file @52213f1
@@ -18,7 +18,9 @@ @@ -18,7 +18,9 @@
18 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 18 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
19 <!-- 编辑页样式覆盖 --> 19 <!-- 编辑页样式覆盖 -->
20 <link rel="stylesheet" href="static/css/edit.css" /> 20 <link rel="stylesheet" href="static/css/edit.css" />
21 - 21 + <style>
  22 + .hide{display:none;}
  23 + </style>
22 </head> 24 </head>
23 <body class="no-skin"> 25 <body class="no-skin">
24 <!-- /section:basics/navbar.layout --> 26 <!-- /section:basics/navbar.layout -->
@@ -36,24 +38,32 @@ @@ -36,24 +38,32 @@
36 <input type="hidden" name="CARD_NO" id="CARD_NO" value="${pd.CARD_NO}" maxlength="255" placeholder="这里输入证件号" title="证件号" style="width:98%;"/> 38 <input type="hidden" name="CARD_NO" id="CARD_NO" value="${pd.CARD_NO}" maxlength="255" placeholder="这里输入证件号" title="证件号" style="width:98%;"/>
37 <div id="zhongxin" style="padding-top: 13px;"> 39 <div id="zhongxin" style="padding-top: 13px;">
38 <table id="table_report" class="table"> 40 <table id="table_report" class="table">
39 - <tr> 41 + <tr class="hide">
40 <td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td> 42 <td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
41 - <td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td> 43 + <td><input type="hidden" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td>
42 </tr> 44 </tr>
43 - <tr> 45 + <tr class="hide">
44 <td style="width:75px;text-align: right;padding-top: 13px;">电话:</td> 46 <td style="width:75px;text-align: right;padding-top: 13px;">电话:</td>
45 - <td><input type="text" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" placeholder="这里输入电话" title="电话" style="width:98%;"/></td> 47 + <td><input type="hidden" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" placeholder="这里输入电话" title="电话" style="width:98%;"/></td>
46 </tr> 48 </tr>
47 49
48 - <tr> 50 + <tr class="hide">
49 <td style="width:75px;text-align: right;padding-top: 13px;">账号:</td> 51 <td style="width:75px;text-align: right;padding-top: 13px;">账号:</td>
50 - <td><input type="text" name="ACCOUT" id="ACCOUT" value="${pd.ACCOUT}" maxlength="255" placeholder="这里输入账号" title="账号" style="width:98%;"/></td> 52 + <td><input type="hidden" name="ACCOUT" id="ACCOUT" value="${pd.ACCOUT}" maxlength="255" placeholder="这里输入账号" title="账号" style="width:98%;"/></td>
51 </tr> 53 </tr>
52 <tr> 54 <tr>
53 - <td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>  
54 - <td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td> 55 + <td style="width:90px;text-align: right;padding-top: 13px;">原密码:</td>
  56 + <td><input type="password" name="PASSWORD_OLD" id="PASSWORD_OLD" value="" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
55 </tr> 57 </tr>
56 <tr> 58 <tr>
  59 + <td style="width:90px;text-align: right;padding-top: 13px;">新密码:</td>
  60 + <td><input type="password" name="PASSWORD_NEW1" id="PASSWORD_NEW1" value="" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
  61 + </tr>
  62 + <tr>
  63 + <td style="width:90px;text-align: right;padding-top: 13px;">确认新密码:</td>
  64 + <td><input type="password" name="PASSWORD_NEW2" id="PASSWORD_NEW2" value="" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
  65 + </tr>
  66 + <tr class="hide">
57 <td style="width:75px;text-align: right;padding-top: 13px;">性别:</td> 67 <td style="width:75px;text-align: right;padding-top: 13px;">性别:</td>
58 <td> 68 <td>
59 <select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="选择性别"> 69 <select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="选择性别">
@@ -61,9 +71,9 @@ @@ -61,9 +71,9 @@
61 <option value="2" <c:if test="${pd.SEX==2}">selected="true"</c:if>>女</option> 71 <option value="2" <c:if test="${pd.SEX==2}">selected="true"</c:if>>女</option>
62 </select> 72 </select>
63 </td> 73 </td>
64 - <tr> 74 + <tr class="hide">
65 <td style="width:75px;text-align: right;padding-top: 13px;">教师卡编号:</td> 75 <td style="width:75px;text-align: right;padding-top: 13px;">教师卡编号:</td>
66 - <td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td> 76 + <td><input type="hidden" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td>
67 </tr> 77 </tr>
68 <tr> 78 <tr>
69 <td style="text-align: center;" colspan="10"> 79 <td style="text-align: center;" colspan="10">
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @52213f1
@@ -225,7 +225,7 @@ @@ -225,7 +225,7 @@
225 'title':'个人设置', 225 'title':'个人设置',
226 'url':'<%=basePath%>teacher/goEdit3.do?teacher_id=${pd.TEACHER.ID}', 226 'url':'<%=basePath%>teacher/goEdit3.do?teacher_id=${pd.TEACHER.ID}',
227 func:function() { 227 func:function() {
228 - parent.location.reload(); 228 + //parent.location.reload();
229 } 229 }
230 }); 230 });
231 window.top.modal.show(); 231 window.top.modal.show();