From 6e5e698d770ee9b2baea858079bd66916638a091 Mon Sep 17 00:00:00 2001
From: wangyi15124 <wiaini83321394>
Date: Sun, 20 Mar 2022 12:34:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../intelligence/controller/SystemController.java  |  2 +-
 src/main/resources/templates/common/zhheader.html  | 13 ++++-----
 .../templates/displayboard/displayboard.html       | 32 +++++++++++-----------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/stonedt/intelligence/controller/SystemController.java b/src/main/java/com/stonedt/intelligence/controller/SystemController.java
index 58409f4..b95f403 100644
--- a/src/main/java/com/stonedt/intelligence/controller/SystemController.java
+++ b/src/main/java/com/stonedt/intelligence/controller/SystemController.java
@@ -251,7 +251,7 @@ public class SystemController {
         }
 
         WarningSetting warning = systemService.getWarningByProjectId(Long.valueOf(project_id));
-        warning.setWarning_word(warningWord);
+        //warning.setWarning_word(warningWord);
         mv.addObject("warning", warning);
         mv.addObject("warningStr", JSON.toJSONString(warning));
         mv.addObject("groupid", groupid);
diff --git a/src/main/resources/templates/common/zhheader.html b/src/main/resources/templates/common/zhheader.html
index d76cdb2..db3ee17 100644
--- a/src/main/resources/templates/common/zhheader.html
+++ b/src/main/resources/templates/common/zhheader.html
@@ -38,14 +38,14 @@
                 </li>
                 
                 
-                <li data-type="report" th:classappend="${menu=='report'?'nav-active3':''}"
+                <!-- <li data-type="report" th:classappend="${menu=='report'?'nav-active3':''}"
                     class="nav-item dropdown hover-none navLi">
                     <a class="nav-link dropdown-toggle waves-effect  waves-dark">
-                        <!-- <i class="fa fa-chart-pie"></i>  -->
+                        <i class="fa fa-chart-pie"></i> 
                         <span class="d-none d-md-block"> <i class="fa fa-tasks"></i> 分析报告</span>
                         <span class="d-block d-md-none">分析报告</span>
                     </a>
-                </li>
+                </li> -->
 
                 <li data-type="project" th:classappend="${menu=='project'?'nav-active3':''}"
                     class="nav-item dropdown hover-none navLi">
@@ -54,14 +54,13 @@
                         <span class="d-block d-md-none">监测管理</span>
                     </a>
                 </li>
-                 <li data-type="full_search" th:classappend="${menu=='full_search'?'nav-active3':''}"
+                <!--  <li data-type="full_search" th:classappend="${menu=='full_search'?'nav-active3':''}"
                     class="nav-item dropdown hover-none navLi">
-<!--                     <a style="display: block; position: absolute; font-size: 12px; color: #fff; margin-left: 76px; margin-top: 6px; background-color: #fe475d; width: 25px; height: 17px; border-radius: 45%; padding-left: 7px;transform: scale(0.9);">新</a>
- -->                    <a class="nav-link dropdown-toggle waves-effect  waves-dark">
+                 <a class="nav-link dropdown-toggle waves-effect  waves-dark">
                         <span class="d-none d-md-block"> <i class="fa fa-search"></i> 综合搜索</span>
                         <span class="d-block d-md-none">综合搜索</span>
                     </a>
-                </li> 
+                </li>  -->
                 <li data-type="public_option" th:classappend="${menu=='public_option'?'nav-active3':''}"
                     class="nav-item dropdown hover-none navLi">
                     <a class="nav-link dropdown-toggle waves-effect  waves-dark">
diff --git a/src/main/resources/templates/displayboard/displayboard.html b/src/main/resources/templates/displayboard/displayboard.html
index 4b81c87..58ebded 100644
--- a/src/main/resources/templates/displayboard/displayboard.html
+++ b/src/main/resources/templates/displayboard/displayboard.html
@@ -220,11 +220,11 @@
 										<div class="align-self-center" style="display:inline;">
 										微信热点
 										</div>
-										<div class="align-self-center" style="display:inline;margin-left:70%">
+										<!-- <div class="align-self-center" style="display:inline;margin-left:70%">
 										<button type="button" class="btn btn-outline-secondary btn-sm bnone" onclick="moreHotdata('微信')">
 													<i class="mdi mdi-checkbox-multiple-blank"></i> 更多
 												</button>
-										</div>
+										</div> -->
 										
 										
 										</div>
@@ -337,11 +337,11 @@
 										<div class="align-self-center" style="display:inline;">
 										微博热点
 										</div>
-										<div class="align-self-center" style="display:inline;margin-left:70%">
+										<!-- <div class="align-self-center" style="display:inline;margin-left:70%">
 										<button type="button" class="btn btn-outline-secondary btn-sm bnone" onclick="moreHotdata('微博')">
 													<i class="mdi mdi-checkbox-multiple-blank"></i> 更多
 												</button>
-										</div>
+										</div> -->
 										
 										
 										</div>
@@ -449,11 +449,11 @@
 										<div class="align-self-center" style="display:inline;">
 										百度热点
 										</div>
-										<div class="align-self-center" style="display:inline;margin-left:70%">
+										<!-- <div class="align-self-center" style="display:inline;margin-left:70%">
 										<button type="button" class="btn btn-outline-secondary btn-sm bnone" onclick="moreHotdata('百度')">
 													<i class="mdi mdi-checkbox-multiple-blank"></i> 更多
 												</button>
-										</div>
+										</div> -->
 										
 										
 										</div>
@@ -518,11 +518,11 @@
 										<div class="align-self-center" style="display:inline;">
 										抖音热榜
 										</div>
-										<div class="align-self-center" style="display:inline;margin-left:70%">
-										<button type="button" class="btn btn-outline-secondary btn-sm bnone" onclick="moreHotdata('抖音')">
+										<!-- <div class="align-self-center" style="display:inline;margin-left:70%">
+										 <button type="button" class="btn btn-outline-secondary btn-sm bnone" onclick="moreHotdata('抖音')">
 													<i class="mdi mdi-checkbox-multiple-blank"></i> 更多
-												</button>
-										</div>
+												</button> 
+										</div> -->
 										
 										
 										</div>
@@ -629,11 +629,11 @@
 										<div class="align-self-center" style="display:inline;">
 										B站热点
 										</div>
-										<div class="align-self-center" style="display:inline;margin-left:70%">
+										<!-- <div class="align-self-center" style="display:inline;margin-left:70%">
 										<button type="button" class="btn btn-outline-secondary btn-sm bnone" onclick="moreHotdata('哔哩哔哩')">
 													<i class="mdi mdi-checkbox-multiple-blank"></i> 更多
 												</button>
-										</div>
+										</div> -->
 										</div>
 										
 										
@@ -740,11 +740,11 @@
 										<div class="align-self-center" style="display:inline;">
 										腾讯热门
 										</div>
-										<div class="align-self-center" style="display:inline;margin-left:70%">
-										<button type="button" class="btn btn-outline-secondary btn-sm bnone" onclick="moreHotdata('腾讯视频')">
+										<!-- <div class="align-self-center" style="display:inline;margin-left:70%">
+										 <button type="button" class="btn btn-outline-secondary btn-sm bnone" onclick="moreHotdata('腾讯视频')">
 													<i class="mdi mdi-checkbox-multiple-blank"></i> 更多
-												</button>
-										</div>
+												</button> 
+										</div> -->
 										</div>
 										
 										<div class="text-center over-load" id="loading7">