Commit 8942b440afb6feccde7959e901c721b2cc5d8d2e

Authored by 孙向锦
1 parent 6429ab88

提交code

WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 <c:when test="${not empty varList}"> 65 <c:when test="${not empty varList}">
66 <c:forEach items="${varList}" var="var" varStatus="vs"> 66 <c:forEach items="${varList}" var="var" varStatus="vs">
67 <tr> 67 <tr>
68 - <td><input type="checkbox" name='ids' value="${var.PAPER_ID}"/>${vs.index+1}</td> 68 + <td><input type="checkbox" name='ids' id="ids" value="${var.PAPER_ID}"/>${vs.index+1}</td>
69 <td ><a target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td> 69 <td ><a target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td>
70 <td >${var.CREATE_DATE}</td> 70 <td >${var.CREATE_DATE}</td>
71 <td >${var.EXAM_TIME}</td> 71 <td >${var.EXAM_TIME}</td>
@@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
181 console.log("false"); 181 console.log("false");
182 } 182 }
183 }}); 183 }});
184 - remove.show(); 184 + window.top.remove.show();
185 } 185 }
186 </script> 186 </script>
187 </html> 187 </html>
188 \ No newline at end of file 188 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
@@ -16,6 +16,27 @@ @@ -16,6 +16,27 @@
16 <%@ include file="../../system/index/top.jsp"%> 16 <%@ include file="../../system/index/top.jsp"%>
17 <!-- 日期框 --> 17 <!-- 日期框 -->
18 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 18 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
  19 + <style>
  20 + .table td{border:0 !important;}
  21 + .btn1 {
  22 + width: 80%;
  23 + height: 40px;
  24 + margin: 0 auto;
  25 + background: #3bc2d6;
  26 + margin-top: 5%;
  27 +}
  28 +
  29 +.btn1 a {
  30 + display: block;
  31 + width: 100%;
  32 + height: 100%;
  33 + color: #fff;
  34 + text-decoration: none;
  35 + text-align: center;
  36 + line-height: 40px;
  37 + font-size: 20px;
  38 +}
  39 + </style>
19 </head> 40 </head>
20 <body class="no-skin"> 41 <body class="no-skin">
21 <!-- /section:basics/navbar.layout --> 42 <!-- /section:basics/navbar.layout -->
@@ -81,7 +102,10 @@ @@ -81,7 +102,10 @@
81 </tr> 102 </tr>
82 <tr> 103 <tr>
83 <td style="text-align: center;" colspan="10"> 104 <td style="text-align: center;" colspan="10">
84 - <a class="btn btn-mini btn-primary" onclick="save();"><div style="width:100px;">保存</div></a> 105 + <!-- <a class="btn" onclick="save();"><div style="width:100px;">保存</div></a> -->
  106 + <div class="btn1">
  107 + <a onclick="save();">保存</a>
  108 + </div>
85 </td> 109 </td>
86 </tr> 110 </tr>
87 </table> 111 </table>
WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp 0 → 100644
  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>
