diff --git a/src/assets/css/components/index.scss b/src/assets/css/components/index.scss index a35e143d..0bd6351e 100644 --- a/src/assets/css/components/index.scss +++ b/src/assets/css/components/index.scss @@ -25,8 +25,8 @@ @import './views/detections/detection-list/row'; @import './views/detections/detection-overview'; @import './views/charts/chartSingleValue'; -// @import './views/charts/panel'; -/*@import 'views/charts/chartIpOpenPortBar'; +@import './views/charts/panel'; +@import 'views/charts/chartIpOpenPortBar'; @import './views/charts/chartTable'; @import './views/charts/chartCryptocurrencyEventList'; @import './views/charts/chartAppBasicInfo'; @@ -41,7 +41,7 @@ @import './views/charts/chartAlarmInfo'; @import './views/chartHeader'; @import './views/charts/chartMap'; -@import 'views/charts/chartRelationShipList';*/ +@import 'views/charts/chartRelationShipList'; @import './views/report/builtinReport'; @import './components/rightBox/report/builtinReportBox'; diff --git a/src/assets/css/components/views/charts2/panel.scss b/src/assets/css/components/views/charts2/panel.scss index 46f76205..323cc8cc 100644 --- a/src/assets/css/components/views/charts2/panel.scss +++ b/src/assets/css/components/views/charts2/panel.scss @@ -1,4 +1,4 @@ -.panel-box { +.panel-box2 { height: calc(100% - 20px); .panel__header { display: flex; diff --git a/src/assets/css/components/views/entityExplorer/entity-detail.scss b/src/assets/css/components/views/entityExplorer/entity-detail.scss index b1ccb2e1..65af6176 100644 --- a/src/assets/css/components/views/entityExplorer/entity-detail.scss +++ b/src/assets/css/components/views/entityExplorer/entity-detail.scss @@ -87,7 +87,8 @@ flex: 1; padding: 10px; overflow: auto; - background-color: $--content-right-background-color; + //background-color: $--content-right-background-color; + background-color: rgb(239, 242, 245); &>.cn-entity-detail .entity-detail__body>.cn-panel2 { .panel-chart { diff --git a/src/assets/css/themes/common.scss b/src/assets/css/themes/common.scss index 03460aa4..1556f2a1 100644 --- a/src/assets/css/themes/common.scss +++ b/src/assets/css/themes/common.scss @@ -4,6 +4,17 @@ border-radius: 5px; /*border: 1px solid #fff;*/ } +.entity-detail__content::-webkit-scrollbar-thumb,.cn-container-entity::-webkit-scrollbar-thumb { + background-color: #ddd; + border-radius: 5px; + /*border: 1px solid #fff;*/ +} +.entity-detail__content::-webkit-scrollbar-thumb:hover,.cn-container-entity::-webkit-scrollbar-thumb:hover { + background-color: #ccc; + border-radius: 5px; + /*border: 1px solid #fff;*/ +} + /*---鼠标点击滚动条显示样式--*/ ::-webkit-scrollbar-thumb:hover { background-color: #ddd; diff --git a/src/components/layout/Container.vue b/src/components/layout/Container.vue index f9c9cf75..4a64a8fc 100644 --- a/src/components/layout/Container.vue +++ b/src/components/layout/Container.vue @@ -1,5 +1,5 @@ diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue index cf907f7b..a4b70630 100644 --- a/src/views/charts2/Panel.vue +++ b/src/views/charts2/Panel.vue @@ -1,5 +1,5 @@