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

【1086】快照详情悬浮界面需要优化 See merge request !1004

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
【1086】快照详情悬浮界面需要优化 See merge request !1004
王涛
Commit da768327bf6058ab7ff839650312cdc6c96cf57d 2 parents 6d78d85b 6087e3e9
Showing 2 changed files with 8 additions and 1 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @da76832
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @da76832
@@ -407,7 +407,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         var $html = addIconByValue(valueStr);
                         var resStyle = obj.alarmEleMatchStyle(ar.flag, ar.kpiId);
                         span += ' <span  ' + menuId + '  style="text-align:left;width:40%">' + ar.kpiName + '</span>' +
-                            '<span title="' + titleStr + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
+                            '<span title="' + titleStr + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;white-space: nowrap;' + resStyle + '">'
                             + $html + valueStr +unit+ '</span>';
                         //补充空白区域
                         if (v.length < cols) {
--- a/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
View file @da76832
+++ b/hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
View file @da76832
@@ -8660,3 +8660,10 @@ form.layui-card-header.layuiadmin-card-header-auto {
     width: 16px;
     height: 16px;
 }
+/*lsq 快照管理详情页基本信息悬浮样式修改 2022-09-27*/
+#base-info-tips>.info-table>li span,#base-info-tips>.info-table>li span .div-link-state-list{
+    display: flex;
+}
+#base-info-tips>.info-table>li span:nth-child(2n){
+    flex:2;
+}