Authored by 王涛

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

打开我的面板页面,刷新我的面板名称修改为设计器预览,在处理遍历页签选项卡时,if(el.attr('lay-href-type') == 'menu' && !…



See merge request !500
... ... @@ -851,9 +851,24 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
$('table tr').hover(function (obj) {
$(obj.currentTarget).find('.reslist-view-topo').removeClass('hide');
$(obj.currentTarget).find('.reslist-assets-details').removeClass('hide');
// Start 资源视图中的资源名称在表格中溢出时给最大宽度限制-更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6
var w=$(obj.currentTarget).find('#res-div span').innerWidth();
var spanMaxW=parseInt($(obj.currentTarget).find('#res-div span').css('max-width'));
//-20是一个图标的宽度,若要增加图标,这里的20需要增加
var maxW=(w-20)+'px';
if(w+15>=spanMaxW){
$(obj.currentTarget).find('#res-div span').css('max-width',maxW)
}
}, function (obj) {
$(obj.currentTarget).find('.reslist-view-topo').addClass('hide');
$(obj.currentTarget).find('.reslist-assets-details').addClass('hide');
var w=$(obj.currentTarget).find('#res-div span').innerWidth();
var spanMaxW=parseInt($(obj.currentTarget).find('#res-div span').css('max-width'));
var maxW=(w+20)+'px';
if(w+15>=spanMaxW){
$(obj.currentTarget).find('#res-div span').css('max-width',maxW)
}
//End LSQ 2022/1/6
})
// 加入/移出收藏夹
... ...
... ... @@ -96,7 +96,7 @@ layui.extend({
//请求视图渲染
view().render(path.join('/')).then(function(res){
console.log("tag&&&&&&&&&",res,pathURL)
//遍历页签选项卡
var matchTo
,tabs = $('#LAY_app_tabsheader>li');
... ... @@ -113,7 +113,9 @@ layui.extend({
try {
let el = admin.tabsPage.elem;
if(el && el.attr('lay-href-type')){
if(el.attr('lay-href-type') == 'menu' && !matchTo){
//lsq 页面刷新后名称改变 2022-03-29
// if(el.attr('lay-href-type') == 'menu' && !matchTo){
if(el.attr('lay-href-type') == 'menu'){
tabName= admin.tabsPage.elem.text()
}
}
... ...
... ... @@ -533,7 +533,72 @@
</p>
</div>
</script>
<!--//start lsq 首页、资源视图、业务视图的资源名称点击进入详情-->
<!--资源名称-->
<script type="text/html" id="resindex_resName">
<!-- 更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6-->
<div id="res-div">
{{# var urlLast=window.location.hash;
var w=$(".layui-table thead th[data-field='resName']").data('minwidth');
if(urlLast=="#/res/index"){
w=$("[lay-id='resListTable'] table thead th[data-field='resName'").data('minwidth');
}else if(urlLast=="#/biz/index"){
w=$("[lay-id='bizListTable'] table thead th[data-field='resName'").data('minwidth');
}else if(urlLast.indexOf("#/biz/list")!=-1){
w=$("[lay-id='bizResListTable'] table thead th[data-field='resName'").data('minwidth');
w=w?w:$("[lay-id='bizResListTable'] table thead th[data-field='resName'").innerWidth();
}
var maxW=(w-45)+'px';
var styleW="float: left;max-width: "+maxW+";overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;";
}}
<span lay-tips="{{ d.resName }}" style="{{styleW}}" data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminname="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" data-manageIp="{{d.manageIp}}" data-collProtocol="{{d.collProtocol}}" data-provider="{{d.provider}}" data-state="{{d.state}}" class="layui-table-link">{{ d.resName }}</span>
{{# if (d.favId == null) { }}
<a class="layui-icon layui-icon-rate hide" data-favid="{{d.favId}}" data-id="{{d.resId}}" lay-tips="加入收藏夹" style="font-size: 14px"></a>
{{# } else { }}
<a class="layui-icon layui-icon-rate-solid" data-favid="{{d.favId}}" style="color: #FEB61E; font-size: 14px; margin-left: 1px;" data-id="{{d.resId}}" lay-tips="移出收藏夹"></a>
{{# } }}
<a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 1px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>
<!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }}
<a class="layui-icon reslist-assets-details hide" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-ip="{{ d.ip }}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>
{{# } }}-->
</div>
</script>
<!--详情页面连接状态-->
<script type="text/html" id="linkStateDetailTpl">
{{#
var linkStateHtml = '';
var linkStateTips = '无连接信息';
if(d.linkStateList && d.linkStateList.length) {
linkStateTips = '';
if(d.linkStateList.length == 1) {
var linkState = d.linkStateList[0];
linkStateTips = `${linkState.protocol}: ${linkState.state}`;
if(linkState.state.indexOf('成功') !== -1) {
linkStateHtml = `<span class="span-green">${linkState.state}</span>`;
} else {
linkStateHtml = `<span class="span-red">${linkState.state}</span>`;
}
} else {
linkStateTips += `<ul class='ul-link-state-tips'>`;
layui.each(d.linkStateList, function(index, value) {
if(value.state.indexOf('成功') !== -1) {
linkStateTips += `<li class='li-link-state-tips-green'>${value.protocol}: ${value.state}</li>`;
linkStateHtml += '<div class="layui-badge-dot layui-bg-green"></div>';
} else {
linkStateTips += `<li class='li-link-state-tips-red'>${value.protocol}: ${value.state}</li>`;
linkStateHtml += '<div class="layui-badge-dot layui-bg-red"></div>';
}
});
linkStateTips += '</ul>';
}
}
}}
<div class="div-link-state-list" lay-tips="{{linkStateTips}}">
{{linkStateHtml}}
</div>
</script>
<!--//end lsq 2022-03-29-->
<!--最大文件系统使用率-->
<script type="text/html" id="fileUseRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI449F5365" data-flag="fs" data-name="{{d.os=='windows'?'磁盘使用情况':'文件系统使用情况'}}" data-showtype="bar" data-barkpiid="{{d.os=='windows'?'KPI29D42042,KPI1988842F':'KPIA91F44E7,KPI98306224'}}" data-barxaxis="{{d.os=='windows'?'KPI9D22EAB6':'KPI7AC1664E'}}"
... ...
... ... @@ -1028,8 +1028,23 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
//绑定鼠标移入移出事件
$('table tr').hover(function (obj) {
$(obj.currentTarget).find('.reslist-view-topo').removeClass('hide');
// Start 资源视图中的资源名称在表格中溢出时给最大宽度限制-更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6
var w=$(obj.currentTarget).find('#res-div span').innerWidth();
var spanMaxW=parseInt($(obj.currentTarget).find('#res-div span').css('max-width'));
//-20是一个图标的宽度,若要增加图标,这里的20需要增加
var maxW=(w-20)+'px';
if(w+15>=spanMaxW){
$(obj.currentTarget).find('#res-div span').css('max-width',maxW)
}
}, function (obj) {
$(obj.currentTarget).find('.reslist-view-topo').addClass('hide');
var w=$(obj.currentTarget).find('#res-div span').innerWidth();
var spanMaxW=parseInt($(obj.currentTarget).find('#res-div span').css('max-width'));
var maxW=(w+20)+'px';
if(w+15>=spanMaxW){
$(obj.currentTarget).find('#res-div span').css('max-width',maxW)
}
//End LSQ 2022/1/6
})
// 加入/移出收藏夹
... ...
... ... @@ -596,6 +596,9 @@
}else if(urlLast=="#/biz/index"){
w=$("[lay-id='bizListTable'] table thead th[data-field='resName'").data('minwidth');
}else if(urlLast.indexOf("#/biz/list")!=-1){
w=$("[lay-id='bizResListTable'] table thead th[data-field='resName'").data('minwidth');
w=w?w:$("[lay-id='bizResListTable'] table thead th[data-field='resName'").innerWidth();
}
var maxW=(w-45)+'px';
var styleW="float: left;max-width: "+maxW+";overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;";
... ...