Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/elk/ElkController.java

@@ -78,6 +78,10 @@ public class ElkController {
      * 热门字段
      */
     private String hotArticle = "e_top";
+    /**
+     * 最新政策
+     */
+//    private String latestPolicy = "hot_top";
 
     /**
      * 排序字段
@@ -365,6 +369,7 @@ public class ElkController {
         ScriptSortBuilder sortBuilder = new ScriptSortBuilder(script, ScriptSortBuilder.ScriptSortType.NUMBER);
         searchSourceBuilder.sort(sortBuilder);
         searchRequest.source(searchSourceBuilder);
+        System.out.println(searchSourceBuilder);
         // 执行搜索
         SearchResponse searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
         SearchHit[] s = searchResponse.getHits().getHits();

nngkxxdp/src/main/resources/static/zdjc/css/sywj.css

@@ -251,7 +251,7 @@ body {
 	align-items: center;
 	justify-content: center;
 	margin-bottom: 1%;
-	margin-top: 2%;
+	margin-top: 4%;
 }
 
 .header-contanier img {
@@ -291,7 +291,7 @@ body {
     border-radius: 10px;
     width: 800px;
 	height: 60px;
-	margin: 20px 10px 30px 0px;
+	margin: 10px 10px 20px 0px;
 	box-sizing: border-box;
 	padding: 10px 30px;
 	display: flex;

nngkxxdp/src/main/resources/static/zdjc/css/wj2.css

@@ -18,7 +18,7 @@ a {
 
 .content {
 	width: 100%;
-	min-height: calc(100vh - 174px);
+	min-height: calc(100vh - 154px);
 	border-top: 1px solid #000;
 	position: relative;
 }
@@ -202,7 +202,7 @@ a {
     border-radius: 10px;
     width: 800px;
 	height: 60px;
-	margin: 20px auto 30px;
+	margin: 10px auto 20px;
 	box-sizing: border-box;
 	padding: 10px 30px;
 	display: flex;

nngkxxdp/src/main/resources/static/zdjc/wj2.html

@@ -52,7 +52,7 @@
 					<a href="javascript:void(0);">文件搜索</a>
 			</div>
 			<div class="text_content">
-				<h4 style="cursor: pointer;" onclick="window.location.href='sy.html'">南岸区政策文件库</h4>
+				<h4 style="cursor: pointer;" onclick="window.location.href='sywj.html'">南岸区政策文件库</h4>
 				<div style="position:relative">
 					<div class="search-area">
 						<div class="all" title="">全部</div>

nngkxxdp/src/main/resources/static/zdjc/xqwj-copy.html

@@ -58,7 +58,7 @@
 			</div>
 			<div class="main-contanier">
 				<div class="title" style="cursor: pointer;"
-					onclick="window.location.href='sy.html'">南岸区政策文件库</div>
+					onclick="window.location.href='sywj.html'">南岸区政策文件库</div>
 				<div style="position: relative; margin-bottom: 20px;">
 					<div class="search-area">
 						<div class="all">全部</div>