孙向锦 / SunvoteEducation

Commit 3371dbc6506e26b995da6d7d5c0ad5994980fb06

Authored by 孙向锦
1 parent 8942b440

0720 版本

Inline Side-by-side
Showing 17 changed files with 404 additions and 378 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
  View file @3371dbc
@@ -107,6 +107,9 @@ @@ -107,6 +107,9 @@
107 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script> 107 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
108 <script type="text/javascript"> 108 <script type="text/javascript">
109 109
  110 + $(document).ready(function(){
  111 + window.top.loading.remove();
  112 + });
110 113
111 function tosearch(){ 114 function tosearch(){
112 window.top.loading.remove(); 115 window.top.loading.remove();
WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
  View file @3371dbc
1 -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> 1 +<%@ page language="java" contentType="text/html; charset=UTF-8"
  2 + pageEncoding="UTF-8"%>
2 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> 3 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
3 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> 4 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
4 -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> 5 +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
5 <% 6 <%
6 String path = request.getContextPath(); 7 String path = request.getContextPath();
7 - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; 8 + String basePath = request.getScheme() + "://"
  9 + + request.getServerName() + ":" + request.getServerPort()
  10 + + path + "/";
8 %> 11 %>
9 <!DOCTYPE html> 12 <!DOCTYPE html>
10 <html lang="en"> 13 <html lang="en">
11 - <head>  
12 - <base href="<%=basePath%>">  
13 - <!-- 下拉框 -->  
14 - <link rel="stylesheet" href="static/ace/css/chosen.css" />  
15 - <!-- jsp文件头和头部 -->  
16 - <%@ include file="../../system/index/top.jsp"%>  
17 - <!-- 日期框 -->  
18 - <link rel="stylesheet" href="static/ace/css/datepicker.css" />  
19 - <style>  
20 - .table td{border:0 !important;}  
21 - .btn1 { 14 +<head>
  15 +<base href="<%=basePath%>">
  16 +<!-- 日期框 -->
  17 +<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
  18 +<style type="text/css">
  19 +li {
  20 + list-style: none;
  21 + margin-top: 10px;
  22 + clear: right;
  23 + clear: both;
  24 +}
  25 +
  26 +li p {
  27 + width: 5em;
  28 + text-align: right;
  29 + margin: 0;
  30 + margin-right: 0.5em;
  31 + float: left;
  32 + line-height: 30px;
  33 +}
  34 +
  35 +li .li_r {
  36 + margin-left: 6em;
  37 + margin-right: 1em;
  38 + clear: right;
  39 +}
  40 +
  41 +li .li_r select {
  42 + height: 30px;
  43 + line-height: 30px;
  44 + background: #f5f5f5;
  45 + border: 1px solid #ccc;
  46 + outline-style: none;
  47 + width: 100%;
  48 +}
  49 +
  50 +li input {
  51 + height: 30px;
  52 + line-height: 30px;
  53 + background: #f5f5f5;
  54 + border: 1px solid #ccc;
  55 + outline-style: none;
  56 + width: 100%;
  57 +}
  58 +
  59 +.btn {
22 width: 80%; 60 width: 80%;
23 height: 40px; 61 height: 40px;
24 margin: 0 auto; 62 margin: 0 auto;
@@ -26,7 +64,7 @@ @@ -26,7 +64,7 @@
26 margin-top: 5%; 64 margin-top: 5%;
27 } 65 }
28 66
29 -.btn1 a { 67 +.btn a {
30 display: block; 68 display: block;
31 width: 100%; 69 width: 100%;
32 height: 100%; 70 height: 100%;
@@ -36,127 +74,158 @@ @@ -36,127 +74,158 @@
36 line-height: 40px; 74 line-height: 40px;
37 font-size: 20px; 75 font-size: 20px;
38 } 76 }
39 - </style> 77 +
  78 +input[type="text"],select {
  79 + padding-left: 6px;
  80 +}
  81 +</style>
  82 +
40 </head> 83 </head>
41 -<body class="no-skin">  
42 -<!-- /section:basics/navbar.layout -->  
43 -<div class="main-container" id="main-container">  
44 - <!-- /section:basics/sidebar -->  
45 - <div class="main-content">  
46 - <div class="main-content-inner">  
47 - <div class="page-content">  
48 - <div class="row">  
49 - <div class="col-xs-12">  
50 -  
51 - <form action="student/${msg }.do" name="Form" id="Form" method="post">  
52 - <input type="hidden" name="ID" id="ID" value="${pd.ID}"/>  
53 - <input type="hidden" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}"/>  
54 - <input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}"/>  
55 - <div id="zhongxin" style="padding-top: 13px;">  
56 - <table id="table_report" class="table">  
57 - <tr>  
58 - <td style="width:90px;text-align: right;padding-top: 13px;">姓名:</td>  
59 - <td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" style="width:98%;"/></td>  
60 - </tr>  
61 - <tr>  
62 - <td style="width:90px;text-align: right;padding-top: 13px;">学籍号:</td>  
63 - <td><input type="text" name="SNO" id="SNO" value="${pd.SNO}" maxlength="255" placeholder="这里输入学籍号" title="学籍号" style="width:98%;"/></td>  
64 - </tr>  
65 - <tr>  
66 - <td style="width:90px;text-align: right;padding-top: 13px;">学号:</td>  
67 - <td><input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}" maxlength="255" placeholder="这里输入学号" title="学号" style="width:98%;"/></td>  
68 - </tr>  
69 - <tr>  
70 - <td style="width:90px;text-align: right;padding-top: 13px;">性别:</td>  
71 - <td>  
72 - <%-- <input type="number" name="SEX" id="SEX" value="${pd.SEX}" maxlength="32" placeholder="这里输入性别" title="性别" style="width:98%;"/></td> --%>  
73 - <select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="这里输入班级类型" style="width:98%;">  
74 - <option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>男</option>  
75 - <option value="0" <c:if test="${pd.SEX==0}">selected="true"</c:if>>女</option>  
76 - </select>  
77 - </td>  
78 - </tr>  
79 - <tr>  
80 - <td style="width:90px;text-align: right;padding-top: 13px;">组号:</td>  
81 - <td><input type="text" name="GROUPID" id="GROUPID" value="${pd.GROUPID}" maxlength="255" placeholder="这里输入组号" title="组号" style="width:98%;"/></td>  
82 - </tr>  
83 - <tr>  
84 - <td style="width:90px;text-align: right;padding-top: 13px;">签到码:</td>  
85 - <td><input type="text" name="SIGN_NO" id="SIGN_NO" value="${pd.SIGN_NO}" maxlength="255" placeholder="这里输入签到码" title="签到码" style="width:98%;"/></td>  
86 - </tr>  
87 - <tr>  
88 - <td style="width:90px;text-align: right;padding-top: 13px;">家长姓名:</td>  
89 - <td><input type="text" name="PARENT_NAME" id="PARENT_NAME" value="${pd.PARENT_NAME}" maxlength="255" placeholder="这里输入家长姓名" title="家长姓名" style="width:98%;"/></td>  
90 - </tr>  
91 - <tr>  
92 - <td style="width:90px;text-align: right;padding-top: 13px;">家长手机号:</td>  
93 - <td><input type="text" name="PARENT_PHONE" id="PARENT_PHONE" value="${pd.PARENT_PHONE}" maxlength="255" placeholder="这里输入家长手机号" title="家长手机号" style="width:98%;"/></td>  
94 - </tr>  
95 - <tr>  
96 - <td style="width:90px;text-align: right;padding-top: 13px;">键盘ID:</td>  
97 - <td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入键盘ID" title="键盘ID" style="width:98%;"/></td>  
98 - </tr>  
99 - <tr>  
100 - <td style="width:90px;text-align: right;padding-top: 13px;">备注:</td>  
101 - <td><input type="text" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" placeholder="这里输入备注" title="备注" style="width:98%;"/></td>  
102 - </tr>  
103 - <tr>  
104 - <td style="text-align: center;" colspan="10">  
105 - <!-- <a class="btn" onclick="save();"><div style="width:100px;">保存</div></a> -->  
106 - <div class="btn1">  
107 - <a onclick="save();">保存</a>  
108 - </div>  
109 - </td>  
110 - </tr>  
111 - </table>  
112 - </div>  
113 - <div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>  
114 - </form>  
115 - </div>  
116 - <!-- /.col --> 84 +<body>
  85 + <form action="../student/${msg }.do" name="Form" id="Form"
  86 + method="post">
  87 + <input type="hidden" name="ID" id="ID" value="${pd.ID}" /> <input
  88 + type="hidden" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}" />
  89 + <input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}" />
  90 + <div id="zhongxin">
  91 + <li>
  92 + <p>学生姓名:</p>
  93 + <div class="li_r">
  94 + <input type="text" name="NAME" id="NAME" value="${pd.NAME}"
  95 + maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" />
