diff --git a/backend/app/service/snapshot.go b/backend/app/service/snapshot.go index 333a7e0f3..a2d90a20e 100644 --- a/backend/app/service/snapshot.go +++ b/backend/app/service/snapshot.go @@ -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 { switch operation { case "snapshot": - exclusionRules := "./data/tmp;./data/cache;" + exclusionRules := "./tmp;./cache;" if strings.Contains(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) } case "recover": - exclusionRules := "./data/tmp/;./data/cache;" + exclusionRules := "./tmp/;./cache;" if strings.Contains(backupDir, target) { exclusionRules += ("." + strings.ReplaceAll(backupDir, target, "") + ";") } diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index a126c2851..adc80f786 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -556,6 +556,7 @@ export default { avgLoad: 'Average load', loadDetail: 'Load detail', resourceUsage: 'Resource utilization rate', + networkCard: 'Net card', min: 'Minutes', read: 'Read', write: 'Write', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 9eca90657..798baa0bb 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -576,6 +576,7 @@ export default { avgLoad: '平均负载', loadDetail: '负载详情', resourceUsage: '资源使用率', + networkCard: '网卡', min: '分钟', read: '读取', write: '写入', diff --git a/frontend/src/views/host/monitor/index.vue b/frontend/src/views/host/monitor/index.vue index 9a6fdefec..324c80cf4 100644 --- a/frontend/src/views/host/monitor/index.vue +++ b/frontend/src/views/host/monitor/index.vue @@ -97,6 +97,7 @@ style="margin-left: 20px" placeholder="Select" > + (''); +const searchStatus = ref(''); const search = async () => { let params = { diff --git a/frontend/src/views/log/operation/index.vue b/frontend/src/views/log/operation/index.vue index 65e06aae8..034765648 100644 --- a/frontend/src/views/log/operation/index.vue +++ b/frontend/src/views/log/operation/index.vue @@ -107,9 +107,9 @@ const paginationConfig = reactive({ pageSize: 10, total: 0, }); -const searchName = ref(); -const searchGroup = ref(); -const searchStatus = ref(); +const searchName = ref(''); +const searchGroup = ref(''); +const searchStatus = ref(''); const search = async () => { let params = { diff --git a/frontend/src/views/log/system/index.vue b/frontend/src/views/log/system/index.vue index 9ba927314..2e0c509f3 100644 --- a/frontend/src/views/log/system/index.vue +++ b/frontend/src/views/log/system/index.vue @@ -41,7 +41,7 @@ const handleReady = (payload) => { const loadSystemlogs = async () => { const pathRes = await loadBaseDir(); - let logPath = pathRes.data.replaceAll('/data', '/log'); + let logPath = pathRes.data + '/log'; await LoadFile({ path: `${logPath}/1Panel.log` }) .then((res) => { loading.value = false;