From e5ccc621f8f9bc6287adc987fe210e73fd590a77 Mon Sep 17 00:00:00 2001 From: zhangxiaolong Date: Tue, 8 Mar 2022 09:40:56 +0800 Subject: [PATCH] =?UTF-8?q?CN-332=20fix=20:=20=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20CN-333=20fix=20:=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/views/chartHeader.scss | 134 ++++++++++-------- .../charts/ChartOneSituationStatistics.scss | 3 +- .../charts/ChartTwoSituationStatistics.scss | 6 +- .../views/charts/chartAlarmInfo.scss | 1 - src/views/charts/ChartHeader.vue | 7 + src/views/charts/charts/ChartAlarmInfo.vue | 2 - .../charts/ChartOneSituationStatistics.vue | 5 +- .../charts/ChartTwoSituationStatistics.vue | 34 +++-- 8 files changed, 108 insertions(+), 84 deletions(-) diff --git a/src/assets/css/components/views/chartHeader.scss b/src/assets/css/components/views/chartHeader.scss index 50b823d1..6b7cfcbe 100644 --- a/src/assets/css/components/views/chartHeader.scss +++ b/src/assets/css/components/views/chartHeader.scss @@ -1,64 +1,78 @@ .cn-chart-header-button { - display: flex; - - button:first-of-type { - border-radius: 2px 0 0 2px; - - } - - .cn-chart-header-button-all { - border-color: #0091FF; - color: #0091FF; - background-color: #FFFFFF; - border-radius: 2px 0 0 2px; - - } - - .cn-chart-header-button-critical { - border-color: #0091FF; - color: #0091FF; - border-radius: 2px; - background-color: #FFFFFF; - - } - - .cn-chart-header-button-high { - border-color: #0091FF; - border-radius: 2px; - background-color: #FFFFFF; - color: #0091FF; - } - - .cn-chart-header-button-low { - border-color: #0091FF; - border-radius: 2px; - background-color: #FFFFFF; - color: #0091FF; - } - - .cn-chart-header-button-info { - border-color: #0091FF; - border-radius: 2px; - background-color: #FFFFFF; - color: #0091FF; - } - - .cn-chart-header-button-medium { - border: 1px solid #0091FF; - border-radius: 2px; - background-color: #FFFFFF; - color: #0091FF; - } - - .el-button--default { - height: 24px; - border-radius: 2px; - min-height: 24px; + .cn-chart-header-button-group { display: flex; - justify-content: center; - align-items: center; - font-family: Roboto-Regular; - font-size: 12px; - font-weight: 400; + + .el-button { + border-radius: 0%; + } + + .el-button:hover { + background: #FFFFFF; + border-color: #0091FF; + } + + .el-button:last-of-type { + border-radius: 0 2px 2px 0; + + } + .el-button:first-of-type{ + border-radius: 2px 0 0 2px; + + } + .cn-chart-header-button-all { + border-color: #0091FF; + color: #0091FF; + background-color: #FFFFFF; + z-index: 1; + } + + .cn-chart-header-button-critical { + border-color: #0091FF; + color: #0091FF; + background-color: #FFFFFF; + z-index: 1; + + } + + .cn-chart-header-button-high { + border-color: #0091FF; + background-color: #FFFFFF; + z-index: 1; + color: #0091FF; + } + + .cn-chart-header-button-low { + border-color: #0091FF; + background-color: #FFFFFF; + z-index: 1; + color: #0091FF; + } + + .cn-chart-header-button-info { + border-color: #0091FF; + background-color: #FFFFFF; + z-index: 1; + color: #0091FF; + } + + .cn-chart-header-button-medium { + border-color: #0091FF; + background-color: #FFFFFF; + z-index: 1; + color: #0091FF; + } + + .el-button--default { + height: 24px; + min-height: 24px; + display: flex; + justify-content: space-around; + align-items: center; + font-family: Roboto-Regular; + font-size: 12px; + font-weight: 400; + } } + + } \ No newline at end of file diff --git a/src/assets/css/components/views/charts/ChartOneSituationStatistics.scss b/src/assets/css/components/views/charts/ChartOneSituationStatistics.scss index 902e83eb..cd3aa00e 100644 --- a/src/assets/css/components/views/charts/ChartOneSituationStatistics.scss +++ b/src/assets/css/components/views/charts/ChartOneSituationStatistics.scss @@ -1,9 +1,10 @@ .chart-one-situation-statistics{ - padding-top: 22px; + height: 100%; .situation-statistics-main { display: flex; align-items: center; margin-left: 33px; + height: 100%; .situation-statistics-main-left{ display: block; width: 76px; diff --git a/src/assets/css/components/views/charts/ChartTwoSituationStatistics.scss b/src/assets/css/components/views/charts/ChartTwoSituationStatistics.scss index 884972b8..185df283 100644 --- a/src/assets/css/components/views/charts/ChartTwoSituationStatistics.scss +++ b/src/assets/css/components/views/charts/ChartTwoSituationStatistics.scss @@ -1,18 +1,18 @@ .chart-two-situation-statistics{ padding-top: 22px; - .situation-statistics-top { + .chart-two-situation-statistics-top { display: flex; align-items: center; margin-left: 33px; padding-top: 22px; - .situation-statistics-main-left{ + .chart-two-situation-statistics-main-left{ display: block; .el-progress__text span{ font-size: 16px; } } - .situation-statistics-main-right{ + .chart-two-situation-statistics-main-right{ margin-left: 22px; :first-child{ font-size: 18px; diff --git a/src/assets/css/components/views/charts/chartAlarmInfo.scss b/src/assets/css/components/views/charts/chartAlarmInfo.scss index 01f49977..de0fd171 100644 --- a/src/assets/css/components/views/charts/chartAlarmInfo.scss +++ b/src/assets/css/components/views/charts/chartAlarmInfo.scss @@ -108,7 +108,6 @@ .cn-alarm-info-bottom-type { width: auto; - border-radius: 2px; font-family: Roboto-Regular; line-height: 16px; font-size: 12px; diff --git a/src/views/charts/ChartHeader.vue b/src/views/charts/ChartHeader.vue index 0c0d780f..00606498 100644 --- a/src/views/charts/ChartHeader.vue +++ b/src/views/charts/ChartHeader.vue @@ -132,21 +132,26 @@ @@ -296,6 +301,7 @@ export default { } }, reload (s, e, v) { + console.log(s,e,v); this.dateTimeRangeChange(s, e, v) }, groupShow () { @@ -303,6 +309,7 @@ export default { }, dateTimeRangeChange (s, e, v) { this.chartTimeFilter = { startTime: s, endTime: e, dateRangeValue: v } + console.log(this.chartTimeFilter); this.$emit('refresh', this.chartTimeFilter) }, tableLimitChange () { diff --git a/src/views/charts/charts/ChartAlarmInfo.vue b/src/views/charts/charts/ChartAlarmInfo.vue index 43fecf2b..ee125e83 100644 --- a/src/views/charts/charts/ChartAlarmInfo.vue +++ b/src/views/charts/charts/ChartAlarmInfo.vue @@ -231,8 +231,6 @@ export default { unitConvert, getData (val, n) { this.pageNo = val - const now = window.$dayJs.tz().valueOf() - console.log(window.$dayJs.tz()) const extraParams = { pageNo: val, pageSize: this.pageSizeForAlarm, diff --git a/src/views/charts/charts/ChartOneSituationStatistics.vue b/src/views/charts/charts/ChartOneSituationStatistics.vue index 563ef2f2..22b2e104 100644 --- a/src/views/charts/charts/ChartOneSituationStatistics.vue +++ b/src/views/charts/charts/ChartOneSituationStatistics.vue @@ -6,11 +6,11 @@ type="circle" :color="chartInfo.params.color" width="76" - :percentage="chartData ? chartData.percent : 0" + :percentage="$_.get(chartData, 'percent', '-') " />
-
{{ chartData ? (chartData.count || '-') : '-' }}
+
{{ $_.get(chartData, 'count', '-') }}
{{ $t(`dns.numberOfNodes`) }}
@@ -18,6 +18,7 @@