liuyuqiang 2 лет назад
Родитель
Сommit
4399a9189e

+ 3 - 3
sooka-admin/src/main/java/com/sooka/web/controller/system/SysIndexController.java

@@ -147,8 +147,6 @@ public class SysIndexController extends BaseController
     @GetMapping("/system/main")
     public String main(ModelMap mmap)
     {
-        mmap.put("title", noticeService.selectNoticeById(1L));
-        mmap.put("notice", noticeService.selectNoticeById(2L));
         SysNotice sysNotice = noticeService.selectNoticeById(10L);
         String[] date = Convert.toStrArray(" 至 ", sysNotice.getNoticeContent());
         if (DateUtil.isIn(DateUtils.getNowDate(), DateUtils.parseDate(date[0]), DateUtils.parseDate(date[1]))) {
@@ -156,9 +154,11 @@ public class SysIndexController extends BaseController
             mmap.put("policestations", btpPolicestationVillageService.getPolicestationVillagesByParentId(0L));
         } else {
             mmap.put("flag", false);
-            mmap.put("announcement", noticeService.selectNoticeById(11L));
             mmap.put("policestations", Arrays.asList(new BtpPolicestationVillage()));
         }
+        mmap.put("title", noticeService.selectNoticeById(1L));
+        mmap.put("notice", noticeService.selectNoticeById(2L));
+        mmap.put("announcement", noticeService.selectNoticeById(11L));
         return "main";
     }
 

+ 52 - 51
sooka-admin/src/main/resources/templates/main.html

@@ -146,10 +146,6 @@
 			left: 0px;
 			display: none;
 		}
