Authored by 郗万祥

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

资源列表-【1068】-加入收藏夹和查看资源拓补重叠



See merge request !969
@@ -686,7 +686,7 @@ @@ -686,7 +686,7 @@
686 data-pingenable="{{d.pingEnable}}" data-manageIp="{{d.manageIp}}" data-collProtocol="{{d.collProtocol}}" 686 data-pingenable="{{d.pingEnable}}" data-manageIp="{{d.manageIp}}" data-collProtocol="{{d.collProtocol}}"
687 data-provider="{{d.provider}}" data-state="{{d.state}}" class="layui-table-link">{{ d.resName }}</span> 687 data-provider="{{d.provider}}" data-state="{{d.state}}" class="layui-table-link">{{ d.resName }}</span>
688 {{# if (d.favId == null) { }} 688 {{# if (d.favId == null) { }}
689 - <a class="layui-icon layui-icon-rate hide" style="position: absolute;" data-favid="{{d.favId}}" data-id="{{d.resId}}" lay-tips="加入收藏夹" 689 + <a class="layui-icon layui-icon-rate hide" data-favid="{{d.favId}}" data-id="{{d.resId}}" lay-tips="加入收藏夹"
690 style="font-size: 14px"></a> 690 style="font-size: 14px"></a>
691 {{# } else { }} 691 {{# } else { }}
692 <a class="layui-icon layui-icon-rate-solid" data-favid="{{d.favId}}" 692 <a class="layui-icon layui-icon-rate-solid" data-favid="{{d.favId}}"