gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-13 17:24:44 +08:00
Code

fix: 监控界面网卡选项样式调整

Browse Source
This commit is contained in:
ssongliu 2023-03-02 18:35:08 +08:00 committed by ssongliu
parent 74dcba6d25
commit a31e2ec913
6 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/service/backup_app.go
View File

@ -153,7 +153,7 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback
if !isRollback {
rollbackFile := fmt.Sprintf("%s/original/app/%s_%s.tar.gz", global.CONF.System.BaseDir, install.Name, time.Now().Format("20060102150405"))
if err := handleAppBackup(install, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil {
global.LOG.Errorf("backup app %s for rollback before recover failed, err: %v", install.Name, err)
return fmt.Errorf("backup app %s for rollback before recover failed, err: %v", install.Name, err)
}
defer func() {
if !isOk {

2
backend/app/service/backup_database.go
View File

@ -146,7 +146,7 @@ func handleMysqlRecover(mysqlInfo *repo.RootInfo, recoverDir, dbName, fileName s
if !isRollback {
rollbackFile := fmt.Sprintf("%s/original/database/%s_%s.sql.gz", global.CONF.System.BaseDir, mysqlInfo.Name, time.Now().Format("20060102150405"))
if err := handleMysqlBackup(mysqlInfo, path.Dir(rollbackFile), dbName, path.Base(rollbackFile)); err != nil {
global.LOG.Errorf("backup mysql db %s for rollback before recover failed, err: %v", mysqlInfo.Name, err)
return fmt.Errorf("backup mysql db %s for rollback before recover failed, err: %v", mysqlInfo.Name, err)
}
defer func() {
if !isOk {

2
backend/app/service/backup_redis.go
View File

@ -119,7 +119,7 @@ func handleRedisRecover(redisInfo *repo.RootInfo, recoverFile string, isRollback
}
rollbackFile := fmt.Sprintf("%s/original/database/redis/%s_%s.%s", global.CONF.System.BaseDir, redisInfo.Name, time.Now().Format("20060102150405"), suffix)
if err := handleRedisBackup(redisInfo, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil {
global.LOG.Errorf("backup database %s for rollback before recover failed, err: %v", redisInfo.Name, err)
return fmt.Errorf("backup database %s for rollback before recover failed, err: %v", redisInfo.Name, err)
}
defer func() {
if !isOk {

2
backend/app/service/backup_website.go
View File

@ -103,7 +103,7 @@ func handleWebsiteRecover(website *model.Website, recoverFile string, isRollback
if !isRollback {
rollbackFile := fmt.Sprintf("%s/original/website/%s_%s.tar.gz", global.CONF.System.BaseDir, website.Alias, time.Now().Format("20060102150405"))
if err := handleWebsiteBackup(website, path.Dir(rollbackFile), path.Base(rollbackFile)); err != nil {
global.LOG.Errorf("backup website %s for rollback before recover failed, err: %v", website.Alias, err)
return fmt.Errorf("backup website %s for rollback before recover failed, err: %v", website.Alias, err)
}
defer func() {
if !isOk {

2
frontend/src/views/container/container/index.vue
View File

@ -316,7 +316,7 @@ const buttons = [
{
label: i18n.global.t('commons.button.log'),
click: (row: Container.ContainerInfo) => {
dialogContainerLogRef.value!.acceptParams({ containerID: row.containerID });
dialogContainerLogRef.value!.acceptParams({ containerID: row.containerID, container: row.name });
},
},
];

49
frontend/src/views/host/monitor/index.vue
View File

@ -21,7 +21,7 @@
:start-placeholder="$t('commons.search.timeStart')"
:end-placeholder="$t('commons.search.timeEnd')"
:shortcuts="shortcuts"
style="float: right"
style="float: right; width: 330px"
></el-date-picker>
</template>
<div id="loadLoadChart" style="width: 100%; height: 400px"></div>
@ -41,7 +41,7 @@
:start-placeholder="$t('commons.search.timeStart')"
:end-placeholder="$t('commons.search.timeEnd')"
:shortcuts="shortcuts"
style="float: right"
style="float: right; width: 330px"
></el-date-picker>
</template>
<div id="loadCPUChart" style="width: 100%; height: 400px"></div>
@ -59,7 +59,7 @@
:start-placeholder="$t('commons.search.timeStart')"
:end-placeholder="$t('commons.search.timeEnd')"
:shortcuts="shortcuts"
style="float: right"
style="float: right; width: 330px"
></el-date-picker>
</template>
<div id="loadMemoryChart" style="width: 100%; height: 400px"></div>
@ -79,16 +79,30 @@
:start-placeholder="$t('commons.search.timeStart')"
:end-placeholder="$t('commons.search.timeEnd')"
:shortcuts="shortcuts"
style="float: right"
style="float: right; width: 330px"
></el-date-picker>
</template>
<div id="loadIOChart" style="width: 100%; height: 400px; margin-top: 34px"></div>
<div id="loadIOChart" style="width: 100%; height: 400px"></div>
</el-card>
</el-col>
<el-col :span="12">
<el-card style="overflow: inherit">
<template #header>
<span style="font-size: 16px; font-weight: 500">{{ $t('monitor.network') }} IO</span>
<span style="font-size: 16px; font-weight: 500">{{ $t('monitor.network') }} IO:</span>
<el-popover placement="bottom" :width="200" trigger="click">
<el-select @change="search('network')" v-model="networkChoose">
<template #prefix>{{ $t('monitor.networkCard') }}</template>
<div v-for="item in netOptions" :key="item">
<el-option v-if="item === 'all'" :label="$t('commons.table.all')" :value="item" />
<el-option v-else :label="item" :value="item" />
</div>
</el-select>
<template #reference>
<span class="networkOption">
{{ networkChoose }}
</span>
</template>
</el-popover>
<el-date-picker
@change="search('network')"
v-model="timeRangeNetwork"
@ -97,20 +111,9 @@
:start-placeholder="$t('commons.search.timeStart')"
:end-placeholder="$t('commons.search.timeEnd')"
:shortcuts="shortcuts"
style="float: right"
style="float: right; width: 330px"
></el-date-picker>
</template>
<el-select
v-model="networkChoose"
clearable
filterable
@change="search('network')"
style="margin-left: 20px"
placeholder="Select"
>
<template #prefix>{{ $t('monitor.networkCard') }}</template>
<el-option v-for="item in netOptions" :key="item" :label="item" :value="item" />
</el-select>
<div id="loadNetworkChart" style="width: 100%; height: 400px"></div>
</el-card>
</el-col>
@ -649,3 +652,13 @@ onBeforeUnmount(() => {
window.removeEventListener('resize', changeChartSize);
});
</script>
<style scoped lang="scss">
.networkOption {
font-size: 16px;
font-weight: 500;
margin-left: 5px;
cursor: pointer;
color: var(--el-color-primary);
}
</style>