修改域名问题

孙向锦
1 parent 8cac9719
Showing 10 changed files with 99 additions and 67 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
WebRoot/WEB-INF/jsp/system/index/login.jsp
WebRoot/favicon.ico
WebRoot/static/js/control-604.js
WebRoot/static/js/teach_paper.js
WebRoot/static/js/test_list.js
resources/dbconfig.properties
@@ -48,14 +48,14 @@
 			      <select name="grade_id" id="grade_id" data-placeholder="这里输入所属年级">
 			      		<option value="">全部</option>
 						<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-							<option value="${var.GRADE_ID}">${var.GNAME}</option>
+							<option value="${var.GRADE_ID}" <c:if test="${pd.GRADE_ID==var.GRADE_ID}">selected="true"</c:if>>${var.GNAME}</option>
 						</c:forEach>
 				</select>
 				<label>科目: </label>&nbsp;&nbsp;
 			    <select name="subject_id" id="subject_id" data-placeholder="这里输入所属科目">
 			    		<option value="">全部</option>
 						<c:forEach items="${subjectInfos}" var="var" varStatus="vs">
-							<option value="${var.SUBJECT_ID}">${var.SCNAME}</option>
+							<option value="${var.SUBJECT_ID}" <c:if test="${pd.SUBJECT_ID==var.SUBJECT_ID}">selected="true"</c:if>>${var.SCNAME}</option>
 						</c:forEach>
 				</select>&nbsp;&nbsp;&nbsp;&nbsp;
 				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> 
@@ -118,7 +118,9 @@
 			</div><!-- /.modal-content -->
 		  </div><!-- /.modal-dialog -->
 		</div><!-- /.modal -->
-  
+  	<script type="text/javascript">
+  		var url = "<%=basePath%>"
+  	</script>
 	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
 	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
@@ -241,6 +241,7 @@
 				url = url + "&ROLE=admin" ;
 			}
 			window.location.href = url;
+			window.top.loading.show();
 			/* $("#Form").sumbit(); */
 		}
@@ -81,6 +81,7 @@
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
 	<script type="text/javascript">
 		var user_id= "${pd.userId}";
+		var url = "<%=basePath%>";
 	</script>
 	<script src="../static/js/test_list.js"></script>
 </html>
 \ No newline at end of file
@@ -10,46 +10,64 @@
 %>
 <!DOCTYPE html>
 <html lang="zh-CN">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>中天电子-教育管理系统</title>
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>中天电子-教育管理系统</title>
-    <!-- Bootstrap -->
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-	<link href="static/login/style_login.css" rel="stylesheet">
-	
-	<script src="static/js/jquery-1.7.2.js"></script>
-	<script src="static/login/js/jquery.easing.1.3.js"></script>
-		<script type="text/javascript" src="static/js/jQuery.md5.js"></script>
-	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
-	<script type="text/javascript" src="static/js/jquery.cookie.js"></script>
+<!-- Bootstrap -->
+<link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet">
+<link href="static/login/style_login.css" rel="stylesheet">
+
+<script src="static/js/jquery-1.7.2.js"></script>
+<script src="static/login/js/jquery.easing.1.3.js"></script>
+<script type="text/javascript" src="static/js/jQuery.md5.js"></script>
+<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+<script type="text/javascript" src="static/js/jquery.cookie.js"></script>
+<style type="text/css">
+.div_foot {
+	height: 30px;
+	line-height: 35px;
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	text-align: center;
+	font-family: Arial;
+	font-size: 14px;
+	letter-spacing: 1px;
+}
+</style>
-    <!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
-    <!-- 警告：通过 file:// 协议（就是直接将 html 页面拖拽到浏览器中）访问页面时 Respond.js 不起作用 -->
-    <!--[if lt IE 9]>
+<!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
+<!-- 警告：通过 file:// 协议（就是直接将 html 页面拖拽到浏览器中）访问页面时 Respond.js 不起作用 -->
+<!--[if lt IE 9]>
       <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
       <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-  </head>
-  <body>
-    <div class="content">
+</head>
+<body>
+	<div class="content">
 		<div class="content_t">
-			<img src="static/login/title.png" alt="SunVote"/>
+			<img src="static/login/title.png" alt="SunVote" />
 		</div>
 		<div class="content_b">
-				<div class="form_box">
-			<form action="" method="post" name="loginbox" id="loginbox">
-					<input type="text" name="loginname" id="loginname" value="" placeholder="用户名" />
-					<input type="password" name="password" id="password" placeholder="密   码" value="" />
-					<a href="#" onclick="severCheck();" class="login_btn">登录</a>
-			</form>
-				</div>
-		</div>
-	</div>
+			<div class="form_box">
+				<form action="" method="post" name="loginbox" id="loginbox">
+					<input type="text" name="loginname" id="loginname" value=""
+						placeholder="用户名" /> <input type="password" name="password"
+						id="password" placeholder="密   码" value="" /> <a href="#"
+						onclick="severCheck();" class="login_btn">登录</a>
+				</form>
-   <script type="text/javascript">
+			</div>
+		</div>
+		<div class="div_foot">
+			&copy;长沙中天电子设计开发有限公司版权所有. 备案许可证号： <a target= "_blank" href="http://www.miitbeian.gov.cn/">湘ICP备09025927号-10</a>
+		</div>
+		<script type="text/javascript">
    		if(window.top != window.self){
 	   		window.top.location.href = "<%=basePath%>";
@@ -158,22 +176,26 @@
 			}
 		}
 	</script>
-	<script type="text/javascript" src="static/login/js/jquery-1.5.1.min.js"></script>
-    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>   
-    <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <script src="static/login/js/bootstrap.min.js"></script>
-	<script src="static/js/jquery-1.7.2.js"></script>
-	<script src="static/login/js/jquery.easing.1.3.js"></script>
-	<script src="static/login/js/jquery.mobile.customized.min.js"></script>
-	<script src="static/login/js/camera.min.js"></script>
-	<script src="static/login/js/templatemo_script.js"></script>
-	<script src="static/login/js/ban.js"></script>
-	<script type="text/javascript" src="static/js/jQuery.md5.js"></script>
-	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
-	<script type="text/javascript" src="static/js/jquery.cookie.js"></script>
-	
-	<!-- 软键盘控件start -->
-	<script type="text/javascript" src="static/login/keypad/js/form/keypad.js"></script>
-	<script type="text/javascript" src="static/login/keypad/js/framework.js"></script>
-  </body>
+		<script type="text/javascript"
+			src="static/login/js/jquery-1.5.1.min.js"></script>
+		<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+		<script
+			src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+		<script src="static/login/js/bootstrap.min.js"></script>
+		<script src="static/js/jquery-1.7.2.js"></script>
+		<script src="static/login/js/jquery.easing.1.3.js"></script>
+		<script src="static/login/js/jquery.mobile.customized.min.js"></script>
+		<script src="static/login/js/camera.min.js"></script>
+		<script src="static/login/js/templatemo_script.js"></script>
+		<script src="static/login/js/ban.js"></script>
+		<script type="text/javascript" src="static/js/jQuery.md5.js"></script>
+		<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+		<script type="text/javascript" src="static/js/jquery.cookie.js"></script>
+
+		<!-- 软键盘控件start -->
+		<script type="text/javascript"
+			src="static/login/keypad/js/form/keypad.js"></script>
+		<script type="text/javascript"
+			src="static/login/keypad/js/framework.js"></script>
+</body>
 </html>
 \ No newline at end of file
@@ -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);
 			}
 		}
-		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,
-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 : {
 #数据源 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