117 </div> 96 </div>
118 - <!-- /.row --> 97 + </li>
  98 + <li>
  99 + <p>学籍号:</p>
  100 + <div class="li_r">
  101 + <input type="text" name="SNO" id="SNO" value="${pd.SNO}"
  102 + maxlength="255" placeholder="这里输入学籍号" title="学籍号" />
  103 + </div>
  104 + </li>
  105 + <li>
  106 + <p>学号:</p>
  107 + <div class="li_r">
  108 + <input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}"
  109 + maxlength="255" placeholder="这里输入学号" title="学号" />
  110 + </div>
  111 + </li>
  112 + <li>
  113 + <p>性别:</p>
  114 + <div class="li_r">
  115 + <select class="chosen-select form-control" name="SEX" id="SEX"
  116 + data-placeholder="这里输入班级类型">
  117 + <option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>男</option>
  118 + <option value="0" <c:if test="${pd.SEX==0}">selected="true"</c:if>>女</option>
  119 + </select>
  120 + </div>
  121 + </li>
  122 + <li>
  123 + <p>组号:</p>
  124 + <div class="li_r">
  125 + <input type="text" name="GROUPID" id="GROUPID"
  126 + value="${pd.GROUPID}" maxlength="255" placeholder="这里输入组号"
  127 + title="组号" />
  128 + </div>
  129 + </li>
  130 + <li>
  131 + <p>签到码:</p>
  132 + <div class="li_r">
  133 + <input type="text" name="SIGN_NO" id="SIGN_NO"
  134 + value="${pd.SIGN_NO}" maxlength="255" placeholder="这里输入签到码"
  135 + title="签到码" />
  136 + </div>
  137 + </li>
  138 + <li>
  139 + <p>家长姓名:</p>
  140 + <div class="li_r">
  141 + <input type="text" name="PARENT_NAME" id="PARENT_NAME"
  142 + value="${pd.PARENT_NAME}" maxlength="255" placeholder="这里输入家长姓名"
  143 + title="家长姓名" />
  144 + </div>
  145 + </li>
  146 + <li>
  147 + <p>家长手机:</p>
  148 + <div class="li_r">
  149 + <input type="text" name="PARENT_PHONE" id="PARENT_PHONE"
  150 + value="${pd.PARENT_PHONE}" maxlength="255" placeholder="这里输入家长手机号"
  151 + title="家长手机号" />
  152 + </div>
  153 + </li>
  154 + <li>
  155 + <p>键盘ID:</p>
  156 + <div class="li_r">
  157 + <input type="text" name="KEYPAD_ID" id="KEYPAD_ID"
  158 + value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入键盘ID"
  159 + title="键盘ID" />
  160 + </div>
  161 + </li>
  162 + <li>
  163 + <p>备注:</p>
  164 + <div class="li_r">
  165 + <input type="text" name="REMARK" id="REMARK" value="${pd.REMARK}"
  166 + maxlength="255" placeholder="这里输入备注" title="备注" />
  167 + </div>
  168 + </li>
  169 +
  170 + <div class="btn">
  171 + <a onclick="save();">保存</a>
119 </div> 172 </div>
120 - <!-- /.page-content -->  
121 </div> 173 </div>
122 - </div>  
123 - <!-- /.main-content -->  
124 -</div>  
125 -<!-- /.main-container --> 174 + <div id="zhongxin2" class="center" style="display:none">
  175 +
  176 + <img src="../static/images/jiazai.gif" /><br />
  177 + <h4 class="lighter block green">提交中...</h4>
  178 + </div>
  179 + </form>
  180 +
126 181
127 182
128 <!-- 页面底部js¨ --> 183 <!-- 页面底部js¨ -->
129 - <%@ include file="../../system/index/foot.jsp"%> 184 + <%@ include file="../../system/index/foot2.jsp"%>
130 <!-- 下拉框 --> 185 <!-- 下拉框 -->
131 - <script src="static/ace/js/chosen.jquery.js"></script> 186 + <script src="../static/ace/js/chosen.jquery.js"></script>
132 <!-- 日期框 --> 187 <!-- 日期框 -->
133 - <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script> 188 + <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
134 <!--提示框--> 189 <!--提示框-->
135 - <script type="text/javascript" src="static/js/jquery.tips.js"></script>  
136 - <script type="text/javascript">  
137 - $(top.hangge()); 190 + <script type="text/javascript" src="../static/js/jquery.tips.js"></script>
  191 + <script type="text/javascript">
