feat:overview 全屏功能bug修复 & 图标等其他调整
1.修复overview取消全屏排版错乱的bug 2.部分图标更换 3.修复F11下方没有铺满的问题
This commit is contained in:
wangwenrui
Binary file not shown.
@@ -20,6 +20,30 @@ Created by iconfont
|
||||
/>
|
||||
<missing-glyph />
|
||||
|
||||
<glyph glyph-name="idc_barn" unicode="" d="M352 768h320v-768H352zM672-32H352a32 32 0 0 0-32 32V768a32 32 0 0 0 32 32h320a32 32 0 0 0 32-32v-768a32 32 0 0 0-32-32z m-288 64h256V736h-256v-704zM544 544h-64a32 32 0 0 0 0 64h64a32 32 0 1 0 0-64zM544 416h-64a32 32 0 0 0 0 64h64a32 32 0 1 0 0-64zM544 288h-64a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM256 352H192a32 32 0 1 0 0 64h64a32 32 0 0 0 0-64zM256 192H192a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM832 352h-64a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM832 192h-64a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM544 160h-64a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM928-32h-256a32 32 0 0 0-32 32V576a32 32 0 0 0 32 32h256a32 32 0 0 0 32-32v-576a32 32 0 0 0-32-32z m-224 64h192V544h-192v-512zM352-32H96a32 32 0 0 0-32 32V576a32 32 0 0 0 32 32h256a32 32 0 0 0 32-32v-576a32 32 0 0 0-32-32z m-224 64h192V544H128v-512z" horiz-adv-x="1024" />
|
||||
|
||||
|
||||
<glyph glyph-name="idc_barn-black" unicode="" d="M352 768h320v-768H352zM672-32H352a32 32 0 0 0-32 32V768a32 32 0 0 0 32 32h320a32 32 0 0 0 32-32v-768a32 32 0 0 0-32-32z m-288 64h256V736h-256v-704zM544 544h-64a32 32 0 0 0 0 64h64a32 32 0 1 0 0-64zM544 416h-64a32 32 0 0 0 0 64h64a32 32 0 1 0 0-64zM544 288h-64a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM256 352H192a32 32 0 1 0 0 64h64a32 32 0 0 0 0-64zM256 192H192a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM832 352h-64a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM832 192h-64a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM544 160h-64a32 32 0 1 0 0 64h64a32 32 0 1 0 0-64zM928-32h-256a32 32 0 0 0-32 32V576a32 32 0 0 0 32 32h256a32 32 0 0 0 32-32v-576a32 32 0 0 0-32-32z m-224 64h192V544h-192v-512zM352-32H96a32 32 0 0 0-32 32V576a32 32 0 0 0 32 32h256a32 32 0 0 0 32-32v-576a32 32 0 0 0-32-32z m-224 64h192V544H128v-512z" horiz-adv-x="1024" />
|
||||
|
||||
|
||||
<glyph glyph-name="server1" unicode="" d="M85.333333 533.333333v128A64 64 0 0 0 149.333333 725.333333h682.666667A64 64 0 0 0 896 661.333333v-128c0-16.384-6.186667-31.36-16.298667-42.666666 10.112-11.306667 16.298667-26.282667 16.298667-42.666667v-128c0-16.384-6.186667-31.36-16.298667-42.666667 10.112-11.306667 16.298667-26.282667 16.298667-42.666666v-128a64 64 0 0 0-64-64h-682.666667A64 64 0 0 0 85.333333 106.666667v128c0 16.384 6.186667 31.36 16.298667 42.666666a63.744 63.744 0 0 0-16.298667 42.666667v128c0 16.384 6.186667 31.36 16.298667 42.666667A63.744 63.744 0 0 0 85.333333 533.333333z m64-21.333333h682.666667a21.333333 21.333333 0 0 1 21.333333 21.333333v128a21.333333 21.333333 0 0 1-21.333333 21.333334h-682.666667a21.333333 21.333333 0 0 1-21.333333-21.333334v-128a21.333333 21.333333 0 0 1 21.333333-21.333333z m682.666667-42.666667h-682.666667a21.333333 21.333333 0 0 1-21.333333-21.333333v-128a21.333333 21.333333 0 0 1 21.333333-21.333333h682.666667a21.333333 21.333333 0 0 1 21.333333 21.333333v128a21.333333 21.333333 0 0 1-21.333333 21.333333z m0-213.333333h-682.666667a21.333333 21.333333 0 0 1-21.333333-21.333333v-128a21.333333 21.333333 0 0 1 21.333333-21.333334h682.666667a21.333333 21.333333 0 0 1 21.333333 21.333334v128a21.333333 21.333333 0 0 1-21.333333 21.333333z m-42.666667 128a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m0 213.333333a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m0-426.666666a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m-128 213.333333a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m0 213.333333a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m0-426.666666a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z" horiz-adv-x="1024" />
|
||||
|
||||
|
||||
<glyph glyph-name="Server" unicode="" d="M0 896h1024v-1024H0zM864-32v32-32zM160-32v-32 32zM928 768h32-32z m0-736h-32 32zM96 768H64h32z m0-736h32-32zM864 832v-32 32zM160 832V864v-32z m768-320a32 32 0 1 1 0 64v-64zM96 576a32 32 0 1 1 0-64v64z m832-352a32 32 0 1 1 0 64v-64zM96 288a32 32 0 1 1 0-64v64zM768 672a32 32 0 1 1 64 0h-64z m64 32a32 32 0 1 1-64 0h64z m-64-320a32 32 0 1 1 64 0h-64z m64 32a32 32 0 1 1-64 0h64z m-64-320a32 32 0 1 1 64 0h-64z m64 32a32 32 0 1 1-64 0h64z m32-128H160v-64h704v64z m32 768v-736h64V768h-64zM64 768v-736h64V768H64z m800 96H160v-64h704V864z m96-96a96 96 0 0 1-96 96v-64a32 32 0 0 0 32-32h64zM128 768a32 32 0 0 0 32 32V864a96 96 0 0 1-96-96h64z m32-768a32 32 0 0 0-32 32H64a96 96 0 0 1 96-96v64z m704-64a96 96 0 0 1 96 96h-64a32 32 0 0 0-32-32v-64zM96 512h832v64H96v-64z m0-288h832v64H96v-64zM832 672V704h-64v-32h64z m0-288v32h-64v-32h64z m0-288v32h-64v-32h64z" horiz-adv-x="1024" />
|
||||
|
||||
|
||||
<glyph glyph-name="server" unicode="" d="M512.209065-52.945692m-56.0294 0a56.0294 56.0294 0 1 1 112.0588 0 56.0294 56.0294 0 1 1-112.0588 0ZM883.926501-52.945692m-56.0294 0a56.0294 56.0294 0 1 1 112.058799 0 56.0294 56.0294 0 1 1-112.058799 0ZM140.073499-52.945692m-56.029399 0a56.0294 56.0294 0 1 1 112.058799 0 56.0294 56.0294 0 1 1-112.058799 0ZM925.94855 832.235198c0 35.122907-28.641895 63.764802-63.764802 63.764802H162.234381C127.111474 896 98.469579 867.358105 98.469579 832.235198v-144.463863c0-17.352389 7.108207-33.241323 18.397714-44.739894-11.289506-11.498571-18.397713-27.387505-18.397714-44.739893v-144.463863c0-17.352389 7.108207-33.241323 18.397714-44.739894-11.289506-11.498571-18.397713-27.387505-18.397714-44.739894v-144.463863c0-35.122907 28.641895-63.764802 63.764802-63.764802h699.949367c35.122907 0 63.764802 28.641895 63.764802 63.764802v144.463863c0 17.352389-7.108207 33.241323-18.397713 44.739894 11.289506 11.498571 18.397713 27.387505 18.397713 44.739894v144.463863c0 17.352389-7.108207 33.241323-18.397713 44.739893 11.289506 11.498571 18.397713 27.387505 18.397713 44.739894V832.235198z m-789.638219 0c0 14.216415 11.498571 25.714986 25.714985 25.714986h699.949368c14.216415 0 25.924051-11.498571 25.92405-25.714986v-144.463863c0-14.216415-11.498571-25.924051-25.92405-25.92405H162.234381c-14.216415 0-25.714986 11.498571-25.714985 25.92405V832.235198h-0.209065z m751.797468-233.94365v-144.463863c0-14.216415-11.498571-25.714986-25.924051-25.714986H162.234381c-14.216415 0-25.714986 11.498571-25.714985 25.714986v144.463863c0 14.216415 11.498571 25.714986 25.714985 25.714985h699.949367c14.216415 0 25.924051-11.498571 25.924051-25.714985z m0-378.407514c0-14.216415-11.498571-25.714986-25.924051-25.714985H162.234381c-14.216415 0-25.714986 11.498571-25.714985 25.714985v144.463863c0 14.216415 11.498571 25.714986 25.714985 25.714986h699.949367c14.216415 0 25.924051-11.498571 25.924051-25.714986v-144.463863zM503.846468 741.082891h236.243365c10.453246 0 19.024908 8.571662 19.024908 19.024908s-8.571662 19.024908-19.024908 19.024908H503.846468c-10.453246 0-19.024908-8.571662-19.024908-19.024908s8.571662-19.024908 19.024908-19.024908zM311.088608 759.898734m-22.579012 0a22.579012 22.579012 0 1 1 45.158023 0 22.579012 22.579012 0 1 1-45.158023 0ZM503.846468 507.139241h236.243365c10.453246 0 19.024908 8.571662 19.024908 19.024908s-8.571662 19.024908-19.024908 19.024908H503.846468c-10.453246 0-19.024908-8.571662-19.024908-19.024908 0.209065-10.662311 8.571662-19.024908 19.024908-19.024908zM740.089833 311.036341H503.846468c-10.453246 0-19.024908-8.571662-19.024908-19.024908s8.571662-19.024908 19.024908-19.024908h236.243365c10.453246 0 19.024908 8.571662 19.024908 19.024908s-8.571662 19.024908-19.024908 19.024908zM311.088608 525.955084m-22.579012 0a22.579012 22.579012 0 1 1 45.158023 0 22.579012 22.579012 0 1 1-45.158023 0ZM311.088608 292.011433m-22.579012 0a22.579012 22.579012 0 1 1 45.158023 0 22.579012 22.579012 0 1 1-45.158023 0ZM883.926501 22.108616c-34.704777 0-63.973867-23.833401-72.545529-56.0294H584.754594a75.305186 75.305186 0 0 1-53.520621 53.520621v59.374438c0 10.453246-8.571662 19.024908-19.024908 19.024908s-19.024908-8.571662-19.024908-19.024908v-59.374438a75.305186 75.305186 0 0 1-53.520621-53.520621H212.409963c-8.362597 32.195998-37.631686 56.0294-72.545529 56.0294-41.394855 0-75.054308-33.659453-75.054307-75.054308s33.659453-75.054308 75.054307-75.054308c34.704777 0 63.973867 23.833401 72.545529 56.0294h227.253573c8.362597-32.195998 37.631686-56.0294 72.545529-56.0294 34.913842 0 63.973867 23.833401 72.545529 56.0294h226.835443c8.362597-32.195998 37.631686-56.0294 72.545529-56.0294 41.394855 0 75.054308 33.659453 75.054307 75.054308s-33.868518 75.054308-75.263372 75.054308zM140.073499-89.950184c-20.488363 0-37.213557 16.725194-37.213556 37.213557S119.585137-15.523071 140.073499-15.523071s37.213557-16.725194 37.213557-37.213556-16.934259-37.213557-37.213557-37.213557z m372.135566 0c-20.488363 0-37.213557 16.725194-37.213557 37.213557s16.725194 37.213557 37.213557 37.213556 37.213557-16.725194 37.213556-37.213556-16.725194-37.213557-37.213556-37.213557z m371.717436 0c-20.488363 0-37.213557 16.725194-37.213557 37.213557s16.725194 37.213557 37.213557 37.213556 37.213557-16.725194 37.213556-37.213556-16.725194-37.213557-37.213556-37.213557z" horiz-adv-x="1024" />
|
||||
|
||||
|
||||
<glyph glyph-name="IDCCabinet" unicode="" d="M605.09 709.818H418.91v-651.636h186.18V709.818z m46.546 0v-651.636h162.91a23.273 23.273 0 0 1 23.272 23.273v605.09a23.273 23.273 0 0 1-23.273 23.273H651.636z m-279.272 0h-162.91a23.273 23.273 0 0 1-23.272-23.273v-605.09a23.273 23.273 0 0 1 23.273-23.273h162.909V709.818z m465.454 46.546a46.545 46.545 0 0 0 46.546-46.546v-651.636a46.545 46.545 0 0 0-46.546-46.546H186.182a46.545 46.545 0 0 0-46.546 46.546V709.818a46.545 46.545 0 0 0 46.546 46.546h651.636z m-558.545-162.91a23.273 23.273 0 1 0 0 46.546 23.273 23.273 0 0 0 0-46.545z m0-69.818a23.273 23.273 0 1 0 0 46.546 23.273 23.273 0 0 0 0-46.546z m0-69.818a23.273 23.273 0 1 0 0 46.546 23.273 23.273 0 0 0 0-46.546zM256 360.72799999999995h46.545a23.273 23.273 0 0 0 0-46.546H256a23.273 23.273 0 0 0 0 46.545z m0-186.183h46.545a23.273 23.273 0 0 0 0-46.545H256a23.273 23.273 0 0 0 0 46.545z m0 93.091h46.545a23.273 23.273 0 0 0 0-46.545H256a23.273 23.273 0 0 0 0 46.545z m232.727 93.091h46.546a23.273 23.273 0 0 0 0-46.545h-46.546a23.273 23.273 0 0 0 0 46.545z m0-186.182h46.546a23.273 23.273 0 0 0 0-46.545h-46.546a23.273 23.273 0 0 0 0 46.545z m0 93.091h46.546a23.273 23.273 0 0 0 0-46.545h-46.546a23.273 23.273 0 0 0 0 46.545z m232.728 93.091H768a23.273 23.273 0 0 0 0-46.545h-46.545a23.273 23.273 0 0 0 0 46.545z m0-186.182H768A23.273 23.273 0 0 0 768 128h-46.545a23.273 23.273 0 0 0 0 46.545z m0 93.091H768a23.273 23.273 0 0 0 0-46.545h-46.545a23.273 23.273 0 0 0 0 46.545zM512 593.4549999999999A23.273 23.273 0 1 0 512 640a23.273 23.273 0 0 0 0-46.545z m0-69.819a23.273 23.273 0 1 0 0 46.546 23.273 23.273 0 0 0 0-46.546z m0-69.818a23.273 23.273 0 1 0 0 46.546 23.273 23.273 0 0 0 0-46.546z m232.727 139.637a23.273 23.273 0 1 0 0 46.545 23.273 23.273 0 0 0 0-46.545z m0-69.819a23.273 23.273 0 1 0 0 46.546 23.273 23.273 0 0 0 0-46.546z m0-69.818a23.273 23.273 0 1 0 0 46.546 23.273 23.273 0 0 0 0-46.546z" horiz-adv-x="1024" />
|
||||
|
||||
|
||||
<glyph glyph-name="dataRecv" unicode="" d="M331.1 639.5c16.8 17.3 25.2 40.2 25.2 68.7 0 60-30 90-89.9 90h-58.3v-184.7h58.1c26.5 0.1 48.1 8.7 64.9 26z m-87 6.3V766.1h19.5c16.3 0 29.5-5.1 39.7-15.4 10.2-10.3 15.2-24.6 15.2-43 0-19-4.9-34.1-14.6-45.2-9.7-11.1-23.1-16.7-40.2-16.7h-19.6z m371.7-339.4h-69.5v79.8c35.3 9.9 61.4 42.8 61.4 81.5 0 46.5-37.6 84.6-83.6 84.6s-83.6-38.1-83.6-84.6c0-38.1 25.3-70.5 59.7-81v-80.2H433c-13.9 36.2-41.9 82.1-67.5 118.3 7.5 12.6 11.8 27.3 11.8 43 0 46.5-38 84.6-84.5 84.6s-84.5-38.1-84.5-84.6c0-46.5 38-84.6 84.5-84.6 13 0 25.4 3 36.4 8.3 17.5-28.4 35.4-61.5 47.8-85h-61.1L422 198.60000000000002l78.3 90.1v-120.6H408L530.4 45l108.1 123.1h-92.2v107l75.4-76.5 93.7 107.7h-44c12.2 23.5 29.9 56.6 47.3 85 10.9-5.3 23.1-8.3 36-8.3 46 0 83.6 38.1 83.6 84.6 0 46.5-37.6 84.6-83.6 84.6S671 514.1 671 467.6c0-15.7 4.3-30.4 11.7-43-25.4-36.1-53.1-82.1-66.9-118.2z m-323 122.8c-21.1 0-38.4 17.3-38.4 38.4s17.3 38.4 38.4 38.4c21.1 0 38.4-17.3 38.4-38.4 0-21.1-17.3-38.4-38.4-38.4z m231.4 0c-20.9 0-38 17.3-38 38.4 0 21.1 17.1 38.4 38 38.4s38-17.3 38-38.4-17.1-38.4-38-38.4z m230.4 76.9c20.9 0 38-17.3 38-38.4s-17.1-38.4-38-38.4-38 17.3-38 38.4c0 21.1 17.1 38.4 38 38.4z m99-92.2V168c0-84.2-66.6-150.3-149.8-150.3H327.3c-83.3 0-147 64.4-147 148.6V414h-49v-247.7c0-109 88.2-198.1 195.9-198.1h376.5c107.8 0 195.9 89.2 195.9 198.1V414l-46-0.1z m-435.7 242h61.3l12.6-42.3H531L470.5 798.2h-42.3l-61.8-184.7h39l12.5 42.4z m27.1 94.9c1.5 5 2.5 10.2 2.9 15.6h1c0.5-6.7 1.4-12 2.6-16.1l19.2-64h-45l19.3 64.5z m139.7-137.2h36.1V766.1h48.1V798.2H536.7V766h48v-152.4z m140.5 42.3h61.3l12.6-42.3h39.2L777.8 798.2h-42.3l-61.8-184.7h39l12.5 42.4z m27.1 94.9c1.5 5 2.5 10.2 2.9 15.6h1c0.5-6.7 1.4-12 2.6-16.1l19.2-64h-45l19.3 64.5z" horiz-adv-x="1024" />
|
||||
|
||||
|
||||
<glyph glyph-name="dataRec" unicode="" d="M929.721379 295.72413800000004h-711.503448a16.595862 16.595862 0 0 0-13.771034 25.776552l127.646896 190.146207a16.595862 16.595862 0 0 0 13.771035 7.415172h456.209655a16.595862 16.595862 0 0 0 13.771034-7.415172l127.646897-190.146207a16.595862 16.595862 0 0 0 0.882758-17.655173 16.41931 16.41931 0 0 0-14.653793-8.121379z m-680.430345 32.838621h649.18069l-105.931034 156.954482h-437.848276zM929.721379 162.78069000000005h-711.503448a16.41931 16.41931 0 0 0-13.771034 25.776551l63.735172 95.16138a16.595862 16.595862 0 0 0 27.718621-17.655173l-46.609656-69.208276H898.648276l-46.609655 69.208276a16.595862 16.595862 0 0 0 4.590345 22.951724 17.655172 17.655172 0 0 0 23.128275-4.413793l63.735173-95.161379a17.655172 17.655172 0 0 0 0.882758-17.655172 16.595862 16.595862 0 0 0-14.653793-9.004138zM929.721379 31.955862000000025h-711.503448a16.595862 16.595862 0 0 0-13.771034 25.776552l58.085517 86.686896a17.655172 17.655172 0 0 0 23.128276 4.590345 17.655172 17.655172 0 0 0 4.413793-23.128276l-40.783449-60.733793H898.648276l-46.609655 69.208276a16.595862 16.595862 0 1 0 27.71862 17.655172l63.735173-95.161379a16.595862 16.595862 0 0 0 0.882758-17.655172 16.41931 16.41931 0 0 0-14.653793-7.238621zM302.433103 541.131034a77.682759 77.682759 0 1 0 77.682759 77.682759 77.85931 77.85931 0 0 0-77.682759-77.682759z m0 122.173794a44.491034 44.491034 0 1 1 44.491035-44.491035 44.491034 44.491034 0 0 1-44.491035 44.491035zM842.857931 541.131034a77.682759 77.682759 0 1 0 77.682759 77.682759 77.85931 77.85931 0 0 0-77.682759-77.682759z m0 122.173794a44.491034 44.491034 0 1 1 44.491035-44.491035 44.491034 44.491034 0 0 1-44.491035 44.491035zM573.969655 598.157241a90.924138 90.924138 0 1 0 90.924138 90.747587 90.924138 90.924138 0 0 0-90.924138-90.747587z m0 148.48a57.732414 57.732414 0 1 1 57.555862-57.732413 57.908966 57.908966 0 0 1-57.555862 57.732413zM573.969655 351.69103399999995a16.595862 16.595862 0 0 0-16.595862 16.595863v247.172413a16.595862 16.595862 0 1 0 33.191724 0v-247.172413a16.595862 16.595862 0 0 0-16.595862-16.595863zM461.329655 374.81931h-2.471724a16.242759 16.242759 0 0 0-13.947586 18.714483c21.892414 146.008276-72.562759 180.435862-76.623448 181.848276a16.772414 16.772414 0 0 0 10.769655 31.602759c1.235862 0 124.822069-43.961379 98.692414-218.217931a17.655172 17.655172 0 0 0-16.419311-13.947587zM697.202759 375.87862099999995a16.595862 16.595862 0 0 0-16.419311 14.124138c-26.129655 174.256552 97.456552 217.688276 98.692414 218.217931a16.595862 16.595862 0 0 0 10.593104-31.602759c-4.06069-1.412414-98.33931-35.310345-76.446897-181.671724a16.41931 16.41931 0 0 0-13.947586-18.891035z" horiz-adv-x="1129" />
|
||||
|
||||
|
||||
<glyph glyph-name="exit-full-screen" unicode="" d="M566.872 478.454l177.54 177.54 39.599-39.598-177.54-177.54zM537.328 409.395l0.068 56 205.82-0.252-0.068-56zM537.153 615.137l56 0.068 0.251-205.82-56-0.068zM240.012 151.59400000000005l177.54 177.54 39.599-39.598-177.54-177.54zM280.794 302.855l0.069 56 205.82-0.252-0.069-56zM430.616 358.597l56 0.068 0.252-205.82-56-0.068zM866.68 241.66999999999996h56v-268.22h-56zM654.37 29.360000000000014h268.22v-56H654.37zM100.89 795.06h56v-268.22h-56zM100.98 795.15H369.2v-56H100.98zM654.37 795.15h268.22v-56H654.37zM866.68 795.06h56v-268.22h-56zM100.98 29.360000000000014H369.2v-56H100.98zM100.89 241.66999999999996h56v-268.22h-56z" horiz-adv-x="1024" />
|
||||
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 50 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
@@ -67,12 +67,16 @@
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-content: flex-start;
|
||||
}
|
||||
.column-flex{
|
||||
|
||||
}
|
||||
.content-row-box .content-col-box{
|
||||
border: 1px solid lightgrey;
|
||||
padding:5px;
|
||||
margin: 10px;
|
||||
display: inline-block;
|
||||
|
||||
}
|
||||
|
||||
.flex-container{
|
||||
|
||||
@@ -28,20 +28,20 @@
|
||||
|
||||
<!--内容-->
|
||||
<div class="overview-content">
|
||||
<el-scrollbar style="height: 100%" ref="overviewScrollbar">
|
||||
<div class="content-row-box" >
|
||||
<div class="content-col-box box-height-200 " style="flex:3;" :class="{'box-height-266':isFullScreen}">
|
||||
<el-scrollbar style="height: 100%" ref="overviewScrollbar" class="column-flex">
|
||||
<div class="content-row-box" style="flex: 1;height: 100%;">
|
||||
<div class="content-col-box " style="flex:3;" >
|
||||
<table-box :pop-data="assetStatData" ref="assetTab" ></table-box>
|
||||
</div>
|
||||
<div class="content-col-box box-height-200 " style="flex: 2" :class="{'box-height-266':isFullScreen}">
|
||||
<div class="content-col-box " style="flex: 2" >
|
||||
<table-box :pop-data="projectStatData" ref="projectTab"></table-box>
|
||||
</div>
|
||||
<div class="content-col-box box-height-200 " style="flex:1;" :class="{'box-height-266':isFullScreen}">
|
||||
<div class="content-col-box " style="flex:1;" >
|
||||
<table-box :pop-data="endpointStatData" ref="endpointTab"></table-box>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-row-box">
|
||||
<div class="content-col-box box-height-250 " style="flex: 1;" :class="{'box-height-316':isFullScreen}">
|
||||
<div class="content-row-box" style="flex: 1.2;height: 100%;">
|
||||
<div class="content-col-box " style="flex: 1;" >
|
||||
<div class="flex-container">
|
||||
<div style="flex: 2;">
|
||||
<table-box :pop-data="dataCenterStatData" ref="dataCenterTab" ></table-box>
|
||||
@@ -52,8 +52,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-row-box">
|
||||
<div class="content-col-box box-height-290 "style="flex: 3" :class="{'box-height-356':isFullScreen}">
|
||||
<div class="content-row-box" style="flex: 1.3;height: 100%;">
|
||||
<div class="content-col-box "style="flex: 3">
|
||||
<div class="avg-children-space">
|
||||
<!--<el-select v-model="topNFilter.default" placeholder="" size="mini" style="display: inline-block;width: 200px" @change="topNChange">
|
||||
<el-option v-for="(item,index) in topNFilter.options" :label="item.label" :value="item.value" :key="item.value+index"></el-option>
|
||||
@@ -76,10 +76,10 @@
|
||||
</div>
|
||||
<table-box :pop-data="topNStatData" ref="topNTab" style="height: 90%;"></table-box>
|
||||
</div>
|
||||
<div class="content-col-box box-height-290 "style="flex: 8;" id="alertTrendBox" :class="{'box-height-356':isFullScreen}">
|
||||
<div class="content-col-box "style="flex: 8;" id="alertTrendBox" >
|
||||
<chart-box ref="chartbox" :chart-title="$t('dashboard.overview.alert.chart.chartTitle')"></chart-box>
|
||||
</div>
|
||||
<div class="content-col-box box-height-290 "style="flex: 2;" :class="{'box-height-356':isFullScreen}">
|
||||
<div class="content-col-box "style="flex: 2;" >
|
||||
<table-box :pop-data="alertRuleStatData" ref="alertRuleTab"></table-box>
|
||||
</div>
|
||||
</div>
|
||||
@@ -174,7 +174,7 @@
|
||||
num:totalData.inStock,
|
||||
title:this.$t('dashboard.overview.asset.title'),
|
||||
showPopover:true,
|
||||
icon:'nz-icon nz-icon-asset',
|
||||
icon:'nz-icon nz-icon-server',
|
||||
popover:[
|
||||
{
|
||||
label:this.$t('dashboard.overview.asset.alertTotal'),
|
||||
@@ -367,7 +367,7 @@
|
||||
num:data.total,
|
||||
title:this.$t('dashboard.overview.project.endpoint'),
|
||||
showPopover:false,
|
||||
icon:'nz-icon nz-icon-project',
|
||||
icon:'nz-icon nz-icon-dataRecv',
|
||||
popover:[]
|
||||
},
|
||||
stat:{//左侧下方 小图标，
|
||||
@@ -411,7 +411,7 @@
|
||||
num:data.dcTotal,
|
||||
title:this.$t('dashboard.overview.dataCenter.dataCenter'),
|
||||
showPopover:true,
|
||||
icon:'nz-icon nz-icon-page',
|
||||
icon:'nz-icon nz-icon-idc_barn-black',
|
||||
popover:[
|
||||
{
|
||||
label:this.$t('dashboard.overview.dataCenter.cabinet'),
|
||||
@@ -854,15 +854,6 @@
|
||||
let fullScreenFunc=container.requestFullscreen||container.mozRequestFullScreen||container.webkitRequestFullscreen||container.msRequestFullscreen;
|
||||
console.log(fullScreenFunc)
|
||||
fullScreenFunc.call(container)
|
||||
// if(container.requestFullscreen){
|
||||
// container.requestFullscreen();
|
||||
// } else if(container.mozRequestFullScreen) {
|
||||
// container.mozRequestFullScreen();
|
||||
// } else if(container.webkitRequestFullscreen) {
|
||||
// container.webkitRequestFullscreen();
|
||||
// } else if(container.msRequestFullscreen) {
|
||||
// container.msRequestFullscreen();
|
||||
// }
|
||||
},
|
||||
exitFullScreen:function(){
|
||||
if(this.judgeFullScreen()){
|
||||
@@ -873,6 +864,24 @@
|
||||
} else if(document.webkitExitFullscreen) {
|
||||
document.webkitExitFullscreen();
|
||||
}
|
||||
//解决flex排版错乱问题
|
||||
document.querySelectorAll(".content-row-box").forEach((item,index)=>{
|
||||
item.style.display = "none";
|
||||
setTimeout(()=>{item.style.display = '';},100)
|
||||
})
|
||||
//解决table显示原生滚动条问题
|
||||
setTimeout(() => {
|
||||
document.querySelectorAll('.el-table__body-wrapper').forEach((item,index)=>{
|
||||
item.classList.add("ps");
|
||||
item.classList.add("ps--active-y");
|
||||
item._ps_.update();
|
||||
})
|
||||
},200)
|
||||
|
||||
setTimeout(()=>{
|
||||
this.$refs.alertRuleTab.layoutTable();
|
||||
console.log('layout')
|
||||
},1000)
|
||||
}
|
||||
},
|
||||
/*header 时间处理 start*/
|
||||
@@ -956,8 +965,13 @@
|
||||
this.initDate();
|
||||
this.initData();
|
||||
window.onresize = () => {
|
||||
this.isFullScreen=this.judgeFullScreen();
|
||||
setTimeout(()=>{this.isFullScreen=this.judgeFullScreen();},200)
|
||||
}
|
||||
// window.addEventListener('keyup',(e)=>{
|
||||
// if(e.key == 'F11'){
|
||||
// this.fullScreen()
|
||||
// }
|
||||
// })
|
||||
},
|
||||
watch:{
|
||||
isFullScreen:function(n,o){
|
||||
@@ -968,7 +982,6 @@
|
||||
let mapWidth=this.$refs.dataCenterMap.$el.clientWidth;
|
||||
let mapHeight=this.$refs.dataCenterMap.$el.clientHeight * .95;
|
||||
this.$refs.dataCenterMap.resizeChart(mapWidth,mapHeight);
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -985,4 +998,9 @@
|
||||
.overview-table .el-table__body{
|
||||
width: 100% !important;
|
||||
}
|
||||
.overview-content .column-flex .el-scrollbar__view{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -4,10 +4,9 @@
|
||||
width: 100%;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
padding-bottom: 2px;
|
||||
}
|
||||
.table-column-box{
|
||||
flex-direction: column;
|
||||
display: block;
|
||||
}
|
||||
.table-box .table-box-left{
|
||||
flex: 1;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<loading ref="loading"></loading>
|
||||
<template v-if="showData&&showData.screen">
|
||||
<div class="table-box-left" :class="{'table-box-left-half':showData.screen.total.direction == 'column'}" v-show="showData.screen.show">
|
||||
<div class="table-screen" :class="{'fill-flex-cavity':!showData.screen.stat.show&&showData.screen.total.direction != 'column'}">
|
||||
<div class="table-screen" :class="{'fill-flex-cavity':!showData.screen.stat.show&&showData.screen.total.direction != 'column'&&showData.screen.direction!='column'}">
|
||||
<div class="screen-top" v-show="showData.screen.total.show" >
|
||||
<div :class="{'screen-row':showData.screen.total.direction == 'row','screen-column':showData.screen.total.direction == 'column'}">
|
||||
<div class="screen-col"><i class="super-icon" :class="showData.screen.total.icon"></i></div>
|
||||
@@ -127,6 +127,9 @@
|
||||
},
|
||||
endLoading(){
|
||||
this.$refs.loading.endLoading();
|
||||
},
|
||||
layoutTable:function(){
|
||||
this.$refs.dataTable.doLayout();
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
Reference in New Issue
Block a user