0 \ No newline at end of file 216 \ No newline at end of file
WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
@@ -19,9 +19,6 @@ @@ -19,9 +19,6 @@
19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" 19 href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
20 rel="stylesheet"> 20 rel="stylesheet">
21 <link href="../static/css/teach.css" rel="stylesheet"> 21 <link href="../static/css/teach.css" rel="stylesheet">
22 -<script src="../static/js/loading.js"></script>  
23 -<script src="../static/js/remove.js"></script>  
24 -<script src="../static/js/dailog.js"></script>  
25 22
26 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 --> 23 <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询(media queries)功能 -->
27 <!-- 警告:通过 file:// 协议(就是直接将 html 页面拖拽到浏览器中)访问页面时 Respond.js 不起作用 --> 24 <!-- 警告:通过 file:// 协议(就是直接将 html 页面拖拽到浏览器中)访问页面时 Respond.js 不起作用 -->
@@ -47,8 +44,7 @@ @@ -47,8 +44,7 @@
47 <table class="table table-striped"> 44 <table class="table table-striped">
48 <thead> 45 <thead>
49 <tr> 46 <tr>
50 - <th><input type="checkbox" value="0" name="choose"  
51 - id="chooseAll" />序号</th> 47 + <th><input type="checkbox" value="0" name='ids' id="ids" />序号</th>
52 <th>姓名</th> 48 <th>姓名</th>
53 <th>学号</th> 49 <th>学号</th>
54 <th>键盘ID</th> 50 <th>键盘ID</th>
@@ -60,11 +56,11 @@ @@ -60,11 +56,11 @@
60 <c:when test="${not empty varList}"> 56 <c:when test="${not empty varList}">
61 <c:forEach items="${varList}" var="var" varStatus="vs"> 57 <c:forEach items="${varList}" var="var" varStatus="vs">
62 <tr> 58 <tr>
63 - <td><input type="checkbox" value="1" name="choose" />${vs.index+1}</td> 59 + <td><input type="checkbox" name='ids' id="ids" value="${var.ID}" />${vs.index+1}</td>
64 <td class='center'>${var.NAME}</td> 60 <td class='center'>${var.NAME}</td>
65 - <td>${var.SNO}</td> 61 + <td>${var.NUMBER}</td>
66 <td>${var.KEYPAD_ID}</td> 62 <td>${var.KEYPAD_ID}</td>
67 - <td><a href="#" onclick="del('${var.ID}');"><img src="../static/images/remove.png" /></a></td> 63 + <td><a href="#" onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="../static/images/eidtor.png" /></a><a href="#" onclick="del('${var.ID}');"><img src="../static/images/remove.png" /></a></td>
68 64
69 65
70 66
@@ -126,7 +122,7 @@ @@ -126,7 +122,7 @@
126 console.log("false"); 122 console.log("false");
127 } 123 }
128 }}); 124 }});
129 - remove.show(); 125 + window.top.remove.show();
130 } 126 }
131 127
132 function add(){ 128 function add(){
@@ -140,8 +136,48 @@ @@ -140,8 +136,48 @@
140 window.top.modal.show(); 136 window.top.modal.show();
141 } 137 }
142 138
143 - function deleteAll(){ 139 + function edit(Id){
  140 + window.top.modal.init({
  141 + 'title':'添加学生',
  142 + 'url':'<%=basePath%>student/goEdit2.do?ID='+Id,
  143 + func:function() {
  144 + tosearch();
  145 + }
  146 + });
  147 + window.top.modal.show();
  148 + }
144 149
  150 + function deleteAll(){
  151 + window.top.remove.init({"title":"删除","func":function(success){
  152 + if(success){
  153 + var str = '';
  154 + for(var i=0;i < document.getElementsByName('ids').length;i++){
  155 + if(document.getElementsByName('ids')[i].checked){
  156 + if(str=='') str += document.getElementsByName('ids')[i].value;
  157 + else str += ',' + document.getElementsByName('ids')[i].value;
  158 + }
  159 + }
  160 + if(str==''){
  161 +
  162 + }else{
  163 + $.ajax({
  164 + type: "POST",
  165 + url: '<%=basePath%>student/deleteAll.do?tm='+new Date().getTime(),
  166 + data: {DATA_IDS:str},
  167 + dataType:'json',
  168 + //beforeSend: validateData,
  169 + cache: false,
  170 + success: function(data){
  171 + tosearch();
  172 + }
  173 + });
  174 + }
  175 + }
  176 + else{
  177 + console.log("false");
  178 + }
  179 + }});
  180 + window.top.remove.show();
145 } 181 }
146 182
147 183
WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
1 -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  
2 -<html xmlns="http://www.w3.org/1999/xhtml">  
3 -<head> 1 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  2 +<html xmlns="http://www.w3.org/1999/xhtml">
  3 +<head>
