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

【973】 阿里云和深信服负载均衡详情页优化-深信服负载均衡详情页优化



See merge request !835

@@ -91,24 +91,27 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
                         }
                         }
                     })
                     })
                     for (let nodeInfo of nodeInfoList) {
                     for (let nodeInfo of nodeInfoList) {
+                        // lsq 详情页节电池样式修改 2022-08-08
                         htmlStr += `<div class="detail-loadbalancing-vs" data-flag="${nodeInfo.flag}">
                         htmlStr += `<div class="detail-loadbalancing-vs" data-flag="${nodeInfo.flag}">
                                     <div class="vs-title">
                                     <div class="vs-title">
                                         <p>${nodeInfo.nodeName}</p>
                                         <p>${nodeInfo.nodeName}</p>
                                     </div>
                                     </div>
-                                    <div class="vs-icon-div ${nodeInfo.healthStatus == 'normal' ? 'vs-icon-up' : 'vs-icon-down'}">
-                                        <div class="vs-icon"></div>
+                                    <div class="vs-flex">
+                                         <div class="vs-icon-div ${nodeInfo.healthStatus == 'normal' ? 'vs-icon-up' : 'vs-icon-down'}">
+                                            <div class="vs-icon"></div>
+                                        </div>
+                                        <ul class="vs-info">
+                                            <li>
+                                                ${nodeInfo.configStatus == 'enable' ? '<i class="iconfont icon-size good">\ue659</i> 已启用' : '<i class="iconfont icon-size serious">\ue668</i> 未启用'}
+                                            </li>
+                                            <li>
+                                                当前连接数: ${nodeInfo.currentConnections}
+                                            </li>
+                                            <li>
+                                                新增连接数: ${nodeInfo.newConnections}
+                                            </li>
+                                        </ul>
                                     </div>
                                     </div>
-                                    <ul class="vs-info">
-                                        <li>
-                                            ${nodeInfo.configStatus == 'enable' ? '<i class="iconfont icon-size good">\ue659</i> 已启用' : '<i class="iconfont icon-size serious">\ue668</i> 未启用'}
-                                        </li>
-                                        <li>
-                                            当前连接数: ${nodeInfo.currentConnections}
-                                        </li>
-                                        <li>
-                                            新增连接数: ${nodeInfo.newConnections}
-                                        </li>
-                                    </ul>
                                 </div>`
                                 </div>`
                     }
                     }
                     $vsDiv.html(htmlStr)
                     $vsDiv.html(htmlStr)
@@ -168,27 +171,30 @@ layui.define(['laypage', 'commonDetail', 'common', 'element', 'admin'], function
                         }
                         }
                     })
                     })
                     for (let nodeInfo of nodeInfoList) {
                     for (let nodeInfo of nodeInfoList) {
+                        // lsq 详情页节电池样式修改 2022-08-08
                         htmlStr += `<div class="detail-loadbalancing-vs" data-flag="${nodeInfo.flag}">
                         htmlStr += `<div class="detail-loadbalancing-vs" data-flag="${nodeInfo.flag}">
                                     <div class="vs-title">
                                     <div class="vs-title">
                                         <p>${nodeInfo.nodeName}</p>
                                         <p>${nodeInfo.nodeName}</p>
                                     </div>
                                     </div>
-                                    <div class="node-icon-div ${nodeInfo.healthStatus == 'normal' ? 'vs-icon-up' : 'vs-icon-down'}">
-                                        <div class="node-icon"></div>
+                                    <div class="vs-flex">
+                                        <div class="node-icon-div ${nodeInfo.healthStatus == 'normal' ? 'vs-icon-up' : 'vs-icon-down'}">
+                                            <div class="node-icon"></div>
+                                        </div>
+                                        <ul class="vs-info">
+                                            <li>
+                                                ${nodeInfo.configStatus == 'enable' ? '<i class="iconfont icon-size good">\ue659</i> 已启用' : '<i class="iconfont icon-size serious">\ue668</i> 未启用'}
+                                            </li>
+                                            <li>
+                                                当前连接数: ${nodeInfo.currentConnections}
+                                            </li>
+                                            <li>
+                                                新增连接数: ${nodeInfo.newConnections}
+                                            </li>
+                                            <li>
+                                                ${nodeInfo.ipAddr}:${nodeInfo.port}
+                                            </li>
+                                        </ul>
                                     </div>
                                     </div>
-                                    <ul class="vs-info">
-                                        <li>
-                                            ${nodeInfo.configStatus == 'enable' ? '<i class="iconfont icon-size good">\ue659</i> 已启用' : '<i class="iconfont icon-size serious">\ue668</i> 未启用'}
-                                        </li>
-                                        <li>
-                                            当前连接数: ${nodeInfo.currentConnections}
-                                        </li>
-                                        <li>
-                                            新增连接数: ${nodeInfo.newConnections}
-                                        </li>
-                                        <li>
-                                            ${nodeInfo.ipAddr}:${nodeInfo.port}
-                                        </li>
-                                    </ul>
                                 </div>`
                                 </div>`
                     }
                     }
                     $vsDiv.html(htmlStr)
                     $vsDiv.html(htmlStr)

@@ -537,16 +537,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 resType: resType,
                 resType: resType,
                 isSend: $('#notice_search_isSend').val()
                 isSend: $('#notice_search_isSend').val()
             };
             };
