Browse Source

页面逻辑修复

tags/v1.0.1-410
wangyi15124 3 years ago
parent
commit
6e5e698d77
3 changed files with 23 additions and 24 deletions
  1. +1
    -1
      src/main/java/com/stonedt/intelligence/controller/SystemController.java
  2. +6
    -7
      src/main/resources/templates/common/zhheader.html
  3. +16
    -16
      src/main/resources/templates/displayboard/displayboard.html

+ 1
- 1
src/main/java/com/stonedt/intelligence/controller/SystemController.java View File

@@ -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);


+ 6
- 7
src/main/resources/templates/common/zhheader.html View File

@@ -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">


+ 16
- 16
src/main/resources/templates/displayboard/displayboard.html View File

@@ -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">


Loading…
Cancel
Save