1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-25 07:14:43 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 容器列表样式调整 (#2179)

Browse source
This commit is contained in:
ssongliu 2023-09-04 22:24:14 +08:00 committed by GitHub
parent fb00ba812a
commit c588c34955
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/app/service/container.go
View file

@ -151,7 +151,7 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
for _, port := range item.Ports {
itemPortStr := fmt.Sprintf("%v/%s", port.PrivatePort, port.Type)
if port.PublicPort != 0 {
itemPortStr = fmt.Sprintf("%s:%v->%v/%s", port.IP, port.PublicPort, port.PrivatePort, port.Type)
itemPortStr = fmt.Sprintf("%v->%v/%s", port.PublicPort, port.PrivatePort, port.Type)
}
ports = append(ports, itemPortStr)
}
@ -170,7 +170,7 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
if item.NetworkSettings != nil && len(item.NetworkSettings.Networks) > 0 {
networks := make([]string, 0, len(item.NetworkSettings.Networks))
for key := range item.NetworkSettings.Networks {
networks = append(networks, key+":"+item.NetworkSettings.Networks[key].IPAddress)
networks = append(networks, item.NetworkSettings.Networks[key].IPAddress)
}
sort.Strings(networks)
backDatas[i].Network = networks

16
frontend/src/views/container/container/index.vue
View file

@ -62,6 +62,7 @@
:data="data"
@sort-change="search"
@search="search"
:row-style="{ height: '65px' }"
>
<el-table-column type="selection" fix />
<el-table-column
@ -90,9 +91,9 @@
<el-table-column :label="$t('container.source')" show-overflow-tooltip min-width="100" fix>
<template #default="{ row }">
<div v-if="row.hasLoad">
<div>
CPU: {{ row.cpuPercent.toFixed(2) }}% {{ $t('monitor.memory') }}:
{{ row.memoryPercent.toFixed(2) }}%
<div class="source-font">CPU: {{ row.cpuPercent.toFixed(2) }}%</div>
<div class="source-font">
{{ $t('monitor.memory') }}: {{ row.memoryPercent.toFixed(2) }}%
</div>
</div>
<div v-if="!row.hasLoad">
@ -103,14 +104,12 @@
<el-table-column
:label="$t('commons.table.network')"
:width="mobile ? 80 : 'auto'"
min-width="80"
min-width="70"
fix
>
<template #default="{ row }">
<div v-if="row.network">
<div v-for="(item, index) in row.network" :key="index">
<div>{{ item }}</div>
</div>
<div v-for="(item, index) in row.network" :key="index">{{ item }}</div>
</div>
</template>
</el-table-column>
@ -573,4 +572,7 @@ onMounted(() => {
.tagMargin {
margin-top: 2px;
}
.source-font {
font-size: 12px;
}
</style>