-            var typeName = new Map();
-            typeName.set("10", "告警通知");
-            typeName.set("11", "告警消除");
-            //2021-10-15 添加合并通知 XuHaoJie
-            typeName.set("13", "合并通知");
-            typeName.set("20", "巡检报表通知");
-            typeName.set("30", "系统通知");
-            typeName.set("40", "工单通知");
-            typeName.set("99", "测试通知");
-            typeName.set("0", "测试通知");
+            //lsq 分类分组统计的x轴标签显示undefined修改 2022-08-08
             $.ajax({
             $.ajax({
                 url: `${common.domainName}/api-web/notice/groupByType`,
                 url: `${common.domainName}/api-web/notice/groupByType`,
                 method: 'GET',
                 method: 'GET',
@@ -556,7 +547,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     var yData = [];
                     var yData = [];
                     if (res && res.map) {
                     if (res && res.map) {
                         $.each(res.map.typeList, function (i, v) {
                         $.each(res.map.typeList, function (i, v) {
-                            xData.push(typeName.get(v))
+                            //lsq 分类分组统计的x轴标签显示undefined修改 2022-08-08
+                            xData.push(v)
                         })
                         })
                         yData = res.map.countList;
                         yData = res.map.countList;
                     }
                     }

@@ -325,7 +325,20 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
                         color: '#333',
                         color: '#333',
                         show: true,
                         show: true,
                         interval: 0,
                         interval: 0,
-                        rotate: 15
+                        rotate: 15,
+                        formatter: val => {
+                            // 一行字数
+                            const max = 6
+                            // 标签长度
+                            const valLength = val.length
+                            // 换行数
+                            const rowNum = valLength / 6
+                            if (valLength > 6) {
+                                return val.slice(0,5) + '...';
+                            } else {
+                                return val
+                            }
+                        }
                     },
                     },
                     axisLine: {
                     axisLine: {
                         lineStyle: {
                         lineStyle: {

@@ -7992,12 +7992,13 @@ table.table-duty tbody td div.table-duty-td-day .duty-td-div-now {
 /*通知页面中间统计图布局样式*/
 /*通知页面中间统计图布局样式*/
 
 
 .detail-loadbalancing-vs {
 .detail-loadbalancing-vs {
-    width: calc(12.5% - 22px);
+    /*lsq 详情页节电池样式修改 2022-08-08*/
+    width: calc(14% - 0px);
     height: 115px;
     height: 115px;
     margin: 5px;
     margin: 5px;
     float: left;
     float: left;
     border: 1px solid #dcdcdc;
     border: 1px solid #dcdcdc;
-    padding: 10px 20px;
+    padding: 10px;
     border-radius: 5px;
     border-radius: 5px;
     cursor: pointer;
     cursor: pointer;
 }
 }
@@ -8006,15 +8007,20 @@ table.table-duty tbody td div.table-duty-td-day .duty-td-div-now {
     font-size: 15px;
     font-size: 15px;
     font-weight: bold;
     font-weight: bold;
     height: 30px;
     height: 30px;
+    word-wrap: break-word;
 }
 }
 
 
 .detail-loadbalancing-vs .vs-title {
 .detail-loadbalancing-vs .vs-title {
     margin-bottom: 10px;
     margin-bottom: 10px;
 }
 }
-
+/*lsq 详情页节点池样式修改 2022-08-08*/
+.detail-loadbalancing-vs .vs-flex{
+    display: flex;
+    align-items: center;
+}
 .detail-loadbalancing-vs div.vs-icon-div {
 .detail-loadbalancing-vs div.vs-icon-div {
-    width: 55px;
-    height: 55px;
+    width: 45px;
+    height: 45px;
     padding: 4px;
     padding: 4px;
     float: left;
     float: left;
     border-radius: 10px;
     border-radius: 10px;
@@ -8030,8 +8036,8 @@ table.table-duty tbody td div.table-duty-td-day .duty-td-div-now {
 }
 }
 
 
 .detail-loadbalancing-vs div.vs-icon {
 .detail-loadbalancing-vs div.vs-icon {
-    width: 50px;
-    height: 50px;
+    width: 40px;
+    height: 40px;
     background-repeat: no-repeat;
     background-repeat: no-repeat;
     background-position: center;
     background-position: center;
     background-image: url(/src/style/img/icon-db.png);
     background-image: url(/src/style/img/icon-db.png);
@@ -8062,6 +8068,8 @@ table.table-duty tbody td div.table-duty-td-day .duty-td-div-now {
     width: 61%;
     width: 61%;
     float: left;
     float: left;
     padding-left: 10px;
     padding-left: 10px;
+    /*lsq 详情页节点池样式修改 2022-08-08*/
+    flex:1;
 }
 }
 
 
 .detail-loadbalancing-vs .vs-info li {
 .detail-loadbalancing-vs .vs-info li {
@@ -8552,3 +8560,6 @@ form.layui-card-header.layuiadmin-card-header-auto {
 .res .layui-card-body{
 .res .layui-card-body{
     background: #ffffff;
     background: #ffffff;
 }
 }
+.layui-layer-tips{
+    word-break: break-all;
+}

@@ -1135,6 +1135,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
             });
             });
             //告警级别
             //告警级别
             form.on('select(alarmLevelSearch)', function (data) {
             form.on('select(alarmLevelSearch)', function (data) {
+                //lsq 切换告警级别时，获取统计告警量接口的参数更改 2022-08-08
+                alarmLevel = $("#alarmLevelSearchBox").val()
                 reloadTable();
                 reloadTable();
             });
             });
             // 告警确认
             // 告警确认

@@ -921,6 +921,8 @@
             class="layui-btn  layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
             class="layui-btn  layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
         失败
         失败
     </button>`;
     </button>`;
+    /*lsq 连接失败时tips显示连接失败 2022-08-08*/
+    linkStateTips='连接失败';
     }
     }
     }
     }
     }}
     }}