1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-09-20 07:35:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修改移动端样式 (#6440)
Some checks failed
Build Test / build-linux-binary (push) Failing after -8m51s
Details
Build / SonarCloud (push) Failing after -8m54s
Details
sync2gitee / repo-sync (push) Failing after -8m56s
Details

Browse source
This commit is contained in:
ssongliu 2024-09-10 22:04:12 +08:00 committed by GitHub
parent 48281ddf86
commit f88a3059be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 83 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

6
frontend/src/styles/common.scss
View file

@ -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;
}

17
frontend/src/views/container/compose/index.vue
View file

@ -25,28 +25,17 @@
</el-alert>
</template>
<template #toolbar>
<div class="hidden sm:block sm:flex sm:flex-row sm:w-full sm:justify-between">
<div>
<div class="flex justify-between gap-2 flex-wrap sm:flex-row">
<div class="flex flex-wrap gap-3">
<el-button type="primary" @click="onOpenDialog()">
{{ $t('container.createCompose') }}
</el-button>
</div>
<div class="flex flex-row gap-2">
<div class="flex flex-wrap gap-3">
<TableSetting @search="search()" />
<TableSearch @search="search()" v-model:searchName="searchName" />
</div>
</div>
<div class="block flex flex-col gap-2 sm:hidden">
<div class="flex justify-between">
<el-button type="primary" @click="onOpenDialog()">
{{ $t('container.createCompose') }}
</el-button>
<TableSetting @search="search()" />
</div>
<div class="flex justify-end">
<TableSearch @search="search()" v-model:searchName="searchName" />
</div>
</div>
</template>
<template #main>
<ComplexTable

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

@ -45,9 +45,3 @@ const buttons = [
},
];
</script>
<style>
.el-button + .el-button {
margin: 0;
}
</style>

17
frontend/src/views/container/repo/index.vue
View file

@ -8,24 +8,13 @@
<LayoutContent :title="$t('container.repo')" :class="{ mask: dockerStatus != 'Running' }">
<template #toolbar>
<div class="block flex flex-col gap-2 sm:hidden">
<div class="flex flex-row justify-between">
<el-button type="primary" @click="onOpenDialog('add')">
{{ $t('container.createRepo') }}
</el-button>
<TableSetting @search="search()" />
</div>
<div class="flex flex-row justify-end">
<TableSearch @search="search()" v-model:searchName="searchName" />
</div>
</div>
<div class="hidden sm:block sm:flex sm:justify-between">
<div>
<div class="flex justify-between gap-2 flex-wrap sm:flex-row">
<div class="flex flex-wrap gap-3">
<el-button type="primary" @click="onOpenDialog('add')">
{{ $t('container.createRepo') }}
</el-button>
</div>
<div class="flex flex-row gap-2">
<div class="flex flex-wrap gap-3">
<TableSetting @search="search()" />
<TableSearch @search="search()" v-model:searchName="searchName" />
</div>

7
frontend/src/views/database/mysql/remote/index.vue
View file

@ -5,11 +5,16 @@
<back-button name="MySQL" :header="$t('database.remoteDB')" />
</template>
<template #toolbar>
<div class="flex justify-between gap-2 flex-wrap sm:flex-row">
<div class="flex flex-wrap gap-3">
<el-button type="primary" @click="onOpenDialog('create')">
{{ $t('database.createRemoteDB') }}
</el-button>
</div>
<div class="flex flex-wrap gap-3">
<TableSearch @search="search()" v-model:searchName="searchName" />
</div>
</div>
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" @sort-change="search" @search="search" :data="data">

7
frontend/src/views/database/postgresql/remote/index.vue
View file

@ -5,11 +5,16 @@
<back-button name="PostgreSQL" :header="$t('database.remoteDB')" />
</template>
<template #toolbar>
<div class="flex justify-between gap-2 flex-wrap sm:flex-row">
<div class="flex flex-wrap gap-3">
<el-button type="primary" @click="onOpenDialog('create')">
{{ $t('database.createRemoteDB') }}
</el-button>
</div>
<div class="flex flex-wrap gap-3">
<TableSearch @search="search()" v-model:searchName="searchName" />
</div>
</div>
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" @sort-change="search" @search="search" :data="data">

4
frontend/src/views/database/redis/index.vue
View file

@ -51,12 +51,16 @@
</el-select>
</template>
<template #toolbar v-if="!isOnSetting">
<div class="flex justify-between gap-2 flex-wrap sm:flex-row">
<div class="flex flex-wrap gap-3">
<el-button v-if="currentDB" type="primary" plain @click="onLoadConn">
{{ $t('database.databaseConnInfo') }}
</el-button>
<el-button @click="goRemoteDB" type="primary" plain>
{{ $t('database.remoteDB') }}
</el-button>
</div>
</div>
</template>
</LayoutContent>

