From 7a1343ba4ae82ca07d33583052f316e14642b3cb Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Thu, 11 Apr 2019 16:10:55 +0800
Subject: [PATCH] 1.修改优化交互

---
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp  | 18 +++++++++---------
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp |  6 +++---
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp     |  2 +-
 WebRoot/static/css/edit.css                              |  4 ++--
 WebRoot/static/js/control_homework.js                    |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
index cbfc7f4..6d11b96 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
@@ -21,7 +21,7 @@
 	<link rel="stylesheet" href="static/ace/css/datepicker.css" />
 	
 	<link rel="stylesheet" href="static/css/teach.css" />
-	<link rel="stylesheet" href="static/css/edit.css" />
+	<link rel="stylesheet" href="static/css/edit.css?a=2" />
 	<style>
 		.box_header{position:fixed;top:0;left:0;width:100%;z-index:9999}
 		#Form{margin-top:102px;}
@@ -127,9 +127,9 @@
 								<col width="10%"/>
 								<thead>
 									<tr>
-										<th style="text-align:left;"><span>题目数量</span><span class="add">+</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/><span class="redu">-</span></th>
-										<th><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/><span class="redu">-</span></th>
-										<th><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" id="score" value="1"/><span class="redu">-</span></th>
+										<th style="text-align:left;"><span>题目数量</span><span class="redu">-</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/><span class="add">+</span></th>
+										<th><span>选项个数</span><span class="redu">-</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/><span class="add">+</span></th>
+										<th><span>分值</span><span class="redu">-</span><input type="number" class="w_100 score" id="score" value="1"/><span class="add">+</span></th>
 										<th></th>
 									</tr>
 								</thead>
@@ -159,8 +159,8 @@
 														</div>
 														
 													</td>
-													<td class="middle"><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/><span class="redu">-</span></td>
-													<td class="middle"><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" value="${var.SCORE}"/><span class="redu">-</span></td>
+													<td class="middle"><span>选项个数</span><span class="redu">-</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/><span class="add">+</span></td>
+													<td class="middle"><span>分值</span><span class="redu">-</span><input type="number" class="w_100 score" value="${var.SCORE}"/><span class="add">+</span></td>
 													<td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td>
 												</tr>
 											</c:forEach>
@@ -210,7 +210,7 @@
 	<!--提示框-->
 	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
 	<!--页面交互-->
-	<script src="static/js/control_homework.js?t=1"></script>
+	<script src="static/js/control_homework.js?t=2"></script>
 	<script>
 	var homework_id="${pd.HOMEWORK_ID}";
 	
@@ -259,7 +259,7 @@
 			success:function(res){
 				var res=JSON.parse(res);
 				if(res.message=="success"){
-					alert(res.message);
+					//alert(res.message);
 					console.log(res);
 					
 					var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
@@ -279,7 +279,7 @@
 			success:function(res){
 				var res=JSON.parse(res);
 				if(res.message=="success"){
-					alert(res.message);
+					//alert(res.message);
 					console.log(res);
 					
 					var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
index 7a523c6..cce058b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -88,9 +88,9 @@
 						style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
 					<td style="vertical-align:top;padding-left:2px"><a
 						class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><img src="static/images/search.png" alt="" class="search_btn" /></a></td>
-					<td><li class="btn ${pd.CURRENT_WEEK==-1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(-1)">上一周</li></td>
-					<td><li class="btn ${pd.CURRENT_WEEK==0?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(0)">本周</li></td>
-					<td><li class="btn ${pd.CURRENT_WEEK==1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(1)">下一周</li></td>
+					<td><li class="btn ${pd.CURRENT_WEEK==-1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(${pd.CURRENT_WEEK-1})">上一周</li></td>
+					
+					<td><li class="btn ${pd.CURRENT_WEEK==1?'btn-primary':'btn-default' } btn-sm" onclick="tosearch_week(${pd.CURRENT_WEEK+1})">下一周</li></td>
 				</tr>
 			</table>
 			<hr />
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index d78be42..2351fb6 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -38,7 +38,7 @@
 		<div class="out">
 			<a href="../logout"><img src="../static/images/close.png" />退出登录</a>
 		</div>
-		<div class="out" style="margin-right:20px;">
+		<div class="out" style="margin-right:20px;cursor: pointer;">
 			<a onclick="editInfo()"><img src="../static/images/psw_edit.png" />个人设置</a>
 		</div>
 		<div class="clear"></div>
diff --git a/WebRoot/static/css/edit.css b/WebRoot/static/css/edit.css
index a425670..1acf23d 100644
--- a/WebRoot/static/css/edit.css
+++ b/WebRoot/static/css/edit.css
@@ -40,8 +40,8 @@ input[type="number"] {
 .homework_edit input:checked+label {background-color: #1989FA;border: 1px solid #1989FA;}
 .homework_edit input:checked+label::after {position: absolute;content: "";width: 5px;height: 10px;top: 3px;left: 6px;border: 2px solid #fff;border-top: none;border-left: none;transform: rotate(45deg)}
 .homework_edit .subject th span,.homework_edit .subject td span{margin-right:10px;}
-.homework_edit .subject th .add,.homework_edit .subject td .add{display:inline-block;cursor: pointer;width:20px;height:31px;margin:0;vertical-align: middle;line-height:31px;text-align:center;border:1px solid #ccc;border-right:0;}
-.homework_edit .subject th .redu,.homework_edit .subject td .redu{display:inline-block;cursor: pointer;width:20px;height:31px;margin:0;vertical-align: middle;line-height:31px;text-align:center;border:1px solid #ccc;border-left:0;}
+.homework_edit .subject th .add,.homework_edit .subject td .add{display:inline-block;cursor: pointer;width:20px;height:31px;margin:0;vertical-align: middle;line-height:31px;text-align:center;border:1px solid #ccc;border-left:0;}
+.homework_edit .subject th .redu,.homework_edit .subject td .redu{display:inline-block;cursor: pointer;width:20px;height:31px;margin:0;vertical-align: middle;line-height:31px;text-align:center;border:1px solid #ccc;border-right:0;}
 ::-webkit-scrollbar {/*������������ʽ*/
     width: 4px;     /*�߿��ֱ��Ӧ�����������ijߴ�*/
     height: 4px;
diff --git a/WebRoot/static/js/control_homework.js b/WebRoot/static/js/control_homework.js
index 3b69c0f..ee1691f 100644
--- a/WebRoot/static/js/control_homework.js
+++ b/WebRoot/static/js/control_homework.js
@@ -19,7 +19,7 @@
 			
 			if(_id=="que_num"){    //新增题目
 				for(j=index;j<=num;j++){
-					$(".subject_body_tbody").append('<tr><td class="first">'+j+'</td><td class="middle"><div class="question question'+j+'"><ul></ul></div></td><td class="middle"><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" value="'+$("#ans_num").val()+'"/><span class="redu">-</span></td><td class="middle"><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" value="1"/><span class="redu">-</span></td><td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td></tr>');
+					$(".subject_body_tbody").append('<tr><td class="first">'+j+'</td><td class="middle"><div class="question question'+j+'"><ul></ul></div></td><td class="middle"><span>选项个数</span><span class="redu">-</span><input type="number" class="w_100 ans_num" value="'+$("#ans_num").val()+'"/><span class="add">+</span></td><td class="middle"><span>分值</span><span class="redu">-</span><input type="number" class="w_100 score" value="1"/><span class="add">+</span></td><td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td></tr>');
 					for(i=0;i<work.ans_num;i++){
 						$(".question"+j+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i)+'</li>')
 					}
--
libgit2 0.21.4