孙向锦 / SunvoteEducation

Commit f19da10849bc68c6f95a8377c8b197f653b85ef6

Authored by 孙向锦
1 parent efdefb1b

添加英语对应的修改

Inline Side-by-side
Showing 15 changed files with 308 additions and 41 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list2.jsp
  View file @f19da10
... ... @@ -62,7 +62,7 @@
62 62 <th><input type="checkbox" name='ids' id="ids" />Serial No.</th>
63 63 <th>Test Paper Title</th>
64 64 <th>Create Time</th>
65   - <th>Advice Time</th>
  65 + <th>Suggested Time</th>
66 66 <th>Total Score</th>
67 67 <th>Operate</th>
68 68 </tr>
... ... @@ -125,6 +125,7 @@
125 125  
126 126 $(document).ready(function(){
127 127 window.top.loading.remove();
  128 + $(".table_box").css("margin-top",$(".head_box").height() - 143);
128 129 });
129 130  
130 131 function tosearch(){
... ...
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
  View file @f19da10
... ... @@ -125,6 +125,7 @@
125 125  
126 126 $(document).ready(function(){
127 127 window.top.loading.remove();
  128 + $(".table_box").css("margin-top",$(".head_box").height() - 143);
128 129 });
129 130  
130 131 function tosearch(){
... ...
WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
  View file @f19da10
... ... @@ -113,6 +113,7 @@
113 113 <script type="text/javascript">
114 114 $(document).ready(function(){
115 115 window.top.loading.remove();
  116 + $(".table_box").css("margin-top",$(".head_box").height() - 143);
116 117 });
117 118 function tosearch(){
118 119 $("#Form").submit();
... ... @@ -157,7 +158,7 @@
157 158  
158 159 function edit(Id){
159 160 window.top.modal.init({
160   - 'title':'添加学生',
  161 + 'title':'Add Student',
161 162 'url':'<%=basePath%>student/goEdit2.do?ID='+Id,
162 163 func:function() {
163 164 tosearch();
... ... @@ -167,7 +168,7 @@
167 168 }
168 169  
169 170 function deleteAll(){
170   - window.top.remove.init({"title":"Delete","func":function(success){
  171 + window.top.remove.init({"title":"Delete","ok":"OK","cancel":"Cancel","func":function(success){
171 172 if(success){
172 173 var str = '';
173 174 for(var i=0;i < document.getElementsByName('ids').length;i++){
... ...
WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
  View file @f19da10
... ... @@ -116,6 +116,7 @@
116 116 <script type="text/javascript">
117 117 $(document).ready(function(){
118 118 window.top.loading.remove();
  119 + $(".table_box").css("margin-top",$(".head_box").height() - 143);
119 120 });
120 121 function tosearch(){
121 122 $("#Form").submit();
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_creat_question.jsp
  View file @f19da10
... ... @@ -211,7 +211,7 @@
211 211 //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"单选","option_num":"","option_content":"","answer":"","difficulty":"","analysis":"","question_from":"","score":1,"part_score":"","remark":"","rank":"1","no_name":"一、","questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.1"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"B","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.2"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"C","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.3"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"D","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.4"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.5"}]}]};
212 212 //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[]};
213 213 </script>
214   -<script type="text/javascript" src="../static/js/en_control-604.js?"></script>
  214 +<script type="text/javascript" src="../static/js/en_control-604.js?a=1"></script>
215 215  
216 216  
217 217 </body>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_paper_view2.jsp
  View file @f19da10
... ... @@ -40,7 +40,7 @@
40 40 <div class="container">
41 41 <div class="page-header">
42 42 <h3 class="col-md-6" id="paper_title"></h3>
43   - <h3 class="col-md-6">Exam Time:<span id="time"></span>Minutes</h3>
  43 + <h3 class="col-md-6">Exam Time:<span id="time"></span> Minutes</h3>
44 44 <div class="clearfix"></div>
45 45 </div>
46 46 <div class="content_report">
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
  View file @f19da10
... ... @@ -147,5 +147,5 @@
147 147  
148 148 var view = "View" ;
149 149 </script>
150   - <script src="../static/js/teach_paper.js?a=1"></script>
  150 + <script src="../static/js/en_teach_paper.js?a=2"></script>
151 151 </html>
152 152 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp
  View file @f19da10
... ... @@ -41,7 +41,7 @@
41 41 <div class="clear"></div>
42 42 </div>
43 43 <div class="content">
44   - <div class="content_l">
  44 + <div class="content_l" style="min-width:300px">
45 45 <div class="info_tab">
46 46 <div class="head_pic">
47 47 <img src="../static/images/head_defult.png" />
... ... @@ -54,29 +54,29 @@
54 54 </div>
55 55 <div class="class tab1">
56 56 <p>
57   - Class Management<span class="right jiao"></span>
  57 + Classes<span class="right jiao"></span>
58 58 </p>
59 59 <ul class="menu_1">
60 60 <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
61   - <li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.GRADE_ENAME} ${var.SUBJECT_ENAME}
62   - <span>${var.CLASS_NAME}</span></p>
  61 + <li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.CLASS_NAME}
  62 + <span>${var.SUBJECT_ENAME}</span></p>
63 63 </li>
64 64 </c:forEach>
65 65  
66 66 </ul>
67 67 </div>
68 68 <div class="testpaper tab1">
69   - <p>Paper Management<span class="right jiao"></span></p>
  69 + <p>Test Papers<span class="right jiao"></span></p>
70 70 <ul class="menu_1">
71 71 <li >
72   - <p id="qingsongkao_paper">E-exam Paper Management</p>
  72 + <p id="qingsongkao_paper">E-exam Papers</p>
73 73 <!-- <ul class="menu_2">
74 74 <li><p>高一数学 202班</p></li>
75 75 <li><p>高一数学 203班</p></li>
76 76 </ul> -->
77 77 </li>
78 78 <li>
79   - <p id="jishice_paper">SunVote Class Paper Management</p>
  79 + <p id="jishice_paper">SunVote Class Papers</p>
80 80  
81 81 <!-- <ul class="menu_2">
82 82 <li><p>高一数学 202班</p></li>
... ... @@ -93,15 +93,15 @@
93 93  
94 94 <ul class="menu_1">
95 95 <li >
96   - <p>E-exam Examination Analysis</p>
  96 + <p>E-exam Tests</p>
97 97 <ul class="menu_2">
98 98 <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
99   - <li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME} Score</p></li>
  99 + <li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>Result of ${var.CLASS_NAME}</p></li>
100 100 </c:forEach>
101 101 </ul>
102 102 </li>
103 103 <li>
104   - <p>SunVote Class Exam Analysis</p>
  104 + <p>SunVote Class Tests</p>
105 105 <ul class="menu_2">
106 106 <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
107 107 <li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME} Score</p></li>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/en_test_list.jsp
  View file @f19da10
... ... @@ -83,5 +83,5 @@
83 83 var user_id= "${pd.userId}";
84 84 var url = "<%=basePath%>";
85 85 </script>
86   - <script src="../static/js/en_test_list.js?a=1"></script>
  86 + <script src="../static/js/en_test_list.js?a=0"></script>
87 87 </html>
88 88 \ No newline at end of file
... ...
WebRoot/static/js/en_control-604.js
  View file @f19da10
... ... @@ -18,7 +18,7 @@ $(function() {
18 18 /*
19 19 * $(".content").append('<div class="section section-1 single"
20 20 * data-fraction="'+fraction+'" data-score=""> <div class="title"> <h3><span
21   - * class="que_num">一、</span><span class="que_name">单选</span></h3>
  21 + * class="que_num">一.</span><span class="que_name">单选</span></h3>
22 22 * <input type="button" class="btn btn-danger pull-right remove"
23 23 * name="remove" value="删除" /> </div> <div class="question_list"></div></div>')
24 24 */
... ... @@ -46,7 +46,7 @@ $(function() {
46 46 $(".section-" + answer_index_b + " .question_list").append(
47 47 '<div class="question question' + (questionNUm)
48 48 + '"><span>' + (questionNUm)
49   - + '、</span><ul></ul></div>');
  49 + + '.</span><ul></ul></div>');
50 50 for (var j = 0; j < a_num; j++) {
51 51 option = String.fromCharCode(0x41 + j);
52 52 if (on_index == j) {
... ... @@ -72,7 +72,7 @@ $(function() {
72 72 }
73 73  
74 74 /***************************************************************************
75   - * 1、单选题 2、完形填空 3、阅读理解 4、判断题 5、多选题
  75 + * 1.单选题 2.完形填空 3.阅读理解 4.判断题 5.多选题
76 76 **************************************************************************/
77 77  
78 78 function addQuestion(type, a_num, index_s_2, index_e_2, fraction2) {
... ... @@ -90,12 +90,12 @@ $(function() {
90 90 + fraction2
91 91 + '" data-score=""> <div class="title"> <h3><span class="que_num">'
92 92 + question_num
93   - + '、</span>'
  93 + + '.</span>'
94 94 + '<span class="que_name">单选</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
95 95 for (i = index_s_2; i <= index_e_2; i++) {
96 96 $(".section-" + answer_index_b + " .question_list").append(
97 97 '<div class="question question' + i + '"><span>' + i
98   - + '、</span><ul></ul></div>');
  98 + + '.</span><ul></ul></div>');
99 99 for (var j = 0; j < a_num; j++) {
100 100 option = String.fromCharCode(0x41 + j);
101 101 $(".section-" + answer_index_b + " .question" + i + ' ul')
... ... @@ -114,11 +114,11 @@ $(function() {
114 114 + fraction2
115 115 + '" data-score=""> <div class="title"> <h3><span class="que_num">'
116 116 + question_num
117   - + '、</span><span class="que_name">完形填空</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
  117 + + '.</span><span class="que_name">完形填空</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
118 118 for (var i = index_s_2; i <= index_e_2; i++) {
119 119 $(".section-" + answer_index_b + " .question_list").append(
120 120 '<div class="question question' + i + '"><span>' + i
121   - + '、</span><ul></ul></div>');
  121 + + '.</span><ul></ul></div>');
122 122 for (var j = 0; j < a_num; j++) {
123 123 option = String.fromCharCode(0x41 + j);
124 124 $(".section-" + answer_index_b + " .question" + i + ' ul')
... ... @@ -137,11 +137,11 @@ $(function() {
137 137 + fraction2
138 138 + '" data-score=""> <div class="title"> <h3><span class="que_num">'
139 139 + question_num
140   - + '、</span><span class="que_name">阅读理解</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
  140 + + '.</span><span class="que_name">阅读理解</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
141 141 for (var i = index_s_2; i <= index_e_2; i++) {
142 142 $(".section-" + answer_index_b + " .question_list").append(
143 143 '<div class="question question' + i + '"><span>' + i
144   - + '、</span><ul></ul></div>');
  144 + + '.</span><ul></ul></div>');
145 145 for (var j = 0; j < a_num; j++) {
146 146 option = String.fromCharCode(0x41 + j);
147 147 $(".section-" + answer_index_b + " .question" + i + ' ul')
... ... @@ -160,11 +160,11 @@ $(function() {
160 160 + fraction2
161 161 + '" data-score=""> <div class="title"> <h3><span class="que_num">'
162 162 + question_num
163   - + '、</span><span class="que_name">判断题</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
  163 + + '.</span><span class="que_name">判断题</span></h3> <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
164 164 for (var i = index_s_2; i <= index_e_2; i++) {
165 165 $(".section-" + answer_index_b + " .question_list").append(
166 166 '<div class="question question' + i + '"><span>' + i
167   - + '、</span><ul></ul></div>');
  167 + + '.</span><ul></ul></div>');
168 168 for (var j = 0; j < a_num; j++) {
169 169 if (j % 2 == 0)
170 170 option = "√";
... ... @@ -181,12 +181,12 @@ $(function() {
181 181 * case 5: //多选题 $(".content").append('<div class="section
182 182 * section-'+answer_index_b+' check" data-fraction="'+fraction2+'"
183 183 * data-score=""> <div class="title"> <h3><span
184   - * class="que_num">'+question_num+'、</span><span class="que_name">多选题</span></h3>
  184 + * class="que_num">'+question_num+'.</span><span class="que_name">多选题</span></h3>
185 185 * <input type="button" class="btn btn-danger pull-right remove"
186 186 * name="remove" value="删除" /> </div> <div class="question_list"></div></div>');
187 187 * for(var i=index_s_2;i<=index_e_2;i++){
188 188 * $(".section-"+answer_index_b+" .question_list").append('<div
189   - * class="question question'+i+'"><span>'+i+'、</span><ul></ul></div>');
  189 + * class="question question'+i+'"><span>'+i+'.</span><ul></ul></div>');
190 190 * for(var j=0;j<a_num;j++){ option=String.fromCharCode(0x41+j);
191 191 * $(".section-"+answer_index_b+" .question"+i+' ul').append('<li class="btn btn-default">'+option+'</li>'); } }
192 192 */
... ... @@ -214,7 +214,7 @@ $(function() {
214 214 $(".section-" + answer_index_b + " .question_list").append(
215 215 '<div class="question question' + questionNUm
216 216 + '"><span>' + questionNUm
217   - + '、</span><ul></ul></div>');
  217 + + '.</span><ul></ul></div>');
218 218 for (var j = 0; j < a_num; j++) {
219 219 option = String.fromCharCode(0x41 + j);
220 220 $(
... ... @@ -510,7 +510,7 @@ $(function() {
510 510 }
511 511 $(".section0").find(".question_list").append(
512 512 '<div class="question question' + (i + 1) + '"><span>'
513   - + (++questionNUm) + '、</span><ul></ul></div>');
  513 + + (++questionNUm) + '.</span><ul></ul></div>');
514 514 for (var k = 0; k < parseInt(data.questions[i].option_num); k++) {
515 515 str_temp = data.questions[i].answer;
516 516 $(".section0").find(".question" + (i + 1) + ' ul').append(
... ... @@ -535,7 +535,7 @@ $(function() {
535 535 $(".section-" + i).find(".question_list").append(
536 536 '<div class="question question' + (j + 1)
537 537 + '"><span>' + (++questionNUm)
538   - + '、</span><ul></ul></div>');
  538 + + '.</span><ul></ul></div>');
539 539 if ($(".section-" + i).find(".que_name").text() == "判断题") {
540 540 for (var k = 0; k < parseInt(data.questions[i].questions[j].option_num); k++) {
541 541 str_temp = data.questions[i].questions[j].answer;
... ... @@ -603,7 +603,7 @@ $(function() {
603 603 }
604 604 $("#answer").val(result);
605 605 if (answerStr.length > 0) {
606   - $(".tips").text("Total number of questions" + answerStr.length + " ");
  606 + $(".tips").text("Total number of questions " + answerStr.length + " ");
607 607 } else {
608 608 $(".tips").text("");
609 609 }
... ...
WebRoot/static/js/en_teach_paper.js 0 → 100644
  View file @f19da10
  1 + var class_html="",
  2 + option_html="";
  3 + var user_id= "",
  4 + subject_id="",
  5 + class_id="";
  6 + $(document).ready(function(){
  7 +
  8 + timeList();
  9 + $.ajax({
  10 + url:url+"/teacher/info",
  11 + async:false,
  12 + type:"post",
  13 + success:function(data){
  14 + console.log(data);
  15 + subject_id=data.data.subjectList[0].SUBJECT_ID;
  16 + user_id=data.data.ID;
  17 +
  18 + if(data.data.classInfoList.length>0){
  19 + for(var i=0;i<data.data.classInfoList.length;i++){
  20 + class_html += '<li data-classId="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</li>';
  21 + option_html += '<option value="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</option>'
  22 + }
  23 + $(".classList").html(class_html+'<div class="clearfix"></div>');
  24 + $(".classList li").eq(0).addClass("active");
  25 + $("#dealer_id_2").html(option_html);
  26 + }
  27 + getList();
  28 + },
  29 + error: function (XMLHttpRequest, textStatus, errorThrown) {
  30 + // wrong massage
  31 + alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
  32 + window.top.loading.remove();
  33 + }
  34 + })
  35 +
  36 +
  37 + window.top.loading.remove();
  38 + $(".table_box").css("margin-top",$(".head_box").height() - 143);
  39 + })
  40 +
  41 + function getList(start_date,end_date,class_id){ //获取试卷列表
  42 + var tab_html="";
  43 + $.ajax({
  44 + url:url+"/api/v1/paper",
  45 + async:false,
  46 + type:"post",
  47 + data:{
  48 + paper_type:"101",
  49 + user_id:user_id,
  50 + subject_id:subject_id,
  51 + class_id:class_id,
  52 + currentpage:"1",
  53 + showcount:"",
  54 + start_date:start_date,
  55 + end_date:end_date
  56 + },
  57 + success:function(data){
  58 + console.log(data);
  59 + for(var i=0;i<data.data.length;i++){
  60 + tab_html += '<tr data-id="'+data.data[i].PAPER_ID+'" data-classid="'+data.data[i].CLASS_ID+'"><td><input type="checkbox" name="ids" id="ids" value="'+data.data[i].PAPER_ID+'"/>'+(i+1)+'</td><td>'+data.data[i].TITLE+'</td><td>'+getClassName(data.data[i].CLASS_ID)+'</td><td>'+getSubjectName(data.data[i].SUBJECT_ID)+'</td><td>'+data.data[i].EXAM_TIME+' Minutes</td><td>'+data.data[i].CREATE_DATE+'</td><td><a style="cursor:pointer" onclick="jump($(this))">' + view + '</a></td><td><a href="#" onclick="del($(this));"><img src="../static/images/remove.png" /></a></td></tr>';
  61 + }
  62 + $("#tab_body").html(tab_html);
  63 + window.top.loading.remove();
  64 + },
  65 + error: function (XMLHttpRequest, textStatus, errorThrown) {
  66 + // wrong massage
  67 + alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
  68 + window.top.loading.remove();
  69 + }
  70 + });
  71 + }
  72 + $('#ids').on('click', function(){
  73 + var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header
  74 +
  75 + $(".table_box .table").find('tbody > tr').each(function(){
  76 + var row = this;
  77 + if(th_checked) $(row).find('input[type=checkbox]').eq(0).prop('checked', true);
  78 + else $(row).find('input[type=checkbox]').eq(0).prop('checked', false);
  79 + });
  80 + });
  81 + function jump(obj){ //预览试卷
  82 + window.top.loading.show();
  83 + var id=obj.closest("tr").attr("data-id");
  84 + var classid=obj.closest("tr").attr("data-classid");
  85 + location.href="paper_view2.do?PAPER_ID="+id+"&classID="+classid+"&userid="+user_id;
  86 + }
  87 + $(".classList").on("click","li",function(){
  88 + $(this).siblings().removeClass("active");
  89 + $(this).addClass("active");
  90 +
  91 + });
  92 + $("#creatPaper").click(function(){ //新建试卷
  93 + $('#myModal').modal('show');
  94 + });
  95 + function setQUestion(){ //新建试卷-选择班级
  96 + if($(".classList .active").length>0){
  97 + class_id=$(".classList .active").attr("data-classid");
  98 + location.href="set_question.do?subject_id="+subject_id+"&class_id="+class_id+"&user_id="+user_id;
  99 + }else{
  100 + alert("Please select class first");
  101 + }
  102 + window.top.loading.show();
  103 + console.log($(".classList .active").length);
  104 + //location.href="";
  105 + }
  106 + function getSubjectName(id){ //获取科目中文名
  107 + var subjectName="";
  108 + $.ajax({
  109 + url:url+"/api/v1/subjectename",
  110 + async:false,
  111 + type:"post",
  112 + data:{id:id},
  113 + success:function(data){
  114 + subjectName=data.data;
  115 + },
  116 + error: function (XMLHttpRequest, textStatus, errorThrown) {
  117 + // wrong massage
  118 + alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
  119 + window.top.loading.remove();
  120 + }
  121 + })
  122 + return subjectName;
  123 + }
  124 + function getClassName(id){ //获取班级中文名
  125 + var className="";
  126 + $.ajax({
  127 + url:url+"/api/v1/classname",
  128 + async:false,
  129 + type:"post",
  130 + data:{id:id},
  131 + success:function(data){
  132 + className=data.data;
  133 + },
  134 + error: function (XMLHttpRequest, textStatus, errorThrown) {
  135 + // wrong massage
  136 + alert("Status code:"+XMLHttpRequest.status+"Status:"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
  137 + window.top.loading.remove();
  138 + }
  139 + })
  140 + return className;
  141 + }
  142 + function getday(month){ //获取日期
  143 + var time=[];
  144 + var d= new Date();
  145 + d.setMonth(month-1);
  146 + d.setDate(1);
  147 + var day=d.getDate();
  148 + var month=d.getMonth()+1;
  149 + if((d.getMonth()+1)<10){
  150 + var month="0"+(d.getMonth()+1);
  151 + }
  152 + var year=d.getFullYear();
  153 + var startTime=year+"-"+month+"-"+day;
  154 + d.setMonth(month);
  155 + var end_day=d.getDate();
  156 + var end_month=d.getMonth()+1;
  157 + if((d.getMonth()+1)<10){
  158 + var end_month="0"+(d.getMonth()+1);
  159 + }
  160 + var end_year=d.getFullYear();
  161 + var endTime=end_year+"-"+end_month+"-"+end_day;
  162 + time[0]=startTime;
  163 + time[1]=endTime;
  164 + return time;
  165 + }
  166 + function timeList(){ //渲染时间列表
  167 + var time = new Date();
  168 + var now_month=time.getMonth()+1;
  169 + time.setMonth(now_month-1)
  170 + if(time.getMonth()!= 0 ){
  171 + var preceding_month = time.getMonth();
  172 + }else
  173 + var preceding_month = 12;
  174 + time.setMonth(now_month-2)
  175 + if(time.getMonth()!= 0 ){
  176 + var last_month = time.getMonth();
  177 + }else
  178 + var last_month = 12;
  179 + var option_html="";
  180 + option_html += '<option value="'+now_month+'">'+now_month+'月</option><option value="'+preceding_month+'">'+preceding_month+'月</option><option value="'+last_month+'">'+last_month+'月</option>';
  181 + $("#dealer_id_1").html(option_html);
  182 + }
  183 + function tosearch(){ //搜索
  184 + //var timeBox=getday($("#dealer_id_1").val());
  185 + var start_date=$("#lastStart").val();
  186 + var end_date=$("#lastEnd").val();
  187 + var class_id=$("#dealer_id_2").val();
  188 + getList(start_date,end_date,class_id);
  189 + }
  190 +
  191 + function del(obj){ //删除
  192 + //var remove = new remove();
  193 + var id=obj.closest("tr").attr("data-id");
  194 + window.top.remove.init({"title":"Delete","func":function(success){
  195 + if(success){
  196 + var url1 = url+ "/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime();
  197 + window.top.loading.show();
  198 + $.get(url1,function(data){
  199 + tosearch();
  200 + });
  201 + }
  202 + else{
  203 + console.log("false");
  204 + }
  205 + }});
  206 + window.top.remove.show();
  207 + }
  208 + function deleteAll(){ //批量删除
  209 + window.top.remove.init({"title":"Delete","func":function(success){
  210 + if(success){
  211 + var str = '';
  212 + for(var i=0;i < document.getElementsByName('ids').length;i++){
  213 + if(document.getElementsByName('ids')[i].checked){
  214 + if(str=='') str += document.getElementsByName('ids')[i].value;
  215 + else str += ',' + document.getElementsByName('ids')[i].value;
  216 + }
  217 + }
  218 + if(str==''){
  219 +
  220 + }else{
  221 + $.ajax({
  222 + type: "POST",
  223 + url:url+ '/paper/deleteAll.do?tm='+new Date().getTime(),
  224 + data: {DATA_IDS:str},
  225 + dataType:'json',
  226 + //beforeSend: validateData,
  227 + cache: false,
  228 + success: function(data){
  229 + $.each(data.list, function(i, list){
  230 + tosearch();
  231 + });
  232 + }
  233 + });
  234 + }
  235 + }
  236 + else{
  237 + console.log("false");
  238 + }
  239 + }});
  240 + window.top.remove.show();
  241 + }
0 242 \ No newline at end of file
... ...
WebRoot/static/js/en_test_list.js
  View file @f19da10
... ... @@ -37,6 +37,19 @@ $(document).ready(
37 37 window.top.loading.remove();
38 38 }
39 39 })
  40 +
  41 + $.fn.datepicker.dates['en'] = {
  42 + days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
  43 + daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
  44 + daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"],
  45 + months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
  46 + monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
  47 + today: "Today",
  48 + clear: "Clear",
  49 + format: "mm/dd/yyyy",
  50 + titleFormat: "MM yyyy", /* Leverages same syntax as 'format' */
  51 + weekStart: 0
  52 + };
40 53 // 日期框
41 54 $('.date-picker').datepicker({
42 55 autoclose : true,
... ...
WebRoot/static/js/remove.js
  View file @f19da10
... ... @@ -4,10 +4,18 @@ var remove={
4 4 this.init.title=obj.title;
5 5 this.init.func = obj.func;
6 6 this.init.msg = obj.msg;
  7 + this.init.ok = obj.ok;
  8 + this.init.cancel = obj.cancel;
  9 + if(typeof(this.init.ok) == "undefined"){
  10 + this.init.ok = "确定";
  11 + }
  12 + if(typeof(this.init.ok) == "undefined"){
  13 + this.init.cancel = "取消" ;
  14 + }
7 15 },
8 16 show:function(){
9 17 if(window.top!=window.self){
10   - $("body",top.document).append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">确认</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">取消</a></div></div></div></div>');
  18 + $("body",top.document).append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">' +window.top.remove.init.ok + '</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">' + window.top.remove.init.cancel + '</a></div></div></div></div>');
11 19 console.log(typeof(window.top.remove.init.msg));
12 20 if(typeof(window.top.remove.init.msg) != "undefined"){
13 21 $(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
... ... @@ -16,7 +24,7 @@ var remove={
16 24 if($(".loading").length==0)
17 25 {
18 26 console.log(typeof(window.top.remove.init.msg));
19   - $("body").append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">确认</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">取消</a></div></div></div></div>');
  27 + $("body").append('<div class="mb remove"><div class="mb_box" ><div class="mb_head"><p>'+window.top.remove.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><div class="mb_content_l"><a href="#" onclick="window.top.remove.init.func(true);window.top.remove.remove();">' + window.top.remove.init.ok +'</a></div><div class="mb_content_r"><a href="#" onclick="window.top.remove.remove();window.top.remove.init.func(false);">' + window.top.remove.init.cancel + '</a></div></div></div></div>');
20 28 if(typeof(window.top.remove.init.msg) != "undefined"){
21 29 $(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
22 30 }
... ...
WebRoot/static/js/teach_paper.js
  View file @f19da10
... ... @@ -30,6 +30,7 @@
30 30 // wrong massage
31 31 alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
32 32 window.top.loading.remove();
  33 + $(".table_box").css("margin-top",$(".head_box").height() - 143);
33 34 }
34 35 })
35 36  
... ...
src/com/fh/entity/Page.java
  View file @f19da10
... ... @@ -84,9 +84,9 @@ public class Page {
84 84 frist = "Frist" ;
85 85 previous = "Previous";
86 86 next = "Next";
87   - tail = "Tail" ;
88   - jump = "JUMP" ;
89   - pageNumber = "Page number";
  87 + tail = "Last" ;
  88 + jump = "Goto" ;
  89 + pageNumber = "PageNo.";
90 90 displayNumber = "Display Number" ;
91 91 }
92 92 }
... ... @@ -97,13 +97,13 @@ public class Page {
97 97 sb.append(" <ul class=\"pagination pull-right no-margin\">\n");
98 98 if(currentPage==1){
99 99 sb.append(" <li><a>" + total +totalResult+articles + "</a></li>\n");
100   - sb.append(" <li><span style='padding:0'><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:50px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></span></li>\n");
  100 + sb.append(" <li><span style='padding:0'><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:80px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></span></li>\n");
101 101 sb.append(" <li style=\"cursor:pointer;\"><a onclick=\"toTZ();\" class=\"btn btn-mini btn-success\">" + jump + "</a></li>\n");
102 102 sb.append(" <li><a>" + frist + "</a></li>\n");
103 103 sb.append(" <li><a>" + previous + "</a></li>\n");
104 104 }else{
105 105 sb.append(" <li><a>"+ total +"<font color=red>"+totalResult+"</font>" + articles + "</a></li>\n");
106   - sb.append(" <li><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:50px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></li>\n");
  106 + sb.append(" <li><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:80px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></li>\n");
107 107 sb.append(" <li style=\"cursor:pointer;\"><a onclick=\"toTZ();\" class=\"btn btn-mini btn-success\">" + jump + "</a></li>\n");
108 108 sb.append(" <li style=\"cursor:pointer;\"><a onclick=\"nextPage(1)\">" + frist + "</a></li>\n");
109 109 sb.append(" <li style=\"cursor:pointer;\"><a onclick=\"nextPage("+(currentPage-1)+")\">" + previous + "</a></li>\n");
... ...