Authored by wangtao

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/src/lib/view.js
... ... @@ -3003,156 +3003,6 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
layer.close(nameClickLoading);
},
//start lsq 停机计划中的右键点击事件 2022-05-19
contextmenuEvent: function (){
var contextmenuTips;
let urlHash=window.location.hash;
$('[type=button]').attr('title','点击鼠标右键查看功能点描述信息')
$('td .layui-table-link').attr('title','点击鼠标右键查看功能点描述信息')
$('table thead tr th span').attr('title','点击鼠标右键查看功能点描述信息')
$('[type=button]').contextmenu(function (e) {
e.preventDefault();
//按钮
let that=$(this);
let elementName=that.text().replace(regular, "");
admin.req({
url: common.domainName + '/api-web/bHalt'
,data:{
urlHash:urlHash,
elementName:elementName
}
, async: false
, done: function (res) {
let liEle=''
var contextmenuEl='<ul id="tipContextmenu" class="contextmenu-style" style="color:#fff;">';
if(res.data && res.data.length>0){
let tipData=res.data;
tipData.map(item=>{
contextmenuEl+='<li>'+item.elementExplain+'</li>';
})
}else{
contextmenuEl+='<li>'+elementName+'</li>';
}
contextmenuEl+='</ul>';
contextmenuTips = layer.tips(contextmenuEl, that, {
time: 0,
tips: [3, '#1e9fff'],
success() {
}
})
}
})
})
// $('.layui-table-link').parents('td').contextmenu(function (e) {
$('td .layui-table-link').contextmenu(function (e) {
e.preventDefault();
//超链接
let that=$(this);
let elementName=that.text().replace(regular, "");
admin.req({
url: common.domainName + '/api-web/bHalt'
,data:{
urlHash:urlHash,
elementName:elementName
}
, async: false
, done: function (res) {
let liEle=''
var contextmenuEl='<ul id="tipContextmenu" class="contextmenu-style" style="color:#fff;">';
if(res.data && res.data.length>0){
let tipData=res.data;
tipData.map(item=>{
contextmenuEl+='<li>'+item.elementExplain+'</li>';
})
}else{
contextmenuEl+='<li>'+elementName+'</li>';
}
contextmenuEl+='</ul>';
contextmenuTips = layer.tips(contextmenuEl, that, {
time: 0,
tips: [3, '#1e9fff'],
success() {
}
})
}
})
})
// $('table thead tr th').contextmenu(function (e) {
$('table thead tr th span').contextmenu(function (e) {
e.preventDefault();
//表头
let that=$(this);
let elementName=that.text().replace(regular, "");
admin.req({
url: common.domainName + '/api-web/bHalt'
,data:{
urlHash:urlHash,
elementName:elementName
}
, async: false
, done: function (res) {
let liEle=''
var contextmenuEl='<ul id="tipContextmenu" class="contextmenu-style" style="color:#fff;">';
if(res.data && res.data.length>0){
let tipData=res.data;
tipData.map(item=>{
contextmenuEl+='<li>'+item.elementExplain+'</li>';
})
}else{
contextmenuEl+='<li>'+elementName+'</li>';
}
contextmenuEl+='</ul>';
contextmenuTips = layer.tips(contextmenuEl, that, {
time: 0,
tips: [3, '#1e9fff'],
success() {
}
})
}
})
})
/*$('[data-contextmenu]').contextmenu(function (e) {
e.preventDefault();
let text='';
if($(this).data('contextmenu')=='link'){
//超链接
text='超链接';
}else if($(this).data('contextmenu')=='button'){
//按钮
text='按钮';
}else if($(this).data('contextmenu')=='th'){
//表头
text='表头';
}
var contextmenuEl='<ul class="contextmenu-style" style="color:#fff;">';
contextmenuEl+='<li>name--'+text+'->'+$(this).text()+'</li>';
contextmenuEl+='</ul>';
contextmenuTips = layer.tips(contextmenuEl, $(this), {
time: 0,
tips: [1, '#1e9fff'],
success() {
}
})
})*/
$(document).on('click', function (event) {
//lsq 停机计划右键tip取消 2022-05-19
// var _con1 = $('[data-contextmenu]'); // 设置目标区域
var _con1 = $('[type=button]'); // 设置目标区域
var _con2 = $('.layui-table-link'); // 设置目标区域
var _con3 = $('table thead tr th'); // 设置目标区域
/*if (contextmenuTips && !_con1.is(event.target) && _con1.has(event.target).length === 0) {
layer.close(contextmenuTips);
}*/
if (contextmenuTips && (!_con1.is(event.target) || !_con2.is(event.target) || !_con3.is(event.target)) && (_con1.has(event.target).length === 0 || _con2.has(event.target).length === 0 || _con3.has(event.target).length === 0)) {
layer.close(contextmenuTips);
}
})
}
//end lsq 停机计划中的右键点击事件 2022-05-19
};
//对外暴露的接口
... ...
... ... @@ -236,12 +236,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}).done(function (res) {
var flags = "";
var kpiIdList= "";
//start lsq 判断当前kpiId是否在状态指标数据列表中 2022-06-08
let status=statusKpiList.indexOf(v.id);
if(status!=-1){
statusF=true;
}
//end lsq 2022-06-08
var data = res.data;
if (data.length > 0) {
var dataArr = common.splieceGroup(data, cols);
... ... @@ -252,6 +246,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
$.each(v, function (j, ar) {
var valueStr = '';
var titleStr = '';
//start lsq 判断当前kpiId是否在状态指标数据列表中 2022-06-08
let status=statusKpiList.indexOf(ar.id);
if(status!=-1){
statusF=true;
}
//end lsq 2022-06-08
if(ar.id == 'KPIE13DD9A3' ) {
valueStr = laytpl($("#linkStateDetailTpl").html()).render({linkStateList: ar.value});
} else if (ar.value != 'null'){
... ... @@ -274,10 +274,10 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
kpiIdList += ar.id + ",";
}
//start lsq 更改下探图标的属性值 2022-06-08
var tips = '<a class="detail_row_menu hide" data-statusf='+statusF+' data-id='+v.id+' data-flag='+v.flag+
' data-name='+v.name+' data-kpiname='+v.name+' data-iswarning=1 data-ident=1' +
var tips = '<a class="detail_row_menu hide" data-statusf="'+statusF+'" data-id='+ar.id+' data-flag='+ar.flag+
' data-name='+ar.name+' data-kpiname='+ar.name+' data-iswarning=1 data-ident=1' +
' data-trend=0 data-unit="" data-hidem="hidem" data-nature="true" ' +
' data-restype='+(v.resType?v.resType:"")+'>\n' +
' data-restype='+(ar.resType?ar.resType:"")+'>\n' +
'<img style="width: 17px;height: 17px;" src="/src/style/img/icon_row_menu.png">\n' +
'</a>'
//end lsq 2022-06-08
... ... @@ -1964,7 +1964,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}
return chbox + '<a class="link showlinechart_' + tableId + '" style="padding-left:5px;' + resStyle + '" ' + 'data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '"' +
'data-trend="' + value.isTrend + '" data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '">' + value.kpiValue + '</a>' +
'<a class="detail_row_menu hide" data-statusf='+statusF+' data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '" data-trend="' + value.isTrend + '" ' +
'<a class="detail_row_menu hide" data-statusf="'+statusF+'" data-isWarning="' + value.isWarning + '" data-ident="' + value.kpiIdent + '" data-trend="' + value.isTrend + '" ' +
'data-id="' + v.id + '" data-kpiname="' + kpiname + '" data-name="' + v.name + '" data-flag="' + value.flag + '"' +
'data-canca="' + value.canCA + '" data-incaing="' + value.inCAing + '" data-restype="' + resType + '"' +
'>' +
... ... @@ -2414,7 +2414,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
var kpiName = d.kpiName == 'TYPE'?'ERRPT':d.kpiName;
let chbox='';
if(status!=-1){
chbox='<a class="detail_row_menu hide" data-one="1" data-statusf='+statusF+' data-isWarning="' + d.isWarning + '" data-ident="' + d.kpiIdent + '" data-trend="' + d.isTrend + '" ' +
chbox='<a class="detail_row_menu hide" data-one="1" data-statusf="'+statusF+'" data-isWarning="' + d.isWarning + '" data-ident="' + d.kpiIdent + '" data-trend="' + d.isTrend + '" ' +
'data-id="' + d.kpiId + '" data-kpiname="' + d.kpiName + '" data-name="' + d.name + '" data-flag="' + d.flag + '"' +
'data-canca="' + d.canCA + '" data-incaing="' + d.inCAing + '" data-restype="' + d.resType + '"' +
'>' +
... ...
... ... @@ -253,8 +253,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
}
}]],
done: function (res, curr, count) {
//lsq 停机计划中的右键点击事件 2022-05-19
layui.commonCols.contextmenuEvent();
//点击名称 进行编辑
$('[shutdownplan-data-edit]').on('click', function () {
... ...
... ... @@ -12,7 +12,7 @@ layui.extend({
, admin: 'lib/admin' //核心模块
/*,sessions: 'controller/sessions'*/
, view: 'lib/view' //核心模块
}).define(['setter', 'admin'], function (exports) {
}).define(['setter', 'admin','pageTips'], function (exports) {
var setter = layui.setter
, element = layui.element
, admin = layui.admin
... ...
... ... @@ -244,13 +244,12 @@ layui.define(['laytpl', 'layer'], function(exports){
that.parse(html);
view.removeLoad();
// 弹框
try{
// 弹框
layui.pageTips.init();
}catch (e) {
console.log(e)
}
if(that.done){
that.done(res);
delete that.done;
... ...