Merge branch 'master-v32-xwx' into 'master'

杭州-资源视图-基本信息悬浮框无数据时不展示



See merge request !291

@@ -3427,19 +3427,21 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 $content.find('[lay-tips]').removeAttr('lay-tips');
                 $content.find('[lay-tips]').removeAttr('lay-tips');
                 // detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true});
                 // detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true});
                 //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --start
                 //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --start
-                detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{
-                    id: 'base-info-tips',
-                    area:[w, 'auto'],
-                    time:0,
-                    tips: [direction],
-                    tipsMore: true,
-                    //添加遮罩层 默认透明度为0.3
-                    shade: [0.1, '#00000000'],
-                    //是否点击遮罩关闭
-                    shadeClose: true
-                });
-                //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --end
-                window.detailTips = detailTips;
+                if (len>0) {
+                    detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that, {
+                        id: 'base-info-tips',
+                        area: [w, 'auto'],
+                        time: 0,
+                        tips: [direction],
+                        tipsMore: true,
+                        //添加遮罩层 默认透明度为0.3
+                        shade: [0.1, '#00000000'],
+                        //是否点击遮罩关闭
+                        shadeClose: true
+                    });
+                    //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --end
+                    window.detailTips = detailTips;
+                }
             });
             });
         // ,function () {
         // ,function () {
         //         layer.close(detailTips);
         //         layer.close(detailTips);

@@ -6,7 +6,7 @@
                 <div class="layui-card-body">
                 <div class="layui-card-body">
                     <div class="lay-row">
                     <div class="lay-row">
                         <div class="lay-row-item">
                         <div class="lay-row-item">
-                            <h5 class="lay-row-title">基本信息</h5>
+                            <h5 class="lay-row-title">基本信息<i data-id="nginx_jbxx" class="iconfont detail_base_info">&#xe61e;</i></h5>
                             <ul class="info-table" id="nginx_jbxx">
                             <ul class="info-table" id="nginx_jbxx">
                             </ul>
                             </ul>
                         </div>
                         </div>