孙向锦 / SunvoteEducation

Commit ce7dae99c61ece33cec9b1b8c01ebd630cfefd0b

Authored by 孙向锦
2 parents 8952fd04 0243e1b6

Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

Inline Side-by-side
Showing 3 changed files with 116 additions and 18 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
  View file @ce7dae9
... ... @@ -54,7 +54,7 @@
54 54 <td>
55 55 <div class="classBox">
56 56 <ul>
57   - <c:if test="${pd.CLASS_ID != ''}">
  57 + <c:if test="${pd.CLASS_ID != null}">
58 58 <li class="checked">
59 59 <input type="checkbox" checked="true" id="class0" name="className" value="${pd.CLASS_ID}" />
60 60 <label for="class0"></label>
... ... @@ -119,7 +119,7 @@
119 119 <col width="10%"/>
120 120 <thead>
121 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 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 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 125 <th></th>
... ... @@ -179,7 +179,7 @@
179 179 </form>
180 180  
181 181  
182   - ${pd}
  182 +
183 183  
184 184 </div>
185 185 <!-- /.col -->
... ... @@ -204,8 +204,11 @@
204 204 <!--页面交互-->
205 205 <script src="static/js/control_homework.js?t=1"></script>
206 206 <script>
  207 + var homework_id="${pd.HOMEWORK_ID}";
  208 +
207 209 $(function() {
208 210 window.top.loading.remove();
  211 + work.que_num=parseInt($("#que_num").val());
209 212 //日期框
210 213 $(document).on("focus",".date-picker",function(){
211 214 $(this).datepicker({
... ... @@ -213,11 +216,11 @@
213 216 todayHighlight: true
214 217 });
215 218 });
216   - if('${pd.CLASS_ID}'==''){
  219 + if(${pd.CLASS_ID==null}==true){
217 220 $.ajax({ //获取该名教师下的班级信息
218 221 url:'<%=basePath%>coursemanagement/teacherClass',
219 222 type:"get",
220   - data:{teacher_id:'${pd.TEACHER_ID}'},
  223 + data:{teacher_id:"${pd.TEACHER_ID}"},
221 224 success:function(res){
222 225 console.log(res);
223 226 if(res.data.length>0){
... ... @@ -242,8 +245,36 @@
242 245 dataType:"text",
243 246 data:{"JSON":data},
244 247 success:function(res){
245   - alert("保存成功");
246   - console.log(res);
  248 + var res=JSON.parse(res);
  249 + if(res.message=="success"){
  250 + alert(res.message);
  251 + console.log(res);
  252 +
  253 + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
  254 + parent.$("#mainFrame").attr('src',path);
  255 + window.top.loading.show();
  256 + }
  257 +
  258 + }
  259 + });
  260 + }
  261 + function up_data(data){
  262 + $.ajax({ //获取该名教师下的班级信息
  263 + url:'<%=basePath%>homework/updateHomework',
  264 + type:"post",
  265 + dataType:"text",
  266 + data:{"JSON":data},
  267 + success:function(res){
  268 + var res=JSON.parse(res);
  269 + if(res.message=="success"){
  270 + alert(res.message);
  271 + console.log(res);
  272 +
  273 + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
  274 + parent.$("#mainFrame").attr('src',path);
  275 + window.top.loading.show();
  276 +
  277 + }
247 278 }
248 279 });
249 280 }
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
  View file @ce7dae9
... ... @@ -111,10 +111,10 @@
111 111 </table>
112 112 <div class="footer">
113 113 <div class="creat">
114   - <input type="button" onclick="add()" value="布置练习" />
  114 + <input type="button" onclick="add('${pd.TEACHER_ID}')" value="布置练习" />
115 115 </div>
116 116 <div class="removeAll">
117   - <input type="button" onclick="deleteAll()" value="批量删除" />
  117 + <input type="button" onclick="del()" value="批量删除" />
118 118 </div>
119 119 <div class="page_box">
120 120  
... ... @@ -147,11 +147,21 @@
147 147 });
148 148 });
149 149  
  150 + $('#ids').on('click', function(){
  151 + var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header
  152 +
  153 + $(".table_box .table").find('tbody > tr').each(function(){
  154 + var row = this;
  155 + if(th_checked) $(row).find('input[type=checkbox]').eq(0).prop('checked', true);
  156 + else $(row).find('input[type=checkbox]').eq(0).prop('checked', false);
  157 + });
  158 + });
  159 +
150 160 function tosearch(){
151 161 $("#Form").submit();
152 162 }
153 163 function add(Id){
154   - var path = '<%=basePath%>homework/goAdd2.do?school_id=${pd.SCHOOL_ID}&HOMEWORK_ID='+Id;
  164 + var path = '<%=basePath%>homework/goAdd2.do?teacher_id='+Id;
155 165 parent.$("#mainFrame").attr('src',path);
156 166 window.top.loading.show();
157 167 }
... ... @@ -160,6 +170,38 @@
160 170 parent.$("#mainFrame").attr('src',path);
161 171 window.top.loading.show();
162 172 }
  173 + function del(Id){
  174 + window.top.remove.init({"title":"删除","func":function(success){
  175 + if(success){
  176 + var str = '';
  177 + for(var i=0;i < document.getElementsByName('ids').length;i++){
  178 + if(document.getElementsByName('ids')[i].checked){
  179 + if(str=='') str += document.getElementsByName('ids')[i].value;
  180 + else str += ',' + document.getElementsByName('ids')[i].value;
  181 + }
  182 + }
  183 + if(str==''){
  184 +
  185 + }else{
  186 + $.ajax({
  187 + type: "POST",
  188 + url: '<%=basePath%>homework/deleteAll.do?tm='+new Date().getTime(),
  189 + data: {DATA_IDS:str},
  190 + dataType:'json',
  191 + //beforeSend: validateData,
  192 + cache: false,
  193 + success: function(data){
  194 + tosearch();
  195 + }
  196 + });
  197 + }
  198 + }
  199 + else{
  200 + console.log("false");
  201 + }
  202 + }});
  203 + window.top.remove.show();
  204 + }
