diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss index 4a3cb347..aafe8010 100644 --- a/src/assets/css/common.scss +++ b/src/assets/css/common.scss @@ -43,3 +43,19 @@ body { .el-form-item__error { padding-top: 0 !important; } + +/* 请求报错样式关于popover的修改 */ +.error-hover { + //min-width: 30px !important; + display: inline-block; + background: #FFE7E6 !important; + border: 1px solid rgba(226,97,84,0.42) !important; + padding: 8px 12px !important; + border-radius: 4px !important; + font-size: 14px !important; + color: #F53A19 !important; + font-weight: 400 !important; + .el-popper__arrow { + display: none !important; + } +} diff --git a/src/assets/css/components/components/common/chart-error.scss b/src/assets/css/components/components/common/chart-error.scss new file mode 100644 index 00000000..a769dddf --- /dev/null +++ b/src/assets/css/components/components/common/chart-error.scss @@ -0,0 +1,51 @@ +.error-block { + position: absolute; + width: 100%; + height: 100%; +} +.error-block-tooltip { + display: inline-block; + width: auto; + max-width: 350px; + background: #FFE7E6; + border: 1px solid rgba(226,97,84,0.42); + border-radius: 4px; + font-size: 14px; + color: #F53A19; + font-weight: 400; + padding: 10px 12px; + margin: 12px; +} +.new-error-icon { + position: relative; + display: inline-block; +} + +.new-error-icon .error-content { + position: absolute; + z-index: 2; + top: -42px; + left: 0; + visibility: hidden; + max-width: 220px; + overflow: scroll; + height: auto; + background: #FFE7E6; + border: 1px solid rgba(226,97,84,0.42); + border-radius: 4px; + font-size: 14px; + color: #F53A19; + font-weight: 400; + padding: 5px 12px; +} + +.error-icon { + font-size: 17px !important; + margin-bottom: -1px; + margin-left: 5px; +} + +.error-icon1 { + margin-left: -2px; + margin-right: 8px; +} diff --git a/src/assets/css/components/index.scss b/src/assets/css/components/index.scss index 0139fabf..f60905e4 100644 --- a/src/assets/css/components/index.scss +++ b/src/assets/css/components/index.scss @@ -72,3 +72,4 @@ @import 'views/charts2/dnsEventChart'; @import './views/charts2/dnsEventChartByPie'; //@import '../chart'; +@import './components/common/chart-error'; diff --git a/src/assets/css/components/views/charts2/npmRelatedSessions.scss b/src/assets/css/components/views/charts2/npmRelatedSessions.scss index 970bb896..51f7c01f 100644 --- a/src/assets/css/components/views/charts2/npmRelatedSessions.scss +++ b/src/assets/css/components/views/charts2/npmRelatedSessions.scss @@ -2,6 +2,7 @@ height: 100%; width: 100%; .npm-sessions-title { + display: flex; font-size: 14px; color: #353636; font-weight: 500; @@ -27,6 +28,14 @@ border-bottom-left-radius: 4px; border-right: none; } + .npm-sessions-div-gray { + height: 100%; + background: rgba(113,113,113,0.30); + border: 1px solid rgba(113,113,113,0.30); + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-right: none; + } } .npm-sessions-body { diff --git a/src/components/common/Error.vue b/src/components/common/Error.vue new file mode 100644 index 00000000..44b9d60a --- /dev/null +++ b/src/components/common/Error.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/main.js b/src/main.js index 842bbe8a..2a3aaabc 100644 --- a/src/main.js +++ b/src/main.js @@ -20,6 +20,7 @@ import bus from 'tiny-emitter' import DateTimeRange from '@/components/common/TimeRange/DateTimeRange' import TimeRefresh from '@/components/common/TimeRange/TimeRefresh' import PanelChartList from '@/views/charts/PanelChartList' +import Error from '@/components/common/Error' import 'lib-flexible' const emitter = new bus() @@ -46,6 +47,7 @@ app.mixin(commonMixin) app.component('date-time-range', DateTimeRange) app.component('time-refresh', TimeRefresh) app.component('panel-chart-list', PanelChartList) +app.component('chart-error', Error) app.mount('#app') diff --git a/src/views/charts2/charts/npm/RelatedSessions.vue b/src/views/charts2/charts/npm/RelatedSessions.vue index aefcde15..cc0f0fb0 100644 --- a/src/views/charts2/charts/npm/RelatedSessions.vue +++ b/src/views/charts2/charts/npm/RelatedSessions.vue @@ -1,9 +1,13 @@