Merge branch 'dev_1.3.16' of http://git.qmth.com.cn/luoshi/stmms-ft.git into dev_1.3.16

stmms-common/src/main/java/cn/com/qmth/stmms/common/enums/Auth.java

@@ -2,11 +2,11 @@ package cn.com.qmth.stmms.common.enums;
 
 public enum Auth {
 
-    ROLE_VIEW("角色查看"), ROLE_EDIT("修改角色"), SCHOOL_VIEW_ALL("所有学校查看"), SCHOOL_VIEW_SELF("所属学校查看"), SCHOOL_CREATE(
-            "创建学校"), SCHOOL_EDIT_ALL("修改所有学校"), SCHOOL_EDIT_SELF("修改所属学校"), SCHOOL_DELETE("删除学校"), SCHOOL_ADMIN_CREATE(
+    ROLE_VIEW("角色查看"), ROLE_EDIT("修改角色"), SCHOOL_VIEW_ALL("所有机构查看"), SCHOOL_VIEW_SELF("所属机构查看"), SCHOOL_CREATE(
+            "创建机构"), SCHOOL_EDIT_ALL("修改所有机构"), SCHOOL_EDIT_SELF("修改所属机构"), SCHOOL_DELETE("删除机构"), SCHOOL_ADMIN_CREATE(
             "创建系统管理员"), SCHOOL_ADMIN_EDIT("修改系统管理员"), SCHOOL_ADMIN_DELETE("删除系统管理员"), SCHOOL_USER_VIEW(
-            "查看学校子用户"), SCHOOL_USER_CREATE("创学校子用户"), SCHOOL_USER_EDIT("修改学校子用户"), SCHOOL_USER_DELETE(
-            "删除学校子用户"), CAMPUS_VIEW_ALL("所有学习中心查看"), CAMPUS_VIEW_SELF("所属学习中心查看"), CAMPUS_CREATE("创建学习中心"), CAMPUS_EDIT_ALL(
+            "查看机构子用户"), SCHOOL_USER_CREATE("创机构子用户"), SCHOOL_USER_EDIT("修改机构子用户"), SCHOOL_USER_DELETE(
+            "删除机构子用户"), CAMPUS_VIEW_ALL("所有学习中心查看"), CAMPUS_VIEW_SELF("所属学习中心查看"), CAMPUS_CREATE("创建学习中心"), CAMPUS_EDIT_ALL(
             "修改所有学习中心"), CAMPUS_EDIT_SELF("修改所属学习中心"), CAMPUS_DELETE("删除学习中心"), CAMPUS_ADMIN_CREATE("创建学习中心管理员"), CAMPUS_ADMIN_EDIT(
             "修改学习中心管理员"), CAMPUS_ADMIN_DELETE("删除学习中心管理员"), CAMPUS_USER_VIEW("查看学习中心子用户"), CAMPUS_USER_CREATE("创建学习中心子用户"), CAMPUS_USER_EDIT(
             "修改学习中心子用户"), CAMPUS_USER_DELETE("删除学习中心子用户"), STUDENT_VIEW("查看学生"), STUDENT_ADD("添加学生"), STUDENT_EDIT("修改学生"), STUDENT_DELETE(

stmms-common/src/main/java/cn/com/qmth/stmms/common/enums/MarkerExcelError.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.stmms.common.enums;
 
 public enum MarkerExcelError {
-    CODENULL("课程代码不存在", 0), NAMENULL("用户名为空", 1), NAMEUSED("用户名已被其他学校占用", 2), NAMENOTMARKER("用户名已被占用,且不是评卷员类型", 3), GROUPNULL(
+    CODENULL("课程代码不存在", 0), NAMENULL("用户名为空", 1), NAMEUSED("用户名已被其他机构占用", 2), NAMENOTMARKER("用户名已被占用,且不是评卷员类型", 3), GROUPNULL(
             "大题号不存在", 4), EXAMNULL("考试为空", 5), CLASSNULL("机组为空", 6), EXAMCLASSNULL("考试下没有该机组", 7), NAMENOTHEADER(
             "用户名已被占用,且不是评卷组长类型", 8), NAMENOTINSPECTOR("用户名已被占用,且不是复核员类型", 9);
 

stmms-web/src/main/java/cn/com/qmth/stmms/admin/school/SchoolController.java

@@ -54,7 +54,7 @@ public class SchoolController extends BaseController {
     @Autowired
     private SystemCache authCache;
 
-    @Logging(menu = "学校查询", type = LogType.QUERY)
+    @Logging(menu = "机构查询", type = LogType.QUERY)
     @RequestMapping
     public ModelAndView list(HttpServletRequest request, SchoolSearchQuery query) {
         ModelAndView view = new ModelAndView("modules/sys/schoolList");
@@ -95,7 +95,7 @@ public class SchoolController extends BaseController {
         }
     }
 
-    @Logging(menu = "新增（修改）学校", type = LogType.UPDATE)
+    @Logging(menu = "新增（修改）机构", type = LogType.UPDATE)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public String save(HttpServletRequest request, School school) {
         School previous = null;

stmms-web/src/main/java/cn/com/qmth/stmms/student/StudentScoreController.java

@@ -37,7 +37,7 @@ public class StudentScoreController {
     public String login(Model model, HttpServletRequest request, @PathVariable Integer schoolId) {
         School school = schoolService.findById(schoolId);
         if (school == null) {
-            model.addAttribute("message", "学校不存在");
+            model.addAttribute("message", "机构不存在");
             return "modules/student/login";
         }
 
@@ -50,7 +50,7 @@ public class StudentScoreController {
             ExamStudentSearchQuery query) {
         School school = schoolService.findById(schoolId);
         if (school == null) {
-            model.addAttribute("message", "学校为空");
+            model.addAttribute("message", "机构为空");
             return "modules/student/login";
         }
         query.setSchoolId(schoolId);

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

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-    <title data-i18n-text="head.title">高校阅卷平台</title>
+    <title data-i18n-text="head.title">阅卷平台</title>
     <meta name="decorator" content="default"/>
     <%@include file="/WEB-INF/views/include/head.jsp" %>
     <style type="text/css">

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

@@ -3,7 +3,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>阅卷平台高校版</title>
+    <title>阅卷平台</title>
     <link href="${ctxStatic}/mark-new/css/bootstrap.css" rel="stylesheet" type="text/css"/>
     <link href="${ctxStatic}/mark-new/css/style.css" rel="stylesheet" type="text/css"/>
     

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

@@ -3,7 +3,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>阅卷平台高校版</title>
+    <title>阅卷平台</title>
     <link href="${ctxStatic}/mark-new/css/bootstrap.css" rel="stylesheet" type="text/css"/>
     <link href="${ctxStatic}/mark-new/css/style.css" rel="stylesheet" type="text/css"/>
     

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

@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>高校版阅卷系统</title>
+    <title>阅卷系统</title>
     <link rel="stylesheet" href="${ctxStatic}/jcrop/css/jquery.Jcrop.min.css"/>
     <link rel="stylesheet" href="${ctxStatic}/pic-config/css/style.css"/>
     <script type="text/javascript" src="${ctxStatic}/jquery/jquery-1.9.1.min.js"></script>

stmms-web/src/main/webapp/WEB-INF/views/modules/monitor/cache/list.jsp

@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>阅卷平台高校版</title>
+<title>阅卷平台</title>
 <link href="${ctxStatic}/mark-new/css/bootstrap.css" rel="stylesheet" type="text/css" />
 <link href="${ctxStatic}/mark-new/css/style.css" rel="stylesheet" type="text/css" />
 <script src="${ctxStatic}/jquery/jquery-1.9.1.min.js" type="text/javascript"></script>

stmms-web/src/main/webapp/WEB-INF/views/modules/report/pdf.jsp

@@ -56,7 +56,7 @@
       <div class="cover-title"></div>
       <div class="cover-footer">
         <p><span>考试名称：</span><span><#:=examName#></span></p>
-        <p><span>学校：</span><span><#:=schoolName#></span></p>
+        <p><span>机构：</span><span><#:=schoolName#></span></p>
         <p><span>科目：</span><span><#:=subjectName#></span></p>
       </div>
     </div>

stmms-web/src/main/webapp/WEB-INF/views/modules/student/list.jsp

@@ -25,7 +25,7 @@
 <div class="container">
 <div class="wp">
   <div class="header cl">
-  	<div class="z"><span class="current">当前学校：${school.name }</span></div>
+  	<div class="z"><span class="current">当前机构：${school.name }</span></div>
     <div class="y">
     	<a class="user" href="">${query.name }</a>
     	<a href="javascript:location.replace(location);">退出</a>

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

@@ -38,7 +38,7 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/admin/sys/school">学校管理</a></li>
+		<li><a href="${ctx}/admin/sys/school">机构管理</a></li>
 		<li class="active"><a href="#">编辑管理员</a></li>
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="user" action="${ctx}/admin/sys/school/admin/save" method="post" class="form-horizontal">

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

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-    <title>新建学校</title>
+    <title>新建机构</title>
     <meta name="decorator" content="default"/>
     <%@include file="/WEB-INF/views/include/head.jsp" %>
     <script type="text/javascript">

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

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
-	<title>学校管理</title>
+	<title>机构管理</title>
 	<meta name="decorator" content="default"/>
 	<%@include file="/WEB-INF/views/include/head.jsp" %>
 	<style type="text/css">.sort{color:#0663A2;cursor:pointer;}</style>

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

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
-	<title>阅卷平台-高校版</title>
+	<title>阅卷平台</title>
 	<meta name="decorator" content="default"/>
 	<%@include file="/WEB-INF/views/include/head.jsp" %>
 	<style type="text/css">
@@ -87,7 +87,7 @@
 							    <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>	
+											<li><a href="${ctx}/admin/sys/school" target="mainFrame" ><i class="icon-th-list"></i>机构管理</a></li>
 											<li><a href="${ctx}/admin/sys/config" target="mainFrame" ><i class="icon-th-list"></i>配置管理</a></li>
 											<li><a href="${ctx}/admin/sys/auth" target="mainFrame" ><i class="icon-th-list"></i>授权管理</a></li>														
 											<c:set var="firstMenu" value="false"/>

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

@@ -34,13 +34,13 @@
 		<tags:message content="${message}"/>
 		<form:hidden path="id"/>
 		<div class="control-group">
-			<label class="control-label">归属学校:</label>
+			<label class="control-label">归属机构:</label>
 			<div class="controls">
 				<label class="lbl">${school.name}</label>
 			</div>
 		</div>
 		<div class="control-group">
-			<label class="control-label">学校Id:</label>
+			<label class="control-label">机构Id:</label>
 			<div class="controls">
 				<label class="lbl">${school.id}</label>
 			</div>