孙向锦 / SunvoteEducation

Commit 1b90180a7d6d42e4ef539f9759aadaa443415421

Authored by 孙向锦
2 parents 02c4ed52 9b72ddba

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

# Conflicts:
#	src/com/fh/controller/sunvote/homework/HomeworkController.java
Inline Side-by-side
Showing 8 changed files with 494 additions and 489 deletions
WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit.jsp
  View file @1b90180
... ... @@ -16,6 +16,8 @@
16 16 <%@ include file="../../system/index/top.jsp"%>
17 17 <!-- 日期框 -->
18 18 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
  19 + <!-- 编辑页样式覆盖 -->
  20 + <link rel="stylesheet" href="static/css/edit.css" />
19 21 </head>
20 22 <body class="no-skin">
21 23 <!-- /section:basics/navbar.layout -->
... ... @@ -30,7 +32,7 @@
30 32 <form action="headmaster/${msg }.do" name="Form" id="Form" method="post">
31 33 <input type="hidden" name="HEADMASTER_ID" id="HEADMASTER_ID" value="${pd.HEADMASTER_ID}"/>
32 34 <div id="zhongxin" style="padding-top: 13px;">
33   - <table id="table_report" class="table table-striped table-bordered table-hover">
  35 + <table id="table_report" class="table">
34 36 <tr>
35 37 <td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
36 38 <td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td>
... ... @@ -42,15 +44,7 @@
42 44 <tr>
43 45 <td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
44 46 <td><input type="text" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
45   - </tr>
46   - <tr>
47   - <td style="width:75px;text-align: right;padding-top: 13px;">所在学校:</td>
48   - <td><input type="text" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="255" placeholder="这里输入所在学校" title="所在学校" style="width:98%;"/></td>
49   - </tr>
50   - <tr>
51   - <td style="width:75px;text-align: right;padding-top: 13px;">权限:</td>
52   - <td><input type="text" name="PERMISSION" id="PERMISSION" value="${pd.PERMISSION}" maxlength="255" placeholder="这里输入权限" title="权限" style="width:98%;"/></td>
53   - </tr>
  47 + </tr>
54 48 <tr>
55 49 <td style="width:75px;text-align: right;padding-top: 13px;">联系电话:</td>
56 50 <td><input type="text" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" placeholder="这里输入联系电话" title="联系电话" style="width:98%;"/></td>
... ... @@ -58,7 +52,7 @@
58 52 <tr>
59 53 <td style="text-align: center;" colspan="10">
60 54 <a class="btn btn-mini btn-primary" onclick="save();">保存</a>
61   - <a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>
  55 + <a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
62 56 </td>
63 57 </tr>
64 58 </table>
... ... @@ -87,7 +81,7 @@
87 81 <!--提示框-->
88 82 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
89 83 <script type="text/javascript">
90   - $(top.hangge());
  84 +