163 205  
164 206 </script>
165 207  
... ...
WebRoot/static/js/control_homework.js
  View file @ce7dae9
... ... @@ -26,7 +26,7 @@
26 26 }
27 27 }
28 28 else if(_id=="ans_num"){//新增选项
29   - alert(work.que_num);
  29 + //alert($("#que_num").val());
30 30 for(j=1;j<=work.que_num;j++){ //轮询每道题目
31 31 var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数
32 32 if(now_length<work.ans_num){ //当前题目选项个数小于数字框中个数，则把选项个数增加到数字框中的个数
... ... @@ -46,6 +46,7 @@
46 46 }else{
47 47 if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id，但是class中含有ans_num，则为单个题目中的选项设置框
48 48 var _index=_id.closest("tr").index()+1;
  49 + console.log(_index);
49 50 for(i=index;i<=num;i++){
50 51 $(".question"+_index+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i-1)+'</li>')
51 52 }
... ... @@ -98,24 +99,30 @@
98 99 if(_that.siblings(".w_100").attr("id")){
99 100 //将下面的数字框的值设置成标题栏数字框的值
100 101 var _class=_that.siblings(".w_100").attr("id");
101   - $("."+_class).val(temp_num);
  102 +
102 103 //题目数
103 104 if(_class=="que_num"){
104 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 109 if(_class=="ans_num"){
  110 + if(temp_num>=10){
  111 + temp_num=9;
  112 + }
109 113 work.ans_num=temp_num;
110 114 creat_work(_class,work.ans_num,work.ans_num);
111   - }
  115 + }
  116 + $("."+_class).val(temp_num);
112 117 }
113 118 else{
114 119 if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){
115 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 128 $(document).on("click",".redu",function(){
... ... @@ -148,7 +155,9 @@
148 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 162 $(document).on("click",".remove",function(){
154 163 var _that=$(this);
... ... @@ -172,6 +181,9 @@
172 181 var old_num=parseInt(work.que_num);
173 182 var _temp=now_num-old_num;
174 183  
  184 + if(now_num!=0){
  185 + $(".main_info").remove();
  186 + }
175 187 if(_temp>0){
176 188 creat_work($(this).attr("id"),(old_num+1),now_num);
177 189 }else{
... ... @@ -185,7 +197,9 @@
185 197 var now_num=parseInt($("#ans_num").val());
186 198 var old_num=parseInt(work.ans_num);
187 199 var _temp=now_num-old_num;
188   -
  200 + if(now_num>=10){
  201 + now_num=9;
  202 + }
189 203 $(".ans_num").val(now_num);
190 204 work.ans_num=now_num;
191 205  
... ... @@ -311,7 +325,18 @@
311 325 saveData.QUESTIONS=QUESTIONS;
312 326  
313 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 }
... ...