Commit 10679fa1e3214e76dffade6a8a91259d62ec7fbc

Authored by =
1 parent 31d7a48c

1、增加布置练习更新接口

WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <td> 54 <td>
55 <div class="classBox"> 55 <div class="classBox">
56 <ul> 56 <ul>
57 - <c:if test="${pd.CLASS_ID != ''}"> 57 + <c:if test="${pd.CLASS_ID != null}">
58 <li class="checked"> 58 <li class="checked">
59 <input type="checkbox" checked="true" id="class0" name="className" value="${pd.CLASS_ID}" /> 59 <input type="checkbox" checked="true" id="class0" name="className" value="${pd.CLASS_ID}" />
60 <label for="class0"></label> 60 <label for="class0"></label>
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 <col width="10%"/> 119 <col width="10%"/>
120 <thead> 120 <thead>
121 <tr> 121 <tr>
122 - <th style="text-align:left;"><span>题目数量</span><span class="add">+</span><input type="number" class="w_100" id="que_num" value="0"/><span class="redu">-</span></th> 122 + <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>
123 <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> 123 <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>
124 <th><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" id="score" value="1"/><span class="redu">-</span></th> 124 <th><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" id="score" value="1"/><span class="redu">-</span></th>
125 <th></th> 125 <th></th>
@@ -179,7 +179,7 @@ @@ -179,7 +179,7 @@
179 </form> 179 </form>
180 180
181 181
182 - ${pd} 182 +
183 183
184 </div> 184 </div>
185 <!-- /.col --> 185 <!-- /.col -->
@@ -204,8 +204,11 @@ @@ -204,8 +204,11 @@
204 <!--页面交互--> 204 <!--页面交互-->
205 <script src="static/js/control_homework.js?t=1"></script> 205 <script src="static/js/control_homework.js?t=1"></script>
206 <script> 206 <script>
  207 + var homework_id="${pd.HOMEWORK_ID}";
  208 +
207 $(function() { 209 $(function() {
208 window.top.loading.remove(); 210 window.top.loading.remove();
  211 + work.que_num=parseInt($("#que_num").val());
209 //日期框 212 //日期框
210 $(document).on("focus",".date-picker",function(){ 213 $(document).on("focus",".date-picker",function(){
211 $(this).datepicker({ 214 $(this).datepicker({
@@ -213,11 +216,11 @@ @@ -213,11 +216,11 @@
213 todayHighlight: true 216 todayHighlight: true
214 }); 217 });
215 }); 218 });
216 - if('${pd.CLASS_ID}'==''){ 219 + if(${pd.CLASS_ID==null}==true){
217 $.ajax({ //获取该名教师下的班级信息 220 $.ajax({ //获取该名教师下的班级信息
218 url:'<%=basePath%>coursemanagement/teacherClass', 221 url:'<%=basePath%>coursemanagement/teacherClass',
219 type:"get", 222 type:"get",
220 - data:{teacher_id:'${pd.TEACHER_ID}'}, 223 + data:{teacher_id:"${pd.TEACHER_ID}"},
221 success:function(res){ 224 success:function(res){
222 console.log(res); 225 console.log(res);
223 if(res.data.length>0){ 226 if(res.data.length>0){
@@ -247,6 +250,18 @@ @@ -247,6 +250,18 @@
247 } 250 }
248 }); 251 });
249 } 252 }
  253 + function up_data(data){
  254 + $.ajax({ //获取该名教师下的班级信息
  255 + url:'<%=basePath%>homework/uploadHomework',
  256 + type:"post",
  257 + dataType:"text",
  258 + data:{"JSON":data},
  259 + success:function(res){
  260 + alert("保存成功");
  261 + console.log(res);
  262 + }
  263 + });
  264 + }
250 265
251 </script> 266 </script>
252 </body> 267 </body>
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 </table> 111 </table>
112 <div class="footer"> 112 <div class="footer">
113 <div class="creat"> 113 <div class="creat">
114 - <input type="button" onclick="add()" value="布置练习" /> 114 + <input type="button" onclick="add('${pd.TEACHER_ID}')" value="布置练习" />
115 </div> 115 </div>
116 <div class="removeAll"> 116 <div class="removeAll">
117 <input type="button" onclick="deleteAll()" value="批量删除" /> 117 <input type="button" onclick="deleteAll()" value="批量删除" />
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
151 $("#Form").submit(); 151 $("#Form").submit();
152 } 152 }
153 function add(Id){ 153 function add(Id){
154 - var path = '<%=basePath%>homework/goAdd2.do?school_id=${pd.SCHOOL_ID}&HOMEWORK_ID='+Id; 154 + var path = '<%=basePath%>homework/goAdd2.do?teacher_id='+Id;
155 parent.$("#mainFrame").attr('src',path); 155 parent.$("#mainFrame").attr('src',path);
156 window.top.loading.show(); 156 window.top.loading.show();
157 } 157 }
WebRoot/static/js/control_homework.js
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 } 26 }
27 } 27 }
28 else if(_id=="ans_num"){//新增选项 28 else if(_id=="ans_num"){//新增选项
29 - alert(work.que_num); 29 + //alert($("#que_num").val());
30 for(j=1;j<=work.que_num;j++){ //轮询每道题目 30 for(j=1;j<=work.que_num;j++){ //轮询每道题目
31 var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数 31 var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数
32 if(now_length<work.ans_num){ //当前题目选项个数小于数字框中个数,则把选项个数增加到数字框中的个数 32 if(now_length<work.ans_num){ //当前题目选项个数小于数字框中个数,则把选项个数增加到数字框中的个数
@@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
46 }else{ 46 }else{
47 if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id,但是class中含有ans_num,则为单个题目中的选项设置框 47 if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id,但是class中含有ans_num,则为单个题目中的选项设置框
48 var _index=_id.closest("tr").index()+1; 48 var _index=_id.closest("tr").index()+1;
  49 + console.log(_index);
49 for(i=index;i<=num;i++){ 50 for(i=index;i<=num;i++){
50 $(".question"+_index+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i-1)+'</li>') 51 $(".question"+_index+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i-1)+'</li>')
51 } 52 }
@@ -98,24 +99,30 @@ @@ -98,24 +99,30 @@
98 if(_that.siblings(".w_100").attr("id")){ 99 if(_that.siblings(".w_100").attr("id")){
99 //将下面的数字框的值设置成标题栏数字框的值 100 //将下面的数字框的值设置成标题栏数字框的值
100 var _class=_that.siblings(".w_100").attr("id"); 101 var _class=_that.siblings(".w_100").attr("id");
101 - $("."+_class).val(temp_num); 102 +
102 //题目数 103 //题目数
103 if(_class=="que_num"){ 104 if(_class=="que_num"){
104 work.que_num=temp_num; 105 work.que_num=temp_num;
105 - creat_work(_class,work.que_num,work.que_num); 106 + creat_work(_class,work.que_num,work.que_num);
106 } 107 }
107 //选项数 108 //选项数
108 if(_class=="ans_num"){ 109 if(_class=="ans_num"){
  110 + if(temp_num>=10){
  111 + temp_num=9;
  112 + }
109 work.ans_num=temp_num; 113 work.ans_num=temp_num;
110 creat_work(_class,work.ans_num,work.ans_num); 114 creat_work(_class,work.ans_num,work.ans_num);
111 - } 115 + }
  116 + $("."+_class).val(temp_num);
112 } 117 }
113 else{ 118 else{
114 if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ 119 if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){
115 creat_work(_that,temp_num,temp_num); 120 creat_work(_that,temp_num,temp_num);
116 } 121 }
117 } 122 }
118 - 123 + if(work.que_num!=0){
  124 + $(".main_info").remove();
  125 + }