12
frontend/src/views/database/redis/remote/index.vue
View file

@ -5,16 +5,16 @@
<back-button name="Redis" :header="$t('database.remoteDB')" />
</template>
<template #toolbar>
<el-row>
<el-col :xs="24" :sm="20" :md="20" :lg="20" :xl="20">
<div class="flex justify-between gap-2 flex-wrap sm:flex-row">
<div class="flex flex-wrap gap-3">
<el-button type="primary" @click="onOpenDialog('create')">
{{ $t('database.createRemoteDB') }}
</el-button>
</el-col>
<el-col :xs="24" :sm="4" :md="4" :lg="4" :xl="4">
</div>
<div class="flex flex-wrap gap-3">
<TableSearch @search="search()" v-model:searchName="searchName" />
</el-col>
</el-row>
</div>
</div>
</template>
<template #main>
<ComplexTable :pagination-config="paginationConfig" @sort-change="search" @search="search" :data="data">

4
frontend/src/views/host/terminal/command/index.vue
View file

@ -5,6 +5,8 @@
<el-alert type="info" :title="$t('terminal.quickCommandHelper')" :closable="false" />
</template>
<template #toolbar>
<div class="flex w-full flex-col gap-4 md:justify-between md:flex-row">
<div class="flex flex-wrap gap-4">
<el-button type="primary" @click="onCreate()">
{{ $t('commons.button.create') }} {{ $t('terminal.quickCommand') }}
</el-button>
@ -14,6 +16,8 @@
<el-button type="primary" plain :disabled="selects.length === 0" @click="batchDelete(null)">
{{ $t('commons.button.delete') }}
</el-button>
</div>
</div>
</template>
<template #search>
<el-row :gutter="5">

12
frontend/src/views/host/terminal/host/index.vue
View file

@ -2,8 +2,8 @@
<div>
<LayoutContent v-loading="loading" :title="$t('terminal.host')">
<template #toolbar>
<el-row>
<el-col :span="20">
<div class="flex w-full flex-col gap-4 md:justify-between md:flex-row">
<div class="flex flex-wrap gap-4">
<el-button type="primary" @click="onOpenDialog('create')">
{{ $t('terminal.addHost') }}
</el-button>
@ -13,11 +13,11 @@
<el-button type="primary" plain :disabled="selects.length === 0" @click="onBatchDelete(null)">
{{ $t('commons.button.delete') }}
</el-button>
</el-col>
<el-col :span="4">
</div>
<div class="flex flex-wrap gap-3">
<TableSearch @search="search()" v-model:searchName="info" />
</el-col>
</el-row>
</div>
</div>
</template>
<template #search>
<el-select v-model="group" @change="search()" clearable class="p-w-200">

12
frontend/src/views/log/login/index.vue
View file

@ -2,8 +2,8 @@
<div>
<LayoutContent v-loading="loading" :title="$t('logs.login')">
<template #toolbar>
<el-row>
<el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
<div class="flex justify-between gap-2 flex-wrap sm:flex-row">
<div class="flex flex-wrap gap-3">
<el-button class="tag-button no-active" @click="onChangeRoute('OperationLog')">
{{ $t('logs.operation') }}
</el-button>
@ -13,14 +13,12 @@
<el-button class="tag-button no-active" @click="onChangeRoute('SystemLog')">
{{ $t('logs.system') }}
</el-button>
</el-col>
<el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
<div class="flex justify-end">
</div>
<div class="flex flex-wrap gap-3">
<TableSetting @search="search()" />
<TableSearch @search="search()" v-model:searchName="searchIP" />
</div>
</el-col>
</el-row>
</div>
</template>
<template #search>

12
frontend/src/views/toolbox/ftp/index.vue
View file

@ -28,8 +28,8 @@
<div v-if="form.isExist">
<LayoutContent v-loading="loading" title="FTP">
<template #toolbar>
<el-row>
<el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
<div class="flex justify-between gap-2 flex-wrap sm:flex-row">
<div class="flex flex-wrap gap-3">
<el-button type="primary" :disabled="!form.isActive" @click="onOpenDialog('add')">
{{ $t('commons.button.add') }} FTP
</el-button>
@ -39,11 +39,11 @@
<el-button plain :disabled="selects.length === 0 || !form.isActive" @click="onDelete(null)">
{{ $t('commons.button.delete') }}
</el-button>
</el-col>
<el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
</div>
<div class="flex flex-wrap gap-3">
<TableSearch @search="search()" v-model:searchName="searchName" />
</el-col>
</el-row>
</div>
</div>
</template>
<template #main>
<ComplexTable