diff --git a/babel.config.js b/babel.config.js
index 81e55256..65755c37 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -12,7 +12,8 @@ module.exports = {
],
plugins: [
'@vue/babel-plugin-jsx',
- '@babel/proposal-class-properties',
+ ['@babel/proposal-class-properties', { loose: true }],
+ ['@babel/plugin-proposal-private-methods', { loose: true }],
'@babel/transform-runtime',
'lodash'
],
diff --git a/src/assets/css/components/components/common/pagination.scss b/src/assets/css/components/components/common/pagination.scss
index be6b8294..f7389ad5 100644
--- a/src/assets/css/components/components/common/pagination.scss
+++ b/src/assets/css/components/components/common/pagination.scss
@@ -66,3 +66,11 @@
border-color: rgba(154,154,154,0.20);
}
}
+.entity__pagination .pagination {
+ .el-pager li.more + li {
+ display: none;
+ }
+ .el-pager li.number:not(:last-of-type) {
+ display: inline-block !important;
+ }
+}
diff --git a/src/assets/css/components/views/charts/chartSingleValue.scss b/src/assets/css/components/views/charts/chartSingleValue.scss
index d5e97407..c845b091 100644
--- a/src/assets/css/components/views/charts/chartSingleValue.scss
+++ b/src/assets/css/components/views/charts/chartSingleValue.scss
@@ -201,7 +201,7 @@
.content__title {
display: flex;
- align-items: end;
+ align-items: flex-end;
height: 50%;
font-size: 16px;
color: #666666;
diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss
index ccf30365..8f204d34 100644
--- a/src/assets/css/components/views/charts/panel.scss
+++ b/src/assets/css/components/views/charts/panel.scss
@@ -131,7 +131,7 @@
}
.header__operations {
display: flex;
- justify-content: end;
+ justify-content: flex-end;
align-items: center;
.header__operation-btn {
@@ -225,7 +225,7 @@
border-bottom: 1px solid $--content-right-background-color;
.header__operations {
display: flex;
- justify-content: end;
+ justify-content: flex-end;
align-items: center;
.header__operation.header__operation--echarts {
diff --git a/src/assets/css/components/views/detections/detection-overview.scss b/src/assets/css/components/views/detections/detection-overview.scss
index 0a7b2c51..1cb56c55 100644
--- a/src/assets/css/components/views/detections/detection-overview.scss
+++ b/src/assets/css/components/views/detections/detection-overview.scss
@@ -8,6 +8,18 @@
display: flex;
flex-direction: column;
+ .overview__metric {
+ display:flex;
+ flex-direction: row;
+ padding-top: 10px;
+
+ .metric__column {
+ display:flex;
+ flex-direction: column;
+ margin-right: 15px;
+ }
+ }
+
.overview__title {
padding: 10px 0;
color: #333;
@@ -33,6 +45,19 @@
color: #6B717B;
}
+ .row__charts {
+ height: 20px;
+ width: 80px;
+ }
+
+ .row__content--metric {
+ display: flex;
+ flex-wrap: nowrap;
+ color: #666666;
+ font-size:14px;
+ font-weight: 400;
+ }
+
.row__content {
display: flex;
color: #3976CB;
diff --git a/src/assets/css/font/iconfont.css b/src/assets/css/font/iconfont.css
index 537462f7..ed4822a6 100644
--- a/src/assets/css/font/iconfont.css
+++ b/src/assets/css/font/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "cn-icon"; /* Project id 2614877 */
- src: url('iconfont.woff2?t=1647073084945') format('woff2'),
- url('iconfont.woff?t=1647073084945') format('woff'),
- url('iconfont.ttf?t=1647073084945') format('truetype');
+ src: url('iconfont.woff2?t=1647594989129') format('woff2'),
+ url('iconfont.woff?t=1647594989129') format('woff'),
+ url('iconfont.ttf?t=1647594989129') format('truetype');
}
.cn-icon {
@@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
+.cn-icon-domain2:before {
+ content: "\e767";
+}
+
+.cn-icon-ip2:before {
+ content: "\e768";
+}
+
+.cn-icon-app2:before {
+ content: "\e769";
+}
+
.cn-icon-intercept:before {
content: "\e600";
}
diff --git a/src/assets/css/font/iconfont.js b/src/assets/css/font/iconfont.js
index 004c214c..7edf9492 100644
--- a/src/assets/css/font/iconfont.js
+++ b/src/assets/css/font/iconfont.js
@@ -1 +1 @@
-!function(c){var a,l,h,o,i,m='',v=(v=document.getElementsByTagName("script"))[v.length-1].getAttribute("data-injectcss"),t=function(c,a){a.parentNode.insertBefore(c,a)};if(v&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function z(){i||(i=!0,h())}function n(){try{o.documentElement.doScroll("left")}catch(c){return void setTimeout(n,50)}z()}a=function(){var c,a=document.createElement("div");a.innerHTML=m,m=null,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(c=document.body).firstChild?t(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),a()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=a,o=c.document,i=!1,n(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,z())})}(window);
\ No newline at end of file
+!function(c){var a,l,h,o,i,m='',v=(v=document.getElementsByTagName("script"))[v.length-1].getAttribute("data-injectcss"),z=function(c,a){a.parentNode.insertBefore(c,a)};if(v&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function t(){i||(i=!0,h())}function n(){try{o.documentElement.doScroll("left")}catch(c){return void setTimeout(n,50)}t()}a=function(){var c,a=document.createElement("div");a.innerHTML=m,m=null,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(c=document.body).firstChild?z(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),a()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=a,o=c.document,i=!1,n(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,t())})}(window);
\ No newline at end of file
diff --git a/src/assets/css/font/iconfont.ttf b/src/assets/css/font/iconfont.ttf
index 9f6b0d97..54c12903 100644
Binary files a/src/assets/css/font/iconfont.ttf and b/src/assets/css/font/iconfont.ttf differ
diff --git a/src/assets/css/font/iconfont.woff b/src/assets/css/font/iconfont.woff
index b236117a..2adfc108 100644
Binary files a/src/assets/css/font/iconfont.woff and b/src/assets/css/font/iconfont.woff differ
diff --git a/src/assets/css/font/iconfont.woff2 b/src/assets/css/font/iconfont.woff2
index 5490c39e..f5a56093 100644
Binary files a/src/assets/css/font/iconfont.woff2 and b/src/assets/css/font/iconfont.woff2 differ
diff --git a/src/components/common/Pagination.vue b/src/components/common/Pagination.vue
index 1cf77745..99b0ec7e 100644
--- a/src/components/common/Pagination.vue
+++ b/src/components/common/Pagination.vue
@@ -9,7 +9,7 @@
:current-page="pageObj.pageNo"
:page-sizes="pageSizes?pageSizes:[20, 50, 100]"
:page-size="Number(pageObj.pageSize)"
- layout="total, prev, pager, next, slot"
+ :layout="layout"
:total="pageObj.total"
>