孙向锦 / SunvoteEducation

Commit eef2f0781b115d0dc024cec108fa99ebfc940ac5

Authored by 孙向锦
1 parent 8cac9719

修改域名问题

Inline Side-by-side
Showing 10 changed files with 99 additions and 67 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
  View file @eef2f07
... ... @@ -48,14 +48,14 @@
48 48 <select name="grade_id" id="grade_id" data-placeholder="这里输入所属年级">
49 49 <option value="">全部</option>
50 50 <c:forEach items="${gradeInfos}" var="var" varStatus="vs">
51   - <option value="${var.GRADE_ID}">${var.GNAME}</option>
  51 + <option value="${var.GRADE_ID}" <c:if test="${pd.GRADE_ID==var.GRADE_ID}">selected="true"</c:if>>${var.GNAME}</option>
52 52 </c:forEach>
53 53 </select>
54 54 <label>科目: </label>&nbsp;&nbsp;
55 55 <select name="subject_id" id="subject_id" data-placeholder="这里输入所属科目">
56 56 <option value="">全部</option>
57 57 <c:forEach items="${subjectInfos}" var="var" varStatus="vs">
58   - <option value="${var.SUBJECT_ID}">${var.SCNAME}</option>
  58 + <option value="${var.SUBJECT_ID}" <c:if test="${pd.SUBJECT_ID==var.SUBJECT_ID}">selected="true"</c:if>>${var.SCNAME}</option>
59 59 </c:forEach>
60 60 </select>&nbsp;&nbsp;&nbsp;&nbsp;
61 61 <input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
  View file @eef2f07
... ... @@ -118,7 +118,9 @@
118 118 </div><!-- /.modal-content -->
119 119 </div><!-- /.modal-dialog -->
120 120 </div><!-- /.modal -->
121   -
  121 + <script type="text/javascript">
  122 + var url = "<%=basePath%>"
  123 + </script>
122 124  
123 125 <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
124 126 <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
  View file @eef2f07
... ... @@ -241,6 +241,7 @@
241 241 url = url + "&ROLE=admin" ;
242 242 }
243 243 window.location.href = url;
  244 + window.top.loading.show();
244 245 /* $("#Form").sumbit(); */
245 246 }
246 247  
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
  View file @eef2f07
... ... @@ -81,6 +81,7 @@
81 81 <script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
82 82 <script type="text/javascript">
83 83 var user_id= "${pd.userId}";
  84 + var url = "<%=basePath%>";
84 85 </script>
85 86 <script src="../static/js/test_list.js"></script>
86 87 </html>
87 88 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/system/index/login.jsp
  View file @eef2f07
... ... @@ -10,46 +10,64 @@
10 10 %>
11 11 <!DOCTYPE html>
12 12 <html lang="zh-CN">
13   - <head>
14   - <meta charset="utf-8">
15   - <meta http-equiv="X-UA-Compatible" content="IE=edge">
16   - <meta name="viewport" content="width=device-width, initial-scale=1">
17   - <title>中天电子-教育管理系统</title>
  13 +<head>
  14 +<meta charset="utf-8">
  15 +<meta http-equiv="X-UA-Compatible" content="IE=edge">
  16 +<meta name="viewport" content="width=device-width, initial-scale=1">
  17 +<title>中天电子-教育管理系统</title>
18 18  
19   - <!-- Bootstrap -->
20   - <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
21   - <link href="static/login/style_login.css" rel="stylesheet">
22   -
23   - <script src="static/js/jquery-1.7.2.js"></script>
24   - <script src="static/login/js/jquery.easing.1.3.js"></script>
25   - <script type="text/javascript" src="static/js/jQuery.md5.js"></script>
26   - <script type="text/javascript" src="static/js/jquery.tips.js"></script>
27   - <script type="text/javascript" src="static/js/jquery.cookie.js"></script>
  19 +<!-- Bootstrap -->
  20 +<link
  21 + href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
  22 + rel="stylesheet">
  23 +<link href="static/login/style_login.css" rel="stylesheet">
  24 +
  25 +<script src="static/js/jquery-1.7.2.js"></script>
  26 +<script src="static/login/js/jquery.easing.1.3.js"></script>
  27 +<script type="text/javascript" src="static/js/jQuery.md5.js"></script>
  28 +<script type="text/javascript" src="static/js/jquery.tips.js"></script>
  29 +<script type="text/javascript" src="static/js/jquery.cookie.js"></script>
  30 +<style type="text/css">
  31 +.div_foot {
  32 + height: 30px;
  33 + line-height: 35px;
  34 + position: fixed;
  35 + bottom: 0;
  36 + width: 100%;
  37 + text-align: center;
  38 + font-family: Arial;
  39 + font-size: 14px;
  40 + letter-spacing: 1px;
  41 +}
  42 +</style>
