monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 8da0ba9a4574f00af967c991e4a143b5b2fe7485 2 parents 010c2cb1 ecff3cbc

Merge branch 'master-V32-LH' into 'master' 

杭州-资源视图资源名称样式修改



See merge request !333
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -222,7 +222,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -222,7 +222,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
222 // {field: 'provider', title: '厂商', minWidth: x_130, align: 'center', sort: true}, 222 // {field: 'provider', title: '厂商', minWidth: x_130, align: 'center', sort: true},
223 // {field: 'model', title: '型号', minWidth: x_130, align: 'center', sort: true}, 223 // {field: 'model', title: '型号', minWidth: x_130, align: 'center', sort: true},
224 { 224 {
225 - field: 'resName', title: '资源名称', minWidth: x_330, sort: true, 225 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
226 templet: '#resindex_resName' }, 226 templet: '#resindex_resName' },
227 {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'}, 227 {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'},
228 // {field: 'diskSize', title: '磁盘总大小', minWidth: 120, align: 'center'}, 228 // {field: 'diskSize', title: '磁盘总大小', minWidth: 120, align: 'center'},
@@ -596,13 +596,13 @@ @@ -596,13 +596,13 @@
596 <!--资源名称--> 596 <!--资源名称-->
597 <script type="text/html" id="resindex_resName"> 597 <script type="text/html" id="resindex_resName">
598 <div> 598 <div>
599 - <span 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> 599 + <span lay-tips="{{ d.resName }}" style="float: left;width: 180px;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;" 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>
600 {{# if (d.favId == null) { }} 600 {{# if (d.favId == null) { }}
601 <a class="layui-icon layui-icon-rate hide" data-favid="{{d.favId}}" data-id="{{d.resId}}" lay-tips="加入收藏夹" style="font-size: 14px"></a> 601 <a class="layui-icon layui-icon-rate hide" data-favid="{{d.favId}}" data-id="{{d.resId}}" lay-tips="加入收藏夹" style="font-size: 14px"></a>
602 {{# } else { }} 602 {{# } else { }}
603 - <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> 603 + <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>
604 {{# } }} 604 {{# } }}
605 - <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> 605 + <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>
606 <!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }} 606 <!--{{# if (d.resCategory == 'share' && d.hardwareFlag && d.hardwareFlag.endsWith("Y")) { }}
607 <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> 607 <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>
608 {{# } }}--> 608 {{# } }}-->