2 年之前 · d9b467406b
--- a/sooka-admin/src/main/java/com/sooka/web/controller/system/SysIndexController.java
+++ b/sooka-admin/src/main/java/com/sooka/web/controller/system/SysIndexController.java
@@ -1,9 +1,13 @@
 
																 package com.sooka.web.controller.system;
															
 
																+import java.util.Arrays;
															
 
																 import java.util.Date;
															
 
																 import java.util.List;
															
 
																 import javax.servlet.http.Cookie;
															
 
																 import javax.servlet.http.HttpServletResponse;
															
 
																+
															
 
																+import com.sooka.business.schooldistrict.domain.BtpPolicestationVillage;
															
 
																+import com.sooka.business.schooldistrict.service.IBtpPolicestationVillageService;
															
 
																 import org.springframework.beans.factory.annotation.Autowired;
															
 
																 import org.springframework.stereotype.Controller;
															
 
																 import org.springframework.ui.ModelMap;
															
@@ -43,6 +47,9 @@ public class SysIndexController extends BaseController
 
																     @Autowired
															
 
																     private SysPasswordService passwordService;
															
 
																+    @Autowired
															
 
																+    private IBtpPolicestationVillageService btpPolicestationVillageService;
															
 
																+
															
 
																     // 系统首页
															
 
																     @GetMapping("/index")
															
 
																     public String index(ModelMap mmap)
															
@@ -130,7 +137,8 @@ public class SysIndexController extends BaseController
 
																     @GetMapping("/system/main")
															
 
																     public String main(ModelMap mmap)
															
 
																     {
															
 
																-        mmap.put("version", SookaConfig.getVersion());
															
 
																+        mmap.put("policestations", btpPolicestationVillageService.getAllByParentId(0L));
															
 
																+        mmap.put("villages", Arrays.asList(new BtpPolicestationVillage()));
															
 
																         return "main";
															
 
																     }
															
--- a/sooka-admin/src/main/resources/application.yml
+++ b/sooka-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@ sooka:
 
																   # 实例演示开关
															
 
																   demoEnabled: true
															
 
																   # 文件路径 示例（ Windows配置D:/sooka/uploadPath，Linux配置 /home/sooka/uploadPath）
															
 
																-  profile: D:/sooka/uploadPath
															
 
																+  profile: C:/sooka/uploadPath
															
 
																   # 获取ip地址开关
															
 
																   addressEnabled: false
															
--- a/sooka-admin/src/main/resources/templates/index.html
+++ b/sooka-admin/src/main/resources/templates/index.html
@@ -193,7 +193,7 @@
 
																                     </a>
															
 
																                 </div>
															
 
																                 <ul class="nav navbar-top-links navbar-right welcome-message">
															
 
																-                    <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.sooka.vip/sooka" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>
															
 
																+                    <!--<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.sooka.vip/sooka" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
															
 
																                     <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
															
 
																 	                <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="#" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
															
 
																                     <li class="dropdown user-menu">
															
--- a/sooka-admin/src/main/resources/templates/main.html
+++ b/sooka-admin/src/main/resources/templates/main.html
--- a/sooka-admin/src/main/resources/templates/system/notice/edit.html
+++ b/sooka-admin/src/main/resources/templates/system/notice/edit.html
@@ -8,7 +8,7 @@
 
																     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
															
 
																         <form class="form-horizontal m" id="form-notice-edit" th:object="${notice}">
															
 
																             <input id="noticeId" name="noticeId" th:field="*{noticeId}"  type="hidden">
															
 
																-            <div class="form-group">	
															
 
																+            <div class="form-group" style="display: none">
															
 
																                 <label class="col-sm-2 control-label is-required">公告标题：</label>
															
 
																                 <div class="col-sm-10">
															
 
																                     <input id="noticeTitle" name="noticeTitle" th:field="*{noticeTitle}" class="form-control" type="text" required>
															
@@ -29,7 +29,7 @@
 
																                     <div id="editor" class="summernote"></div>
															
 
																                 </div>
															
 
																             </div>
															
 
																-            <div class="form-group">
															
 
																+            <div class="form-group" style="display: none">
															
 
																 				<label class="col-sm-2 control-label">公告状态：</label>
															
 
																 				<div class="col-sm-10">
															
 
																 					<div class="radio-box" th:each="dict : ${@dict.getType('sys_notice_status')}">
															
--- a/sooka-admin/src/main/resources/templates/system/notice/notice.html
+++ b/sooka-admin/src/main/resources/templates/system/notice/notice.html
@@ -6,7 +6,7 @@
 
																 <body class="gray-bg">
															
 
																     <div class="container-div">
															
 
																 		<div class="row">
															
 
																-			<div class="col-sm-12 search-collapse">
															
 
																+			<div class="col-sm-12 search-collapse" style="display: none">
															
 
																 				<form id="notice-form">
															
 
																 					<div class="select-list">
															
 
																 						<ul>
															
@@ -31,7 +31,7 @@
 
																 				</form>
															
 
																 			</div>
															
 
																-	        <div class="btn-group-sm" id="toolbar" role="group">
															
 
																+	        <div class="btn-group-sm" id="toolbar" role="group" style="display: none">
															
 
																 		        <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:notice:add">
															
 
																 		            <i class="fa fa-plus"></i> 新增
															
 
																 		        </a>
															
@@ -63,6 +63,7 @@
 
																                 updateUrl: prefix + "/edit/{id}",
															
 
																                 removeUrl: prefix + "/remove",
															
 
																                 modalName: "公告",
															
 
																+				showSearch: false,
															
 
																                 columns: [{
															
 
																 		            checkbox: true
															
 
																 		        },