28 43  
29   - <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
30   - <!-- 警告：通过 file:// 协议（就是直接将 html 页面拖拽到浏览器中）访问页面时 Respond.js 不起作用 -->
31   - <!--[if lt IE 9]>
  44 +<!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
  45 +<!-- 警告：通过 file:// 协议（就是直接将 html 页面拖拽到浏览器中）访问页面时 Respond.js 不起作用 -->
  46 +<!--[if lt IE 9]>
32 47 <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
33 48 <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
34 49 <![endif]-->
35   - </head>
36   - <body>
37   - <div class="content">
  50 +</head>
  51 +<body>
  52 + <div class="content">
38 53 <div class="content_t">
39   - <img src="static/login/title.png" alt="SunVote"/>
  54 + <img src="static/login/title.png" alt="SunVote" />
40 55 </div>
41 56 <div class="content_b">
42   - <div class="form_box">
43   - <form action="" method="post" name="loginbox" id="loginbox">
44   - <input type="text" name="loginname" id="loginname" value="" placeholder="用户名" />
45   - <input type="password" name="password" id="password" placeholder="密 码" value="" />
46   - <a href="#" onclick="severCheck();" class="login_btn">登录</a>
47   - </form>
48   - </div>
49   - </div>
50   - </div>
  57 + <div class="form_box">
  58 + <form action="" method="post" name="loginbox" id="loginbox">
  59 + <input type="text" name="loginname" id="loginname" value=""
  60 + placeholder="用户名" /> <input type="password" name="password"
  61 + id="password" placeholder="密 码" value="" /> <a href="#"
  62 + onclick="severCheck();" class="login_btn">登录</a>
  63 + </form>
51 64  
52   - <script type="text/javascript">
  65 + </div>
  66 + </div>
  67 + <div class="div_foot">
  68 + &copy;长沙中天电子设计开发有限公司版权所有. 备案许可证号： <a target= "_blank" href="http://www.miitbeian.gov.cn/">湘ICP备09025927号-10</a>
  69 + </div>
  70 + <script type="text/javascript">
53 71  
54 72 if(window.top != window.self){
55 73 window.top.location.href = "<%=basePath%>";
... ... @@ -158,22 +176,26 @@
158 176 }
159 177 }
160 178 </script>
161   - <script type="text/javascript" src="static/login/js/jquery-1.5.1.min.js"></script>
162   - <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
163   - <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
164   - <script src="static/login/js/bootstrap.min.js"></script>
165   - <script src="static/js/jquery-1.7.2.js"></script>
166   - <script src="static/login/js/jquery.easing.1.3.js"></script>
167   - <script src="static/login/js/jquery.mobile.customized.min.js"></script>
168   - <script src="static/login/js/camera.min.js"></script>
169   - <script src="static/login/js/templatemo_script.js"></script>
170   - <script src="static/login/js/ban.js"></script>
171   - <script type="text/javascript" src="static/js/jQuery.md5.js"></script>
172   - <script type="text/javascript" src="static/js/jquery.tips.js"></script>
173   - <script type="text/javascript" src="static/js/jquery.cookie.js"></script>
174   -
175   - <!-- 软键盘控件start -->
176   - <script type="text/javascript" src="static/login/keypad/js/form/keypad.js"></script>
177   - <script type="text/javascript" src="static/login/keypad/js/framework.js"></script>
178   - </body>
  179 + <script type="text/javascript"
  180 + src="static/login/js/jquery-1.5.1.min.js"></script>
  181 + <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
  182 + <script
  183 + src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
  184 + <script src="static/login/js/bootstrap.min.js"></script>
  185 + <script src="static/js/jquery-1.7.2.js"></script>
  186 + <script src="static/login/js/jquery.easing.1.3.js"></script>
  187 + <script src="static/login/js/jquery.mobile.customized.min.js"></script>
  188 + <script src="static/login/js/camera.min.js"></script>
  189 + <script src="static/login/js/templatemo_script.js"></script>
  190 + <script src="static/login/js/ban.js"></script>
  191 + <script type="text/javascript" src="static/js/jQuery.md5.js"></script>
  192 + <script type="text/javascript" src="static/js/jquery.tips.js"></script>
  193 + <script type="text/javascript" src="static/js/jquery.cookie.js"></script>
  194 +
  195 + <!-- 软键盘控件start -->
  196 + <script type="text/javascript"
  197 + src="static/login/keypad/js/form/keypad.js"></script>
  198 + <script type="text/javascript"
  199 + src="static/login/keypad/js/framework.js"></script>
  200 +</body>
179 201 </html>
180 202 \ No newline at end of file
... ...
WebRoot/favicon.ico
View file @eef2f07
No preview for this file type
WebRoot/static/js/control-604.js
  View file @eef2f07
... ... @@ -648,6 +648,13 @@ $(function() {
648 648 template[i].questionNum, template[i].score);
649 649 }
650 650 }
  651 + if(testData != null){
  652 + $(".header_box h1").html(testData.title);
  653 + $("#time").html(testData.exam_time);
  654 + if(testData.score != null && testData.score > 0 && testData.score != ''){
  655 + $("#score_all").html(testData.score);
  656 + }
  657 + }