138 //保存 192 //保存
139 - function save(){  
140 - if($("#NAME").val()==""){ 193 + function save() {
  194 + if ($("#NAME").val() == "") {
141 $("#NAME").tips({ 195 $("#NAME").tips({
142 - side:3,  
143 - msg:'请输入学生姓名',  
144 - bg:'#AE81FF',  
145 - time:2  
146 - }); 196 + side : 3,
  197 + msg : '请输入学生姓名',
  198 + bg : '#AE81FF',
  199 + time : 2
  200 + });
147 $("#NAME").focus(); 201 $("#NAME").focus();
148 - return false; 202 + return false;
149 } 203 }
150 - 204 +
  205 + if ($("#KEYPAD_ID").val() == ""
  206 + || $("#KEYPAD_ID").val().length != 10) {
  207 + $("#KEYPAD_ID").tips({
  208 + side : 3,
  209 + msg : '输入十位有效编号',
  210 + bg : '#AE81FF',
  211 + time : 2
  212 + });
  213 + $("#KEYPAD_ID").focus();
  214 + return false;
  215 + }
  216 +
151 $("#Form").submit(); 217 $("#Form").submit();
152 $("#zhongxin").hide(); 218 $("#zhongxin").hide();
153 $("#zhongxin2").show(); 219 $("#zhongxin2").show();
154 } 220 }
155 - 221 +
156 $(function() { 222 $(function() {
157 //日期框 223 //日期框
158 - $('.date-picker').datepicker({autoclose: true,todayHighlight: true}); 224 + $('.date-picker').datepicker({
  225 + autoclose : true,
  226 + todayHighlight : true
  227 + });
159 }); 228 });
160 - </script> 229 + </script>
161 </body> 230 </body>
162 </html> 231 </html>
163 \ No newline at end of file 232 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp deleted
View file @8942b44
1 -<%@ page language="java" contentType="text/html; charset=UTF-8"  
2 - pageEncoding="UTF-8"%>  
3 -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>  
4 -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>  
5 -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>  
6 -<%  
7 - String path = request.getContextPath();  
8 - String basePath = request.getScheme() + "://"  
9 - + request.getServerName() + ":" + request.getServerPort()  
10 - + path + "/";  
11 -%>  
12 -<!DOCTYPE html>  
13 -<html lang="en">  
14 -<head>  
15 -<base href="<%=basePath%>">  
16 -<!-- 日期框 -->  
17 -<link rel="stylesheet" href="static/ace/css/datepicker.css" />  
18 -<style type="text/css">  
19 -li {  
20 - list-style: none;  
21 - margin-top: 10px;  
22 - clear: right;  
23 - clear: both;  
24 -}  
25 -  
26 -li p {  
27 - width: 5em;  
28 - text-align: right;  
29 - margin: 0;  
30 - margin-right: 0.5em;  
31 - float: left;  
32 - line-height: 30px;  
33 -}  
34 -  
35 -li .li_r {  
36 - margin-left: 6em;  
37 - margin-right: 1em;  
38 - clear: right;  
39 -}  
40 -  
41 -li .li_r select {  
42 - height: 30px;  
43 - line-height: 30px;  
44 - background: #f5f5f5;  
45 - border: 1px solid #ccc;  
46 - outline-style: none;  
47 - width: 100%;  
48 -}  
49 -  
50 -li input {  
51 - height: 30px;  
52 - line-height: 30px;  
53 - background: #f5f5f5;  
54 - border: 1px solid #ccc;  
55 - outline-style: none;  
56 - width: 100%;  
57 -}  
58 -  
59 -.btn {  
60 - width: 80%;  
61 - height: 40px;  
62 - margin: 0 auto;  
63 - background: #3bc2d6;  
64 - margin-top: 5%;  
65 -}  
66 -  
67 -.btn a {  
68 - display: block;  
69 - width: 100%;  
70 - height: 100%;  
71 - color: #fff;  
72 - text-decoration: none;  
73 - text-align: center;  
74 - line-height: 40px;  
75 - font-size: 20px;  
76 -}  
77 -</style>  
78 -  
79 -</head>  
80 -<body>  
81 - <form action="<%=basePath %>student/${msg }.do" name="Form" id="Form" method="post">  
82 - <input type="hidden" name="ID" id="ID" value="${pd.ID}" />  
83 - <input type="hidden" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}" />  
84 - <input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}" />  
85 - <div id="zhongxin">  
86 - <li>  
87 - <p>学生姓名:</p>  
88 - <div class="li_r">  
89 - <input type="text" name="NAME" id="NAME" value="${pd.NAME}"  
90 - maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" />  
91 - </div>  
92 - </li>  
93 - <li>  
94 - <p>学籍号:</p>  
95 - <div class="li_r">  
96 - <input type="text" name="SNO" id="SNO" value="${pd.SNO}"  
97 - maxlength="255" placeholder="这里输入学籍号" title="学籍号" />  
98 - </div>  
99 - </li>  
100 - <li>  
101 - <p>学号:</p>  
102 - <div class="li_r">  
103 - <input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}"  
104 - maxlength="255" placeholder="这里输入学号" title="学号" />  
105 - </div>  
106 - </li>  
107 - <li>  
108 - <p>性别:</p>  
109 - <div class="li_r">  
110 - <select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="这里输入班级类型">  
111 - <option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>男</option>  
112 - <option value="0" <c:if test="${pd.SEX==0}">selected="true"</c:if>>女</option>  
113 - </select>  
114 - </div>  
115 - </li>  
116 - <li>  
117 - <p>组号:</p>  
118 - <div class="li_r">  
119 - <input type="text" name="GROUPID" id="GROUPID"  
120 - value="${pd.GROUPID}" maxlength="255" placeholder="这里输入组号"  
121 - title="组号" />  
122 - </div>  
123 - </li>  
124 - <li>  
125 - <p>签到码:</p>  
126 - <div class="li_r">  
127 - <input type="text" name="SIGN_NO" id="SIGN_NO"  
128 - value="${pd.SIGN_NO}" maxlength="255" placeholder="这里输入签到码"  
129 - title="签到码" />  
130 - </div>  
131 - </li>  
132 - <li>  
133 - <p>家长姓名:</p>  
134 - <div class="li_r">  
135 - <input type="text" name="PARENT_NAME" id="PARENT_NAME"  
136 - value="${pd.PARENT_NAME}" maxlength="255" placeholder="这里输入家长姓名"  
137 - title="家长姓名" />  
138 - </div>  
139 - </li>  
140 - <li>  
141 - <p>家长手机:</p>  
142 - <div class="li_r">  
143 - <input type="text" name="PARENT_PHONE" id="PARENT_PHONE"  
144 - value="${pd.PARENT_PHONE}" maxlength="255" placeholder="这里输入家长手机号"  
145 - title="家长手机号" />  
146 - </div>  
147 - </li>  
148 - <li>  
149 - <p>键盘ID:</p>  
150 - <div class="li_r">  
151 - <input type="text" name="KEYPAD_ID" id="KEYPAD_ID"  
152 - value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入键盘ID"  
153 - title="键盘ID" />  
154 - </div>  
155 - </li>  
156 - <li>  
157 - <p>备注:</p>  
158 - <div class="li_r">  
159 - <input type="text" name="REMARK" id="REMARK" value="${pd.REMARK}"  
160 - maxlength="255" placeholder="这里输入备注" title="备注" />  
161 - </div>  
162 - </li>  
163 -  
164 - <div class="btn">  
165 - <a href="#" onclick="save();">保存</a>  
166 - </div>  
167 - </div>  
168 - <div id="zhongxin2" class="center" style="display:none">  
169 -  
170 - <img src="static/images/jiazai.gif" /><br />  
171 - <h4 class="lighter block green">提交中...</h4>  
172 - </div>  
173 - </form>  
174 -  
175 -  
176 -  
177 - <!-- 页面底部js¨ -->  
178 - <%@ include file="../../system/index/foot.jsp"%>  
179 - <!-- 下拉框 -->  
180 - <script src="static/ace/js/chosen.jquery.js"></script>  
181 - <!-- 日期框 -->  
182 - <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>  
183 - <!--提示框-->  
184 - <script type="text/javascript" src="static/js/jquery.tips.js"></script>  
185 - <script type="text/javascript">  
186 - //保存  
187 - function save() {  
188 - if ($("#NAME").val() == "") {  
189 - $("#NAME").tips({  
190 - side : 3,  
191 - msg : '请输入学生姓名',  
192 - bg : '#AE81FF',  
193 - time : 2  
194 - });  
195 - $("#NAME").focus();  
196 - return false;  
197 - }  
198 -  
199 - $("#Form").submit(function(e){  
200 - alert(1);  
201 - });  
202 - $("#zhongxin").hide();  
203 - $("#zhongxin2").show();  
204 - }  
205 -  
206 - $(function() {  
207 - //日期框  
208 - $('.date-picker').datepicker({  
209 - autoclose : true,  
210 - todayHighlight : true  
211 - });  
212 - });  
213 - </script>  
214 -</body>  
215 -</html>  
216 \ No newline at end of file 0 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
  View file @3371dbc
@@ -82,6 +82,9 @@ @@ -82,6 +82,9 @@
82 <div class="creat"> 82 <div class="creat">
83 <input type="button" onclick="add();" value="添加学生" /> 83 <input type="button" onclick="add();" value="添加学生" />
84 </div> 84 </div>
  85 + <div class="creat">
  86 + <input type="button" onclick="upload();" value="批量导入" />
  87 + </div>
85 <div class="removeAll" > 88 <div class="removeAll" >
86 <input type="button" onclick="deleteAll();" value="批量删除" /> 89 <input type="button" onclick="deleteAll();" value="批量删除" />
87 </div> 90 </div>
@@ -95,7 +98,9 @@ @@ -95,7 +98,9 @@
95 98
96 <%@ include file="../../system/index/foot2.jsp"%> 99 <%@ include file="../../system/index/foot2.jsp"%>
97 <script type="text/javascript"> 100 <script type="text/javascript">
98 - window.top.loading.remove(); 101 + $(document).ready(function(){
  102 + window.top.loading.remove();
  103 + });
99 function tosearch(){ 104 function tosearch(){
100 $("#Form").submit(); 105 $("#Form").submit();
101 } 106 }
@@ -180,6 +185,16 @@ @@ -180,6 +185,16 @@
180 window.top.remove.show(); 185 window.top.remove.show();
181 } 186 }
182 187
  188 + function upload(){
  189 + window.top.modal.init({
  190 + 'title':'EXCEL导入学生名单',
  191 + 'url':'<%=basePath%>student/goUploadExcel.do?class_id=${pd.CLASS_ID}&term_id=${pd.TERM_ID}',
  192 + func:function() {
  193 + tosearch();
  194 + }
  195 + });
  196 + window.top.modal.show();
  197 + }
183 198
184 </script> 199 </script>
185 </html> 200 </html>
186 \ No newline at end of file 201 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp
  View file @3371dbc
