gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-19 08:19:15 +08:00
Code

fix: 解决合并导致的代码格式问题 (#2174)

Browse Source
This commit is contained in:
ssongliu 2023-09-04 16:56:13 +08:00 committed by GitHub
parent c00d715b87
commit ea17c451a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/api/interface/container.ts
View File

@ -57,6 +57,7 @@ export namespace Container {
createTime: string; createTime: string;
state: string; state: string;
runTime: string; runTime: string;
network: Array<string>;
ports: Array<string>; ports: Array<string>;
isFromApp: boolean; isFromApp: boolean;
isFromCompose: boolean; isFromCompose: boolean;

2
frontend/src/lang/modules/en.ts
View File

@ -78,7 +78,7 @@ const message = {
interval: 'Interval', interval: 'Interval',
user: 'User', user: 'User',
title: 'Title', title: 'Title',
network: 'Network', network: 'Network',
port: 'Port', port: 'Port',
protocol: 'Protocol', protocol: 'Protocol',
tableSetting: 'Table setting', tableSetting: 'Table setting',

2
frontend/src/lang/modules/tw.ts
View File

@ -78,7 +78,7 @@ const message = {
interval: '耗時', interval: '耗時',
user: '用戶', user: '用戶',
title: '標題', title: '標題',
network: '網絡', network: '網絡',
port: '端口', port: '端口',
protocol: '協議', protocol: '協議',
tableSetting: '列表設置', tableSetting: '列表設置',

2
frontend/src/lang/modules/zh.ts
View File

@ -78,7 +78,7 @@ const message = {
interval: '耗时', interval: '耗时',
user: '用户', user: '用户',
title: '标题', title: '标题',
network: '网络', network: '网络',
port: '端口', port: '端口',
protocol: '协议', protocol: '协议',
tableSetting: '列表设置', tableSetting: '列表设置',

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

@ -90,7 +90,10 @@
<el-table-column :label="$t('container.source')" show-overflow-tooltip min-width="100" fix> <el-table-column :label="$t('container.source')" show-overflow-tooltip min-width="100" fix>
<template #default="{ row }"> <template #default="{ row }">
<div v-if="row.hasLoad"> <div v-if="row.hasLoad">
<div>CPU: {{ row.cpuPercent.toFixed(2) }}% {{ $t('monitor.memory') }}: {{ row.memoryPercent.toFixed(2) }}%</div> <div>
CPU: {{ row.cpuPercent.toFixed(2) }}% {{ $t('monitor.memory') }}:
{{ row.memoryPercent.toFixed(2) }}%
</div>
</div> </div>
<div v-if="!row.hasLoad"> <div v-if="!row.hasLoad">
<el-button link loading></el-button> <el-button link loading></el-button>
@ -98,16 +101,18 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
:label="$t('commons.table.network')" :label="$t('commons.table.network')"
:width="mobile ? 80 : 'auto'" :width="mobile ? 80 : 'auto'"
min-width="80" min-width="80"
fix fix
> >
<div v-if="row.network"> <template #default="{ row }">
<div v-for="(item, index) in row.network" :key="index"> <div v-if="row.network">
<div>{{ item }}</div> <div v-for="(item, index) in row.network" :key="index">
</div> <div>{{ item }}</div>
</div> </div>
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
:label="$t('commons.table.port')" :label="$t('commons.table.port')"