diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp index 4a27619..fbd9953 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp @@ -48,14 +48,14 @@         diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp index 38fdbab..c27b0ed 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp @@ -118,7 +118,9 @@ - + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp index 93ceff4..433f9ee 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp @@ -241,6 +241,7 @@ url = url + "&ROLE=admin" ; } window.location.href = url; + window.top.loading.show(); /* $("#Form").sumbit(); */ } diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp index b436b4f..d121686 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp @@ -81,6 +81,7 @@ \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp index a6cf7ea..6e4e9a3 100644 --- a/WebRoot/WEB-INF/jsp/system/index/login.jsp +++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp @@ -10,46 +10,64 @@ %> - - - - - 中天电子-教育管理系统 + + + + +中天电子-教育管理系统 - - - - - - - - - + + + + + + + + + + - - - + + - - -
+ + +
- SunVote + SunVote
-
-
- - - -
-
-
-
+
+
+ +
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/favicon.ico b/WebRoot/favicon.ico index 4f811e9..f7ac2e7 100644 --- a/WebRoot/favicon.ico +++ b/WebRoot/favicon.ico diff --git a/WebRoot/static/js/control-604.js b/WebRoot/static/js/control-604.js index ed65549..def932e 100644 --- a/WebRoot/static/js/control-604.js +++ b/WebRoot/static/js/control-604.js @@ -648,6 +648,13 @@ $(function() { template[i].questionNum, template[i].score); } } + if(testData != null){ + $(".header_box h1").html(testData.title); + $("#time").html(testData.exam_time); + if(testData.score != null && testData.score > 0 && testData.score != ''){ + $("#score_all").html(testData.score); + } + } }else if (testData != null && testData.questions != null && testData.questions.length > 0) { @@ -665,7 +672,7 @@ $(function() { if(testData != null){ $(".header_box h1").html(testData.title); $("#time").html(testData.exam_time); - if(data.score != null && testData.score > 0 && testData.score != ''){ + if(testData.score != null && testData.score > 0 && testData.score != ''){ $("#score_all").html(testData.score); } } diff --git a/WebRoot/static/js/teach_paper.js b/WebRoot/static/js/teach_paper.js index ecef41f..42cb8d2 100644 --- a/WebRoot/static/js/teach_paper.js +++ b/WebRoot/static/js/teach_paper.js @@ -1,4 +1,3 @@ - var url=""; var class_html="", option_html=""; var user_id= "", @@ -8,7 +7,7 @@ timeList(); $.ajax({ - url:url+"/SunvoteEducation/teacher/info", + url:url+"/teacher/info", async:false, type:"post", success:function(data){ @@ -45,7 +44,7 @@ function getList(start_date,end_date,class_id){ //获取试卷列表 var tab_html=""; $.ajax({ - url:url+"/SunvoteEducation/api/v1/paper", + url:url+"/api/v1/paper", async:false, type:"post", data:{ @@ -110,7 +109,7 @@ function getSubjectName(id){ //获取科目中文名 var subjectName=""; $.ajax({ - url:url+"/SunvoteEducation/api/v1/subjectcname", + url:url+"/api/v1/subjectcname", async:false, type:"post", data:{id:id}, @@ -128,7 +127,7 @@ function getClassName(id){ //获取班级中文名 var className=""; $.ajax({ - url:url+"/SunvoteEducation/api/v1/classname", + url:url+"/api/v1/classname", async:false, type:"post", data:{id:id}, @@ -197,9 +196,9 @@ var id=obj.closest("tr").attr("data-id"); window.top.remove.init({"title":"删除","func":function(success){ if(success){ - var url = "/SunvoteEducation/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime(); + var url1 = url+ "/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime(); window.top.loading.show(); - $.get(url,function(data){ + $.get(url1,function(data){ tosearch(); }); } @@ -224,7 +223,7 @@ }else{ $.ajax({ type: "POST", - url: '/SunvoteEducation/paper/deleteAll.do?tm='+new Date().getTime(), + url:url+ '/paper/deleteAll.do?tm='+new Date().getTime(), data: {DATA_IDS:str}, dataType:'json', //beforeSend: validateData, diff --git a/WebRoot/static/js/test_list.js b/WebRoot/static/js/test_list.js index 9db78b9..73cef9d 100644 --- a/WebRoot/static/js/test_list.js +++ b/WebRoot/static/js/test_list.js @@ -1,4 +1,3 @@ -var url = ""; var option_html = ""; var subject_id = ""; @@ -14,7 +13,7 @@ $(document).ready( function() { $.ajax({ - url : url + "/SunvoteEducation/teacher/info", + url : url + "/teacher/info", async : false, type : "post", success : function(data) { @@ -51,7 +50,7 @@ function getList(start_date, end_date, class_id) { // 获取测验列表 class_id = getQueryString("classid"); } $.ajax({ - url : url + "/SunvoteEducation/api/v1/testpaper", + url : url + "/api/v1/testpaper", async : false, type : "post", data : { @@ -103,7 +102,7 @@ function ansync(obj){ function getSubjectName(id) { // 获取科目中文名 var subjectName = ""; $.ajax({ - url : url + "/SunvoteEducation/api/v1/subjectcname", + url : url + " /api/v1/subjectcname", async : false, type : "post", data : { @@ -118,7 +117,7 @@ function getSubjectName(id) { // 获取科目中文名 function getClassName(id) { // 获取班级中文名 var className = ""; $.ajax({ - url : url + "/SunvoteEducation/api/v1/classname", + url : url + "/api/v1/classname", async : false, type : "post", data : { diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties index 773eb26..896903b 100644 --- a/resources/dbconfig.properties +++ b/resources/dbconfig.properties @@ -1,5 +1,6 @@ #数据源 1 -url:jdbc:mysql://120.78.57.84:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 +url:jdbc:mysql://47.107.98.47:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 +#url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 driverClassName:com.mysql.jdbc.Driver username:root