91 85 //保存
92 86 function save(){
93 87 if($("#NAME").val()==""){
... ... @@ -120,26 +114,7 @@
120 114 $("#PASSWORD").focus();
121 115 return false;
122 116 }
123   - if($("#SCHOOL_ID").val()==""){
124   - $("#SCHOOL_ID").tips({
125   - side:3,
126   - msg:'请输入所在学校',
127   - bg:'#AE81FF',
128   - time:2
129   - });
130   - $("#SCHOOL_ID").focus();
131   - return false;
132   - }
133   - if($("#PERMISSION").val()==""){
134   - $("#PERMISSION").tips({
135   - side:3,
136   - msg:'请输入权限',
137   - bg:'#AE81FF',
138   - time:2
139   - });
140   - $("#PERMISSION").focus();
141   - return false;
142   - }
  117 +
143 118 if($("#PHONE").val()==""){
144 119 $("#PHONE").tips({
145 120 side:3,
... ...
WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list.jsp
  View file @1b90180
... ... @@ -2,6 +2,7 @@
2 2 pageEncoding="UTF-8"%>
3 3 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
4 4 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  5 +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
5 6 <%
6 7 String path = request.getContextPath();
7 8 String basePath = request.getScheme() + "://"
... ... @@ -13,90 +14,80 @@
13 14 <title>中天电子-教育管理系统</title>
14 15 <head>
15 16 <base href="<%=basePath%>">
16   -<link
17   - href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
18   - rel="stylesheet">
  17 +
  18 +<!-- 下拉框 -->
  19 +<link rel="stylesheet" href="static/ace/css/chosen.css" />
  20 +<!-- jsp文件头和头部 -->
  21 +
  22 +<!-- 日期框 -->
  23 +<link rel="stylesheet" href="static/ace/css/datepicker.css" />
  24 +<link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
  25 +<link href="static/css/teach.css" rel="stylesheet">
19 26 </head>
20 27 <body class="no-skin">
  28 +
  29 +
21 30 <!-- 检索 -->
22   - <form action="headmaster/listcs.do" method="post" name="Form" id="Form">
23   - <table style="margin-top:5px;">
24   - </table>
25   - <!-- 检索 -->
  31 + <form action="headmaster/list.do" method="post" name="Form" id="Form">
  32 + <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
  33 + <input type="hidden" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}"/>
  34 + <div class="head_box">
  35 + <div class="box_header">
  36 + <div class="head_box_l">
  37 + <p>
  38 + <span class="right_b"></span>班长管理
  39 + </p>
  40 + </div>
  41 + <div class="clearfix"></div>
  42 + </div>
  43 + <div style="background:#fff;padding:0 5%;" >
26 44  
27   - <table id="simple-table"
28   - class="table table-striped table-bordered table-hover"
29   - style="margin-top:5px;">
30   - <thead>
31   - <tr>
32   - <th class="center" style="width:35px;"><label class="pos-rel"><input
33   - type="checkbox" class="ace" id="zcheckbox" /><span class="lbl"></span></label>
34   - </th>
35   - <th class="center" style="width:50px;">序号</th>
36   - <th class="center">姓名</th>
37   - <th class="center">用户名</th>
38   - <th class="center">密码</th>
39   - <th class="center">所在学校</th>
40   - <th class="center">权限</th>
41   - <th class="center">联系电话</th>
42   - <th class="center">操作</th>
43   - </tr>
44   - </thead>
  45 + <table class="table table-striped" >
  46 + <col style="width: 10%" />
  47 + <col style="width: 10%" />
  48 + <col style="width: 10%" />
  49 + <col style="width: 10%" />
  50 + <col style="width: 20%" />
  51 + <col style="width: 20%" />
  52 + <thead>
  53 + <tr>
  54 + <th><input type="checkbox" value="0" name='ids' id="ids" />序号</th>
  55 + <th class="center">姓名</th>
  56 + <th class="center">用户名</th>
  57 + <th class="center">密码</th>
  58 + <th class="center">联系电话</th>
  59 + <th class="center">操作</th>
  60 + </tr>
  61 +
  62 + </thead>
  63 + </table>
  64 + </div>
  65 +
  66 + <div class="clearfix"></div>
  67 + <!-- 检索 -->
45 68  
46   - <tbody>
47   - <!-- 开始循环 -->
  69 + </div>
  70 + <div class="table_box" >
  71 + <table class="table table-striped" >
  72 + <col style="width: 10%" />
  73 + <col style="width: 10%" />
  74 + <col style="width: 10%" />
  75 + <col style="width: 10%" />
  76 + <col style="width: 20%" />
  77 + <col style="width: 20%" />
  78 + <tbody>
  79 + <!-- 开始循环 -->
48 80 <c:choose>
49 81 <c:when test="${not empty varList}">
50 82 <c:forEach items="${varList}" var="var" varStatus="vs">
51   - <tr>
52   - <td class='center'><label class="pos-rel"><input
53   - type='checkbox' name='ids' value="${var.HEADMASTER_ID}"
54   - class="ace" /><span class="lbl"></span></label></td>
55   - <td class='center' style="width: 30px;">${vs.index+1}</td>
  83 + <tr>
  84 + <td><input type="checkbox" name='ids' id="ids"
  85 + value="${var.ID}" />${vs.index+1}</td>
56 86 <td class='center'>${var.NAME}</td>
57 87 <td class='center'>${var.USERNAME}</td>
58   - <td class='center'>${var.PASSWORD}</td>
59   - <td class='center'>${var.SCHOOL_ID}</td>
60   - <td class='center'>${var.PERMISSION}</td>
  88 + <td class='center'>${var.PASSWORD}</td>
61 89 <td class='center'>${var.PHONE}</td>
62   - <td class="center"><span
63   - class="label label-large label-grey arrowed-in-right arrowed-in"><i
64   - class="ace-icon fa fa-lock" title="无权限"></i></span>
65   - <div class="hidden-sm hidden-xs btn-group">
66   - <a class="btn btn-xs btn-success" title="编辑"
67   - onclick="edit('${var.HEADMASTER_ID}');"> <i
68   - class="ace-icon fa fa-pencil-square-o bigger-120" title="编辑"></i>
69   - </a> <a class="btn btn-xs btn-danger"
70   - onclick="del('${var.HEADMASTER_ID}');"> <i
71   - class="ace-icon fa fa-trash-o bigger-120" title="删除"></i>
72   - </a>
73   - </div>
74   - <div class="hidden-md hidden-lg">
75   - <div class="inline pos-rel">
76   - <button class="btn btn-minier btn-primary dropdown-toggle"
77   - data-toggle="dropdown" data-position="auto">
78   - <i class="ace-icon fa fa-cog icon-only bigger-110"></i>
79   - </button>
80   -
81   - <ul
82   - class="dropdown-menu dropdown-only-icon dropdown-yellow dropdown-menu-right dropdown-caret dropdown-close">
83   - <li><a style="cursor:pointer;"
84   - onclick="edit('${var.HEADMASTER_ID}');"
85   - class="tooltip-success" data-rel="tooltip" title="修改">
86   - <span class="green"> <i
87   - class="ace-icon fa fa-pencil-square-o bigger-120"></i>
88   - </span>
89   - </a></li>
90   - <li><a style="cursor:pointer;"
91   - onclick="del('${var.HEADMASTER_ID}');"
92   - class="tooltip-error" data-rel="tooltip" title="删除"> <span
93   - class="red"> <i
94   - class="ace-icon fa fa-trash-o bigger-120"></i>
95   - </span>
96   - </a></li>
97   - </ul>
98   - </div>
99   - </div></td>
  90 + <td><a onclick="edit('${var.HEADMASTER_ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a href="#" onclick="del('${var.HEADMASTER_ID}');"><img src="static/images/remove.png" /></a></td>
100 91 </tr>
101 92  
102 93 </c:forEach>
... ... @@ -107,22 +98,20 @@
107 98 </tr>
108 99 </c:otherwise>
109 100 </c:choose>
110   - </tbody>
111   - </table>
112   - <div class="page-header position-relative">
113   - <table style="width:100%;">
114   - <tr>
115   - <td style="vertical-align:top;"><c:if test="${QX.add == 1 }">
116   - <a class="btn btn-mini btn-success" onclick="add();">新增</a>
117   - </c:if> <c:if test="${QX.del == 1 }">
118   - <a class="btn btn-mini btn-danger"
119   - onclick="makeAll('确定要删除选中的数据吗?');" title="批量删除"><i
120   - class='ace-icon fa fa-trash-o bigger-120'></i></a>
121   - </c:if></td>
122   - <td style="vertical-align:top;"><div class="pagination"
123   - style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div></td>
124   - </tr>
  101 + </tbody>
125 102 </table>
  103 + <div class="footer" style="width:auto;margin: 0px 5%;">
  104 + <div class="creat">
  105 + <input type="button" onclick="add();" value="添加班级" />
  106 + </div>
  107 + <div class="removeAll">
  108 + <input type="button" onclick="del();" value="删除" />
  109 + </div>
  110 +
  111 + <div class="page_box">
  112 + <div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
  113 + </div>
  114 + </div>
126 115 </div>
127 116 </form>
128 117 </div>
... ... @@ -138,169 +127,34 @@
138 127 function tosearch(){
139 128 $("#Form").submit();
140 129 }
141   - $(function() {
142   -
143   - //日期框
144   - $('.date-picker').datepicker({
145   - autoclose: true,
146   - todayHighlight: true
147   - });
148   -
149   - //下拉框
150   - if(!ace.vars['touch']) {
151   - $('.chosen-select').chosen({allow_single_deselect:true});
152   - $(window)
153   - .off('resize.chosen')
154   - .on('resize.chosen', function() {
155   - $('.chosen-select').each(function() {
156   - var $this = $(this);
157   - $this.next().css({'width': $this.parent().width()});
158   - });
159   - }).trigger('resize.chosen');
160   - $(document).on('settings.ace.chosen', function(e, event_name, event_val) {
161   - if(event_name != 'sidebar_collapsed') return;
162   - $('.chosen-select').each(function() {
163   - var $this = $(this);
164   - $this.next().css({'width': $this.parent().width()});
165   - });
166   - });
167   - $('#chosen-multiple-style .btn').on('click', function(e){
168   - var target = $(this).find('input[type=radio]');
169   - var which = parseInt(target.val());
170   - if(which == 2) $('#form-field-select-4').addClass('tag-input-style');
171   - else $('#form-field-select-4').removeClass('tag-input-style');
172   - });
  130 + //修改
  131 + function edit(Id){
  132 + window.top.modal.init({
  133 + 'title':'修改信息',
  134 + 'url':'<%=basePath%>headmaster/goEdit.do?HEADMASTER_ID='+Id,
  135 + func:function() {
  136 + tosearch();
173 137 }
174   -
175   -
176   - //复选框全选控制
177   - var active_class = 'active';
178   - $('#simple-table > thead > tr > th input[type=checkbox]').eq(0).on('click', function(){
179   - var th_checked = this.checked;//checkbox inside "TH" table header
180   - $(this).closest('table').find('tbody > tr').each(function(){
181   - var row = this;
182   - if(th_checked) $(row).addClass(active_class).find('input[type=checkbox]').eq(0).prop('checked', true);
183   - else $(row).removeClass(active_class).find('input[type=checkbox]').eq(0).prop('checked', false);
184   - });
185 138 });
186   - });
187   -
188   - //新增
189   - function add(){
190   - top.jzts();
191   - var diag = new top.Dialog();
192   - diag.Drag=true;
193   - diag.Title ="新增";
194   - diag.URL = '<%=basePath%>headmaster/goAdd.do';
195   - diag.Width = 450;
196   - diag.Height = 355;
197   - diag.Modal = true; //有无遮罩窗口
198   - diag. ShowMaxButton = true; //最大化按钮
199   - diag.ShowMinButton = true; //最小化按钮
200   - diag.CancelEvent = function(){ //关闭事件
201   - if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){
202   - if('${page.currentPage}' == '0'){
203   - tosearch();
204   - }else{
205   - tosearch();
206   - }
207   - }
208   - diag.close();
209   - };
210   - diag.show();
  139 + window.top.modal.show();
211 140 }
212   -
213   - //删除
214   - function del(Id){
215   - bootbox.confirm("确定要删除吗?", function(result) {
216   - if(result) {
217   - top.jzts();
218   - var url = "<%=basePath%>headmaster/delete.do?HEADMASTER_ID="+Id+"&tm="+new Date().getTime();
219   - $.get(url,function(data){
220   - tosearch();
221   - });
222   - }
  141 + function add(){
  142 + window.top.modal.init({
  143 + 'title':'添加班长',
  144 + 'url':'<%=basePath%>headmaster/goAdd.do?school_id=${pd.SCHOOL_ID}&grade_id=${pd.GRADE_ID}',
  145 + func:function() {
  146 + tosearch();
  147 + }
223 148 });
  149 + window.top.modal.show();
224 150 }
  151 + $(function() {
  152 +
  153 +
225 154  
226   - //修改
227   - function edit(Id){
228   - top.jzts();
229   - var diag = new top.Dialog();
230   - diag.Drag=true;
231   - diag.Title ="编辑";
232   - diag.URL = '<%=basePath%>headmaster/goEdit.do?HEADMASTER_ID='+Id;
233   - diag.Width = 450;
234   - diag.Height = 355;
235   - diag.Modal = true; //有无遮罩窗口
236   - diag. ShowMaxButton = true; //最大化按钮
237   - diag.ShowMinButton = true; //最小化按钮
238   - diag.CancelEvent = function(){ //关闭事件
239   - if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){
240   - tosearch();
241   - }
242   - diag.close();
243   - };
244   - diag.show();
245   - }
246 155  
247   - //批量操作
248   - function makeAll(msg){
249   - bootbox.confirm(msg, function(result) {
250   - if(result) {
251   - var str = '';
252   - for(var i=0;i < document.getElementsByName('ids').length;i++){
253   - if(document.getElementsByName('ids')[i].checked){
254   - if(str=='') str += document.getElementsByName('ids')[i].value;
255   - else str += ',' + document.getElementsByName('ids')[i].value;
256   - }
257   - }
258   - if(str==''){
259   - bootbox.dialog({
260   - message: "<span class='bigger-110'>您没有选择任何内容!</span>",
261   - buttons:
262   - { "button":{ "label":"确定", "className":"btn-sm btn-success"}}
263   - });
264   - $("#zcheckbox").tips({
265   - side:1,
266   - msg:'点这里全选',
267   - bg:'#AE81FF',
268   - time:8
269   - });
270   - return;
271   - }else{
272   - if(msg == '确定要删除选中的数据吗?'){
273   - top.jzts();
274   - $.ajax({
275   - type: "POST",
276   - url: '<%=basePath%>headmaster/deleteAll.do?tm='+ new Date().getTime(),
277   - data : {
278   - DATA_IDS : str
279   - },
280   - dataType : 'json',
281   - //beforeSend: validateData,
282   - cache : false,
283   - success : function(data) {
284   - $
285   - .each(
286   - data.list,
287   - function(
288   - i,
289   - list) {
290   - tosearch();
291   - });
292   - }
293   - });
294   - }
295   - }
296   - }
297   - });
298   - };
  156 + })
299 157  
300   - //导出excel
301   - function toExcel() {
302   - window.location.href = '<%=basePath%>headmaster/excel.do';
303   - }
304 158 </script>
305 159  
306 160  
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
  View file @1b90180
... ... @@ -36,23 +36,23 @@
36 36 <div class="col-xs-12">
37 37  
38 38 <form action="homework/${msg }.do" name="Form" id="Form" method="post">
39   - <input type="hidden" name="HOMEWORK_ID" id="HOMEWORK_ID" value="${pd.HOMEWORK_ID}"/>
  39 + <input type="hidden" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}"/>
40 40 <div id="zhongxin" style="padding-top: 13px;width:80%;margin:0 auto;">
41 41 <table id="table_report" class="table">
42 42 <tr>
43 43 <td style="width:95px;text-align: right;padding-top: 13px;">练习标题</td>
44   - <td><input type="text" name="CODE" class="form-control" id="CODE" value="${pd.CODE}" maxlength="255" placeholder="输入练习标题，不超过20个汉字" title="作业代码" /></td>
  44 + <td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.CODE}" maxlength="255" placeholder="输入练习标题，不超过20个汉字" title="作业代码" /></td>
45 45 </tr>
46 46 <tr>
47 47 <td style="width:95px;text-align: right;padding-top: 13px;">练习说明</td>
48   - <td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="输入题目说明，如教材第12页1-5题，教辅第5页1-3题，尽量精简，不超过100个汉字" title="作业名称" /></td>
  48 + <td><input type="text" name=HOMEWORK_DESC class="form-control" id="HOMEWORK_DESC" value="${pd.NAME}" maxlength="255" placeholder="输入题目说明，如教材第12页1-5题，教辅第5页1-3题，尽量精简，不超过100个汉字" title="作业名称" /></td>
49 49 </tr>
50 50 <tr>
51 51 <td style="width:95px;text-align: right;padding-top: 13px;">指定班级完成时间</td>
52 52 <td>
53 53 <div class="classBox">
54 54 <ul>
55   - <li>
  55 + <!-- <li>
56 56  
57 57 <input type="checkbox" id="class1" name="className" value="1" />
58 58 <label for="class1"></label>
... ... @@ -91,7 +91,7 @@
91 91 <label for="class6"></label>
92 92 <span>6班</span>
93 93 <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/>
94   - </li>
  94 + </li> -->
95 95 </ul>
96 96 </div>
97 97  
... ... @@ -109,7 +109,7 @@
109 109 <col width="10%"/>
110 110 <thead>
111 111 <tr>
112   - <th style="text-align:left;"><span>题目数量</span><span class="add">+</span><input type="number" class="w_100" id="que_num" value="1"/><span class="redu">-</span></th>
  112 + <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>
113 113 <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>
114 114 <th><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" id="score" value="1"/><span class="redu">-</span></th>
115 115 <th></th>
... ... @@ -123,7 +123,7 @@
123 123 <col width="20%"/>
124 124 <col width="10%"/>
125 125 <tbody class="subject_body_tbody">
126   - <tr>
  126 + <!-- <tr>
127 127 <td class="first">1</td>
128 128 <td class="middle">
129 129  
... ... @@ -157,13 +157,14 @@
157 157 <td class="middle"><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" value="4"/><span class="redu">-</span></td>
158 158 <td class="middle"><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" value="1"/><span class="redu">-</span></td>
159 159 <td class="last"><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
160   - </tr>
  160 + </tr>-->
161 161 </tbody>
162 162 </table>
163 163 </div>
164 164 <hr />
165 165 <div>
166 166 <div style="text-align: center;" colspan="10">
  167 +
167 168 <a class="btn btn-mini btn-primary" onclick="save();">确定布置</a>
168 169 <a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
169 170 </div>
... ... @@ -182,7 +183,6 @@
182 183 </div>
183 184 <!-- /.main-container -->
184 185  
185   -
186 186 <!-- 页面底部js¨ -->
187 187 <%@ include file="../../system/index/foot.jsp"%>
188 188 <!-- 下拉框 -->
... ... @@ -191,200 +191,50 @@
191 191 <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
192 192 <!--提示框-->
193 193 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
194   - <script type="text/javascript">
195   -
196   - $("input[type='checkbox']").on('click',function(){
197   - console.log($(this).attr("checked"));
198   - if($(this).prop('checked')){
199   - $(this).closest("li").attr("class","checked");
200   - }else{
201   - $(this).closest("li").removeClass("checked");
202   - }
203   -
  194 + <!--页面交互-->
  195 + <script src="static/js/control_homework.js?t=12"></script>
  196 + <script>
  197 + $(function() {
  198 + window.top.loading.remove();
  199 + //日期框
  200 + $(document).on("focus",".date-picker",function(){
  201 + $(this).datepicker({
  202 + autoclose: true,
  203 + todayHighlight: true
  204 + });
204 205 });
205   - var work={
206   - que_num:1,
207   - ans_num:4,
208   - score:1
209   - }
210   - //点击+执行操作
211   - function creat_work(obj){
212   - var _id=obj.siblings(".w_100").attr("id")
213   - if(_id=="que_num"){
214   - var que_index=$(".subject_body_tbody tr").length+1;
215   - $(".subject_body_tbody").append('<tr><td class="first">'+que_index+'</td><td class="middle"><div class="question question'+que_index+'"><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 onclick="del();"><img src="static/images/remove.png" /></a></td></tr>');
216   - for(i=0;i<parseInt($("#ans_num").val());i++){
217   - $(".question"+que_index+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
218   - }
219   - }
220   - }
221   - //点击-执行操作
222   - function remove_work(obj,index,num){
223   - var _id=obj.siblings(".w_100").attr("id")
224   - if(_id=="que_num"){
225   - for(i=index;i<(index+num);i++){
226   - $(".subject_body_tbody tr").eq(i).remove();
  206 +
  207 + $.ajax({ //获取该名教师下的班级信息
  208 + url:'<%=basePath%>coursemanagement/teacherClass',
  209 + type:"get",
  210 + data:{teacher_id:"08b418184e5044c7b419caa830b834a7"},
  211 + success:function(res){
  212 + console.log(res);
  213 + if(res.data.length>0){
  214 + var _html="";
  215 + $.each(res.data,function(k,v){
  216 + _html+='<li><input type="checkbox" id="class'+k+'" name="className" value="'+v.ID+'"><label for="class'+k+'"></label><span>'+v.CLASS_NAME+'</span><input class="date-picker" type="text" style="width:150px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""></li>';
  217 +
  218 + });
  219 + $(".classBox ul").html(_html);
227 220 }
228 221 }
229   - }
230   - $(".add").on("click",function(){
231   - var temp_num=0;
232   - temp_num=parseInt($(this).siblings(".w_100").val());
233   - temp_num+=1;
234   - $(this).siblings(".w_100").val(temp_num);
235   -
236   - if($(this).siblings(".w_100").attr("id")){
237   - var _class=$(this).siblings(".w_100").attr("id");
238   -
239   - $("."+_class).val(temp_num);
240   - }
241   - creat_work($(this));
242   - })
243   - $(".redu").on("click",function(){
244   -
245   - var temp_num=0;
246   - temp_num=parseInt($(this).siblings(".w_100").val());
247   - temp_num-=1;
248   - if(temp_num<=1){
249   - temp_num=1;
250   - }
251   - $(this).siblings(".w_100").val(temp_num);
252   -
253   - if($(this).siblings(".w_100").attr("id")){
254   - var _class=$(this).siblings(".w_100").attr("id");
255   -
256   - $("."+_class).val(temp_num);
257   - }
258   - //remove_work($(this),$(".subject_body_tbody tr").length-1,1);
259   - })
260   - $("#que_num").change(function(){
261   - remove_work($(this),$(".subject_body_tbody tr").length-1,1);
262   - })
263   -
  222 + });
264 223  
265   - function save(){
266   - if($("#CODE").val()==""){
267   - $("#CODE").tips({
268   - side:3,
269   - msg:'请输入作业代码',
270   - bg:'#AE81FF',
271   - time:2
272   - });
273   - $("#CODE").focus();
274   - return false;
275   - }
276   - if($("#NAME").val()==""){
277   - $("#NAME").tips({
278   - side:3,
279   - msg:'请输入作业名称',
280   - bg:'#AE81FF',
281   - time:2
282   - });
283   - $("#NAME").focus();
284   - return false;
285   - }
286   - if($("#SUBJECT_ID").val()==""){
287   - $("#SUBJECT_ID").tips({
288   - side:3,
289   - msg:'请输入科目ID',
290   - bg:'#AE81FF',
291   - time:2
292   - });
293   - $("#SUBJECT_ID").focus();
294   - return false;
295   - }
296   - if($("#CLASS_ID").val()==""){
297   - $("#CLASS_ID").tips({
298   - side:3,
299   - msg:'请输入班级ID',
300   - bg:'#AE81FF',
301   - time:2
302   - });
303   - $("#CLASS_ID").focus();
304   - return false;
305   - }
306   - if($("#GRADE_ID").val()==""){
307   - $("#GRADE_ID").tips({
308   - side:3,
309   - msg:'请输入年级ID',
310   - bg:'#AE81FF',
311   - time:2
312   - });
313   - $("#GRADE_ID").focus();
314   - return false;
315   - }
316   - if($("#SCHOOL_ID").val()==""){
317   - $("#SCHOOL_ID").tips({
318   - side:3,
319   - msg:'请输入学校ID',
320   - bg:'#AE81FF',
321   - time:2
322   - });
323   - $("#SCHOOL_ID").focus();
324   - return false;
325   - }
326   - if($("#COMPLETE_DATE").val()==""){
327   - $("#COMPLETE_DATE").tips({
328   - side:3,
329   - msg:'请输入需要完成时间',
330   - bg:'#AE81FF',
331   - time:2
332   - });
333   - $("#COMPLETE_DATE").focus();
334   - return false;
335   - }
336   - if($("#CREATE_DATE").val()==""){
337   - $("#CREATE_DATE").tips({
338   - side:3,
339   - msg:'请输入创建时间',
340   - bg:'#AE81FF',
341   - time:2
342   - });
343   - $("#CREATE_DATE").focus();
344   - return false;
345   - }
346   - if($("#MODIFY_DATE").val()==""){
347   - $("#MODIFY_DATE").tips({
348   - side:3,
349   - msg:'请输入修改时间',
350   - bg:'#AE81FF',
351   - time:2
352   - });
353   - $("#MODIFY_DATE").focus();
354   - return false;
355   - }
356   - if($("#COMPLETE_COUNT").val()==""){
357   - $("#COMPLETE_COUNT").tips({
358   - side:3,
359   - msg:'请输入完成次数',
360   - bg:'#AE81FF',
361   - time:2
362   - });
363   - $("#COMPLETE_COUNT").focus();
364   - return false;
365   - }
366   - if($("#ALL_SCORE").val()==""){
367   - $("#ALL_SCORE").tips({
368   - side:3,
369   - msg:'请输入总分',
370   - bg:'#AE81FF',
371   - time:2
372   - });
373   - $("#ALL_SCORE").focus();
374   - return false;
  224 + });
  225 +
  226 + function save_data(data){
  227 + $.ajax({ //获取该名教师下的班级信息
  228 + url:'<%=basePath%>homework/uploadHomework',
  229 + type:"post",
  230 + dataType:"text",
  231 + data:{"JSON":data},
  232 + success:function(res){
  233 + alert("保存成功");
  234 + console.log(res);
375 235 }
376   - $("#Form").submit();
377   - $("#zhongxin").hide();
378   - $("#zhongxin2").show();
379   - }
380   -
381   - $(function() {
382   - //日期框
383   - $('.date-picker').datepicker({
384   - autoclose: true,
385   - todayHighlight: true
386   - });
387 236 });
388   - </script>
  237 + }
  238 + </script>
389 239 </body>
390 240 </html>
391 241 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
  View file @1b90180
... ... @@ -93,8 +93,8 @@
93 93 <td >${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"}</td>
94 94 <td >${var.ALL_SCORE}</td>
95 95 <td>
96   - <a onclick="edit('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
97   - <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a>
  96 + <a onclick="edit('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a>
  97 + <a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
98 98 </td>
99 99 </tr>
100 100  
... ... @@ -150,18 +150,17 @@
150 150 function tosearch(){
151 151 $("#Form").submit();
152 152 }
  153 + function add(Id){
  154 + var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id;
  155 + parent.$("#mainFrame").attr('src',path);
  156 + window.top.loading.show();
  157 + }
153 158 function edit(Id){
154   - window.top.modal.init({
155   - 'title':'布置练习',
156   - 'width':1200,
157   - 'height':600,
158   - 'url':'<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id,
159   - func:function() {
160   - tosearch();
161   - }
162   - });
163   - window.top.modal.show();
  159 + var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id;
  160 + parent.$("#mainFrame").attr('src',path);
  161 + window.top.loading.show();
164 162 }
  163 +
165 164 </script>
166 165  
167 166  
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @1b90180
... ... @@ -100,10 +100,10 @@
100 100  
101 101 <ul class="menu_1">
102 102 <li>
103   - <p id="practice_manage" onclick="event.stopPropagation();homeWork('${SCHOOL_ID}')">练习列表</p>
  103 + <p id="practice_manage" onclick="event.stopPropagation();homeWorkList('${SCHOOL_ID}')">练习列表</p>
104 104 </li>
105 105 <li>
106   - <p id="practice_do" >布置练习</p>
  106 + <p id="practice_do" onclick="event.stopPropagation();homeWork('${SCHOOL_ID}')">布置练习</p>
107 107 </li>
108 108 <li>
109 109 <p id="practice_report">练习报表</p>
... ... @@ -176,7 +176,7 @@
176 176 window.top.loading.show();
177 177 }
178 178 }
179   - function homeWork(schoolId){
  179 + function homeWorkList(schoolId){
180 180 //var path = "../school/goEdit2.do?ID=" + schoolId ;
181 181  
182 182 var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
... ... @@ -184,6 +184,14 @@
184 184 $("#mainFrame").attr('src',path);
185 185 window.top.loading.show();
186 186 }
  187 + function homeWork(schoolId){
  188 + //var path = "../school/goEdit2.do?ID=" + schoolId ;
  189 +
  190 + var path = '<%=basePath%>homework/goEdit2.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
  191 +
  192 + $("#mainFrame").attr('src',path);
  193 + window.top.loading.show();
  194 + }
187 195  
188 196 function report(classId){
189 197 //window.open('<%=basePath%>report/report.do?classid=' + classId);
... ...
WebRoot/static/css/edit.css
  View file @1b90180
... ... @@ -30,7 +30,7 @@ input[type=&quot;number&quot;] {
30 30 .homework_edit .subject_body_tabel .last img{width:24px;}
31 31 .homework_edit .classBox{border:1px solid #ccc;padding-top:10px;}
32 32 .homework_edit .classBox li{position:relative;text-align:left;float:left;width:275px;height:50px;list-style:none;padding:7px;margin-bottom:10px;margin-left:10px;font-size:18px;}
33   -.homework_edit .classBox li span{vertical-align: text-bottom;}
  33 +.homework_edit .classBox li span{vertical-align: text-bottom;margin:0 5px;}
34 34 .homework_edit .classBox li .date-picker{vertical-align: bottom;}
35 35 .homework_edit .classBox li.checked{border:1px solid #1989FA;border-radius:4px;}
36 36 .homework_edit .classBox li.checked span{color:#1989FA}
... ...
WebRoot/static/js/control_homework.js 0 → 100644
  View file @1b90180
  1 +var saveData={} //声明保存数据
  2 +
  3 + $(document).on('click',"input[type='checkbox']",function(){ //选择班级
  4 + console.log($(this).prop("checked"));
  5 + if($(this).prop('checked')){
  6 + $(this).closest("li").attr("class","checked");
  7 + }else{
  8 + $(this).closest("li").removeClass("checked");
  9 + }
  10 +
  11 + });
  12 + var work={ //保存标题框中的数字框的值
  13 + que_num:0,
  14 + ans_num:4,
  15 + score:0
  16 + }
  17 + //点击+执行操作
  18 + function creat_work(_id,index,num){//index:开始序号，num:目标序号
  19 +
  20 + if(_id=="que_num"){ //新增题目
  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>');
  23 + for(i=0;i<work.ans_num;i++){
  24 + $(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
  25 + }
  26 + }
  27 + }
  28 + else if(_id=="ans_num"){//新增选项
  29 + for(j=1;j<=work.que_num;j++){ //轮询每道题目
  30 + var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数
  31 + if(now_length<work.ans_num){ //当前题目选项个数小于数字框中个数，则把选项个数增加到数字框中的个数
  32 + for(i=now_length;i<work.ans_num;i++){
  33 + console.log("index:"+index+"-"+"num:"+num+"i:"+i);
  34 + $(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
  35 + }
  36 + }
  37 + if(now_length>work.ans_num){//当前题目选项个数大于数字框中个数，则把选项个数减少到数字框中的个数
  38 + for(i=now_length;i>=work.ans_num;i--){
  39 + $(".question"+j+" ul").find(".btn").eq(work.ans_num).remove();
  40 + }
  41 + }
  42 +
  43 + }
  44 +
  45 + }else{
  46 + if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id，但是class中含有ans_num，则为单个题目中的选项设置框
  47 + var _index=_id.closest("tr").index()+1;
  48 + for(i=index;i<=num;i++){
  49 + $(".question"+_index+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i-1)+'</li>')
  50 + }
  51 + }
  52 + }
  53 + }
  54 + //点击-执行操作
  55 + function remove_work(_id,index,num){
  56 +
  57 + if(_id=="que_num"){ //减少题目
  58 + for(i=index;i<=num;i++){
  59 + $(".subject_body_tbody tr").eq(index).remove();
  60 + }
  61 + }
  62 + if(_id=="ans_num"){ //减少选项
  63 + for(j=1;j<=work.que_num;j++){ //轮询每道题目
  64 + var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目中的选项个数
  65 + if(now_length>work.ans_num){ //如果当前选项个数大于数字框中的值，则减少选项个数到数字框中的个数
  66 + for(i=now_length;i>=work.ans_num;i--){
  67 + $(".question"+j+" ul").find(".btn").eq(work.ans_num).remove();
  68 + }
  69 + }
  70 + if(now_length<work.ans_num){ //如果当前选项个数小于数字框中的值，则增加选项个数到数字框中的个数
  71 + for(i=now_length;i<work.ans_num;i++){
  72 + $(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
  73 + }
  74 + }
  75 +
  76 + }
  77 + }else{
  78 + if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id值，但是类名中含有ans_num，则判断为单个题目中的选项设置框
  79 + var _index=_id.closest("tr").index()+1;
  80 + for(i=index;i<=num;i++){
  81 + $(".question"+_index+" ul").find(".btn").eq(index).remove();
  82 + }
  83 + }
  84 + }
  85 +
  86 + }
  87 + //点击+按钮
  88 + $(document).on("click",".add",function(){
  89 + var _that=$(this);
  90 + var temp_num=0;
  91 + //获取当前按钮旁边数字框的值
  92 + temp_num=parseInt(_that.siblings(".w_100").val());
  93 + temp_num+=1;
  94 + //点击+号，数字框中的数字+1
  95 + _that.siblings(".w_100").val(temp_num);
  96 + //如果数字框有id，则是标题栏上面的数字框
  97 + if(_that.siblings(".w_100").attr("id")){
  98 + //将下面的数字框的值设置成标题栏数字框的值
  99 + var _class=_that.siblings(".w_100").attr("id");
  100 + $("."+_class).val(temp_num);
  101 + //题目数
  102 + if(_class=="que_num"){
  103 + work.que_num=temp_num;
  104 + creat_work(_class,work.que_num,work.que_num);
  105 + }
  106 + //选项数
  107 + if(_class=="ans_num"){
  108 + work.ans_num=temp_num;
  109 + creat_work(_class,work.ans_num,work.ans_num);
  110 + }
  111 + }
  112 + else{
  113 + if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){
  114 + creat_work(_that,temp_num,temp_num);
  115 + }
  116 + }
  117 +
  118 + })
  119 + //点击-按钮
  120 + $(document).on("click",".redu",function(){
  121 + var _that=$(this);
  122 + var temp_num=0;
  123 +
  124 + temp_num=parseInt(_that.siblings(".w_100").val());
  125 + temp_num-=1;
  126 + if(temp_num<0){
  127 + temp_num=0;
  128 + return;
  129 + }
  130 +
  131 + _that.siblings(".w_100").val(temp_num);
  132 +
  133 + if(_that.siblings(".w_100").attr("id")){
  134 + var _class=$(this).siblings(".w_100").attr("id");
  135 + $("."+_class).val(temp_num);
  136 +
  137 + if(_class=="que_num"){
  138 + work.que_num=temp_num;
  139 + remove_work(_class,work.que_num,work.que_num);
  140 + }
  141 + if(_class=="ans_num"){
  142 + work.ans_num=temp_num;
  143 + remove_work(_class,work.ans_num,work.ans_num);
  144 + }
  145 + }else{
  146 + if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){
  147 + remove_work(_that,temp_num,temp_num);
  148 + }
  149 + }
  150 +
  151 + })
  152 + $(document).on("click",".remove",function(){
  153 + var _that=$(this);
  154 + _that.closest("tr").remove();
  155 + work.que_num=$(".first").length;
  156 + $("#que_num").val(work.que_num);
  157 + for(i=0;i<$(".first").length;i++){
  158 + //console.log($(".first").closest("tr").index());
  159 + $(".first").eq(i).text(i+1);
  160 + $(".question").eq(i).attr("class","question question"+(i+1));
  161 + }
  162 + });
  163 + $(document).on("click","li.btn ",function(){
  164 + if($(this).attr("class").indexOf("on")>-1)
  165 + $(this).removeClass("on");
  166 + else
  167 + $(this).addClass("on");
  168 + });
  169 + $("#que_num").change(function(){
  170 + var now_num=parseInt($("#que_num").val());
  171 + var old_num=parseInt(work.que_num);
  172 + var _temp=now_num-old_num;
  173 +
  174 + if(_temp>0){
  175 + creat_work($(this).attr("id"),(old_num+1),now_num);
  176 + }else{
  177 + remove_work($(this).attr("id"),now_num,old_num);
  178 + }
  179 +
  180 + work.que_num=now_num;
  181 +
  182 + })
  183 + $("#ans_num").change(function(){
  184 + var now_num=parseInt($("#ans_num").val());
  185 + var old_num=parseInt(work.ans_num);
  186 + var _temp=now_num-old_num;
  187 +
  188 + $(".ans_num").val(now_num);
  189 + work.ans_num=now_num;
  190 +
  191 + if(_temp>0){
  192 + creat_work($(this).attr("id"),(old_num+1),now_num);
  193 + }else{
  194 + remove_work($(this).attr("id"),now_num,old_num);
  195 + }
  196 +
  197 +
  198 + });
  199 +
  200 +
  201 +
  202 + function save(){
  203 + if($("#NAME").val()==""){
  204 + $("#NAME").tips({
  205 + side:3,
  206 + msg:'请输入练习标题',
  207 + bg:'#AE81FF',
  208 + time:2
  209 + });
  210 + $("#NAME").focus();
  211 + return false;
  212 + }
  213 + if($("#HOMEWORK_DESC").val()==""){
  214 + $("#HOMEWORK_DESC").tips({
  215 + side:3,
  216 + msg:'请输入练习说明',
  217 + bg:'#AE81FF',
  218 + time:2
  219 + });
  220 + $("#HOMEWORK_DESC").focus();
  221 + return false;
  222 + }
  223 + var all_score=0;
  224 + for(var i=0;i<work.que_num;i++){
  225 + all_score+=parseInt($(".score").eq(i+1).val());
  226 + }
  227 + var CLASSLIST=[];
  228 + if($(".checked").length>0){
  229 + for(var j=0;j<$(".checked").length;j++){
  230 + var _index=$(".checked").eq(j).index();
  231 + console.log($(".date-picker").eq(_index).val());
  232 + if($(".date-picker").eq(_index).val()==''){
  233 + $(".date-picker").eq(_index).tips({
  234 + side:3,
  235 + msg:'请指定时间',
  236 + bg:'#AE81FF',
  237 + time:2
  238 + });
  239 + return false;
  240 + }
  241 +
  242 + CLASSLIST[j]={
  243 + CLASS_ID:$("#class"+_index).val(),
  244 + COMPLETE_DATE:$(".date-picker").eq(_index).val()
  245 + };
  246 +
  247 + }
  248 + }else{
  249 + $(".classBox").tips({
  250 + side:3,
  251 + msg:'请选择班级和指定时间',
  252 + bg:'#AE81FF',
  253 + time:2
  254 + });
  255 + return false;
  256 + }
  257 +
  258 + if(work.que_num<=0){
  259 + $('.subject').tips({
  260 + side:3,
  261 + msg:'请添加题目',
  262 + bg:'#AE81FF',
  263 + time:2
  264 + });
  265 + return false;
  266 + }
  267 + var QUESTIONS=[];
  268 + for(var k=0;k<work.que_num;k++){
  269 + QUESTIONS[k]={
  270 + RANK:$(".first").eq(k).text(),
  271 + NAME:$(".first").eq(k).text(),
  272 + OPTION_NUM:$(".ans_num").eq(k+1).val(),
  273 + SCORE:$(".score").eq(k+1).val(),
  274 + RIGHT_ANSWER:"",
  275 + TYPE:""
  276 + }
  277 +
  278 + var type=0,right_ans='';
  279 + var a_num=$('.question'+(k+1)).find('.on').length;
  280 + if(a_num<=0){
  281 + //alert("题目"+(k+1)+"请选择正确答案");
  282 + $('.question'+(k+1)).tips({
  283 + side:3,
  284 + msg:'请指定正确答案',
  285 + bg:'#AE81FF',
  286 + time:2
  287 + });
  288 + return false;
  289 + }
  290 + for(var x=0;x<a_num;x++){
  291 + right_ans+=$('.question'+(k+1)).find('.on').eq(x).text();
  292 + }
  293 + if(a_num>1){
  294 + type=2;
  295 + }else{
  296 + type=1;
  297 + }
  298 +
  299 + QUESTIONS[k].RIGHT_ANSWER=right_ans;
  300 + QUESTIONS[k].TYPE=type;
  301 + }
  302 +
  303 +
  304 + saveData.TEACHER_ID=$("#TEACHER_ID").val();
  305 + saveData.NAME=$("#NAME").val();
  306 + saveData.HOMEWORK_DESC=$("#HOMEWORK_DESC").val();
  307 + saveData.ALL_SCORE=all_score;
  308 + saveData.CLASSLIST=CLASSLIST;
  309 + saveData.QUESTION_COUNT=work.que_num;
  310 + saveData.QUESTIONS=QUESTIONS;
  311 +
  312 + //console.log(saveData);
  313 + save_data(JSON.stringify(saveData));
  314 +
  315 +
  316 + }
  317 +
  318 +
0 319 \ No newline at end of file
... ...
src/com/fh/controller/sunvote/homework/HomeworkController.java
  View file @1b90180
... ... @@ -175,6 +175,7 @@ public class HomeworkController extends BaseController {
175 175 pd = this.getPageData();
176 176 pd = homeworkService.findById(pd); // 根据ID读取
177 177 pd.put("PROBLEMS", homeworkproblemService.listProblem(pd));
  178 + pd.put("TEACHER_ID", geTeacherID());
178 179 mv.setViewName("sunvote/homework/homework_edit2");
179 180 mv.addObject("msg", "edit");
180 181 mv.addObject("pd", pd);
... ...