Merge branch 'master-v32-xwx' into 'master'

天津-首页-删除首页一体化视图入口 See merge request !23

Merge branch 'master-v32-xwx' into 'master'
天津-首页-删除首页一体化视图入口 See merge request !23
王涛
Commit acc95a051fa00fcb49e58fb132bc9f8b9ddeb44f 2 parents e587ac31 b533250a
Showing 2 changed files with 5 additions and 4 deletions
hg-monitor-web-base/src/main/resources/static/src/views/layout.html
hg-monitor-web-zj/src/main/resources/application.yml
--- a/hg-monitor-web-base/src/main/resources/static/src/views/layout.html
View file @acc95a0
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/layout.html
View file @acc95a0
@@ -58,9 +58,10 @@
             <li class="layui-nav-item layui-hide-xs" lay-tips="全局搜索">
                 <a href="javascript:;" layadmin-event="globalSearch"><i class="layui-icon layui-icon-search"></i></a>
             </li>
-            <li class="layui-nav-item" lay-tips="一体化视图">
-                <a href="javascript:;" layadmin-event="toSxView"><i class="layui-icon layui-icon-chart-screen"></i></a>
-            </li>
+            <!-- // Start xwx 2021/10/28  删除天津首页一体化视图 -->
+<!--            <li class="layui-nav-item" lay-tips="一体化视图">-->
+<!--                <a href="javascript:;" layadmin-event="toSxView"><i class="layui-icon layui-icon-chart-screen"></i></a>-->
+<!--            </li>-->
             <li class="layui-nav-item" lay-tips="大屏">
                 <a href="javascript:;" layadmin-event="toBigScreen"><i class="layui-icon layui-icon-chart-screen"></i></a>
             </li>
--- a/hg-monitor-web-zj/src/main/resources/application.yml
View file @acc95a0
+++ b/hg-monitor-web-zj/src/main/resources/application.yml
View file @acc95a0
@@ -29,7 +29,7 @@ url:
 config:
   layer:
     load:
-      icon: hg
+      icon: mj
   audio:
     mp3: 14039
   tingyun: