monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 8faae5ae37ce8cfaf4cf2e96fa91033aa984b10f 1 parent 04e7af40

拓扑图标更换

Inline Side-by-side
Showing 12 changed files with 31 additions and 13 deletions
@@ -3478,7 +3478,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3478,7 +3478,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3478 title += `<a class="layui-icon layui-icon-rate" data-id=${resId} lay-tips="加入收藏夹"></a>`; 3478 title += `<a class="layui-icon layui-icon-rate" data-id=${resId} lay-tips="加入收藏夹"></a>`;
3479 } 3479 }
3480 title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`; 3480 title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
3481 - title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"><i class="iconfont">&#XE515;</i></a>`; 3481 + title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"></a>`;
3482 //lsq 2022-04-25 增加ping详情提交按钮 3482 //lsq 2022-04-25 增加ping详情提交按钮
3483 title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${resName} data-ip=${ip} data-restypename=${resTypeName} data-adminname=${adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`; 3483 title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${resName} data-ip=${ip} data-restypename=${resTypeName} data-adminname=${adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
3484 if (resCategory === 'share' && hardwareFlag.endsWith("Y")) { 3484 if (resCategory === 'share' && hardwareFlag.endsWith("Y")) {
@@ -3508,7 +3508,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele @@ -3508,7 +3508,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
3508 title += `<a class="layui-icon layui-icon-play" id=${resId} data-opts="start" style="display: none" lay-tips="恢复采集"></a>` 3508 title += `<a class="layui-icon layui-icon-play" id=${resId} data-opts="start" style="display: none" lay-tips="恢复采集"></a>`
3509 title += `<a class="layui-icon layui-icon-rate" data-id=${resId} lay-tips="加入收藏夹"></a>`; 3509 title += `<a class="layui-icon layui-icon-rate" data-id=${resId} lay-tips="加入收藏夹"></a>`;
3510 title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`; 3510 title += `<a class="layui-icon filterList" data-id=${resId} lay-tips="指标过滤清单" style="margin-left: 10px"><i class="iconfont">&#XE516;</i></a>`;
3511 - title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"><i class="iconfont">&#XE515;</i></a>`; 3511 + title += `<a class="layui-icon res-view-relation-topo" data-id=${resId} lay-tips="查看资源关系拓扑" style="margin-left: 10px"></a>`;
3512 //lsq 2022-04-25 增加ping详情提交按钮 3512 //lsq 2022-04-25 增加ping详情提交按钮
3513 title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`; 3513 title += `<a class="layui-icon res-view-ping" data-id=${resId} data-resname=${res.resName} data-ip=${ip} data-restypename=${res.resTypeName} data-adminname=${res.adminName} lay-tips="历史数据" style="margin-left: 10px;position:relative;top:-3px;"> <img width="20" src="/src/style/img/ping.png" ></a>`;
3514 title += `<div style="width:60px;display:flex;justify-content: flex-end"><a class="layui-icon res-view-addSnapshot" data-id=${resId} lay-tips="创建快照" style=" margin: 0 10px"> <img width="20" src="/src/style/img/snapshotadd.png" ></a>`; 3514 title += `<div style="width:60px;display:flex;justify-content: flex-end"><a class="layui-icon res-view-addSnapshot" data-id=${resId} lay-tips="创建快照" style=" margin: 0 10px"> <img width="20" src="/src/style/img/snapshotadd.png" ></a>`;
@@ -257,7 +257,7 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports @@ -257,7 +257,7 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports
257 } else { 257 } else {
258 favStr = `<a class="layui-icon layui-icon-rate-solid" data-favid="${d.favId}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" data-id="${d.resId}" lay-tips="移出收藏夹"></a>`; 258 favStr = `<a class="layui-icon layui-icon-rate-solid" data-favid="${d.favId}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" data-id="${d.resId}" lay-tips="移出收藏夹"></a>`;
259 } 259 }
260 - var topoStr = `<a class="layui-icon reslist-view-topo hide" data-resid="${d.resId}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>`; 260 + var topoStr = `<a class="layui-icon reslist-view-topo hide" data-resid="${d.resId}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"></a>`;
261 var assetsStr = ''; 261 var assetsStr = '';
262 if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { 262 if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) {
263 /* 263 /*
@@ -106,7 +106,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -106,7 +106,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
106 }, { 106 }, {
107 field: 'resName', title: '资源名称', align: 'left', sort: true, minWidth: '410', 107 field: 'resName', title: '资源名称', align: 'left', sort: true, minWidth: '410',
108 templet: '<div><span data-id="{{d.id}}" class="layui-table-link link-relation-res-name">{{d.resName}}' + 108 templet: '<div><span data-id="{{d.id}}" class="layui-table-link link-relation-res-name">{{d.resName}}' +
109 - ' <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>' + 109 + ' <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"></a>' +
110 '</span></div>' 110 '</span></div>'
111 }, { 111 }, {
112 field: 'resTypeName', title: '资源类型', align: 'center', sort: true, width: '160' 112 field: 'resTypeName', title: '资源类型', align: 'center', sort: true, width: '160'
@@ -122,7 +122,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -122,7 +122,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
122 } 122 }
123 return `<div> 123 return `<div>
124 <span>` + d.targetName + 124 <span>` + d.targetName +
125 - `<a class="layui-icon ` + viewTope + ` hide" data-resid="{{d.targetId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a> 125 + `<a class="layui-icon ` + viewTope + ` hide" data-resid="{{d.targetId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"></a>
126 </span> 126 </span>
127 </div>` 127 </div>`
128 } 128 }
@@ -772,7 +772,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', @@ -772,7 +772,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
772 } else { 772 } else {
773 html += '<a class="layui-icon layui-icon-rate-solid" data-favid="' + d.favId + '" style="color: #FEB61E; font-size: 14px;" data-id="' + d.resId + '" lay-tips="移出收藏夹"></a>' 773 html += '<a class="layui-icon layui-icon-rate-solid" data-favid="' + d.favId + '" style="color: #FEB61E; font-size: 14px;" data-id="' + d.resId + '" lay-tips="移出收藏夹"></a>'
774 } 774 }
775 - html += '<a class="layui-icon reslist-view-topo hide" data-resid="' + d.resId + '" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>'; 775 + html += '<a class="layui-icon reslist-view-topo hide" data-resid="' + d.resId + '" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"></a>';
776 if ((d.resCategory === 'share' || d.resCategory === 'assets') && d.hardwareFlag.endsWith("Y")) { 776 if ((d.resCategory === 'share' || d.resCategory === 'assets') && d.hardwareFlag.endsWith("Y")) {
777 /* 777 /*
778 html += '<a class="layui-icon resmanage-assets-details hide" data-id="'+d.resId+'" data-ip="'+ d.ip +'" data-restype="'+d.resType+'" data-name="'+d.resName+'" data-rescategory="'+d.resCategory+'" data-hardwareflag="'+d.hardwareFlag+'" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>' 778 html += '<a class="layui-icon resmanage-assets-details hide" data-id="'+d.resId+'" data-ip="'+ d.ip +'" data-restype="'+d.resType+'" data-name="'+d.resName+'" data-rescategory="'+d.resCategory+'" data-hardwareflag="'+d.hardwareFlag+'" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="资产配置信息"><i class="iconfont">&#XE517;</i></a>'
@@ -8634,3 +8634,21 @@ form.layui-card-header.layuiadmin-card-header-auto { @@ -8634,3 +8634,21 @@ form.layui-card-header.layuiadmin-card-header-auto {
8634 height: 100%; 8634 height: 100%;
8635 cursor: pointer; 8635 cursor: pointer;
8636 } 8636 }
  8637 +
  8638 +.reslist-view-topo{
  8639 + color:#898b90!important;
  8640 + background-image: url("../img/topu.png");
  8641 + background-size: 100%;
  8642 + background-repeat: no-repeat;
  8643 + width: 16px;
  8644 + height: 16px;
  8645 + padding-left: 14px;
  8646 +}
  8647 +.bizcard-view-topo{
  8648 + color:#898b90!important;
  8649 + background-image: url("../img/topu.png");
  8650 + background-size: 100%;
  8651 + background-repeat: no-repeat;
  8652 + width: 16px;
  8653 + height: 16px;
  8654 +}
@@ -206,7 +206,7 @@ @@ -206,7 +206,7 @@
206 <div class="layui-card-header"> 206 <div class="layui-card-header">
207 {{ item.resTypeName }} 207 {{ item.resTypeName }}
208 <a class="layui-icon bizcard-view-topo {{d.isBiz ? '' : 'hide'}}" data-busid="{{item.resType}}" 208 <a class="layui-icon bizcard-view-topo {{d.isBiz ? '' : 'hide'}}" data-busid="{{item.resType}}"
209 - style="color: #FEB61E; float: right" lay-tips="查看业务拓扑"><i class="iconfont">&#XE515;</i></a> 209 + style="color: #FEB61E; float: right" lay-tips="查看业务拓扑"></a>
210 </div> 210 </div>
211 <div class="layui-card-body card-main"> 211 <div class="layui-card-body card-main">
212 <ul> 212 <ul>
@@ -295,7 +295,7 @@ @@ -295,7 +295,7 @@
295 <i class="{{bizClas}}"></i> 295 <i class="{{bizClas}}"></i>
296 <span>{{item.title}}<a class="layui-icon bizcard-view-topo {{isBiz ? '' : 'hide'}}" 296 <span>{{item.title}}<a class="layui-icon bizcard-view-topo {{isBiz ? '' : 'hide'}}"
297 data-busid="{{item.busId}}" style="color: #FEB61E; margin-left: 10px" 297 data-busid="{{item.busId}}" style="color: #FEB61E; margin-left: 10px"
298 - lay-tips="查看业务拓扑"><i class="iconfont">&#XE515;</i></a></span> 298 + lay-tips="查看业务拓扑"></a></span>
299 <div class="index-banner-title-desc"><span>{{item.countTxt}}</span></div> 299 <div class="index-banner-title-desc"><span>{{item.countTxt}}</span></div>
300 <i id="{{item.busId}}" class="iconfont detail_base_info" 300 <i id="{{item.busId}}" class="iconfont detail_base_info"
301 style="color:rgb(30,159,255);display: none;">&#xe61e;</i> 301 style="color:rgb(30,159,255);display: none;">&#xe61e;</i>
@@ -317,7 +317,7 @@ @@ -317,7 +317,7 @@
317 <div class="index-banner-item-title"> 317 <div class="index-banner-item-title">
318 <p>{{item.busTypeName}}<a class="layui-icon bizcard-view-topo" data-busid="{{item.busId}}" 318 <p>{{item.busTypeName}}<a class="layui-icon bizcard-view-topo" data-busid="{{item.busId}}"
319 style="color: #FEB61E; float: right; margin-left: 10px; margin-bottom: 2px" 319 style="color: #FEB61E; float: right; margin-left: 10px; margin-bottom: 2px"
320 - lay-tips="查看业务拓扑"><i class="iconfont">&#XE515;</i></a></p> 320 + lay-tips="查看业务拓扑"></a></p>
321 {{# if(item.topTime != ''){ }} 321 {{# if(item.topTime != ''){ }}
322 <i class="iconfont top_icon" data-type="" data-id="{{item.busId}}" lay-tips="已置顶，点击取消置顶">&#xe61c;</i> 322 <i class="iconfont top_icon" data-type="" data-id="{{item.busId}}" lay-tips="已置顶，点击取消置顶">&#xe61c;</i>
323 {{# } }} 323 {{# } }}
@@ -640,7 +640,7 @@ @@ -640,7 +640,7 @@
640 style="color: #FEB61E; font-size: 14px; margin-left: 1px;" data-id="{{d.resId}}" lay-tips="移出收藏夹"></a> 640 style="color: #FEB61E; font-size: 14px; margin-left: 1px;" data-id="{{d.resId}}" lay-tips="移出收藏夹"></a>
641 {{# } }} 641 {{# } }}
642 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" 642 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}"
643 - style="color: #FEB61E; font-size: 14px; margin-left: 1px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a> 643 + style="color: #FEB61E; font-size: 14px; margin-left: 1px;" lay-tips="查看资源拓扑"></a>
644 <!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }} 644 <!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }}
645 <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> 645 <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>
646 {{# } }}--> 646 {{# } }}-->
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 <i class="biz-tpr-fill"></i> 53 <i class="biz-tpr-fill"></i>
54 <i class="biz-tpr-val" data-biz-degree="56"></i> 54 <i class="biz-tpr-val" data-biz-degree="56"></i>
55 <ul> 55 <ul>
56 - <li>100</li> 56 + <li maximumScale="switchboard">100</li>
57 <li>90</li> 57 <li>90</li>
58 <li>80</li> 58 <li>80</li>
59 <li>70</li> 59 <li>70</li>
@@ -688,7 +688,7 @@ @@ -688,7 +688,7 @@
688 style="color: #FEB61E; font-size: 14px; margin-left: 1px;" data-id="{{d.resId}}" lay-tips="移出收藏夹"></a> 688 style="color: #FEB61E; font-size: 14px; margin-left: 1px;" data-id="{{d.resId}}" lay-tips="移出收藏夹"></a>
689 {{# } }} 689 {{# } }}
690 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" 690 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}"
691 - style="color: #FEB61E; font-size: 14px; margin-left: 1px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a> 691 + style="color: #FEB61E; font-size: 14px; margin-left: 1px;" lay-tips="查看资源拓扑"></a>
692 <!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }} 692 <!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }}
693 <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> 693 <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>
694 {{# } }}--> 694 {{# } }}-->
@@ -694,7 +694,7 @@ @@ -694,7 +694,7 @@
694 style="color: #FEB61E; font-size: 14px; margin-left: 1px;" data-id="{{d.resId}}" lay-tips="移出收藏夹"></a> 694 style="color: #FEB61E; font-size: 14px; margin-left: 1px;" data-id="{{d.resId}}" lay-tips="移出收藏夹"></a>
695 {{# } }} 695 {{# } }}
696 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" 696 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}"
697 - style="color: #FEB61E; font-size: 14px; margin-left: 1px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a> 697 + style="color: #FEB61E; font-size: 14px; margin-left: 1px;" lay-tips="查看资源拓扑"></a>
698 <!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }} 698 <!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }}
699 <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> 699 <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>
700 {{# } }}--> 700 {{# } }}-->