4 <% 4 <%
5 String path = request.getContextPath(); 5 String path = request.getContextPath();
6 String basePath = request.getScheme() + "://" 6 String basePath = request.getScheme() + "://"
7 + request.getServerName() + ":" + request.getServerPort() 7 + request.getServerName() + ":" + request.getServerPort()
8 + path + "/"; 8 + path + "/";
9 %> 9 %>
10 -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />  
11 -<title>班级-测试名单</title> 10 +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  11 +<title>班级-测试名单</title>
12 <script src="http://libs.baidu.com/jquery/1.11.1/jquery.min.js"></script> 12 <script src="http://libs.baidu.com/jquery/1.11.1/jquery.min.js"></script>
13 -<script src="http://cdn.staticfile.org/twitter-bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script>  
14 -<link href="http://cdn.staticfile.org/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="all" />  
15 -<link href="../static/css/jquery.circliful.css" rel="stylesheet" type="text/css" />  
16 -<link href="../static/css/style1.css" rel="stylesheet" type="text/css" />  
17 -<script src="../static/laydate/laydate.js"></script> <!-- 改成你的路径 --> 13 +<script
  14 + src="http://cdn.staticfile.org/twitter-bootstrap/4.0.0-alpha.2/js/bootstrap.min.js"></script>
  15 +<link
  16 + href="http://cdn.staticfile.org/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css"
  17 + rel="stylesheet" type="text/css" media="all" />
  18 +<link href="../static/css/jquery.circliful.css" rel="stylesheet"
  19 + type="text/css" />
  20 +<link href="../static/css/style1.css?t=123" rel="stylesheet" type="text/css" />
  21 +<!-- 日期框 -->
  22 +<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
  23 +<script src="../static/laydate/laydate.js"></script>
  24 +<!-- 改成你的路径 -->
18 <script src="../static/js/jquery.circliful.min.js"></script> 25 <script src="../static/js/jquery.circliful.min.js"></script>
19 <script src="../static/js/echars.js"></script> 26 <script src="../static/js/echars.js"></script>
20 -<script>  
21 - lay('#version').html('-v'+ laydate.v);  
22 - //日期范围  
23 - laydate.render({  
24 - elem: '#test6'  
25 - ,range: true  
26 - });  
27 -</script> 27 +<!-- 日期框 -->
  28 +<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
  29 +<!--提示框-->
  30 +<script type="text/javascript" src="../static/js/jquery.tips.js"></script>
  31 +
  32 +
  33 +
  34 +
28 <style> 35 <style>
29 - body { padding-top: 70px; }  
30 - li{list-style:none;} 36 +body {
  37 + padding-top: 50px;
  38 +}
  39 +
  40 +li {
  41 + list-style: none;
  42 +}
31 </style> 43 </style>
32 - </head>  
33 - <body> 44 +</head>
  45 +<body>
34 <div class="header"> 46 <div class="header">
35 <nav class="navbar navbar-default navbar-fixed-top"> 47 <nav class="navbar navbar-default navbar-fixed-top">
36 - <div class="container">  
37 - <input type="text" class="demo-input" placeholder="开始日期" name="starDate" id="test6">  
38 - <input type="text" class="demo-input" placeholder="结束日期" name="endDate" id="test6">  
39 - <input type="button" value="查询" id="search"/>  
40 - </div>  
41 -</nav> 48 + <div class="container">
  49 + <input type="text" class="date-picker" placeholder="开始日期" name="starDate" id="starDate" data-date-format="yyyy-mm-dd" readonly="readonly"/>
  50 + <input type="text" class="date-picker" placeholder="结束日期" name="endDate" id="endDate" data-date-format="yyyy-mm-dd" readonly="readonly"/>
  51 + <input type="button" value="查询" id="search" />
  52 + </div>
  53 + </nav>
42 </div> 54 </div>
43 <div class="content row"> 55 <div class="content row">
44 <div class="content_l col-md-2"> 56 <div class="content_l col-md-2">
45 <ul> 57 <ul>
46 - 58 +
47 </ul> 59 </ul>
48 </div> 60 </div>
49 <div class="content_r col-md-10"> 61 <div class="content_r col-md-10">
50 <div class="tabel_t"> 62 <div class="tabel_t">
51 - <div class="name"><h1></h1></div> 63 + <div class="name">
  64 + <h1></h1>
  65 + </div>