@@ -16,6 +16,86 @@ @@ -16,6 +16,86 @@
16 <!-- jsp文件头和头部 --> 16 <!-- jsp文件头和头部 -->
17 <%@ include file="../../system/index/top.jsp"%> 17 <%@ include file="../../system/index/top.jsp"%>
18 18
  19 +
  20 +<style>
  21 +
  22 +.ace-file-input .ace-file-container{
  23 +display: block;
  24 + position: absolute;
  25 + top: 0;
  26 + left: 0;
  27 + right: 0;
  28 + height: 40px;
  29 + background-color: #ffffff;
  30 + border: 1px solid #d5d5d5;
  31 + cursor: pointer;
  32 + -webkit-box-shadow: none;
  33 + box-shadow: none;
  34 + -webkit-transition: all 0.15s;
  35 + -o-transition: all 0.15s;
  36 + transition: all 0.15s;
  37 +}
  38 +.ace-file-input .ace-file-container:before{
  39 + display: inline-block;
  40 + content: attr(data-title);
  41 + position: absolute;
  42 + right: 0;
  43 + top: 0;
  44 + bottom: 0;
  45 + line-height: 34px;
  46 + text-align: center;
  47 + padding: 0 8px;
  48 + background-color: #3bc2d6;
  49 + color: #FFF;
  50 + font-size: 11px;
  51 + font-weight: bold;
  52 + border: 2px solid #FFF;
  53 + border-left-width: 4px;
  54 + -webkit-transition: all 0.3s;
  55 + -o-transition: all 0.3s;
  56 + transition: all 0.3s;
  57 +}
  58 +.ace-file-input .ace-file-container .ace-file-name {
  59 + display: inline-block;
  60 + height: 38px;
  61 + max-width: 80%;
  62 + white-space: nowrap;
  63 + overflow: hidden;
  64 + line-height: 38px;
  65 + color: #888888;
  66 + font-size: 13px;
  67 + vertical-align: top;
  68 + position: static;
  69 + padding-left: 36px;
  70 + }
  71 +
  72 + .ace-file-input .ace-file-container .ace-icon {
  73 + display: inline-block;
  74 + position: absolute;
  75 + left: 0;
  76 + top: 0;
  77 + bottom: 0;
  78 + line-height: 34px;
  79 + width: 36px;
  80 + text-align: center;
  81 + font-family: FontAwesome;
  82 + font-size: 13px;
  83 + border: 2px solid #FFF;
  84 + color: #FFF;
  85 + -webkit-transition: all 0.1s;
  86 + -o-transition: all 0.1s;
  87 + transition: all 0.1s;
  88 + background-color: #3bc2d6;
  89 + }
  90 +
  91 + .ace-file-input .ace-file-container .ace-file-name:after {
  92 + display: inline-block;
  93 + content: attr(data-title);
  94 +}
  95 +
  96 +
  97 +</style>
  98 +