-		#tk_btn{
-			width: 100px;
-			height: 35px;
-		}
 		.tk_window{
 			width: 30rem;
 			padding-bottom: 2rem;
@@ -248,7 +244,7 @@
 </head>
 
 <body class="gray-bg">
-	<h1 class="xit_logo">南关区学区查询系统</h1>
+	<h1 class="xit_logo"></h1>
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content2">
 		<div id="schoolType" class="sel_zx">
 			<span class="on" value="1">按小学查询</span>
@@ -256,31 +252,27 @@
 		</div>
 		<div class="form-horizontal sel_form" id="form-pv-add">
 			<div class="row">
-			<div class="form-group2 col-sm-3 col-md-3 col-xs-12">
-
+				<div class="form-group2 col-sm-3 col-md-3 col-xs-12">
 					<select id="pId" class="form-control">
-                        <option value="">请选择</option>
-                        <option th:each="policestation:${policestations}" th:value="${policestation.pvId}" th:text="${policestation.pvName}"></option>
+						<option value="">请选择派出所</option>
+						<option th:each="policestation:${policestations}" th:value="${policestation.pvId}" th:text="${policestation.pvName}"></option>
 					</select>
-
-			</div>
-			<div class="form-group2 col-sm-3 col-md-3 col-xs-12">
-
+				</div>
+				<div class="form-group2 col-sm-3 col-md-3 col-xs-12">
 					<select id="vId" class="form-control">
-                        <option value="">请选择</option>
+						<option value="">请选择委(村)</option>
 					</select>
-
-			</div>
-			<div class="col-sm-4 col-md-4 col-xs-12 left_row" th:if="${captchaEnabled==true}">
-				<div class="left_div1">
-					<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
 				</div>
-				<div class="left_div2">
-					<a href="javascript:void(0);" title="点击更换验证码">
-						<img th:src="@{/captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
-					</a>
+				<div class="col-sm-4 col-md-4 col-xs-12 left_row" th:if="${captchaEnabled==true}">
+					<div class="left_div1">
+						<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
+					</div>
+					<div class="left_div2">
+						<a href="javascript:void(0);" title="点击更换验证码">
+							<img th:src="@{/captcha/captchaImage(type=${captchaType})}" class="imgcode" width="85%"/>
+						</a>
+					</div>
 				</div>
-			</div>
 				<div class="btn-group-sm  col-sm-2 col-md-2 col-xs-12" id="toolbar" role="group">
 					<button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证,请稍候..." onclick="submitHandler()">查询</button>
 				</div>
@@ -288,32 +280,22 @@
 		</div>
 		<div class="form-group ss_jg">
 			<label class="ck_tit control-label">关于您所选的关键词有以下结果可供参考:</label>
-			<div class="ck_div22">
-				<span id="schoolId" class="ss_span">1111111</span>
-				<span id="schoolId" class="ss_span">东北师范小学</span>
-			</div>
+			<div class="ck_div22"></div>
 		</div>
 		<div class="cksm">
 			<h4>温馨提示</h4>
-			<p>该功能模块对学区信息进行查询,选择中、小学,派出所,委(村),输入验证码,验证通过后,即可查询对应学区。因学区查询系统仅在开学季、招生季开放,若当前日期不在规定日期范围内,需进行公告提示。</p>
-		</div>
-		<div id="tk_btn">
-			<button class="link">
-				<a >弹窗</a>
-			</button>
+			<p></p>
 		</div>
-
 	</div>
 
 	<!--弹框 开始-->
-	<div class="xq_zg"></div>
-	<div id="tk_window" class="tk_window">
-			<h1>温馨提示</h1>
-			<h2>该功能模块对学区信息进行查询,选择中、小学,派出所</h2>
+	<div class="xq_zg">
+		<div class="tk_window">
+			<h1>系统公告</h1>
+			<h2></h2>
 			<span class="close_btn">关闭</span>
+		</div>
 	</div>
-	​
-
 	<!--弹框 结束-->
 	<script th:inline="javascript"> var ctx = [[@{/}]]; var captchaType = [[${captchaType}]]; </script>
     <script th:src="@{/js/jquery.min.js}"></script>
@@ -323,6 +305,14 @@
 	<script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
 	<script src="../static/sooka/js/ry-ui.js" th:src="@{/sooka/js/ry-ui.js?v=4.7.6}"></script>
     <script type="text/javascript">
+		$(".xit_logo").html(unescapeHtml('[[${title.noticeContent}]]'));
+		$(".cksm p").html(unescapeHtml('[[${notice.noticeContent}]]'));
+		if (![[${flag}]]) {
+			$(".tk_window h2").html(unescapeHtml('[[${announcement.noticeContent}]]'));
+			$(".xq_zg").show();
+			$(".tk_window").show();
+		}
+
 		function submitHandler() {
 			var pId = $("#pId").val(), vId = $("#vId").val();
 			if (pId == "" || vId == "") {
@@ -339,11 +329,13 @@
 				if (r.code == web_status.SUCCESS) {
 					var name = "";
 					if (r.data.length == 0) {
-						name += "暂无学区 ";
+						name += '<span class="ss_span">暂无学区</span>';
 					} else {
-						name += r.data.join(",");
+						$.each(r.data, function(i, item) {
+							name += '<span class="ss_span">' + item + '</span>'
+						})
 					}
-					$("#schoolId").empty().append(name);
+					$(".ck_div22").empty().append(name);
 				} else {
 					$('.imgcode').click();
 					$(".code").val("");
@@ -353,8 +345,22 @@
 			});
 		}
 
+		function unescapeHtml(str) {
+			if (Object.prototype.toString.call(str) !== '[object String]') {
+				return '';
+			}
+			str = str.replace(/&lt;|&gt;|&amp;/g, function (match) {
+				return ({
+					'&lt;': '<',
+					'&gt;': '>',
+					'&amp;': '&'
+				})[match];
+			});
+			return str;
+		}
+
 		function getData(array) {
-			var str = "<option value=''>请选择</option>";
+			var str = "<option value=''>请选择委(村)</option>";
 			$.each(array, function (index, item) {
 				str += "<option value='" + item.pvId + "'>" + item.pvName + "</option>";
 			})
@@ -362,14 +368,9 @@
 		}
 
 		$(function() {
-            // 弹框 关闭 选择
-            $("#tk_btn").on('click',function(){
-                $(".xq_zg").show();
-                $("#tk_window").show();
-            })
             $(".close_btn").on('click',function(){
                 $(".xq_zg").hide();
-                $("#tk_window").hide();
+				$(".tk_window").hide();
             })
 
 			$("#schoolType span").click(function () {