diff --git a/src/assets/css/components/views/charts/chartAlarmInfo.scss b/src/assets/css/components/views/charts/chartAlarmInfo.scss index 2d942ebd..cbdd035f 100644 --- a/src/assets/css/components/views/charts/chartAlarmInfo.scss +++ b/src/assets/css/components/views/charts/chartAlarmInfo.scss @@ -6,6 +6,7 @@ .alarm-info__box { height: calc(100% - 40px); width: 100%; + overflow: auto; .box__body { display: flex; @@ -13,7 +14,8 @@ margin-right: 30px; justify-content: flex-start; align-items: center; - height: calc(100% / 9); + //height: calc(100% / 9); + min-height: 78px; border-bottom: 1px solid #E7EAED; .body__content { @@ -43,7 +45,7 @@ } .content__text-box { - margin-left: 17px; + margin: 2px 0 2px 17px; .text-box__title { font-size: 16px; @@ -69,12 +71,12 @@ flex-wrap: wrap; &>div { - margin-bottom: 4px; + margin-bottom: 8px; } .text__time-box { display: flex; - margin-left: 20px; + margin-right: 8px; height: 14px; .cn-icon-time2 { @@ -125,6 +127,7 @@ max-width: 150px; padding-left: 2px; padding-right: 2px; + margin-right: 8px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; diff --git a/src/assets/css/components/views/charts/chartSingleValue.scss b/src/assets/css/components/views/charts/chartSingleValue.scss index 81cfe314..f257081e 100644 --- a/src/assets/css/components/views/charts/chartSingleValue.scss +++ b/src/assets/css/components/views/charts/chartSingleValue.scss @@ -66,7 +66,6 @@ .single-value__content { display: flex; flex-direction: column; - width: 200px; padding-right: 10px; .content__data { @@ -488,7 +487,7 @@ .content__data { margin-bottom: 5px; - font-size: 12px; + font-size: 14px; color: #333333; font-weight: bold; } diff --git a/src/views/charts/charts/ChartAlarmInfo.vue b/src/views/charts/charts/ChartAlarmInfo.vue index fffa5c96..477bc8d7 100644 --- a/src/views/charts/charts/ChartAlarmInfo.vue +++ b/src/views/charts/charts/ChartAlarmInfo.vue @@ -55,7 +55,6 @@ {{value.startTime ? dateFormatByAppearance(value.startTime) : '-'}} -