52 <div class="circle row"> 66 <div class="circle row">
53 <div class="col-md-6"> 67 <div class="col-md-6">
54 <!-- <div id="myStathalf" data-dimension="350" data-text="9/19" data-info="参与测试" data-width="10" data-fontsize="38" data-percent="35" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div> --> 68 <!-- <div id="myStathalf" data-dimension="350" data-text="9/19" data-info="参与测试" data-width="10" data-fontsize="38" data-percent="35" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div> -->
55 - 69 +
56 </div> 70 </div>
57 <div class="col-md-6"> 71 <div class="col-md-6">
58 <!-- <div id="myStathalf1" data-dimension="350" data-text="36%" data-info="个人平均得分率" data-width="10" data-fontsize="38" data-percent="35" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div> --> 72 <!-- <div id="myStathalf1" data-dimension="350" data-text="36%" data-info="个人平均得分率" data-width="10" data-fontsize="38" data-percent="35" data-fgcolor="#8ad254" data-bgcolor="#a9f9ff" data-type="half" data-fill="#50b5c9"></div> -->
59 - 73 +
60 </div> 74 </div>
61 </div> 75 </div>
62 <div class="info row"> 76 <div class="info row">
63 <div class="col-md-6"> 77 <div class="col-md-6">
64 - <p>班级平均得分率<span id="class_avg">0.0</span>%</p> 78 + <p>
  79 + 班级平均得分率<span id="class_avg">0.0</span>%
  80 + </p>
65 </div> 81 </div>
66 <div class="col-md-6"> 82 <div class="col-md-6">
67 - <p>班级最高得分率<span id="class_max">0.0</span>%</p> 83 + <p>
  84 + 班级最高得分率<span id="class_max">0.0</span>%
  85 + </p>
68 </div> 86 </div>
69 </div> 87 </div>
70 <div class="prev"></div> 88 <div class="prev"></div>
@@ -83,10 +101,9 @@ @@ -83,10 +101,9 @@
83 </ul> 101 </ul>
84 </div> 102 </div>
85 <div class="check_box"> 103 <div class="check_box">
86 - <input type="radio" checked value="1" name="check" id="check1" />  
87 - <label for="check1">按得分率</label>  
88 - <input type="radio" value="2" name="check" id="check2" />  
89 - <label for="check2">按分数</label> 104 + <input type="radio" checked value="1" name="check" id="check1" />
  105 + <label for="check1">按得分率</label> <input type="radio" value="2"
  106 + name="check" id="check2" /> <label for="check2">按分数</label>
90 </div> 107 </div>
91 </div> 108 </div>
92 </div> 109 </div>
@@ -100,5 +117,21 @@ @@ -100,5 +117,21 @@
100 var URL = '<%=basePath%>${URL}'; 117 var URL = '<%=basePath%>${URL}';
101 </script> 118 </script>
102 <script src="../static/js/control1.js"></script> 119 <script src="../static/js/control1.js"></script>
103 - </body>  
104 -</html>  
105 \ No newline at end of file 120 \ No newline at end of file
  121 + <!-- 日期框 -->
  122 + <script>
  123 + //lay('#version').html('-v'+ laydate.v);
  124 + //日期范围
  125 + // laydate.render({
  126 + // elem: '#test6'
  127 + // ,range: true
  128 + // });
  129 + $('.date-picker').datepicker({
  130 + autoclose : true,
  131 + todayHighlight : true
  132 + });
  133 +</script>
  134 +
  135 +
  136 +
  137 +</body>
  138 +</html>
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </head> 26 </head>
27 27
28 <body style="background:#fff"> 28 <body style="background:#fff">
29 - <div style="min-width:1360px;"> 29 + <div style="min-width:1360px;padding:20px 20px;">
30 <form action="report/report.do" method="post" name="Form" id="Form"> 30 <form action="report/report.do" method="post" name="Form" id="Form">
31 <input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" /> 31 <input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
32 <table style="margin-top:5px;"> 32 <table style="margin-top:5px;">
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 <th class="center"><div style="width:80px;">课程总分</div></th> 61 <th class="center"><div style="width:80px;">课程总分</div></th>
62 <c:forEach items="${testpaperList}" var="var" varStatus="vs"> 62 <c:forEach items="${testpaperList}" var="var" varStatus="vs">
63 <th class="center"><a 63 <th class="center"><a
64 - href="report/test_report?TestID=${var.TESTPAPER_ID}&class_id=${info.CLASS_ID}"><div style="width:150px;">${var.NAME}${var.CREATE_DATE}</div></a></th> 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>
65 </c:forEach> 65 </c:forEach>
66 </tr> 66 </tr>
67 </thead> 67 </thead>
WebRoot/static/css/mb_style.css
@@ -7,8 +7,9 @@ @@ -7,8 +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:5%;} 10 +.remove .mb_box{display:table;padding-bottom:3%;}
  11 +.remove .mb_msg p{text-align: left;line-height: 40px;font-size: 20px;margin: 0;padding-left: 20px;}
