diff --git a/nezha-fronted/src/assets/css/main.css b/nezha-fronted/src/assets/css/main.css index 466de3f34..8f7a8efb4 100644 --- a/nezha-fronted/src/assets/css/main.css +++ b/nezha-fronted/src/assets/css/main.css @@ -11,9 +11,10 @@ .el-loading-mask .el-loading-spinner{ background: url(../img/loading.gif) no-repeat; background-size: 48px 48px; - width: 200px; - height: 200px; + width: 48px; + height: 48px; position: relative; top: 50%; - left: 48.5%; + left: 50%; + transform: translate(-50%, -50%); } diff --git a/nezha-fronted/src/assets/stylus/index.scss b/nezha-fronted/src/assets/stylus/index.scss index f71ce20f2..f6de58e77 100644 --- a/nezha-fronted/src/assets/stylus/index.scss +++ b/nezha-fronted/src/assets/stylus/index.scss @@ -1,6 +1,6 @@ $global-text-color-active: #ee9d3f; // 全局文字active字色 -$content-right-background-color: #fcfcfc; //右侧背景色 +$content-right-background-color: #f9f9f9; //右侧背景色 $header-text-color: #e5e5e5; // header默认字色 $header-text-color-active: #fff; // header高亮字色 diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 4e79f2c97..1f6ed53f1 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -587,7 +587,7 @@ li{ border-top: 1px solid #DCDFE6; border-bottom: 1px solid #E4E7ED; margin: 0 -6px; - background-color: #fcfcfc; + background-color: $content-right-background-color; } .sub-top-tools>div { margin-top: 2px; @@ -1652,7 +1652,7 @@ li{ } .el-table__fixed-right-patch { width: 0px !important; - background-color: #fcfcfc; + background-color: $content-right-background-color; } .nz-table .el-table__fixed, .nz-table .el-table__fixed-right { height: 100% !important; diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 831005d2c..5a1e8bc42 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -239,18 +239,26 @@ const en = { module:'Module', endpoint:'Endpoint', }, + module: { + module: "Module", + }, + endpoint: { + endpoint: "Endpoint", + }, dataCenter:{ dataCenter:'Data center', cabinet:'Cabinet', promServer:'Prom server', }, alert:{ + alertMessage: 'Alert message', level:'Level', alertRule:'Alert rule', ruleNum:'Rule num', alertNum:'Alert num', - alertRuleTopN:'According to Alert Rule', - assetTopN:'According to Asset', + alertRuleTopN: 'Top alert message', + assetTopN: 'Top alert message by Asset', + moduleTopN: 'Top alert message by Module', top:'Top', chart:{ chartTitle:'Alert Trend' diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.scss b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss new file mode 100644 index 000000000..404a4f748 --- /dev/null +++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.scss @@ -0,0 +1,100 @@ +.overview{ + height: 100%; +} +.overview-right { + background-color: $content-right-background-color; +} +.overview-content-header{ + display: flex; + padding-top: 10px; +} +.overview-content-header .header-title{ + flex:13; + height: 35px; + line-height: 35px; + font-size: 1.5rem !important; + font-weight: 700; + margin-left: 15px; +} +.overview-content-header .header-tool{ + flex: 2; + height: 35px; +} +.header-tool .tool-container{ + display: flex; + text-align: center; +} +.tool-container .time{ + flex: 4; + font-size: 1.5rem !important; + font-weight: 700; + display: inline-block; + height: 35px; + line-height: 35px; + vertical-align: middle; +} +.tool-container .date{ + flex: 4; + height: 35px; +} +.date .week{ + font-size: 1.125rem; + font-weight: bold; +} +.date .sys-date{ + margin-top: -6px; + font-size: .75rem; +} +.tool-container .operation{ + flex: 2; + display: inline-block; + line-height: 35px; +} +.operation .screen-icon{ + font-size: 1.875rem !important; +} +.overview-content{ + height: calc(100% - 45px); + width: 100%; +} +.overview-content .content-row-box { + width: 100%; + display: flex; + justify-content: space-between; + align-content: flex-start; +} +.overview-content .content-row-box:first-of-type { + height: 16%; +} +.overview-content .content-row-box:nth-of-type(2) { + height: 45%; +} +.overview-content .content-row-box:nth-of-type(3) { + height: 39%; +} +.content-row-box .content-col-box{ + margin: 5px; + display: inline-block; + background-color: white; + flex: 1; +} +.content-col-title { + height: 25px; + line-height: 25px; + border-bottom: 1px solid #f2f2f2; + color: #333; + font-size: 16px; + padding-left: 8px; +} +.content-col-content { + display: flex; + align-items: center; + height: calc(100% - 26px); + justify-content: center; +} +.content-col-content-num { + font-size: 40px; + color: #333; +} + + diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue new file mode 100644 index 000000000..86b0aaeec --- /dev/null +++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue @@ -0,0 +1,526 @@ + + + + + diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index 3fd0e5a7b..5d6340efc 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -1120,21 +1120,6 @@ .control-icon-checked{ color:#666; } - .endpoint-query-table .el-loading-spinner .circular{ - width: 42px; - height: 42px; - animation: loading-rotate 2s linear infinite; - display: none; - } - .endpoint-query-table .el-loading-spinner{ - background: url(../../../assets/img/loading.gif) no-repeat; - background-size: 48px 48px; - width: 100%; - height: 100%; - position: relative; - top: 50%; - left: 48.5%; - } .project .sidebar-info-item{ margin:0px !important; } diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js index 462e3a776..49491c3b1 100644 --- a/nezha-fronted/src/router/index.js +++ b/nezha-fronted/src/router/index.js @@ -46,7 +46,7 @@ export default new Router({ }, { path: 'overview', - component: resolve => require(['../components/page/dashboard/overview/overview.vue'],resolve) + component: resolve => require(['../components/page/dashboard/overview/overview2.vue'],resolve) }, { path: '/project',