diff --git a/backend/app/service/dashboard.go b/backend/app/service/dashboard.go index b40da97b5..239843170 100644 --- a/backend/app/service/dashboard.go +++ b/backend/app/service/dashboard.go @@ -151,12 +151,12 @@ func (u *DashboardService) LoadCurrentInfo(ioOption string, netOption string) *d currentInfo.Procs = hostInfo.Procs currentInfo.CPUTotal, _ = cpu.Counts(true) - totalPercent, _ := cpu.Percent(1*time.Second, false) + totalPercent, _ := cpu.Percent(100*time.Millisecond, false) if len(totalPercent) == 1 { currentInfo.CPUUsedPercent = totalPercent[0] currentInfo.CPUUsed = currentInfo.CPUUsedPercent * 0.01 * float64(currentInfo.CPUTotal) } - currentInfo.CPUPercent, _ = cpu.Percent(1*time.Second, true) + currentInfo.CPUPercent, _ = cpu.Percent(100*time.Millisecond, true) loadInfo, _ := load.Avg() currentInfo.Load1 = loadInfo.Load1 diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss index 146e77c81..779cac84d 100644 --- a/frontend/src/styles/common.scss +++ b/frontend/src/styles/common.scss @@ -444,6 +444,12 @@ html { cursor: pointer; } +.dialog-footer{ + display: flex; + align-items: center; + justify-content: flex-end; +} + .monaco-editor-tree-light .el-tree-node__content:hover { background-color: #e5eefd; } diff --git a/frontend/src/views/container/compose/index.vue b/frontend/src/views/container/compose/index.vue index 1ff40d1f9..42747b2ae 100644 --- a/frontend/src/views/container/compose/index.vue +++ b/frontend/src/views/container/compose/index.vue @@ -25,28 +25,17 @@