19 </head> 99 </head>
20 <body class="no-skin"> 100 <body class="no-skin">
21 101
@@ -37,9 +117,7 @@ @@ -37,9 +117,7 @@
37 </tr> 117 </tr>
38 <tr> 118 <tr>
39 <td style="text-align: center;padding-top: 10px;"> 119 <td style="text-align: center;padding-top: 10px;">
40 - <a class="btn btn-mini btn-primary" onclick="save();">导入</a>  
41 - <a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>  
42 - <a style="display:none" class="btn btn-mini btn-success" onclick="window.location.href='<%=basePath%>/user/downExcel.do'">下载模版</a> 120 + <a class="btn btn-mini btn-primary" style="background-color:#3bc2d6 !important;border-color:#3bc2d6 !important;width:300px; height:50px;line-height:50px;font-size:18px;margin-top:5%;padding:0" onclick="save();">导入</a>
43 </td> 121 </td>
44 </tr> 122 </tr>
45 </table> 123 </table>
@@ -68,7 +146,6 @@ @@ -68,7 +146,6 @@
68 <!--提示框--> 146 <!--提示框-->
69 <script type="text/javascript" src="static/js/jquery.tips.js"></script> 147 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
70 <script type="text/javascript"> 148 <script type="text/javascript">
71 - $(top.hangge());  
72 $(function() { 149 $(function() {
73 //上传 150 //上传
74 $('#excel').ace_file_input({ 151 $('#excel').ace_file_input({
WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
  View file @3371dbc
@@ -125,6 +125,10 @@ li { @@ -125,6 +125,10 @@ li {
125 // elem: '#test6' 125 // elem: '#test6'
126 // ,range: true 126 // ,range: true
127 // }); 127 // });
  128 + $(document).ready(function(){
  129 + window.top.loading.remove();
  130 + });
  131 +
128 $('.date-picker').datepicker({ 132 $('.date-picker').datepicker({
129 autoclose : true, 133 autoclose : true,
130 todayHighlight : true 134 todayHighlight : true
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @3371dbc
@@ -128,12 +128,18 @@ @@ -128,12 +128,18 @@
128 function chooseClass(classID,termID){ 128 function chooseClass(classID,termID){
129 var path = "../student/listcs.do?class_id=" + classID + "&term_id=" + termID ; 129 var path = "../student/listcs.do?class_id=" + classID + "&term_id=" + termID ;
130 //$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>'); 130 //$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
131 - $("#mainFrame").attr('src',path); 131 + if($("#mainFrame").attr('src') != (path)){
  132 + $("#mainFrame").attr('src',path);
  133 + window.top.loading.show();
  134 + }
132 } 135 }
133 136
134 function report(classId){ 137 function report(classId){
135 //window.open('<%=basePath%>report/report.do?classid=' + classId); 138 //window.open('<%=basePath%>report/report.do?classid=' + classId);
136 - $("#mainFrame").attr('src','<%=basePath%>report/report.do?classid=' + classId); 139 + //if($("#mainFrame").attr('src') != ('<%=basePath%>report/report.do?classid=' + classId)){
  140 + $("#mainFrame").attr('src','<%=basePath%>report/report.do?classid=' + classId);
  141 + window.top.loading.show();
  142 + //}
137 } 143 }
138 144
139 $("#time_submit").click(function(){ 145 $("#time_submit").click(function(){
@@ -148,7 +154,10 @@ @@ -148,7 +154,10 @@
148 $(".testpaper").click(function (){ 154 $(".testpaper").click(function (){
149 var path = "../paper/list2.do?" ; 155 var path = "../paper/list2.do?" ;
150 //$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>'); 156 //$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
151 - $("#mainFrame").attr('src',path); 157 + if($("#mainFrame").attr('src') != (path)){
  158 + $("#mainFrame").attr('src',path);
  159 + window.top.loading.show();
  160 + }
152 }); 161 });
153 </script> 162 </script>
154 </body> 163 </body>
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
  View file @3371dbc
@@ -22,7 +22,10 @@ @@ -22,7 +22,10 @@
22 <%@ include file="../../system/index/top.jsp"%> 22 <%@ include file="../../system/index/top.jsp"%>
23 <!-- 日期框 --> 23 <!-- 日期框 -->
24 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 24 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
25 - 25 +<style>
  26 + .font span{ font-size: 12px;
  27 + font-weight: initial;color:#000;}
  28 + </style>
26 </head> 29 </head>
27 30
28 <body style="background:#fff"> 31 <body style="background:#fff">
@@ -61,7 +64,7 @@ @@ -61,7 +64,7 @@
61 <th class="center"><div style="width:80px;">课程总分</div></th> 64 <th class="center"><div style="width:80px;">课程总分</div></th>
62 <c:forEach items="${testpaperList}" var="var" varStatus="vs"> 65 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
63 <th class="center"><a 66 <th class="center"><a
64 - href="report/test_report?TestID=${var.TESTPAPER_ID}&class_id=${info.CLASS_ID}"><div style="width:180px;">${var.NAME}</br>${var.CREATE_DATE}</div></a></th> 67 + href="report/test_report?TestID=${var.TESTPAPER_ID}&class_id=${info.CLASS_ID}" onclick="window.top.loading.show();"><div style="width:180px;" class="font">${var.NAME}</br><span>${var.CREATE_DATE}</span></div></a></th>
65 </c:forEach> 68 </c:forEach>
66 </tr> 69 </tr>
67 </thead> 70 </thead>
@@ -101,7 +104,7 @@ @@ -101,7 +104,7 @@
101 href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a> 104 href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
102 </td> --%> 105 </td> --%>
103 <td class="center"><a 106 <td class="center"><a
104 - href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a> 107 + href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}" onclick="window.top.loading.show();">${var.NAME}</a>
105 </td> 108 </td>
106 <td class="center"><fmt:formatNumber type="number" 109 <td class="center"><fmt:formatNumber type="number"
107 value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}" 110 value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
@@ -133,7 +136,7 @@ @@ -133,7 +136,7 @@
133 136
134 <script type="text/javascript"> 137 <script type="text/javascript">
135 $(function() { 138 $(function() {
136 - 139 +
137 //日期框 140 //日期框
138 $('.date-picker').datepicker({ 141 $('.date-picker').datepicker({
139 autoclose : true, 142 autoclose : true,
@@ -215,6 +218,10 @@ @@ -215,6 +218,10 @@
215 window.location.href = url; 218 window.location.href = url;
216 /* $("#Form").sumbit(); */ 219 /* $("#Form").sumbit(); */
217 } 220 }
  221 +
  222 + $(document).ready(function(){
  223 + window.top.loading.remove();
  224 + });
218 </script> 225 </script>
219 226
220 </body> 227 </body>
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
  View file @3371dbc
@@ -52,12 +52,12 @@ @@ -52,12 +52,12 @@
52 <th class="center"><div style="width:80px;">学号</div></th> 52 <th class="center"><div style="width:80px;">学号</div></th>
53 <th class="center"><div style="width:80px;">姓名</div></th> 53 <th class="center"><div style="width:80px;">姓名</div></th>
54 <th class="center"><div style="width:80px;">得分</div></th> 54 <th class="center"><div style="width:80px;">得分</div></th>
55 - <th class="center"><div style="width:80px;">正确率</div></th> 55 + <!-- <th class="center"><div style="width:80px;">正确率</div></th> -->
56 <th class="center"><div style="width:80px;">排名</div></th> 56 <th class="center"><div style="width:80px;">排名</div></th>
57 <c:forEach items="${questionInfo}" var="var" varStatus="vs"> 57 <c:forEach items="${questionInfo}" var="var" varStatus="vs">
58 <th class="center"><div style="width:80px;">题目${vs.index+1}</div></th> 58 <th class="center"><div style="width:80px;">题目${vs.index+1}</div></th>
59 </c:forEach> 59 </c:forEach>
60 - <th class="center"><div style="width:150px;">非选择题得分</div></th> 60 + <!-- <th class="center"><div style="width:150px;">非选择题得分</div></th> -->
61 <th class="center"><div style="width:80px;">总分</div></th> 61 <th class="center"><div style="width:80px;">总分</div></th>
62 </tr> 62 </tr>
63 </thead> 63 </thead>
@@ -67,14 +67,14 @@ @@ -67,14 +67,14 @@
67 <td class="center"></td> 67 <td class="center"></td>
68 <td class="center"></td> 68 <td class="center"></td>
69 <td class="center"></td> 69 <td class="center"></td>
70 - <td class="center"></td> 70 + <!-- <td class="center"></td> -->
71 <td class="center"></td> 71 <td class="center"></td>
72 <c:forEach items="${questionInfo}" var="var" varStatus="vs"> 72 <c:forEach items="${questionInfo}" var="var" varStatus="vs">
73 <td class="center"><fmt:formatNumber type="number" 73 <td class="center"><fmt:formatNumber type="number"
74 value="${var == 0 ? 0: (var / classInfo.studentNum * 100)}" 74 value="${var == 0 ? 0: (var / classInfo.studentNum * 100)}"
75 maxFractionDigits="1" />%</td> 75 maxFractionDigits="1" />%</td>
76 </c:forEach> 76 </c:forEach>
77 - <td class="center"></td> 77 + <!-- <td class="center"></td> -->
78 <td class="center"></td> 78 <td class="center"></td>
79 </tr> 79 </tr>
80 80
@@ -86,12 +86,12 @@ @@ -86,12 +86,12 @@
86 <td class="center">${var.SNO}</td> 86 <td class="center">${var.SNO}</td>
87 <td class="center">${var.NAME}</td> 87 <td class="center">${var.NAME}</td>
88 <td class="center">${var.GETSCORE}</td> 88 <td class="center">${var.GETSCORE}</td>
89 - <td class="center">${var.RIGHT}</td> 89 + <%-- <td class="center">${var.RIGHT}</td> --%>
90 <td class="center">${vs.index + 1}</td> 90 <td class="center">${vs.index + 1}</td>
91 <c:forEach items="${questionInfo}" var="var1" varStatus="vs1"> 91 <c:forEach items="${questionInfo}" var="var1" varStatus="vs1">
92 <td class="center">${var.detail[vs1.index].ANSWER}</td> 92 <td class="center">${var.detail[vs1.index].ANSWER}</td>
93 </c:forEach> 93 </c:forEach>
94 - <td class="center">${var.OTHER_SCORE}</td> 94 + <%-- <td class="center">${var.OTHER_SCORE}</td> --%>
95 <td class="center">${var.GETSCORE}</td> 95 <td class="center">${var.GETSCORE}</td>
96 </tr> 96 </tr>
97 </c:forEach> 97 </c:forEach>
@@ -114,6 +114,9 @@ @@ -114,6 +114,9 @@
114 <script type="text/javascript" src="static/js/jquery.tips.js"></script> 114 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
115 115
116 <script type="text/javascript"> 116 <script type="text/javascript">
  117 + $(document).ready(function(){
  118 + window.top.loading.remove();
  119 + });
117 $(function() { 120 $(function() {
118 121
119 //日期框 122 //日期框
WebRoot/WEB-INF/jsp/system/index/login.jsp
  View file @3371dbc
1 -<!DOCTYPE html> 1 +<%@ page language="java" contentType="text/html; charset=UTF-8"
  2 + pageEncoding="UTF-8"%>
  3 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  4 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  5 +<%
  6 + String path = request.getContextPath();
  7 + String basePath = request.getScheme() + "://"
  8 + + request.getServerName() + ":" + request.getServerPort()
  9 + + path + "/";
  10 +%>
  11 +<!DOCTYPE html>
2 <html lang="zh-CN"> 12 <html lang="zh-CN">
3 <head> 13 <head>
4 <meta charset="utf-8"> 14 <meta charset="utf-8">
@@ -41,6 +51,9 @@ @@ -41,6 +51,9 @@
41 51
42 <script type="text/javascript"> 52 <script type="text/javascript">
43 53
  54 + if(window.top != window.self){
  55 + window.top.location.href = "<%=basePath%>";
  56 + }
44 //客户端校验 57 //客户端校验
45 function check() { 58 function check() {
46 59
WebRoot/static/css/mb_style.css
  View file @3371dbc
@@ -7,7 +7,9 @@ @@ -7,7 +7,9 @@
7 .mb_content{height:calc(100% - 50px);} 7 .mb_content{height:calc(100% - 50px);}
8 .mb_content iframe{width:100%;height:100%;border:0;box-sizing:border-box;padding:12px;} 8 .mb_content iframe{width:100%;height:100%;border:0;box-sizing:border-box;padding:12px;}
9 9
10 -.remove .mb_box{display:table;padding-bottom:3%;} 10 +.remove .mb_box{display:inline-block;height:150px;}
  11 +.mb_content p{margin:0;}
  12 +
11 .remove .mb_msg p{text-align: left;line-height: 40px;font-size: 20px;margin: 0;padding-left: 20px;} 13 .remove .mb_msg p{text-align: left;line-height: 40px;font-size: 20px;margin: 0;padding-left: 20px;}
12 .mb_content .mb_content_l{width:50%;float:left;margin-top:5%;} 14 .mb_content .mb_content_l{width:50%;float:left;margin-top:5%;}
13 .mb_content .mb_content_l a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#fd8080;text-align:center;height:40px;line-height:40px;} 15 .mb_content .mb_content_l a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#fd8080;text-align:center;height:40px;line-height:40px;}
WebRoot/static/css/teach.css
  View file @3371dbc
@@ -13,11 +13,12 @@ html,body{width:100%;height:100%;} @@ -13,11 +13,12 @@ html,body{width:100%;height:100%;}
13 } 13 }
14 .pagination>li:first-child>a, .pagination>li:first-child>span{border-radius:0;} 14 .pagination>li:first-child>a, .pagination>li:first-child>span{border-radius:0;}
15 .pagination>li:last-child>a, .pagination>li:last-child>span{border-radius:0;} 15 .pagination>li:last-child>a, .pagination>li:last-child>span{border-radius:0;}
16 - 16 +input[type="checkbox"]{margin-right:10px;}
17 17
18 .header{width:100%;background:#0bb8b9;box-sizing:border-box;padding:20px 30px;position:fixed;top:0;} 18 .header{width:100%;background:#0bb8b9;box-sizing:border-box;padding:20px 30px;position:fixed;top:0;}
19 .header .logo{float:left;} 19 .header .logo{float:left;}
20 .header .out{float:right;font-size:18px;color:#fff;} 20 .header .out{float:right;font-size:18px;color:#fff;}
  21 +.header .out a{color:#fff;text-decoration:none;}
21 .header .out img{width:18px;margin-right:15px;} 22 .header .out img{width:18px;margin-right:15px;}
22 .content{width:100%;height:100%;box-sizing:border-box;padding-top:66px;} 23 .content{width:100%;height:100%;box-sizing:border-box;padding-top:66px;}
23 .content .content_l{width:18%;float:left;height:100%;background:#13707b;overflow-y:auto;} 24 .content .content_l{width:18%;float:left;height:100%;background:#13707b;overflow-y:auto;}
@@ -31,7 +32,7 @@ html,body{width:100%;height:100%;} @@ -31,7 +32,7 @@ html,body{width:100%;height:100%;}
31 .content .content_l .tab1{border-bottom:1px solid #80afb4;} 32 .content .content_l .tab1{border-bottom:1px solid #80afb4;}
32 .content .content_l .tab1 p{width:100%;height:77px;line-height:77px;margin-bottom:0;font-size:24px;color:#fff;padding-left:10%;} 33 .content .content_l .tab1 p{width:100%;height:77px;line-height:77px;margin-bottom:0;font-size:24px;color:#fff;padding-left:10%;}
33 .content .content_l .tab1 ul{margin-bottom:0;padding:12px 0;padding-left:15%;background:#0b535b;font-size:18px;line-height:64px;display:none;} 34 .content .content_l .tab1 ul{margin-bottom:0;padding:12px 0;padding-left:15%;background:#0b535b;font-size:18px;line-height:64px;display:none;}
34 -.content .content_l .tab1 ul li{list-style:none;color:#fff;} 35 +.content .content_l .tab1 ul li{list-style:none;color:#fff;cursor:pointer;}
35 .content .content_r{margin-left:18%;height:100%;overflow-y:hidden;} 36 .content .content_r{margin-left:18%;height:100%;overflow-y:hidden;}
36 37
37 38
@@ -45,7 +46,7 @@ html,body{width:100%;height:100%;} @@ -45,7 +46,7 @@ html,body{width:100%;height:100%;}
45 .table_box input[name="choose"]{vertical-align:top;margin-right:15px;} 46 .table_box input[name="choose"]{vertical-align:top;margin-right:15px;}
46 .table_box img{width:24px;} 47 .table_box img{width:24px;}
47 .footer .creat,.content .content_r .footer .removeAll {float:left;} 48 .footer .creat,.content .content_r .footer .removeAll {float:left;}
48 - .footer .creat input{background:#3bc2d6;outline-style:none;text-decoration:none;border:none;color:#fff;padding:15px 20px;font-size:18px;} 49 + .footer .creat input{background:#3bc2d6;outline-style:none;text-decoration:none;border:none;color:#fff;padding:15px 20px;margin-right:20px;font-size:18px;}
49 .footer .removeAll input{background:#f29c9f;outline-style:none;text-decoration:none;border:none;margin-left:15px;color:#fff;padding:15px 20px;font-size:18px;} 50 .footer .removeAll input{background:#f29c9f;outline-style:none;text-decoration:none;border:none;margin-left:15px;color:#fff;padding:15px 20px;font-size:18px;}
50 .footer .page_box{float:right;} 51 .footer .page_box{float:right;}
51 52
WebRoot/static/js/control1.js
  View file @3371dbc
@@ -159,58 +159,58 @@ @@ -159,58 +159,58 @@
159 data: data1, 159 data: data1,
160 type: 'line', 160 type: 'line',
161 symbol: 'circle', 161 symbol: 'circle',
162 - symbolSize: 10, 162 + symbolSize: 5,
163 lineStyle: { 163 lineStyle: {
164 normal: { 164 normal: {
165 color: 'green', 165 color: 'green',
166 - width: 4,  
167 - type: 'solid' 166 + width: 2,
  167 + type: 'dashed'
168 } 168 }
169 }, 169 },
170 itemStyle: { 170 itemStyle: {
171 normal: { 171 normal: {
172 - borderWidth: 3, 172 + borderWidth: 2,
173 borderColor: 'green', 173 borderColor: 'green',
174 color: 'green' 174 color: 'green'
175 } 175 }
176 } 176 }
177 },{ 177 },{
178 - data: data2, 178 + data: data3,
179 type: 'line', 179 type: 'line',
180 symbol: 'circle', 180 symbol: 'circle',
181 - symbolSize: 10, 181 + symbolSize: 5,
182 lineStyle: { 182 lineStyle: {
183 normal: { 183 normal: {
184 - color: 'blue',  
185 - width: 4,  
186 - type: 'dashed' 184 + color: 'yellow',
  185 + width: 2,
  186 + type: 'dashed',
187 } 187 }
188 }, 188 },
189 itemStyle: { 189 itemStyle: {
190 normal: { 190 normal: {
191 - borderWidth: 3,  
192 - borderColor: 'blue',  
193 - color: 'blue',  
194 - label : {show: true} 191 + borderWidth: 2,
  192 + borderColor: 'yellow',
  193 + color: 'yellow'
195 } 194 }
196 } 195 }
197 },{ 196 },{
198 - data: data3, 197 + data: data2,
199 type: 'line', 198 type: 'line',
200 symbol: 'circle', 199 symbol: 'circle',
201 symbolSize: 10, 200 symbolSize: 10,
202 lineStyle: { 201 lineStyle: {
203 normal: { 202 normal: {
204 - color: 'yellow', 203 + color: 'blue',
205 width: 4, 204 width: 4,
206 - type: 'solid', 205 + type: 'solid'
207 } 206 }
208 }, 207 },
209 itemStyle: { 208 itemStyle: {
210 normal: { 209 normal: {
211 borderWidth: 3, 210 borderWidth: 3,
212 - borderColor: 'yellow',  
213 - color: 'yellow' 211 + borderColor: 'blue',
  212 + color: 'blue',
  213 + label : {show: true}
214 } 214 }
215 } 215 }
216 }] 216 }]
WebRoot/static/js/loading.js
  View file @3371dbc
@@ -9,6 +9,9 @@ @@ -9,6 +9,9 @@
9 9
10 var loading={ 10 var loading={
11 show:function(url){ 11 show:function(url){
  12 + if(typeof(url) == "undefined"){
  13 + url = '../static/images/loading.gif' ;
  14 + }
12 if(window.top!=window.self){ 15 if(window.top!=window.self){
13 $("body",top.document).append('<div class="loading" style="background:rgba(0,0,0,0.5);width:100%;height:100%;position:fixed;top:0;display:block;"><img src="'+url+'" width="200px" style="position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;"/></div>'); 16 $("body",top.document).append('<div class="loading" style="background:rgba(0,0,0,0.5);width:100%;height:100%;position:fixed;top:0;display:block;"><img src="'+url+'" width="200px" style="position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;"/></div>');
14 }else{ 17 }else{
WebRoot/static/login/style_login.css
  View file @3371dbc
1 -html,body{width:100%;height:100%;} 1 +html,body{width:100%;height:100%;}
2 input::-webkit-input-placeholder{ /*WebKit browsers*/ 2 input::-webkit-input-placeholder{ /*WebKit browsers*/
3 3
4 color: #666666; 4 color: #666666;
@@ -23,6 +23,6 @@ color: #666666; @@ -23,6 +23,6 @@ color: #666666;
23 .content_t{background:#01a5a6;height:40%;position:relative;} 23 .content_t{background:#01a5a6;height:40%;position:relative;}
24 .content_t img{position:absolute;bottom:0;width:30%;left:35%;display:block;} 24 .content_t img{position:absolute;bottom:0;width:30%;left:35%;display:block;}
25 .content_b .form_box{width:25%;margin:0 auto;margin-top:3%;} 25 .content_b .form_box{width:25%;margin:0 auto;margin-top:3%;}
26 -.content_b input{display:block;width:100%;background:#f2f2f2;border:1px solid #cccccc;line-height:50px;box-sizing:border-box;padding:0 12px;outline-style:none;font-size:20px;} 26 +.content_b input{display:block;width:100%;height:50px;background:#f2f2f2;border:1px solid #cccccc;line-height:50px;box-sizing:border-box;padding:0 12px;outline-style:none;font-size:20px;}
27 .content_b input:nth-child(2){margin-top:15px;} 27 .content_b input:nth-child(2){margin-top:15px;}
28 -.content_b .login_btn{display:block;width:100%;background:#13b5b1;color:#fff;font-size:24px;text-align:center;padding:2% 0;margin-top:10%;} 28 +.content_b .login_btn{display:block;width:100%;background:#13b5b1;color:#fff;font-size:24px;text-align:center;padding:2% 0;margin-top:10%;text-decoration:none;}
src/com/fh/controller/api/V1.java
  View file @3371dbc
@@ -162,6 +162,7 @@ public class V1 extends BaseController { @@ -162,6 +162,7 @@ public class V1 extends BaseController {
162 @RequestMapping(value = "/login", produces = "application/json;charset=UTF-8") 162 @RequestMapping(value = "/login", produces = "application/json;charset=UTF-8")
163 @ResponseBody 163 @ResponseBody
164 public Object login() throws Exception { 164 public Object login() throws Exception {
  165 + event("apilogin");
165 PageData pd = this.getPageData(); 166 PageData pd = this.getPageData();
166 ResponseGson<PageData> res = new ResponseGson(); 167 ResponseGson<PageData> res = new ResponseGson();
167 if (!pd.containsKey("ACCOUT")) { 168 if (!pd.containsKey("ACCOUT")) {
@@ -216,6 +217,7 @@ public class V1 extends BaseController { @@ -216,6 +217,7 @@ public class V1 extends BaseController {
216 @RequestMapping(value = "/class", produces = "application/json;charset=UTF-8") 217 @RequestMapping(value = "/class", produces = "application/json;charset=UTF-8")
217 @ResponseBody 218 @ResponseBody
218 public Object sclass() throws Exception { 219 public Object sclass() throws Exception {
  220 + event("sclass");
219 long cur = System.currentTimeMillis(); 221 long cur = System.currentTimeMillis();
220 PageData pd = this.getPageData(); 222 PageData pd = this.getPageData();
221 if (pd.containsKey("ID")) { 223 if (pd.containsKey("ID")) {
@@ -247,6 +249,7 @@ public class V1 extends BaseController { @@ -247,6 +249,7 @@ public class V1 extends BaseController {
247 @RequestMapping(value = "/questiontype", produces = "application/json;charset=UTF-8") 249 @RequestMapping(value = "/questiontype", produces = "application/json;charset=UTF-8")
248 @ResponseBody 250 @ResponseBody
249 public Object questiontype() throws Exception { 251 public Object questiontype() throws Exception {
  252 + event("questiontype");
250 long cur = System.currentTimeMillis(); 253 long cur = System.currentTimeMillis();
251 PageData pd = this.getPageData(); 254 PageData pd = this.getPageData();
252 ResponseGson<List<PageData>> res = new ResponseGson(); 255 ResponseGson<List<PageData>> res = new ResponseGson();
@@ -259,6 +262,7 @@ public class V1 extends BaseController { @@ -259,6 +262,7 @@ public class V1 extends BaseController {
259 @RequestMapping(value = "/classtype", produces = "application/json;charset=UTF-8") 262 @RequestMapping(value = "/classtype", produces = "application/json;charset=UTF-8")
260 @ResponseBody 263 @ResponseBody
261 public Object classtype() throws Exception { 264 public Object classtype() throws Exception {
  265 + event("classtype");
262 long cur = System.currentTimeMillis(); 266 long cur = System.currentTimeMillis();
263 PageData pd = this.getPageData(); 267 PageData pd = this.getPageData();
264 ResponseGson<List<PageData>> res = new ResponseGson(); 268 ResponseGson<List<PageData>> res = new ResponseGson();
@@ -271,6 +275,7 @@ public class V1 extends BaseController { @@ -271,6 +275,7 @@ public class V1 extends BaseController {
271 @RequestMapping(value = "/grade", produces = "application/json;charset=UTF-8") 275 @RequestMapping(value = "/grade", produces = "application/json;charset=UTF-8")
272 @ResponseBody 276 @ResponseBody
273 public Object grade() throws Exception { 277 public Object grade() throws Exception {
  278 + event("grade");
274 long cur = System.currentTimeMillis(); 279 long cur = System.currentTimeMillis();
275 PageData pd = this.getPageData(); 280 PageData pd = this.getPageData();
276 ResponseGson<List<PageData>> res = new ResponseGson(); 281 ResponseGson<List<PageData>> res = new ResponseGson();
@@ -288,6 +293,7 @@ public class V1 extends BaseController { @@ -288,6 +293,7 @@ public class V1 extends BaseController {
288 @RequestMapping(value = "/subject", produces = "application/json;charset=UTF-8") 293 @RequestMapping(value = "/subject", produces = "application/json;charset=UTF-8")
289 @ResponseBody 294 @ResponseBody
290 public Object subject() throws Exception { 295 public Object subject() throws Exception {
  296 + event("subject");
291 long cur = System.currentTimeMillis(); 297 long cur = System.currentTimeMillis();
292 PageData pd = this.getPageData(); 298 PageData pd = this.getPageData();
293 ResponseGson<List<PageData>> res = new ResponseGson(); 299 ResponseGson<List<PageData>> res = new ResponseGson();
@@ -307,6 +313,7 @@ public class V1 extends BaseController { @@ -307,6 +313,7 @@ public class V1 extends BaseController {
307 @RequestMapping(value = "/keypadscan", produces = "application/json;charset=UTF-8") 313 @RequestMapping(value = "/keypadscan", produces = "application/json;charset=UTF-8")
308 @ResponseBody 314 @ResponseBody
309 public Object keypadScan() throws Exception { 315 public Object keypadScan() throws Exception {
  316 + event("keypadScan");
310 long cur = System.currentTimeMillis(); 317 long cur = System.currentTimeMillis();
311 PageData pd = this.getPageData(); 318 PageData pd = this.getPageData();
312 ResponseGson<String> res = new ResponseGson(); 319 ResponseGson<String> res = new ResponseGson();
@@ -327,6 +334,7 @@ public class V1 extends BaseController { @@ -327,6 +334,7 @@ public class V1 extends BaseController {
327 @RequestMapping(value = "/paper", produces = "application/json;charset=UTF-8") 334 @RequestMapping(value = "/paper", produces = "application/json;charset=UTF-8")
328 @ResponseBody 335 @ResponseBody
329 public Object paper() throws Exception { 336 public Object paper() throws Exception {
  337 + event("paper");
330 long cur = System.currentTimeMillis(); 338 long cur = System.currentTimeMillis();
331 PageData pd = this.getPageData(); 339 PageData pd = this.getPageData();
332 ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>(); 340 ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
@@ -363,6 +371,7 @@ public class V1 extends BaseController { @@ -363,6 +371,7 @@ public class V1 extends BaseController {
363 @RequestMapping(value = "/paperinfo", produces = "application/json;charset=UTF-8") 371 @RequestMapping(value = "/paperinfo", produces = "application/json;charset=UTF-8")
364 @ResponseBody 372 @ResponseBody
365 public Object paperInfo() throws Exception { 373 public Object paperInfo() throws Exception {
  374 + event("paperInfo");
366 long cur = System.currentTimeMillis(); 375 long cur = System.currentTimeMillis();
367 PageData pd = this.getPageData(); 376 PageData pd = this.getPageData();
368 ResponseGson<Paper> res = new ResponseGson<Paper>(); 377 ResponseGson<Paper> res = new ResponseGson<Paper>();
@@ -469,6 +478,7 @@ public class V1 extends BaseController { @@ -469,6 +478,7 @@ public class V1 extends BaseController {
469 @RequestMapping(value = "/paperquestion", produces = "application/json;charset=UTF-8") 478 @RequestMapping(value = "/paperquestion", produces = "application/json;charset=UTF-8")
470 @ResponseBody 479 @ResponseBody
471 public Object paperQuestion() throws Exception { 480 public Object paperQuestion() throws Exception {
  481 + event("paperQuestion");
472 long cur = System.currentTimeMillis(); 482 long cur = System.currentTimeMillis();
473 PageData pd = this.getPageData(); 483 PageData pd = this.getPageData();
474 ResponseGson<PageData> res = new ResponseGson(); 484 ResponseGson<PageData> res = new ResponseGson();
@@ -479,6 +489,7 @@ public class V1 extends BaseController { @@ -479,6 +489,7 @@ public class V1 extends BaseController {
479 @RequestMapping(value = "/question", produces = "application/json;charset=UTF-8") 489 @RequestMapping(value = "/question", produces = "application/json;charset=UTF-8")
480 @ResponseBody 490 @ResponseBody
481 public Object question() throws Exception { 491 public Object question() throws Exception {
  492 + event("question");
482 long cur = System.currentTimeMillis(); 493 long cur = System.currentTimeMillis();
483 PageData pd = this.getPageData(); 494 PageData pd = this.getPageData();
484 ResponseGson<PageData> res = new ResponseGson(); 495 ResponseGson<PageData> res = new ResponseGson();
@@ -496,6 +507,7 @@ public class V1 extends BaseController { @@ -496,6 +507,7 @@ public class V1 extends BaseController {
496 @RequestMapping(value = "/question/add", produces = "application/json;charset=UTF-8") 507 @RequestMapping(value = "/question/add", produces = "application/json;charset=UTF-8")
497 @ResponseBody 508 @ResponseBody
498 public Object questionAdd() throws Exception { 509 public Object questionAdd() throws Exception {
  510 + event("questionAdd");
499 long cur = System.currentTimeMillis(); 511 long cur = System.currentTimeMillis();
500 PageData pd = this.getPageData(); 512 PageData pd = this.getPageData();
501 ResponseGson<PageData> res = new ResponseGson(); 513 ResponseGson<PageData> res = new ResponseGson();
@@ -508,6 +520,7 @@ public class V1 extends BaseController { @@ -508,6 +520,7 @@ public class V1 extends BaseController {
508 @RequestMapping(value = "/uploadpaper", produces = "application/json;charset=UTF-8") 520 @RequestMapping(value = "/uploadpaper", produces = "application/json;charset=UTF-8")
509 @ResponseBody 521 @ResponseBody
510 public Object uploadpaper() throws Exception { 522 public Object uploadpaper() throws Exception {
  523 + event("uploadpaper");
511 long cur = System.currentTimeMillis(); 524 long cur = System.currentTimeMillis();
512 PageData pd = this.getPageData(); 525 PageData pd = this.getPageData();
513 ResponseGson<String> res = new ResponseGson(); 526 ResponseGson<String> res = new ResponseGson();
@@ -636,6 +649,7 @@ public class V1 extends BaseController { @@ -636,6 +649,7 @@ public class V1 extends BaseController {
636 @RequestMapping(value = "/uploadtestpaper", produces = "application/json;charset=UTF-8") 649 @RequestMapping(value = "/uploadtestpaper", produces = "application/json;charset=UTF-8")
637 @ResponseBody 650 @ResponseBody
638 public Object uploadTestpaper() { 651 public Object uploadTestpaper() {
  652 + event("uploadTestpaper");
639 long cur = System.currentTimeMillis(); 653 long cur = System.currentTimeMillis();
640 PageData pd = this.getPageData(); 654 PageData pd = this.getPageData();
641 ResponseGson<String> res = new ResponseGson(); 655 ResponseGson<String> res = new ResponseGson();
@@ -750,6 +764,7 @@ public class V1 extends BaseController { @@ -750,6 +764,7 @@ public class V1 extends BaseController {
750 @RequestMapping(value = "/uploadupdatetestpaper", produces = "application/json;charset=UTF-8") 764 @RequestMapping(value = "/uploadupdatetestpaper", produces = "application/json;charset=UTF-8")
751 @ResponseBody 765 @ResponseBody
752 public Object uploadupdateTestpaper() { 766 public Object uploadupdateTestpaper() {
  767 + event("uploadupdateTestpaper");
753 long cur = System.currentTimeMillis(); 768 long cur = System.currentTimeMillis();
754 PageData pd = this.getPageData(); 769 PageData pd = this.getPageData();
755 ResponseGson<String> res = new ResponseGson(); 770 ResponseGson<String> res = new ResponseGson();
@@ -862,6 +877,7 @@ public class V1 extends BaseController { @@ -862,6 +877,7 @@ public class V1 extends BaseController {
862 @RequestMapping(value = "/downloadtestpaper", produces = "application/json;charset=UTF-8") 877 @RequestMapping(value = "/downloadtestpaper", produces = "application/json;charset=UTF-8")
863 @ResponseBody 878 @ResponseBody
864 public Object downloadTestpaper() { 879 public Object downloadTestpaper() {
  880 + event("downloadTestpaper");
865 long cur = System.currentTimeMillis(); 881 long cur = System.currentTimeMillis();
866 PageData pd = this.getPageData(); 882 PageData pd = this.getPageData();
867 ResponseGson<TestPaper> res = new ResponseGson(); 883 ResponseGson<TestPaper> res = new ResponseGson();
@@ -947,6 +963,7 @@ public class V1 extends BaseController { @@ -947,6 +963,7 @@ public class V1 extends BaseController {
947 @RequestMapping(value = "/testpaper", produces = "application/json;charset=UTF-8") 963 @RequestMapping(value = "/testpaper", produces = "application/json;charset=UTF-8")
948 @ResponseBody 964 @ResponseBody
949 public Object testpaper() { 965 public Object testpaper() {
  966 + event("testpaper");
950 long cur = System.currentTimeMillis(); 967 long cur = System.currentTimeMillis();
951 PageData pd = this.getPageData(); 968 PageData pd = this.getPageData();
952 ResponseGson<List<TestPaper>> res = new ResponseGson(); 969 ResponseGson<List<TestPaper>> res = new ResponseGson();
@@ -988,6 +1005,7 @@ public class V1 extends BaseController { @@ -988,6 +1005,7 @@ public class V1 extends BaseController {
988 @RequestMapping(value = "/schooladmin", produces = "application/json;charset=UTF-8") 1005 @RequestMapping(value = "/schooladmin", produces = "application/json;charset=UTF-8")
989 @ResponseBody 1006 @ResponseBody
990 public void schoolAdmin(){ 1007 public void schoolAdmin(){
  1008 + event("schoolAdmin");
991 PageData pd = this.getPageData(); 1009 PageData pd = this.getPageData();
992 this.getUserID(); 1010 this.getUserID();
993 } 1011 }
@@ -996,6 +1014,7 @@ public class V1 extends BaseController { @@ -996,6 +1014,7 @@ public class V1 extends BaseController {
996 @RequestMapping(value = "/network", produces = "application/json;charset=UTF-8") 1014 @RequestMapping(value = "/network", produces = "application/json;charset=UTF-8")
997 @ResponseBody 1015 @ResponseBody
998 public Object network() throws Exception{ 1016 public Object network() throws Exception{
  1017 + event("network");
999 PageData pd = this.getPageData(); 1018 PageData pd = this.getPageData();
1000 ResponseGson<PageData> res = new ResponseGson(); 1019 ResponseGson<PageData> res = new ResponseGson();
1001 PageData spd = networkstatisticsService.findByClientID(pd); 1020 PageData spd = networkstatisticsService.findByClientID(pd);
@@ -1055,6 +1074,7 @@ public class V1 extends BaseController { @@ -1055,6 +1074,7 @@ public class V1 extends BaseController {
1055 @RequestMapping(value = "/newversion", produces = "application/json;charset=UTF-8") 1074 @RequestMapping(value = "/newversion", produces = "application/json;charset=UTF-8")
1056 @ResponseBody 1075 @ResponseBody
1057 public Object getNewVersion(HttpServletRequest request) throws Exception{ 1076 public Object getNewVersion(HttpServletRequest request) throws Exception{
  1077 + event("getNewVersion");
1058 PageData pd = this.getPageData(); 1078 PageData pd = this.getPageData();
1059 String softId = pd.getString("SOFTID"); 1079 String softId = pd.getString("SOFTID");
1060 String path = request.getContextPath(); 1080 String path = request.getContextPath();
@@ -1081,5 +1101,20 @@ public class V1 extends BaseController { @@ -1081,5 +1101,20 @@ public class V1 extends BaseController {
1081 1101
1082 1102
1083 1103
  1104 + private void event(String apiName){
  1105 + PageData eventPd = new PageData();
  1106 + eventPd.put("EVENT_ID", get32UUID());
  1107 + eventPd.put("EVENT_NAME", apiName);
  1108 + eventPd.put("EVENT_USER", getUsername());
  1109 + eventPd.put("EVENT_TYPE", "0");
  1110 + eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
  1111 + eventPd.put("CLIENT_ID", "SERVER");
  1112 + eventPd.put("EVENT_IP", getRemoteIp());
  1113 + try{
  1114 + eventService.save(eventPd);
  1115 + }catch(Exception e){
  1116 +
  1117 + }
  1118 + }
1084 1119
1085 } 1120 }
src/com/fh/controller/sunvote/student/StudentController.java
  View file @3371dbc
@@ -168,7 +168,7 @@ public class StudentController extends BaseController { @@ -168,7 +168,7 @@ public class StudentController extends BaseController {
168 } 168 }
169 } 169 }
170 mv.addObject("msg","success"); 170 mv.addObject("msg","success");
171 - mv.setViewName("save_result"); 171 + mv.setViewName("save_result2");
172 return mv; 172 return mv;
173 } 173 }
174 174
@@ -216,8 +216,8 @@ public class StudentController extends BaseController { @@ -216,8 +216,8 @@ public class StudentController extends BaseController {
216 PageData pd = new PageData(); 216 PageData pd = new PageData();
217 pd = this.getPageData(); 217 pd = this.getPageData();
218 studentService.edit(pd); 218 studentService.edit(pd);
219 - mv.addObject("msg","success2");  
220 - mv.setViewName("save_result"); 219 + mv.addObject("msg","success");
  220 + mv.setViewName("save_result2");
221 return mv; 221 return mv;
222 } 222 }
223 223