651 658  
652 659 }else if (testData != null && testData.questions != null
653 660 && testData.questions.length > 0) {
... ... @@ -665,7 +672,7 @@ $(function() {
665 672 if(testData != null){
666 673 $(".header_box h1").html(testData.title);
667 674 $("#time").html(testData.exam_time);
668   - if(data.score != null && testData.score > 0 && testData.score != ''){
  675 + if(testData.score != null && testData.score > 0 && testData.score != ''){
669 676 $("#score_all").html(testData.score);
670 677 }
671 678 }
... ...
WebRoot/static/js/teach_paper.js
  View file @eef2f07
1   - var url="";
2 1 var class_html="",
3 2 option_html="";
4 3 var user_id= "",
... ... @@ -8,7 +7,7 @@
8 7  
9 8 timeList();
10 9 $.ajax({
11   - url:url+"/SunvoteEducation/teacher/info",
  10 + url:url+"/teacher/info",
12 11 async:false,
13 12 type:"post",
14 13 success:function(data){
... ... @@ -45,7 +44,7 @@
45 44 function getList(start_date,end_date,class_id){ //获取试卷列表
46 45 var tab_html="";
47 46 $.ajax({
48   - url:url+"/SunvoteEducation/api/v1/paper",
  47 + url:url+"/api/v1/paper",
49 48 async:false,
50 49 type:"post",
51 50 data:{
... ... @@ -110,7 +109,7 @@
110 109 function getSubjectName(id){ //获取科目中文名
111 110 var subjectName="";
112 111 $.ajax({
113   - url:url+"/SunvoteEducation/api/v1/subjectcname",
  112 + url:url+"/api/v1/subjectcname",
114 113 async:false,
115 114 type:"post",
116 115 data:{id:id},
... ... @@ -128,7 +127,7 @@
128 127 function getClassName(id){ //获取班级中文名
129 128 var className="";
130 129 $.ajax({
131   - url:url+"/SunvoteEducation/api/v1/classname",
  130 + url:url+"/api/v1/classname",
132 131 async:false,
133 132 type:"post",
134 133 data:{id:id},
... ... @@ -197,9 +196,9 @@
197 196 var id=obj.closest("tr").attr("data-id");
198 197 window.top.remove.init({"title":"删除","func":function(success){
199 198 if(success){
200   - var url = "/SunvoteEducation/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime();
  199 + var url1 = url+ "/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime();
201 200 window.top.loading.show();
202   - $.get(url,function(data){
  201 + $.get(url1,function(data){
203 202 tosearch();
204 203 });
205 204 }
... ... @@ -224,7 +223,7 @@
224 223 }else{
225 224 $.ajax({
226 225 type: "POST",
227   - url: '/SunvoteEducation/paper/deleteAll.do?tm='+new Date().getTime(),
  226 + url:url+ '/paper/deleteAll.do?tm='+new Date().getTime(),
228 227 data: {DATA_IDS:str},
229 228 dataType:'json',
230 229 //beforeSend: validateData,
... ...
WebRoot/static/js/test_list.js
  View file @eef2f07
1   -var url = "";
2 1 var option_html = "";
3 2 var subject_id = "";
4 3  
... ... @@ -14,7 +13,7 @@ $(document).ready(
14 13 function() {
15 14  
16 15 $.ajax({
17   - url : url + "/SunvoteEducation/teacher/info",
  16 + url : url + "/teacher/info",
18 17 async : false,
19 18 type : "post",
20 19 success : function(data) {
... ... @@ -51,7 +50,7 @@ function getList(start_date, end_date, class_id) { // 获取测验列表
51 50 class_id = getQueryString("classid");
52 51 }
53 52 $.ajax({
54   - url : url + "/SunvoteEducation/api/v1/testpaper",
  53 + url : url + "/api/v1/testpaper",
55 54 async : false,
56 55 type : "post",
57 56 data : {
... ... @@ -103,7 +102,7 @@ function ansync(obj){
103 102 function getSubjectName(id) { // 获取科目中文名
104 103 var subjectName = "";
105 104 $.ajax({
106   - url : url + "/SunvoteEducation/api/v1/subjectcname",
  105 + url : url + " /api/v1/subjectcname",
107 106 async : false,
108 107 type : "post",
109 108 data : {
... ... @@ -118,7 +117,7 @@ function getSubjectName(id) { // 获取科目中文名
118 117 function getClassName(id) { // 获取班级中文名
119 118 var className = "";
120 119 $.ajax({
121   - url : url + "/SunvoteEducation/api/v1/classname",
  120 + url : url + "/api/v1/classname",
122 121 async : false,
123 122 type : "post",
124 123 data : {
... ...
resources/dbconfig.properties
  View file @eef2f07
1 1 #数据源 1
2   -url:jdbc:mysql://120.78.57.84:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
  2 +url:jdbc:mysql://47.107.98.47:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
  3 +#url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
3 4 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
4 5 driverClassName:com.mysql.jdbc.Driver
5 6 username:root
... ...