11 .mb_content .mb_content_l{width:50%;float:left;margin-top:5%;} 12 .mb_content .mb_content_l{width:50%;float:left;margin-top:5%;}
12 -.mb_content .mb_content_l a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#3bc2d6;text-align:center;height:40px;line-height:40px;} 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;}
13 .mb_content .mb_content_r{width:50%;float:left;margin-top:5%;} 14 .mb_content .mb_content_r{width:50%;float:left;margin-top:5%;}
14 .mb_content .mb_content_r a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#3bc2d6;text-align:center;height:40px;line-height:40px;} 15 .mb_content .mb_content_r a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#3bc2d6;text-align:center;height:40px;line-height:40px;}
WebRoot/static/css/style1.css
@@ -7,12 +7,14 @@ ul{padding:0;} @@ -7,12 +7,14 @@ ul{padding:0;}
7 .yellow{background:yellow;} 7 .yellow{background:yellow;}
8 .clear{clear:both;} 8 .clear{clear:both;}
9 9
  10 +.container{display:table;margin:0 auto;}
  11 +.container input[type="text"]{margin-right:10px;}
10 .content .content_l{height:100%;overflow-y:auto;padding:0;} 12 .content .content_l{height:100%;overflow-y:auto;padding:0;}
11 .content .content_l li p{line-height:50px;font-size:25px;text-align:center;} 13 .content .content_l li p{line-height:50px;font-size:25px;text-align:center;}
12 .content .content_r{padding:0;overflow-x:hidden;} 14 .content .content_r{padding:0;overflow-x:hidden;}
13 .content .content_r .tabel_t{background:#50b5c9;padding-top:5%;position:relative;} 15 .content .content_r .tabel_t{background:#50b5c9;padding-top:5%;position:relative;}
14 .content .content_r .tabel_t .name{color:#fff;text-align:center;} 16 .content .content_r .tabel_t .name{color:#fff;text-align:center;}
15 -.header .navbar{background:#fff;border-bottom:1px solid #ccc;height:70px;} 17 +.header .navbar{background:#fff;border-bottom:1px solid #ccc;height:50px;}
16 .circle{border-bottom:1px solid #fff;} 18 .circle{border-bottom:1px solid #fff;}
17 .circle .col-md-6{height:200px;} 19 .circle .col-md-6{height:200px;}
18 .circle .col-md-6 div:first-child{margin:0 auto;} 20 .circle .col-md-6 div:first-child{margin:0 auto;}
WebRoot/static/images/eidtor.png 0 → 100644

1.3 KB

WebRoot/static/js/control1.js
@@ -60,10 +60,12 @@ @@ -60,10 +60,12 @@
60 }) 60 })
61 61
62 $("#search").click(function(){ 62 $("#search").click(function(){
63 - var date_string=$("#test6").val();  
64 - var date_arry=date_string.split(' - ');  
65 - startDate=date_arry[0];  
66 - endDate=date_arry[1]; 63 +// var date_string=$("#test6").val();
  64 +// var date_arry=date_string.split(' - ');
  65 +// startDate=date_arry[0];
  66 +// endDate=date_arry[1];
  67 + startDate = $("#starDate").val();
  68 + endDate = $("#endDate").val();
67 getData(startDate,endDate); 69 getData(startDate,endDate);
68 }) 70 })
69 71
WebRoot/static/js/remove.js
@@ -3,14 +3,23 @@ var remove={ @@ -3,14 +3,23 @@ var remove={
3 init:function(obj){ 3 init:function(obj){
4 this.init.title=obj.title; 4 this.init.title=obj.title;
5 this.init.func = obj.func; 5 this.init.func = obj.func;
  6 + this.init.msg = obj.msg;
6 }, 7 },
7 show:function(){ 8 show:function(){
8 - if(window.top!=window.self){ 9 + if(window.top!=window.self){
9 $("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>'); 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>');
  11 + console.log(typeof(window.top.remove.init.msg));
  12 + if(typeof(window.top.remove.init.msg) != "undefined"){
  13 + $(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
  14 + }
10 }else{ 15 }else{
11 if($(".loading").length==0) 16 if($(".loading").length==0)
12 { 17 {
  18 + console.log(typeof(window.top.remove.init.msg));
13 $("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>'); 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>');
  20 + if(typeof(window.top.remove.init.msg) != "undefined"){
  21 + $(".mb_content_l").before('<div class="mb_msg"><p>'+window.top.remove.init.msg+'</p></div>');
  22 + }
14 } 23 }
15 } 24 }
16 }, 25 },
src/com/fh/controller/sunvote/student/StudentController.java
@@ -58,7 +58,6 @@ public class StudentController extends BaseController { @@ -58,7 +58,6 @@ public class StudentController extends BaseController {
58 @RequestMapping(value="/save") 58 @RequestMapping(value="/save")
59 public ModelAndView save() throws Exception{ 59 public ModelAndView save() throws Exception{
60 logBefore(logger, Jurisdiction.getUsername()+"新增Student"); 60 logBefore(logger, Jurisdiction.getUsername()+"新增Student");
61 - if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限  
62 ModelAndView mv = this.getModelAndView(); 61 ModelAndView mv = this.getModelAndView();
63 PageData pd = new PageData(); 62 PageData pd = new PageData();
64 pd = this.getPageData(); 63 pd = this.getPageData();
@@ -181,7 +180,6 @@ public class StudentController extends BaseController { @@ -181,7 +180,6 @@ public class StudentController extends BaseController {
181 @RequestMapping(value="/delete") 180 @RequestMapping(value="/delete")
182 public void delete(PrintWriter out) throws Exception{ 181 public void delete(PrintWriter out) throws Exception{
183 logBefore(logger, Jurisdiction.getUsername()+"删除Student"); 182 logBefore(logger, Jurisdiction.getUsername()+"删除Student");
184 - if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限  
185 PageData pd = new PageData(); 183 PageData pd = new PageData();
186 pd = this.getPageData(); 184 pd = this.getPageData();
187 studentService.delete(pd); 185 studentService.delete(pd);
@@ -198,7 +196,6 @@ public class StudentController extends BaseController { @@ -198,7 +196,6 @@ public class StudentController extends BaseController {
198 @RequestMapping(value="/edit") 196 @RequestMapping(value="/edit")
199 public ModelAndView edit() throws Exception{ 197 public ModelAndView edit() throws Exception{
200 logBefore(logger, Jurisdiction.getUsername()+"修改Student"); 198 logBefore(logger, Jurisdiction.getUsername()+"修改Student");
201 - if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限  
202 ModelAndView mv = this.getModelAndView(); 199 ModelAndView mv = this.getModelAndView();
203 PageData pd = new PageData(); 200 PageData pd = new PageData();
204 pd = this.getPageData(); 201 pd = this.getPageData();
@@ -208,6 +205,22 @@ public class StudentController extends BaseController { @@ -208,6 +205,22 @@ public class StudentController extends BaseController {
208 return mv; 205 return mv;
209 } 206 }
210 207
  208 + /**修改
  209 + * @param
  210 + * @throws Exception
  211 + */
  212 + @RequestMapping(value="/edit2")
  213 + public ModelAndView edit2() throws Exception{
  214 + logBefore(logger, Jurisdiction.getUsername()+"修改Student");
  215 + ModelAndView mv = this.getModelAndView();
  216 + PageData pd = new PageData();
  217 + pd = this.getPageData();
  218 + studentService.edit(pd);
  219 + mv.addObject("msg","success2");
  220 + mv.setViewName("save_result");
  221 + return mv;
  222 + }
  223 +
211 /**列表 224 /**列表
212 * @param page 225 * @param page
213 * @throws Exception 226 * @throws Exception
@@ -215,7 +228,6 @@ public class StudentController extends BaseController { @@ -215,7 +228,6 @@ public class StudentController extends BaseController {
215 @RequestMapping(value="/list") 228 @RequestMapping(value="/list")
216 public ModelAndView list(Page page) throws Exception{ 229 public ModelAndView list(Page page) throws Exception{
217 logBefore(logger, Jurisdiction.getUsername()+"列表Student"); 230 logBefore(logger, Jurisdiction.getUsername()+"列表Student");
218 - //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)  
219 ModelAndView mv = this.getModelAndView(); 231 ModelAndView mv = this.getModelAndView();
220 PageData pd = new PageData(); 232 PageData pd = new PageData();
221 pd = this.getPageData(); 233 pd = this.getPageData();
@@ -239,7 +251,6 @@ public class StudentController extends BaseController { @@ -239,7 +251,6 @@ public class StudentController extends BaseController {
239 @RequestMapping(value="/listcs") 251 @RequestMapping(value="/listcs")
240 public ModelAndView listClassStudent(Page page) throws Exception{ 252 public ModelAndView listClassStudent(Page page) throws Exception{
241 logBefore(logger, Jurisdiction.getUsername()+"列表Student"); 253 logBefore(logger, Jurisdiction.getUsername()+"列表Student");
242 - //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)  
243 ModelAndView mv = this.getModelAndView(); 254 ModelAndView mv = this.getModelAndView();
244 PageData pd = new PageData(); 255 PageData pd = new PageData();
245 pd = this.getPageData(); 256 pd = this.getPageData();
@@ -309,7 +320,7 @@ public class StudentController extends BaseController { @@ -309,7 +320,7 @@ public class StudentController extends BaseController {
309 pd = studentService.findById(pd); //根据ID读取 320 pd = studentService.findById(pd); //根据ID读取
310 pd.put("CLASS_ID", classID); 321 pd.put("CLASS_ID", classID);
311 mv.setViewName("sunvote/student/student_edit2"); 322 mv.setViewName("sunvote/student/student_edit2");
312 - mv.addObject("msg", "edit"); 323 + mv.addObject("msg", "edit2");
313 mv.addObject("pd", pd); 324 mv.addObject("pd", pd);
314 return mv; 325 return mv;
315 } 326 }
@@ -322,7 +333,6 @@ public class StudentController extends BaseController { @@ -322,7 +333,6 @@ public class StudentController extends BaseController {
322 @ResponseBody 333 @ResponseBody
323 public Object deleteAll() throws Exception{ 334 public Object deleteAll() throws Exception{
324 logBefore(logger, Jurisdiction.getUsername()+"批量删除Student"); 335 logBefore(logger, Jurisdiction.getUsername()+"批量删除Student");
325 - if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限  
326 PageData pd = new PageData(); 336 PageData pd = new PageData();
327 Map<String,Object> map = new HashMap<String,Object>(); 337 Map<String,Object> map = new HashMap<String,Object>();
328 pd = this.getPageData(); 338 pd = this.getPageData();
@@ -348,7 +358,6 @@ public class StudentController extends BaseController { @@ -348,7 +358,6 @@ public class StudentController extends BaseController {
348 @RequestMapping(value="/excel") 358 @RequestMapping(value="/excel")
349 public ModelAndView exportExcel() throws Exception{ 359 public ModelAndView exportExcel() throws Exception{
350 logBefore(logger, Jurisdiction.getUsername()+"导出Student到excel"); 360 logBefore(logger, Jurisdiction.getUsername()+"导出Student到excel");
351 - if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}  
352 ModelAndView mv = new ModelAndView(); 361 ModelAndView mv = new ModelAndView();
353 PageData pd = new PageData(); 362 PageData pd = new PageData();
354 pd = this.getPageData(); 363 pd = this.getPageData();
src/com/fh/interceptor/LoginHandlerInterceptor.java
@@ -22,7 +22,7 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter{ @@ -22,7 +22,7 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter{
22 try{ 22 try{
23 Jurisdiction.hasJurisdiction(path); 23 Jurisdiction.hasJurisdiction(path);
24 }catch(Exception e){ 24 }catch(Exception e){
25 - e.printStackTrace(); 25 +
26 } 26 }
27 if(!b){ 27 if(!b){
28 response.sendRedirect(request.getContextPath() + Const.LOGIN); 28 response.sendRedirect(request.getContextPath() + Const.LOGIN);