diff --git a/src/assets/css/components/components/layout/layout.scss b/src/assets/css/components/components/layout/layout.scss index 0606b910..ce016c39 100644 --- a/src/assets/css/components/components/layout/layout.scss +++ b/src/assets/css/components/components/layout/layout.scss @@ -57,6 +57,98 @@ font-size: 17px; color: #046ECA; } + .header__left-breadcrumb{ + display:flex; + align-items:center; + .route-menu:hover{ + cursor: pointer; + color: #2C72C6; + } + .header__left-breadcrumb-item-select{ + display:flex; + align-items: center; + .search-input{ + width:100%; + padding: 4px 4px 0px 4px; + .el-input__inner{ + padding:0px 4px; + background: #FFFFFF; + border: 1px solid #C5C5C5; + box-shadow: -1px 1px 10px -1px rgba(205,205,205,0.85); + border-radius: 2px; + font-size: 12px; + /*color: rgba(87,87,87,0.60);*/ + letter-spacing: 0; + font-weight: 400; + } + } + .breadcrumb-button{ + align-items: center; + width: 100%; + height: 24px; + justify-content: center; + line-height: 24px; + padding: 0px 6px; + span { + margin-right: 6px; + } + } + .breadcrumb-button:hover,.breadcrumb-button__active { + cursor:pointer; + background: rgba(113,113,113,0.10); + box-shadow: 0 2px 4px 0 rgba(51,51,51,0.02); + border-radius: 2px; + } + .breadcrumb__popper{ + top: -7px !important; + width:auto !important; + max-height:206px; + overflow:hidden; + padding: 0px !important; + background: #FFFFFF; + border:1px solid #C5C5C5 !important; + box-shadow: -1px 1px 10px -1px rgba(205,205,205,0.85)!important; + border-radius: 2px !important; + .selected { + color: #0091ff; + font-weight: bold; + } + .el-popper { + max-height: 405px; + } + .select-dropdown { + max-height:172px; + width:100%; + margin: 1px 0px; + overflow:auto; + list-style: none; + padding:4px 0px; + box-sizing: border-box; + .select-dropdown__item:hover{ + background-color: #F5F7FA !important; + } + .select-dropdown__item{ + width:100%; + height:30px; + padding:0px 11px; + line-height:30px; + position: relative; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: #666665; + display: list-item; + text-align: -webkit-match-parent; + box-sizing: border-box; + cursor: pointer; + font-family: Helvetica; + font-size: 12px; + font-weight: 400; + } + } + } + } + } } .cn-menu-modal { top: 60px; @@ -184,3 +276,16 @@ .vue-grid-item{ transition: none; } +#breadcrumbSelectDropdown::-webkit-scrollbar { + width:10px; +} +#breadcrumbSelectDropdown::-webkit-scrollbar-track-piece { + background: #ECECEC; + border-radius: 0 0 2px 0; +} +#breadcrumbSelectDropdown::-webkit-scrollbar-thumb { + background-clip: content-box !important; + background: #C5C5C5; + border-radius: 4px; + border: 2px solid transparent; +} \ No newline at end of file diff --git a/src/assets/css/components/views/charts2/networkOverviewTabs.scss b/src/assets/css/components/views/charts2/networkOverviewTabs.scss index ea04794c..3a3011d1 100644 --- a/src/assets/css/components/views/charts2/networkOverviewTabs.scss +++ b/src/assets/css/components/views/charts2/networkOverviewTabs.scss @@ -3,6 +3,9 @@ $grey:#353636; height:100%; font-size:12px; + .tab-hide{ + margin-top:40px; + } .cn-chart__tabs { height:100%; .tab-pane { @@ -12,6 +15,9 @@ border-radius: 4px; .tab-table { border:0px; + .data-click:hover{ + cursor: pointer; + } } .data-total{ display: flex !important; @@ -84,6 +90,9 @@ .el-tabs__content { height: calc(100% - 40px); border:none; + .el-table__body-wrapper { + height: calc(100% - 32px) !important; + } } } .tab-search { diff --git a/src/assets/css/font/iconfont.css b/src/assets/css/font/iconfont.css index 582d6224..28b1a26e 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=1658134544266') format('woff2'), - url('iconfont.woff?t=1658134544266') format('woff'), - url('iconfont.ttf?t=1658134544266') format('truetype'); + src: url('iconfont.woff2?t=1659663639076') format('woff2'), + url('iconfont.woff?t=1659663639076') format('woff'), + url('iconfont.ttf?t=1659663639076') format('truetype'); } .cn-icon { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.cn-icon-xiala:before { + content: "\e7a3"; +} + +.cn-icon-Provider:before { + content: "\e7a1"; +} + +.cn-icon-APP1:before { + content: "\e7a2"; +} + .cn-icon-social-network:before { content: "\e79b"; } diff --git a/src/assets/css/font/iconfont.js b/src/assets/css/font/iconfont.js index b9f24386..4ff6f5fc 100644 --- a/src/assets/css/font/iconfont.js +++ b/src/assets/css/font/iconfont.js @@ -1 +1 @@ -!function(a){var c,l,h,o,i,m='',v=(v=document.getElementsByTagName("script"))[v.length-1].getAttribute("data-injectcss"),z=function(a,c){c.parentNode.insertBefore(a,c)};if(v&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function t(){i||(i=!0,h())}function n(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}t()}c=function(){var a,c=document.createElement("div");c.innerHTML=m,m=null,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?z(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),c()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=c,o=a.document,i=!1,n(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,t())})}(window); \ No newline at end of file +!(function (a) { let c; let l; let h; let o; let i; let m = ''; var v = (v = document.getElementsByTagName('script'))[v.length - 1].getAttribute('data-injectcss'); const z = function (a, c) { c.parentNode.insertBefore(a, c) }; if (v && !a.__iconfont__svg__cssinject__) { a.__iconfont__svg__cssinject__ = !0; try { document.write('') } catch (a) { console && console.log(a) } } function t () { i || (i = !0, h()) } function s () { try { o.documentElement.doScroll('left') } catch (a) { return void setTimeout(s, 50) }t() }c = function () { let a; let c = document.createElement('div'); c.innerHTML = m, m = null, (c = c.getElementsByTagName('svg')[0]) && (c.setAttribute('aria-hidden', 'true'), c.style.position = 'absolute', c.style.width = 0, c.style.height = 0, c.style.overflow = 'hidden', c = c, (a = document.body).firstChild ? z(c, a.firstChild) : a.appendChild(c)) }, document.addEventListener ? ~['complete', 'loaded', 'interactive'].indexOf(document.readyState) ? setTimeout(c, 0) : (l = function () { document.removeEventListener('DOMContentLoaded', l, !1), c() }, document.addEventListener('DOMContentLoaded', l, !1)) : document.attachEvent && (h = c, o = a.document, i = !1, s(), o.onreadystatechange = function () { o.readyState == 'complete' && (o.onreadystatechange = null, t()) }) }(window)) diff --git a/src/assets/css/font/iconfont.ttf b/src/assets/css/font/iconfont.ttf index 3d0fe3df..77d60e73 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 cd0251ce..5a4f830f 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 3c7de049..79a93fe6 100644 Binary files a/src/assets/css/font/iconfont.woff2 and b/src/assets/css/font/iconfont.woff2 differ diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue index b00f805a..07650bc2 100644 --- a/src/components/layout/Header.vue +++ b/src/components/layout/Header.vue @@ -38,8 +38,49 @@