孙向锦 / SunvoteEducation

Commit 2ce09a2057114e026925bbd917b82f2a7f60f1e1

Authored by jack
1 parent e9e81463

1.修改bug

Inline Side-by-side
Showing 11 changed files with 66 additions and 51 deletions
WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp
  View file @2ce09a2
... ... @@ -34,7 +34,7 @@
34 34 <div id="zhongxin" style="padding-top: 13px;">
35 35 <table id="table_report" class="table">
36 36 <tr>
37   - <td style="width:75px;text-align: right;padding-top: 13px;">科目名称:</td>
  37 + <td style="width:75px;text-align: right;padding-top: 13px;">年级名称:</td>
38 38 <td>
39 39 <select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="">
40 40 <c:forEach var="item" items="${gradeList}">
... ...
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
  View file @2ce09a2
... ... @@ -184,7 +184,7 @@
184 184  
185 185 $(":checkbox").on("click",function(){
186 186 if($("input[type='checkbox']:checked").length>0){
187   - $(".disable").attr("disabled","false");
  187 + $(".disable").removeAttr("disabled");
188 188 $(".disable").removeClass("disable");
189 189 }else{
190 190 $(".disable").attr("disabled","true");
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
  View file @2ce09a2
... ... @@ -121,9 +121,17 @@
121 121 </div><!-- /.modal-content -->
122 122 </div><!-- /.modal-dialog -->
123 123 </div><!-- /.modal -->
124   - <script type="text/javascript">
  124 +
  125 +
  126 + <script src="../static/js/jquery.min.js"></script>
  127 + <script src="../static/js/bootstrap.min.js" ></script>
  128 + <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
  129 + <script src="../static/ace/js/bootbox.js"></script>
  130 + <script src="../static/js/teach_paper.js?a=1"></script>
  131 + <script type="text/javascript">
125 132 var url = "<%=basePath%>" ;
126 133 $(document).ready(function(){
  134 + $(".table_box").css("padding-top",$(".head_box").height());
127 135 window.top.loading.remove();
128 136 });
129 137 $('.date-picker').datepicker({
... ... @@ -132,10 +140,4 @@
132 140 });
133 141 var view = "查看" ;
134 142 </script>
135   -
136   - <script src="../static/js/jquery.min.js"></script>
137   - <script src="../static/js/bootstrap.min.js" ></script>
138   - <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
139   - <script src="../static/ace/js/bootbox.js"></script>
140   - <script src="../static/js/teach_paper.js?a=0"></script>
141 143 </html>
142 144 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
  View file @2ce09a2
... ... @@ -127,5 +127,5 @@
127 127 <script src="../static/js/bootstrap.min.js"></script>
128 128 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
129 129 <script src="../static/ace/js/bootbox.js"></script>
130   - <script src="../static/js/teach_paper.js?a=2"></script>
  130 + <script src="../static/js/teach_paper.js?a=3"></script>
131 131 </html>
132 132 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
  View file @2ce09a2
... ... @@ -34,6 +34,9 @@
34 34 <input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
35 35 <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
36 36 <div id="zhongxin" style="padding-top: 13px;">
  37 +
  38 +
  39 +
37 40 <table id="table_report" class="table">
38 41 <tr>
39 42 <td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
... ... @@ -57,7 +60,11 @@
57 60 </tr>
58 61 <tr>
59 62 <td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
60   - <td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
  63 + <td>
  64 + <input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="opacity:0;height:0;padding:0;margin:0;border:0;float:left;"/>
  65 + <input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="opacity:0;height:0;padding:0;margin:0;border:0;float:left;"/>
  66 + <input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;" />
  67 + </td>
61 68 </tr>
62 69 <tr>
63 70 <td style="width:75px;text-align: right;padding-top: 13px;">性别:</td>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
  View file @2ce09a2
... ... @@ -53,7 +53,10 @@
53 53 </tr>
54 54 <tr>
55 55 <td style="width:90px;text-align: right;padding-top: 13px;">原密码:</td>
56   - <td><input type="password" name="PASSWORD_OLD" id="PASSWORD_OLD" value="" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
  56 + <td>
  57 + <input type="password" name="PASSWORD_OLD" id="PASSWORD_OLD1" value="" maxlength="255" placeholder="这里输入密码" title="密码" style="height:0;padding:0;margin:0;border:0;opacity:0;float:left;"/>
  58 + <input type="password" name="PASSWORD_OLD" id="PASSWORD_OLD" value="" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/>
  59 + </td>
57 60 </tr>
58 61 <tr>
59 62 <td style="width:90px;text-align: right;padding-top: 13px;">新密码:</td>
... ... @@ -106,7 +109,7 @@
106 109 <!--提示框-->
107 110 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
108 111 <script type="text/javascript">
109   - $(top.hangge());
  112 +
110 113 //保存
111 114 function save(){
112 115  
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
  View file @2ce09a2
... ... @@ -86,8 +86,9 @@
86 86 var user_id= "${pd.userId}";
87 87 var url = "<%=basePath%>";
88 88 $(document).ready(function(){
  89 + $(".table_box").css("padding-top",$(".head_box").height());
89 90 window.top.loading.remove();
90 91 });
91 92 </script>
92   - <script src="../static/js/test_list.js?a=1"></script>
  93 + <script src="../static/js/test_list.js?a=2"></script>
93 94 </html>
94 95 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/system/index/login.jsp
  View file @2ce09a2
... ... @@ -175,7 +175,7 @@ body{
175 175 $("#loginname").tips({
176 176 side : 2,
177 177 msg : '用户名不得为空',
178   - bg : '#AE81FF',
  178 + bg : '#FF5080',
179 179 time : 3
180 180 });
181 181 showfh();
... ... @@ -188,7 +188,7 @@ body{
188 188 $("#password").tips({
189 189 side : 2,
190 190 msg : '密码不得为空',
191   - bg : '#AE81FF',
  191 + bg : '#FF5080',
192 192 time : 3
193 193 });
194 194 showfh();
... ... @@ -196,12 +196,7 @@ body{
196 196 return false;
197 197 }
198 198  
199   - $("#loginbox").tips({
200   - side : 1,
201   - msg : '正在登录 , 请稍后 ...',
202   - bg : '#68B500',
203   - time : 10
204   - });
  199 +
205 200  
206 201 return true;
207 202 }
... ...
WebRoot/static/js/teach_paper.js
  View file @2ce09a2
... ... @@ -4,7 +4,6 @@
4 4 subject_id="",
5 5 class_id="";
6 6 $(document).ready(function(){
7   -
8 7 timeList();
9 8 $.ajax({
10 9 url:url+"/teacher/info",
... ... @@ -12,21 +11,25 @@
12 11 type:"post",
13 12 success:function(data){
14 13 console.log(data);
15   - if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){
16   - subject_id=data.data.subjectList[0].SUBJECT_ID;
17   - }
18   - user_id=data.data.ID;
19   -
20   - if(data.data.classInfoList.length>0){
21   - for(var i=0;i<data.data.classInfoList.length;i++){
22   - class_html += '<li data-classId="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</li>';
23   - option_html += '<option value="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</option>'
  14 + if(data!=null){
  15 + if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){
  16 + subject_id=data.data.subjectList[0].SUBJECT_ID;
24 17 }
25   - $(".classList").html(class_html+'<div class="clearfix"></div>');
26   - $(".classList li").eq(0).addClass("active");
27   - $("#dealer_id_2").html(option_html);
  18 + user_id=data.data.ID;
  19 +
  20 + if(data.data.classInfoList.length>0){
  21 + for(var i=0;i<data.data.classInfoList.length;i++){
  22 + class_html += '<li data-classId="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</li>';
  23 + option_html += '<option value="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</option>'
  24 + }
  25 + $(".classList").html(class_html+'<div class="clearfix"></div>');
  26 + $(".classList li").eq(0).addClass("active");
  27 + $("#dealer_id_2").html(option_html);
  28 + }
  29 + getList();
  30 + }else{
  31 + window.top.loading.remove();
28 32 }
29   - getList();
30 33 },
31 34 error: function (XMLHttpRequest, textStatus, errorThrown) {
32 35 // wrong massage
... ...
WebRoot/static/js/teach_paper1.js
  View file @2ce09a2
... ... @@ -5,7 +5,7 @@
5 5 subject_id="",
6 6 class_id="";
7 7 $(document).ready(function(){
8   -
  8 + $(".table_box").css("padding-top",$(".head_box").height());
9 9 timeList();
10 10 $.ajax({
11 11 url:url+"/SunvoteEducation/teacher/info",
... ...
WebRoot/static/js/test_list.js
  View file @2ce09a2
... ... @@ -65,21 +65,25 @@ function getList(start_date, end_date, class_id) { // 获取测验列表
65 65 },
66 66 success : function(data) {
67 67 console.log(data);
68   - for (var i = 0; i < data.data.length; i++) {
69   - tab_html += '<tr><td>'
70   - + (i + 1)
71   - + '</td><td>'
72   - + data.data[i].name
73   - + '</td><td>'
74   - + getClassName(data.data[i].classId)
75   - + '</td><td>'
76   - + data.data[i].createDate
77   - + '</td><td><a onclick="window.top.loading.show();jump($(this));" data-id="'
78   - + data.data[i].testpaperId
79   - + '" >查看详情</a> &nbsp;&nbsp;&nbsp;&nbsp; <!-- <a onclick="window.top.loading.show();ansync($(this)); " data-id="'
80   - + data.data[i].testpaperId + '" >班级分析</a> --></td></tr>'
  68 + if(data.length>0){
  69 + for (var i = 0; i < data.data.length; i++) {
  70 + tab_html += '<tr><td>'
  71 + + (i + 1)
  72 + + '</td><td>'
  73 + + data.data[i].name
  74 + + '</td><td>'
  75 + + getClassName(data.data[i].classId)
  76 + + '</td><td>'
  77 + + data.data[i].createDate
  78 + + '</td><td><a onclick="window.top.loading.show();jump($(this));" data-id="'
  79 + + data.data[i].testpaperId
  80 + + '" >查看详情</a> &nbsp;&nbsp;&nbsp;&nbsp; <!-- <a onclick="window.top.loading.show();ansync($(this)); " data-id="'
  81 + + data.data[i].testpaperId + '" >班级分析</a> --></td></tr>'
  82 + }
  83 + $("#tab_body").html(tab_html);
  84 + }else{
  85 + $("#tab_body").html('<td style="text-align:center;padding-top:20px;">暂无数据</td>');
81 86 }
82   - $("#tab_body").html(tab_html);
83 87 },
84 88 error: function (XMLHttpRequest, textStatus, errorThrown) {
85 89 // 错误信息
... ...