github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 搜索框设置默认值

pull/128/head
ssongliu 2023-02-09 18:30:59 +08:00 committed by ssongliu
parent af86d1d20a
commit 1d3738be39
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/app/service/snapshot.go
View File

@ -607,7 +607,7 @@ func (u *SnapshotService) handleBackupDatas(fileOp files.FileOp, operation strin
func (u *SnapshotService) handlePanelDatas(fileOp files.FileOp, operation string, source, target, backupDir, dockerDir string) error { func (u *SnapshotService) handlePanelDatas(fileOp files.FileOp, operation string, source, target, backupDir, dockerDir string) error {
switch operation { switch operation {
case "snapshot": case "snapshot":
exclusionRules := "./data/tmp;./data/cache;" exclusionRules := "./tmp;./cache;"
if strings.Contains(backupDir, source) { if strings.Contains(backupDir, source) {
exclusionRules += ("." + strings.ReplaceAll(backupDir, source, "") + ";") exclusionRules += ("." + strings.ReplaceAll(backupDir, source, "") + ";")
} }
@ -618,7 +618,7 @@ func (u *SnapshotService) handlePanelDatas(fileOp files.FileOp, operation string
return fmt.Errorf("backup panel data failed, err: %v", err) return fmt.Errorf("backup panel data failed, err: %v", err)
} }
case "recover": case "recover":
exclusionRules := "./data/tmp/;./data/cache;" exclusionRules := "./tmp/;./cache;"
if strings.Contains(backupDir, target) { if strings.Contains(backupDir, target) {
exclusionRules += ("." + strings.ReplaceAll(backupDir, target, "") + ";") exclusionRules += ("." + strings.ReplaceAll(backupDir, target, "") + ";")
} }

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

@ -556,6 +556,7 @@ export default {
avgLoad: 'Average load', avgLoad: 'Average load',
loadDetail: 'Load detail', loadDetail: 'Load detail',
resourceUsage: 'Resource utilization rate', resourceUsage: 'Resource utilization rate',
networkCard: 'Net card',
min: 'Minutes', min: 'Minutes',
read: 'Read', read: 'Read',
write: 'Write', write: 'Write',

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

@ -576,6 +576,7 @@ export default {
avgLoad: '平均负载', avgLoad: '平均负载',
loadDetail: '负载详情', loadDetail: '负载详情',
resourceUsage: '资源使用率', resourceUsage: '资源使用率',
networkCard: '网卡',
min: '分钟', min: '分钟',
read: '读取', read: '读取',
write: '写入', write: '写入',

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

@ -97,6 +97,7 @@
style="margin-left: 20px" style="margin-left: 20px"
placeholder="Select" placeholder="Select"
> >
<template #prefix>{{ $t('monitor.networkCard') }}</template>
<el-option v-for="item in netOptions" :key="item" :label="item" :value="item" /> <el-option v-for="item in netOptions" :key="item" :label="item" :value="item" />
</el-select> </el-select>
<el-date-picker <el-date-picker

4
frontend/src/views/log/login/index.vue
View File

@ -80,8 +80,8 @@ const paginationConfig = reactive({
pageSize: 10, pageSize: 10,
total: 0, total: 0,
}); });
const searchIP = ref(); const searchIP = ref<string>('');
const searchStatus = ref(); const searchStatus = ref<string>('');
const search = async () => { const search = async () => {
let params = { let params = {

6
frontend/src/views/log/operation/index.vue
View File

@ -107,9 +107,9 @@ const paginationConfig = reactive({
pageSize: 10, pageSize: 10,
total: 0, total: 0,
}); });
const searchName = ref(); const searchName = ref<string>('');
const searchGroup = ref(); const searchGroup = ref<string>('');
const searchStatus = ref(); const searchStatus = ref<string>('');
const search = async () => { const search = async () => {
let params = { let params = {

2
frontend/src/views/log/system/index.vue
View File

@ -41,7 +41,7 @@ const handleReady = (payload) => {
const loadSystemlogs = async () => { const loadSystemlogs = async () => {
const pathRes = await loadBaseDir(); const pathRes = await loadBaseDir();
let logPath = pathRes.data.replaceAll('/data', '/log'); let logPath = pathRes.data + '/log';
await LoadFile({ path: `${logPath}/1Panel.log` }) await LoadFile({ path: `${logPath}/1Panel.log` })
.then((res) => { .then((res) => {
loading.value = false; loading.value = false;