119 }) 126 })
120 //点击-按钮 127 //点击-按钮
121 $(document).on("click",".redu",function(){ 128 $(document).on("click",".redu",function(){
@@ -148,7 +155,9 @@ @@ -148,7 +155,9 @@
148 remove_work(_that,temp_num,temp_num); 155 remove_work(_that,temp_num,temp_num);
149 } 156 }
150 } 157 }
151 - 158 + if(work.que_num!=0){
  159 + $(".main_info").remove();
  160 + }
152 }) 161 })
153 $(document).on("click",".remove",function(){ 162 $(document).on("click",".remove",function(){
154 var _that=$(this); 163 var _that=$(this);
@@ -172,6 +181,9 @@ @@ -172,6 +181,9 @@
172 var old_num=parseInt(work.que_num); 181 var old_num=parseInt(work.que_num);
173 var _temp=now_num-old_num; 182 var _temp=now_num-old_num;
174 183
  184 + if(now_num!=0){
  185 + $(".main_info").remove();
  186 + }
175 if(_temp>0){ 187 if(_temp>0){
176 creat_work($(this).attr("id"),(old_num+1),now_num); 188 creat_work($(this).attr("id"),(old_num+1),now_num);
177 }else{ 189 }else{
@@ -185,7 +197,9 @@ @@ -185,7 +197,9 @@
185 var now_num=parseInt($("#ans_num").val()); 197 var now_num=parseInt($("#ans_num").val());
186 var old_num=parseInt(work.ans_num); 198 var old_num=parseInt(work.ans_num);
187 var _temp=now_num-old_num; 199 var _temp=now_num-old_num;
188 - 200 + if(now_num>=10){
  201 + now_num=9;
  202 + }
189 $(".ans_num").val(now_num); 203 $(".ans_num").val(now_num);
190 work.ans_num=now_num; 204 work.ans_num=now_num;
191 205
@@ -311,7 +325,18 @@ @@ -311,7 +325,18 @@
311 saveData.QUESTIONS=QUESTIONS; 325 saveData.QUESTIONS=QUESTIONS;
312 326
313 //console.log(saveData); 327 //console.log(saveData);
314 - save_data(JSON.stringify(saveData)); 328 + if(homework_id==""){
  329 + save_data(JSON.stringify(saveData));
  330 + //console.log("保存");
  331 + }
  332 + else{
  333 + //console.log("更新");
  334 + saveData.HOMEWORK_ID=homework_id;
  335 + up_data(JSON.stringify(saveData));
  336 + }
  337 +
  338 +
  339 +
315 340
316 341
317 } 342 }