monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit b6681608e8d818ffe40cf17343d105f018d5994b 2 parents bf477aed 505f80b6

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 6 changed files with 25 additions and 10 deletions
... ... @@ -160,13 +160,22 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
$("#favorites_parentId").val(id);
$(".empty").hide();
var name = $(this).data("name");
//lsq 文字超出10个省略 2022-09-01
var nameAll = $(this).data("name");
let layTips='';
let name='';
if(nameAll && nameAll.length>10){
name=nameAll.substring(0,10)+'...';
layTips='lay-tips="'+nameAll+'"';
}else{
name=nameAll;
}
//动态加载面包屑
var crubmDiv = '';
if (res && res != '0') {//进入资源列表
crubmDiv = '<span lay-separator="">/</span> <a class="breadcrumb_a" data-flag="res" href="javascript:void(0)" id="' + id + '">' + name + '</a>';
crubmDiv = '<span lay-separator="">/</span> <a class="breadcrumb_a" '+layTips+' data-flag="res" href="javascript:void(0)" id="' + id + '">' + name + '</a>';
} else {
crubmDiv = '<span lay-separator="">/</span> <a class="breadcrumb_a" href="javascript:void(0)" id="' + id + '">' + name + '</a>';
crubmDiv = '<span lay-separator="">/</span> <a class="breadcrumb_a" '+layTips+' href="javascript:void(0)" id="' + id + '">' + name + '</a>';
}
if (isInArray(id) == -1) {
$(".layui-breadcrumb").append(crubmDiv);
... ...
... ... @@ -319,7 +319,8 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
var resourceHealthTips;
function baseInfoHover(){
$(".detail_base_info").hover(function () {
//lsq 悬浮提示重叠优化 2022-08-31
$(".index-banner-title .detail_base_info").hover(function () {
openMsg();
}, function () {
layer.close(resourceHealthTips);
... ...
... ... @@ -53,7 +53,7 @@
type="text/html">
<ul class="layui-nav layui-layout-left" style="left:50px;"><!--//lsq 由于增加侧边伸缩按钮，左边距从0更改为50 2022-03-13-->
<li class="layui-nav-item active" data-restype="biz">
<li class="layui-nav-item active" layadmin-event="changeActive" data-restype="biz">
<a href="javascript:;" lay-href="/">应用</a>
</li>
</ul>
... ... @@ -69,7 +69,7 @@
<li class="layui-nav-item" data-restype="{{item.resType}}" data-resnum="{{item.resNum}}"
lay-tips="资源总数：{{item.resNum }} <br>严重告警：{{item.serious}}<br>重要告警：{{item.important}}<br>一般告警：{{item.normal}}"
data-serious="{{item.serious}}" data-important="{{item.important}}"
data-normal="{{item.normal}}" lay-filter="layadmin-app">
data-normal="{{item.normal}}" lay-filter="layadmin-app" layadmin-event="changeActive">
<!--lsq 右上角点击跳转到活动告警 2022-08-31-->
<a href="javascript:;" lay-href="{{ '/biz/list/restype=' + item.resType }}">{{item.resTypeName}}
{{# if(alarmCount!=0){ }}
... ...
... ... @@ -9,7 +9,7 @@
</parent>
<groupId>com.honggroup</groupId>
<artifactId>hg-monitor-web-nx</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>5.4.0</version>
<name>hg-monitor-web-nx</name>
<description>宁夏个性化版本</description>
<properties>
... ... @@ -24,7 +24,7 @@
</dependencies>
<build>
<finalName>nxweb_${timestamp}</finalName>
<finalName>nxweb-${version}.${timestamp}</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
... ...
... ... @@ -9,7 +9,7 @@
</parent>
<groupId>com.honggroup</groupId>
<artifactId>hg-monitor-web-qh</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>5.4.0</version>
<name>hg-monitor-web-qh</name>
<description>青海个性化版本</description>
<properties>
... ... @@ -24,7 +24,7 @@
</dependencies>
<build>
<finalName>zhjk-web-5.4.0.${timestamp}</finalName>
<finalName>zhjk-web-${version}.${timestamp}</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
... ...
... ... @@ -400,6 +400,11 @@ layui.define(['view'], function (exports) {
window.resizeEventFn();
}, 500);
}
//lsq 首页左侧应用点击后样式 2022-09-01
,changeActive:function (othis) {
$('.layui-layout-left .layui-nav-item').removeClass("active");
othis.addClass("active");
}
//刷新
, refresh: function () {
... ...