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

【无】资源详情页的基本信息悬浮样式调整



See merge request !872

@@ -128,6 +128,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                     var li = '<div style="text-align:center;">'
                         + '<i style="line-height: 150px; padding:20px;font-style:normal;">' + "暂无数据" + '</i>' + '</div>'
                 }
+                $('.detail_base_info').attr('data-infotext','text');
                 $.each(data, function (i, v) {
                     var fontColor = '';
                     var valueStr = '';
@@ -237,6 +238,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 var flags = "";
                 var kpiIdList = "";
                 var data = res.data;
+                $('.detail_base_info').attr('data-infotext','textCols');
+
                 if (data.length > 0) {
                     var dataArr = common.splieceGroup(data, cols);
                     var li = "";
@@ -4000,8 +4003,26 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 direction || (direction = 2);
                 var len = $(`#${targetId}`).find("li").eq(0).find("span").length;
                 var w = "420px";
-                if (len && len > 2) {
+               /* if (len && len > 2) {
                     w = '740px';
+                }*/
+
+                //lsq 判断是否两列显示 2022-06-28
+                var count=$(this).data('count');
+                var info_text=$(this).data('infotext');
+                if(count>12 && info_text=='text'){
+                    //两列显示
+                    w = '820px';
+                    $(`#${targetId}`).addClass('info-table-two')
+                }else{
+                    //一列显示
+                    if(len && len > 2){
+                        w = '740px';
+                    }
+                    //lsq renderTextCols基本信息悬浮中下探样式 2022-08-09
+                    // if(info_text=='textCols'){
+                        $(`#${targetId}`).addClass('info-table-three')
+                    // }
                 }
                 var $content = $(`#${targetId}`).clone();
                 $content.find('[lay-tips]').removeAttr('lay-tips');
@@ -4017,7 +4038,20 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         //添加遮罩层 默认透明度为0.3
                         shade: [0.1, '#00000000'],
                         //是否点击遮罩关闭
-                        shadeClose: true
+                        shadeClose: true,
+                        closeBtn:true,
+                        success:function(){
+                            let resId=$(`#${targetId}` + `_detail_row_menu.statusMenu`).data('resid')
+                            $(`#${targetId}` + `_detail_row_menu.statusMenu`).hover(function () {
+                                var $that = $(this);
+                                var $btn = $that.find(".detail_row_menu");
+                                if ($btn.length > 0) {
+                                    $(".layui-card-body").find(".detail_row_menu:not(.hide)").addClass("hide")
+                                    $btn.removeClass("hide");
+                                }
+                            });
+                            filterSuppressMonitor(resId)
+                        }
                     });
                     //xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --end
                     window.detailTips = detailTips;
@@ -4446,6 +4480,12 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
     function filterSuppressMonitor(resId) {
         //菜单按钮点击事件
         $("a.detail_row_menu").off("click").on("click", function (e) {
+            if (e.preventDefault()) {
+                e.preventDefault();
+            }
+            if (e.stopPropagation()) {
+                e.stopPropagation();
+            }
             $("#detail_menubox_id").remove();
             var $menu = $(this);
             var hideM = $menu.data('hidem');

@@ -8563,3 +8563,53 @@ form.layui-card-header.layuiadmin-card-header-auto {
 .layui-layer-tips{
     word-break: break-all;
 }
+/*start lsq x86增加了8个指标后的基本信息样式 2022-06-28*/
+.layui-layer-tips .info-table-two{
+    display: flex;
+    flex-wrap: wrap;
+}
+.layui-layer-tips .layui-layer-content .info-table-two li{
+    width:50%;
+}
+.layui-layer-tips .info-table-two li:nth-child(4n-1){
+    background-color: #262323 !important;
+}
+.layui-layer-tips .info-table-two li:nth-child(2n){
+    background-color: inherit !important;
+}
+.layui-layer-tips .info-table-two li:nth-child(4n){
+    background-color: #262323 !important;
+}
+.layui-layer-content .info-table li span:first-child{
+    width:40%!important;
+}
+.layui-layer-tips .layui-layer-content .info-table-two li span:first-child{
+    flex:2;
+}
+.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li,.layui-layer-tips .layui-layer-content .info-table-three .detail_menubox li{
+    width:100%;
+    padding:15px 20px;
+    box-sizing: border-box;
+    cursor: pointer;
+}
+.layui-layer-tips .layui-layer-content .info-table-two .detail_menubox li:hover,.layui-layer-tips .layui-layer-content .info-table-three .detail_menubox li:hover{
+    color: #fff;
+    background: #0d82e9!important;
+}
+.layui-layer-tips .info-table-two li .detail_menubox,.layui-layer-tips .info-table-three li .detail_menubox{
+    position: fixed;
+    /*padding:0 10px;*/
+    z-index: 999;
+    background: #fff!important;
+}
+.layui-layer-tips .info-table-three li .detail_menubox li{
+    background-color: #FFFFFF!important;
+}
+.layui-layer-tips .info-table-two li .detail_menubox li:nth-child(4n-1),.layui-layer-tips .info-table-two li .detail_menubox li:nth-child(4n){
+    background: #fff!important;
+}
+.isProbeDown{
+    cursor: pointer;
+    text-decoration: underline;
+}
+/*end lsq 2022-06-28*/
\ No newline at end of file