Merge branch 'master' of http://git.qmth.com.cn/luoshi/stmms-gx into dev0619_luoshi

.gitignore

@@ -3,3 +3,5 @@
 .classpath
 */target
 */bin
+.idea/
+*.iml

stmms-web/src/main/java/cn/com/qmth/stmms/admin/home/HomeController.java

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,14 +17,22 @@ import cn.com.qmth.stmms.common.utils.RequestUtils;
 @Controller
 @RequestMapping("/admin/home")
 public class HomeController {
+    @Value("${app.index}")  
+    private String appIndex;
 
     @RequestMapping
     public ModelAndView index(HttpServletRequest request) {
         WebUser user = RequestUtils.getWebUser(request);
         if (user.getRoles().contains(Role.SYS_ADMIN)) {
+        	if("aopeng".equals(appIndex)){
+        		return new ModelAndView("modules/sys/sysIndexAp");
+        	}
             ModelAndView modelAndView = new ModelAndView("modules/sys/sysIndex");
             return modelAndView;
         } else {
+        	if("aopeng".equals(appIndex)){
+        		return new ModelAndView("modules/exam/examIndexAp");
+        	}
             ModelAndView modelAndView = new ModelAndView("modules/exam/examIndex");
             return modelAndView;
         }

stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/LoginController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -31,10 +32,16 @@ import cn.com.qmth.stmms.common.utils.RequestUtils;
 public class LoginController {
 
     protected static final String INDEX_VIEW = "modules/sys/index";
+    
+    protected static final String AP_INDEX_VIEW = "modules/sys/indexAp";
 
     protected static final String SYS_LOGIN_VIEW = "modules/sys/sysLogin";
+    
+    protected static final String AP_SYS_LOGIN_VIEW = "modules/sys/sysLoginAp";
 
     protected static final String MARK_LOGIN_VIEW = "modules/sys/markLogin";
+    
+    protected static final String AP_MARK_LOGIN_VIEW = "modules/sys/markLoginAp";
 
     @Autowired
     private UserService userService;
@@ -44,9 +51,15 @@ public class LoginController {
 
     @Autowired
     private ExamSubjectService examSubjectService;
+    
+    @Value("${app.index}")  
+    private String appIndex;
 
     @RequestMapping(value = { "/", "", "/index" })
     public ModelAndView index(HttpServletRequest request) {
+    	if("aopeng".equals(appIndex)){
+    		return new ModelAndView(AP_INDEX_VIEW);
+    	}
         return new ModelAndView(INDEX_VIEW);
     }
 
@@ -56,6 +69,9 @@ public class LoginController {
         // if (StringUtils.isNotBlank(session.getParameter("userId"))) {
         // return new ModelAndView("modules/sys/examIndex");
         // } else {
+    	if("aopeng".equals(appIndex)){
+    		return new ModelAndView(AP_SYS_LOGIN_VIEW);
+    	}
         return new ModelAndView(SYS_LOGIN_VIEW);
         // }
     }
@@ -91,16 +107,31 @@ public class LoginController {
                     ModelAndView modelAndView = new ModelAndView("redirect:admin/home");
                     return modelAndView;
                 } else {
+                	if("aopeng".equals(appIndex)){
+                		ModelAndView aPview = new ModelAndView(AP_SYS_LOGIN_VIEW);
+                		aPview.addObject("message", "无此类型的用户");
+                        return aPview;
+                	}
                     ModelAndView view = new ModelAndView(SYS_LOGIN_VIEW);
                     view.addObject("message", "无此类型的用户");
                     return view;
                 }
             } else {
+            	if("aopeng".equals(appIndex)){
+            		ModelAndView aPview = new ModelAndView(AP_SYS_LOGIN_VIEW);
+            		aPview.addObject("message", "密码错误");
+                    return aPview;
+            	}
                 ModelAndView modelAndView = new ModelAndView(SYS_LOGIN_VIEW);
                 modelAndView.addObject("message", "密码错误");
                 return modelAndView;
             }
         } else {
+        	if("aopeng".equals(appIndex)){
+        		ModelAndView aPview = new ModelAndView(AP_SYS_LOGIN_VIEW);
+        		aPview.addObject("message", "无此用户");
+                return aPview;
+        	}
             ModelAndView modelAndView = new ModelAndView(SYS_LOGIN_VIEW);
             modelAndView.addObject("message", "无此用户");
             return modelAndView;
@@ -129,6 +160,12 @@ public class LoginController {
      */
     @RequestMapping(value = "/mark-login", method = RequestMethod.GET)
     public ModelAndView loginInit(HttpServletRequest request, @RequestParam(required = false) String message) {
+    	
+    	if("aopeng".equals(appIndex)){
+    		ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
+    		aPview.addObject("message", StringUtils.trimToNull(message));
+            return aPview;
+    	}
         ModelAndView modelAndView = new ModelAndView(MARK_LOGIN_VIEW);
         modelAndView.addObject("message", StringUtils.trimToNull(message));
         return modelAndView;
@@ -157,7 +194,11 @@ public class LoginController {
         // if (header != null) {
         // return subjectHeaderLogin(request, header, password);
         // }
-
+        if("aopeng".equals(appIndex)){
+    		ModelAndView aPview = new ModelAndView(AP_MARK_LOGIN_VIEW);
+    		aPview.addObject("message","帐号不存在");
+            return aPview;
+    	}
         ModelAndView view = new ModelAndView(MARK_LOGIN_VIEW);
         view.addObject("message", "帐号不存在");
         return view;
@@ -176,8 +217,12 @@ public class LoginController {
             ExamSubject subject = examSubjectService.find(sh.getExamId(), sh.getSubjectCode());
             ModelAndView modelAndView = new ModelAndView();
             if (subject == null) {
-                modelAndView.setViewName(MARK_LOGIN_VIEW);
-                modelAndView.addObject("message", "科目不存在");
+            	if("aopeng".equals(appIndex)){
+            		modelAndView.setViewName(AP_MARK_LOGIN_VIEW);
+            	}else{
+            		modelAndView.setViewName(MARK_LOGIN_VIEW);
+            	}
+            	modelAndView.addObject("message", "科目不存在");
             } else {
                 StmmsSession session = RequestUtils.getSession(request);
 
@@ -196,6 +241,11 @@ public class LoginController {
             session.setParameter("subjectCode", sh.getSubjectCode());
             return modelAndView;
         } else {
+        	if("aopeng".equals(appIndex)){
+        		 ModelAndView modelAndView = new ModelAndView(AP_MARK_LOGIN_VIEW);
+                 modelAndView.addObject("message", "密码错误");
+                 return modelAndView;
+        	}
             ModelAndView modelAndView = new ModelAndView(MARK_LOGIN_VIEW);
             modelAndView.addObject("message", "密码错误");
             return modelAndView;
@@ -225,25 +275,46 @@ public class LoginController {
      */
     public ModelAndView markerLogin(HttpServletRequest request, Marker marker, String password) {
         ModelAndView modelAndView = new ModelAndView(MARK_LOGIN_VIEW);
+        ModelAndView modelAndViewForAP = new ModelAndView(AP_MARK_LOGIN_VIEW);
         if (!marker.getPassword().equals(password)) {
+        	if("aopeng".equals(appIndex)){
+            	modelAndViewForAP.addObject("message", "密码错误");
+            	return modelAndViewForAP;
+            }
             modelAndView.addObject("message", "密码错误");
             return modelAndView;
         }
         if (marker.isEnable() == false) {
+        	if("aopeng".equals(appIndex)){
+            	modelAndViewForAP.addObject("message", "帐号已禁用");
+            	return modelAndViewForAP;
+            }
             modelAndView.addObject("message", "帐号已禁用");
             return modelAndView;
         }
         if (!marker.isCommon()) {
             ExamSubject subject = examSubjectService.find(marker.getExamId(), marker.getSubjectCode());
             if (subject == null) {
+            	if("aopeng".equals(appIndex)){
+                	modelAndViewForAP.addObject("message", "科目不存在");
+                	return modelAndViewForAP;
+                }
                 modelAndView.addObject("message", "科目不存在");
                 return modelAndView;
             }
             if (subject.getStatus() == ExamSubjectStatus.PAUSE) {
+            	if("aopeng".equals(appIndex)){
+                	modelAndViewForAP.addObject("message", "当前科目暂停评卷");
+                	return modelAndViewForAP;
+                }
                 modelAndView.addObject("message", "当前科目暂停评卷");
                 return modelAndView;
             }
             if (subject.getStatus() == ExamSubjectStatus.FINISH) {
+            	if("aopeng".equals(appIndex)){
+                	modelAndViewForAP.addObject("message", "当前科目评卷已结束");
+                	return modelAndViewForAP;
+                }
                 modelAndView.addObject("message", "当前科目评卷已结束");
                 return modelAndView;
             }

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -66,6 +66,9 @@ public class MarkController extends BaseController {
 
     @Value("${card.server}")
     private String cardServer;
+    
+    @Value("${app.index}")  
+    private String appIndex;
 
     @RequestMapping(value = "/reset", method = RequestMethod.GET)
     public ModelAndView reset(HttpServletRequest request) {
@@ -89,7 +92,12 @@ public class MarkController extends BaseController {
     @RequestMapping(value = "/subject-select", method = RequestMethod.GET)
     public ModelAndView select(HttpServletRequest request) {
         Marker marker = RequestUtils.getWebUser(request).getMarker();
-        ModelAndView modelAndView = new ModelAndView("modules/mark/subjectSelect");
+        ModelAndView modelAndView = new ModelAndView();
+        if("aopeng".equals(appIndex)){
+        	modelAndView.setViewName("modules/mark/subjectSelectAp");
+    	}else{
+    		modelAndView.setViewName("modules/mark/subjectSelect");
+    	}
         modelAndView.addObject("marker", marker);
         modelAndView.addObject("subjectList",
                 subjectService.list(marker.getExamId(), ExamSubjectStatus.MARKING, 0, 0, 0));

stmms-web/src/main/webapp/WEB-INF/application.properties

@@ -53,3 +53,5 @@ upyun.slice.password=qmth12345678
 subject.name.bracket.replace=false
 jvm.cleanMapinterval = 20
 jvm.cleanMapTimer = 0 0/10 6-23 * * ?
+app.home=
+app.index=aopeng

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examIndexAp.jsp

@@ -0,0 +1,184 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>云阅卷</title>
+	<meta name="decorator" content="default"/>
+	<%@include file="/WEB-INF/views/include/head.jsp" %>
+	<style type="text/css">
+		#main {padding:0;margin:0;} #main .container-fluid{padding:0 7px 0 10px;}
+		#header {margin:0 0 10px;position:static;} #header li {font-size:14px;_font-size:12px;}
+		#header .brand {font-family:Helvetica, Georgia, Arial, sans-serif, 黑体;font-size:26px;padding-left:33px;}
+		#footer {margin:8px 0 0 0;padding:3px 0 0 0;font-size:11px;text-align:center;border-top:2px solid #0663A2;}
+		#footer, #footer a {color:#999;} 
+	</style>
+	<script type="text/javascript"> 
+		$(document).ready(function() {
+			$("#menu a.menu").click(function(){
+				$("#menu li.menu").removeClass("active");
+				$(this).parent().addClass("active");
+				if(!$("#openClose").hasClass("close")){
+					$("#openClose").click();
+				}
+			});
+			
+			$(".accordion-heading a").click(function(){
+				$('.accordion-toggle i').removeClass('icon-chevron-down');
+				$('.accordion-toggle i').addClass('icon-chevron-right');
+				if(!$($(this).attr('href')).hasClass('in')){
+					$(this).children('i').removeClass('icon-chevron-right');
+					$(this).children('i').addClass('icon-chevron-down');
+				}
+			});
+			$(".accordion-body a").click(function(){
+				$("#menu li").removeClass("active");
+				$("#menu li i").removeClass("icon-white");
+				$(this).parent().addClass("active");
+				$(this).children("i").addClass("icon-white");
+			}); 
+			$(".accordion-body a:first i").click();
+			$('#mainFrame').load(function(){
+			    var path = window.frames[0].window.location.pathname;
+			    $('#menu li').each(function(){
+			        var src = $(this).find('a').attr('href');
+			        if(src.indexOf(path)>=0) {
+			            $('#menu li').removeClass('active');
+		                $("#menu li i").removeClass("icon-white");
+			            $(this).addClass('active');
+			        }
+			    });
+			});
+		});
+	</script>
+</head>
+<body>
+	<div id="main">
+		<div id="header" class="navbar navbar-fixed-top">
+	      <div class="navbar-inner">
+	      	 <div class="brand">奥鹏教育</div>
+	         <div class="nav-collapse">
+	           <%-- <ul id="menu" class="nav">
+				 <c:set var="firstMenu" value="true"/>
+		 		<li class="menu "><a class="menu" href="${ctx }/admin/exam" target="menuFrame" >考试管理</a></li>
+				<li class="menu "><a class="menu" href="" target="menuFrame" >基础管理</a></li>
+	           </ul> --%>
+	           <ul class="nav pull-right">
+			  	 <li id="themeSwitch" class="dropdown">
+			       	<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="主题切换"><i class="icon-th-large"></i></a>
+				    <ul class="dropdown-menu">
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/default?url='+location.href">默认主题</a></li>
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/cerulean?url='+location.href">天蓝主题</a></li>
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/readable?url='+location.href">橙色主题</a></li>
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/united?url='+location.href">红色主题</a></li>
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/flat?url='+location.href">Flat主题</a></li>
+				    </ul>
+				    <!--[if lte IE 6]><script type="text/javascript">$('#themeSwitch').hide();</script><![endif]-->
+			     </li>
+			  	 <li class="dropdown">
+				    <a class="dropdown-toggle" data-toggle="dropdown" href="#" title="个人信息">${web_user.name}</a>
+				    <ul class="dropdown-menu">
+				      <li><a href="${ctx}/admin/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; 个人信息</a></li>
+				      <li><a href="${ctx}/admin/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp;  修改密码</a></li>
+				    </ul>
+			  	 </li>
+			  	 <li><a href="${ctx}/admin-logout" title="退出登录">退出</a></li>
+			  	 <li>&nbsp;</li>
+	           </ul>
+	         </div><!--/.nav-collapse -->
+	      </div>
+	    </div>
+	    <div class="container-fluid">
+			<div id="content" class="row-fluid">
+				<div id="left">
+							<div class="accordion" id="menu"><c:set var="firstMenu" value="true"/>
+							<div class="accordion-group">
+							    <%-- <div class="accordion-heading">
+							    	<a class="accordion-toggle" data-toggle="collapse" data-parent="#menu" href="#collapse${menu.id}" title="考试管理"><i class="icon-chevron-${firstMenu?'down':'right'}"></i>&nbsp;考试管理</a>
+							    </div> --%>
+							    <div id="collapse1" class="accordion-body collapse ${firstMenu?'in':''}">
+									<div class="accordion-inner">
+										<ul class="nav nav-list">
+											<c:if test="${web_user.type.value==0 || web_user.type.value==6}">
+											<li><a href="${ctx}/admin/exam/list" target="mainFrame" ><i class="icon-th-list"></i>考试管理</a></li>
+											</c:if>
+											<c:if test="${web_user.type.value==0}">
+											<li><a href="${ctx}/admin/exam-param/student" target="mainFrame" ><i class="icon-user"></i>考生管理</a></li>
+											</c:if>
+											<%-- <li><a href="${ctx}/admin/exam-param/subject" target="mainFrame" ><i class="icon-th-list"></i>科目管理</a></li>--%>
+											<%-- <li><a href="${ctx}/admin/exam-param/header" target="mainFrame" ><i class="icon-leaf"></i>科组长管理</a></li> --%>
+											<!-- 
+											<c:if test="${web_user.type.value==0}">
+											<li><a href="${ctx}/admin/exam-param/paper" target="mainFrame" ><i class="icon-tasks"></i>试卷管理</a></li>
+											</c:if>
+											 -->
+											<c:if test="${web_user.type.value==0}">
+											<li class="dropdown">
+											<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-signal"></i>试卷管理</a> 
+												<ul class="dropdown-menu">
+													<li><a href="${ctx}/admin/exam-param/paper" target="mainFrame" ><i class="icon-upload"></i>Excel导入</a></li>
+													<li><a href="${ctx}/admin/exam-param/subjectPaper" target="mainFrame" ><i class="icon-list-alt"></i>科目配置</a></li>
+												</ul>
+											</li>
+											</c:if>
+										<%-- 	<li><a href="${ctx}/admin/exam-param/objective" target="mainFrame" ><i class="icon-tasks"></i>客观题管理</a></li>
+											<li><a href="${ctx}/admin/exam-param/subjective" target="mainFrame" ><i class="icon-th-large"></i>主观题管理</a></li> --%>
+											<c:if test="${web_user.type.value==0}">
+											<li><a href="${ctx}/admin/exam-param/marker" target="mainFrame" ><i class="icon-eye-open"></i>评卷员管理</a></li>
+											</c:if>
+											
+											<c:if test="${web_user.type.value==0}">
+											<li><a href="${ctx}/admin/exam/scan" target="mainFrame" ><i class="icon-th-list"></i>扫描进度</a></li>
+											</c:if>
+											<c:if test="${web_user.type.value==0 || web_user.type.value==5}">
+											<li><a href="${ctx}/admin/exam/mark" target="mainFrame" ><i class="icon-th-list"></i>评卷进度</a></li>
+											</c:if>
+											<c:if test="${web_user.type.value==0 || web_user.type.value==5 || web_user.type.value==6}">
+											<li><a href="${ctx}/admin/exam/score" target="mainFrame" ><i class="icon-tag"></i>成绩查询</a></li>		
+											</c:if>
+											<c:if test="${web_user.type.value==0}">
+											<li><a href="${ctx}/admin/exam/statistics" target="mainFrame" ><i class="icon-th-list"></i>成绩分析</a></li>		
+											</c:if>
+											<c:if test="${web_user.type.value==0}">
+											<li><a href="${ctx}/admin/exam/tag" target="mainFrame" ><i class="icon-tag"></i>标记试卷</a></li>	
+											</c:if>
+											<c:if test="${web_user.type.value==0}">
+											<li><a href="${ctx}/admin/exam/check/answer" target="mainFrame" ><i class="icon-th-list"></i>数据检查</a></li>							
+											</c:if>
+											<c:set var="firstMenu" value="false"/>
+										</ul>
+									</div>
+							    </div>
+							</div>
+						</div>
+				</div>
+				<div id="openClose" class="close">&nbsp;</div>
+				<div id="right">
+					<iframe id="mainFrame" name="mainFrame" src="" style="overflow:auto;"
+						scrolling="yes" frameborder="no" width="100%" height="650"></iframe>
+				</div>
+			</div>
+		    <div id="footer" class="row-fluid">
+		       <!--  Copyright ©武汉启明软件 2012-2014--> 
+			</div>
+		</div>
+	</div>
+	<script type="text/javascript"> 
+		var leftWidth = "160"; // 左侧窗口大小
+		function wSize(){
+			var minHeight = 500, minWidth = 980;
+			var strs=getWindowSize().toString().split(",");
+			$("#menuFrame, #mainFrame, #openClose").height((strs[0]<minHeight?minHeight:strs[0])-$("#header").height()-$("#footer").height()-32);
+			$("#openClose").height($("#openClose").height()-5);
+			if(strs[1]<minWidth){
+				$("#main").css("width",minWidth-10);
+				$("html,body").css({"overflow":"auto","overflow-x":"auto","overflow-y":"auto"});
+			}else{
+				$("#main").css("width","auto");
+				$("html,body").css({"overflow":"hidden","overflow-x":"hidden","overflow-y":"hidden"});
+			}
+			$("#right").width($("#content").width()-$("#left").width()-$("#openClose").width()-5);
+		}
+	</script>
+	<script src="${ctxStatic}/common/wsize.min.js" type="text/javascript"></script>
+</body>
+</html>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/scoreList.jsp

@@ -46,9 +46,9 @@
 				<option value="2" <c:if test="${filter==2}">selected</c:if>>客观有分，主观0分</option>
 			</select>
 			<label>总分：从</label>
-			<input  type="text" number="true" name="startScroe"value="${query.startScroe}"  maxlength="5" class="input-mini"/>
+			<input  type="text" number="true" name="startScroe"value="${query.startScroe}" class="input-mini"/>
 			<label> 到&nbsp;&nbsp;&nbsp;</label>
-			<input type="text" max="100" number="true" name="endScroe" value="${query.endScroe}"  maxlength="5" class="input-mini"/>
+			<input type="text"  number="true" name="endScroe" value="${query.endScroe}"  class="input-mini"/>
 			 
 			<br/><br/>
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/subjectSelectAp.jsp

@@ -0,0 +1,85 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>评卷科目选择</title>
+	<meta name="decorator" content="default"/>
+	<%@include file="/WEB-INF/views/include/head.jsp" %>
+    <link rel="stylesheet" href="${ctxStatic}/common/typica-login.css">
+	<style type="text/css">
+		.control-group{border-bottom:0px;}
+	</style>
+    <script src="${ctxStatic}/common/backstretch.min.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			<!--针对nw.js评卷客户端，自动窗口最大化-->
+			try{
+				require('nw.gui').Window.get().maximize();
+			}catch(e){
+			}
+
+			$.backstretch([
+ 		      "${ctxStatic}/images/bg1.jpg", 
+ 		      "${ctxStatic}/images/bg2.jpg",
+ 		      "${ctxStatic}/images/bg3.jpg"
+ 		  	], {duration: 10000, fade: 2000});
+
+ 		  	if($('#subject-select option').length==0){
+ 	 		  	$('#submit-button').hide();
+ 	 		}
+
+			$('#submit-button').click(function(){
+				var code = $('#subject-select').val();
+				return code!=undefined && code!='' && code!=null;
+			});
+		});
+		// 如果在框架中，则跳转刷新上级页面
+		if(self.frameElement && self.frameElement.tagName=="IFRAME"){
+			parent.location.reload();
+		}
+	</script>
+</head>
+<body>
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </a>
+          <a class="brand" href="${ctx}"><img src="${ctxStatic}/images/logo.png" alt="" style="height:40px;"></a>
+        </div>
+      </div>
+    </div>
+
+    <div class="container">
+		<!--[if lte IE 6]><br/><div class='alert alert-block' style="text-align:left;padding-bottom:10px;"><a class="close" data-dismiss="alert">x</a><h4>温馨提示：</h4><p>你使用的浏览器版本过低。为了获得更好的浏览体验，我们强烈建议您 <a href="http://browsehappy.com" target="_blank">升级</a> 到最新版本的IE浏览器，或者使用较新版本的 Chrome、Firefox、Safari 等。</p></div><![endif]-->
+		<div id="messageBox" class="alert alert-error <c:if test="${message == null }">hide</c:if>">
+			<label id="error" class="error">${message}</label>
+		</div>
+        <div id="login-wraper">
+            <form class="form login-form" action="${ctx}/mark/subject-select" method="post">
+                <legend><span style="color:#033249">请选择评卷科目</span></legend>
+                <div class="body">
+					<div class="control-group">
+						<div class="controls">
+							<select name="subjectCode" id="subject-select">
+							<c:forEach items="${subjectList}" var="subject">
+							<option value="${subject.code}" <c:if test="${subject.code==marker.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
+							</c:forEach>
+							</select>
+						</div>
+					</div>
+                </div>
+                <div class="footer">
+                    <input class="btn btn-primary" type="submit" id="submit-button" value="确 定"/>
+                    <a href="${ctx}/mark-logout" class="btn">退 出</a>
+                </div>
+            </form>
+        </div>
+    </div>
+    <footer class="white navbar-fixed-bottom">
+    </footer>
+  </body>
+</html>

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/sysIndexAp.jsp

@@ -0,0 +1,128 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>云阅卷</title>
+	<meta name="decorator" content="default"/>
+	<%@include file="/WEB-INF/views/include/head.jsp" %>
+	<style type="text/css">
+		#main {padding:0;margin:0;} #main .container-fluid{padding:0 7px 0 10px;}
+		#header {margin:0 0 10px;position:static;} #header li {font-size:14px;_font-size:12px;}
+		#header .brand {font-family:Helvetica, Georgia, Arial, sans-serif, 黑体;font-size:26px;padding-left:33px;}
+		#footer {margin:8px 0 0 0;padding:3px 0 0 0;font-size:11px;text-align:center;border-top:2px solid #0663A2;}
+		#footer, #footer a {color:#999;} 
+	</style>
+	<script type="text/javascript"> 
+		$(document).ready(function() {
+			$("#menu a.menu").click(function(){
+				$("#menu li.menu").removeClass("active");
+				$(this).parent().addClass("active");
+				if(!$("#openClose").hasClass("close")){
+					$("#openClose").click();
+				}
+			});
+			
+			$(".accordion-heading a").click(function(){
+				$('.accordion-toggle i').removeClass('icon-chevron-down');
+				$('.accordion-toggle i').addClass('icon-chevron-right');
+				if(!$($(this).attr('href')).hasClass('in')){
+					$(this).children('i').removeClass('icon-chevron-right');
+					$(this).children('i').addClass('icon-chevron-down');
+				}
+			});
+			$(".accordion-body a").click(function(){
+				$("#menu li").removeClass("active");
+				$("#menu li i").removeClass("icon-white");
+				$(this).parent().addClass("active");
+				$(this).children("i").addClass("icon-white");
+			}); 
+			$(".accordion-body a:first i").click();
+		});
+	</script>
+</head>
+<body>
+	<div id="main">
+		<div id="header" class="navbar navbar-fixed-top">
+	      <div class="navbar-inner">
+	      	 <div class="brand">奥鹏教育</div>
+	         <div class="nav-collapse">
+	           <%-- <ul id="menu" class="nav">
+				 <c:set var="firstMenu" value="true"/>
+		 		<li class="menu "><a class="menu" href="${ctx }/admin/exam" target="menuFrame" >考试管理</a></li>
+				<li class="menu "><a class="menu" href="" target="menuFrame" >基础管理</a></li>
+	           </ul> --%>
+	           <ul class="nav pull-right">
+			  	 <li id="themeSwitch" class="dropdown">
+			       	<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="主题切换"><i class="icon-th-large"></i></a>
+				    <ul class="dropdown-menu">
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/default?url='+location.href">默认主题</a></li>
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/cerulean?url='+location.href">天蓝主题</a></li>
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/readable?url='+location.href">橙色主题</a></li>
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/united?url='+location.href">红色主题</a></li>
+				      <li><a href="#" onclick="location='${ctx}/admin/home/theme/flat?url='+location.href">Flat主题</a></li>
+				    </ul>
+				    <!--[if lte IE 6]><script type="text/javascript">$('#themeSwitch').hide();</script><![endif]-->
+			     </li>
+			  	 <li class="dropdown">
+				    <a class="dropdown-toggle" data-toggle="dropdown" href="#" title="个人信息">您好,${web_user.name}</a>
+				    <ul class="dropdown-menu">
+				      <li><a href="${ctx}/admin/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; 个人信息</a></li>
+				      <li><a href="${ctx}/admin/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp;  修改密码</a></li>
+				    </ul>
+			  	 </li>
+			  	 <li><a href="${ctx}/admin-logout" title="退出登录">退出</a></li>
+			  	 <li>&nbsp;</li>
+	           </ul>
+	         </div><!--/.nav-collapse -->
+	      </div>
+	    </div>
+	    <div class="container-fluid">
+			<div id="content" class="row-fluid">
+				<div id="left">
+							<div class="accordion" id="menu"><c:set var="firstMenu" value="true"/>
+							<div class="accordion-group">
+							    <%-- <div class="accordion-heading">
+							    	<a class="accordion-toggle" data-toggle="collapse" data-parent="#menu" href="#collapse${menu.id}" title="考试管理"><i class="icon-chevron-${firstMenu?'down':'right'}"></i>&nbsp;考试管理</a>
+							    </div> --%>
+							    <div id="collapse1" class="accordion-body collapse ${firstMenu?'in':''}">
+									<div class="accordion-inner">
+										<ul class="nav nav-list">
+											<li><a href="${ctx}/admin/sys/school" target="mainFrame" ><i class="icon-th-list"></i>学校管理</a></li>								
+											<c:set var="firstMenu" value="false"/>
+										</ul>
+									</div>
+							    </div>
+							</div>
+						</div>
+				</div>
+				<div id="openClose" class="close">&nbsp;</div>
+				<div id="right">
+					<iframe id="mainFrame" name="mainFrame" src="" style="overflow:visible;"
+						scrolling="yes" frameborder="no" width="100%" height="650"></iframe>
+				</div>
+			</div>
+		    <div id="footer" class="row-fluid">
+		    	<!-- Copyright ©武汉启明软件 2012-2014 -->
+			</div>
+		</div>
+	</div>
+	<script type="text/javascript"> 
+		var leftWidth = "160"; // 左侧窗口大小
+		function wSize(){
+			var minHeight = 500, minWidth = 980;
+			var strs=getWindowSize().toString().split(",");
+			$("#menuFrame, #mainFrame, #openClose").height((strs[0]<minHeight?minHeight:strs[0])-$("#header").height()-$("#footer").height()-32);
+			$("#openClose").height($("#openClose").height()-5);
+			if(strs[1]<minWidth){
+				$("#main").css("width",minWidth-10);
+				$("html,body").css({"overflow":"auto","overflow-x":"auto","overflow-y":"auto"});
+			}else{
+				$("#main").css("width","auto");
+				$("html,body").css({"overflow":"hidden","overflow-x":"hidden","overflow-y":"hidden"});
+			}
+			$("#right").width($("#content").width()-$("#left").width()-$("#openClose").width()-5);
+		}
+	</script>
+	<script src="${ctxStatic}/common/wsize.min.js" type="text/javascript"></script>
+</body>
+</html>