Browse Source

奥鹏自动化部署优化

nikang 7 years ago
parent
commit
fa78857b5a

+ 9 - 1
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));

+ 85 - 0
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>