Commit 7a1343ba4ae82ca07d33583052f316e14642b3cb

Authored by jack
1 parent d184cfe4

1.修改优化交互

WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
... ... @@ -21,7 +21,7 @@
21 21 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
22 22  
23 23 <link rel="stylesheet" href="static/css/teach.css" />
24   - <link rel="stylesheet" href="static/css/edit.css" />
  24 + <link rel="stylesheet" href="static/css/edit.css?a=2" />
25 25 <style>
26 26 .box_header{position:fixed;top:0;left:0;width:100%;z-index:9999}
27 27 #Form{margin-top:102px;}
... ... @@ -127,9 +127,9 @@
127 127 <col width="10%"/>
128 128 <thead>
129 129 <tr>
130   - <th style="text-align:left;"><span>题目数量</span><span class="add">+</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/><span class="redu">-</span></th>
131   - <th><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/><span class="redu">-</span></th>
132   - <th><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" id="score" value="1"/><span class="redu">-</span></th>
  130 + <th style="text-align:left;"><span>题目数量</span><span class="redu">-</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/><span class="add">+</span></th>
  131 + <th><span>选项个数</span><span class="redu">-</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/><span class="add">+</span></th>
  132 + <th><span>分值</span><span class="redu">-</span><input type="number" class="w_100 score" id="score" value="1"/><span class="add">+</span></th>
133 133 <th></th>
134 134 </tr>
135 135 </thead>
... ... @@ -159,8 +159,8 @@
159 159 </div>
160 160  
161 161 </td>
162   - <td class="middle"><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/><span class="redu">-</span></td>
163   - <td class="middle"><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" value="${var.SCORE}"/><span class="redu">-</span></td>
  162 + <td class="middle"><span>选项个数</span><span class="redu">-</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/><span class="add">+</span></td>
  163 + <td class="middle"><span>分值</span><span class="redu">-</span><input type="number" class="w_100 score" value="${var.SCORE}"/><span class="add">+</span></td>
164 164 <td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td>
165 165 </tr>
166 166 </c:forEach>
... ... @@ -210,7 +210,7 @@
210 210 <!--提示框-->
211 211 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
212 212 <!--页面交互-->
213   - <script src="static/js/control_homework.js?t=1"></script>
  213 + <script src="static/js/control_homework.js?t=2"></script>
214 214 <script>
215 215 var homework_id="${pd.HOMEWORK_ID}";
216 216  
... ... @@ -259,7 +259,7 @@
259 259 success:function(res){
260 260 var res=JSON.parse(res);
261 261 if(res.message=="success"){
262   - alert(res.message);
  262 + //alert(res.message);
263 263 console.log(res);
264 264  
265 265 var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
... ... @@ -279,7 +279,7 @@
279 279 success:function(res){
280 280 var res=JSON.parse(res);
281 281 if(res.message=="success"){
282   - alert(res.message);
  282 + //alert(res.message);
283 283 console.log(res);
284 284  
285 285 var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
... ... @@ -88,9 +88,9 @@
88 88 style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
89 89 <td style="vertical-align:top;padding-left:2px"><a
90 90 class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><img src="static/images/search.png" alt="" class="search_btn" /></a></td>
91   - <td><li class="btn ${pd.CURRENT_WEEK==-1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(-1)">上一周</li></td>
92   - <td><li class="btn ${pd.CURRENT_WEEK==0?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(0)">本周</li></td>
93   - <td><li class="btn ${pd.CURRENT_WEEK==1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(1)">下一周</li></td>
  91 + <td><li class="btn ${pd.CURRENT_WEEK==-1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(${pd.CURRENT_WEEK-1})">上一周</li></td>
  92 +
  93 + <td><li class="btn ${pd.CURRENT_WEEK==1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(${pd.CURRENT_WEEK+1})">下一周</li></td>
94 94 </tr>
95 95 </table>
96 96 <hr />
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
... ... @@ -38,7 +38,7 @@
38 38 <div class="out">
39 39 <a href="../logout"><img src="../static/images/close.png" />退出登录</a>
40 40 </div>
41   - <div class="out" style="margin-right:20px;">
  41 + <div class="out" style="margin-right:20px;cursor: pointer;">
42 42 <a onclick="editInfo()"><img src="../static/images/psw_edit.png" />个人设置</a>
43 43 </div>
44 44 <div class="clear"></div>
... ...
WebRoot/static/css/edit.css
... ... @@ -40,8 +40,8 @@ input[type=&quot;number&quot;] {
40 40 .homework_edit input:checked+label {background-color: #1989FA;border: 1px solid #1989FA;}
41 41 .homework_edit input:checked+label::after {position: absolute;content: "";width: 5px;height: 10px;top: 3px;left: 6px;border: 2px solid #fff;border-top: none;border-left: none;transform: rotate(45deg)}
42 42 .homework_edit .subject th span,.homework_edit .subject td span{margin-right:10px;}
43   -.homework_edit .subject th .add,.homework_edit .subject td .add{display:inline-block;cursor: pointer;width:20px;height:31px;margin:0;vertical-align: middle;line-height:31px;text-align:center;border:1px solid #ccc;border-right:0;}
44   -.homework_edit .subject th .redu,.homework_edit .subject td .redu{display:inline-block;cursor: pointer;width:20px;height:31px;margin:0;vertical-align: middle;line-height:31px;text-align:center;border:1px solid #ccc;border-left:0;}
  43 +.homework_edit .subject th .add,.homework_edit .subject td .add{display:inline-block;cursor: pointer;width:20px;height:31px;margin:0;vertical-align: middle;line-height:31px;text-align:center;border:1px solid #ccc;border-left:0;}
  44 +.homework_edit .subject th .redu,.homework_edit .subject td .redu{display:inline-block;cursor: pointer;width:20px;height:31px;margin:0;vertical-align: middle;line-height:31px;text-align:center;border:1px solid #ccc;border-right:0;}
45 45 ::-webkit-scrollbar {/*滚动条整体样式*/
46 46 width: 4px; /*高宽分别对应横竖滚动条的尺寸*/
47 47 height: 4px;
... ...
WebRoot/static/js/control_homework.js
... ... @@ -19,7 +19,7 @@
19 19  
20 20 if(_id=="que_num"){ //新增题目
21 21 for(j=index;j<=num;j++){
22   - $(".subject_body_tbody").append('<tr><td class="first">'+j+'</td><td class="middle"><div class="question question'+j+'"><ul></ul></div></td><td class="middle"><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" value="'+$("#ans_num").val()+'"/><span class="redu">-</span></td><td class="middle"><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" value="1"/><span class="redu">-</span></td><td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td></tr>');
  22 + $(".subject_body_tbody").append('<tr><td class="first">'+j+'</td><td class="middle"><div class="question question'+j+'"><ul></ul></div></td><td class="middle"><span>选项个数</span><span class="redu">-</span><input type="number" class="w_100 ans_num" value="'+$("#ans_num").val()+'"/><span class="add">+</span></td><td class="middle"><span>分值</span><span class="redu">-</span><input type="number" class="w_100 score" value="1"/><span class="add">+</span></td><td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td></tr>');
23 23 for(i=0;i<work.ans_num;i++){
24 24 $(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
25 25 }
... ...