mirror of https://github.com/1Panel-dev/1Panel
fix: 搜索框设置默认值
parent
af86d1d20a
commit
1d3738be39
|
@ -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, "") + ";")
|
||||
}
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -576,6 +576,7 @@ export default {
|
|||
avgLoad: '平均负载',
|
||||
loadDetail: '负载详情',
|
||||
resourceUsage: '资源使用率',
|
||||
networkCard: '网卡',
|
||||
min: '分钟',
|
||||
read: '读取',
|
||||
write: '写入',
|
||||
|
|
|
@ -97,6 +97,7 @@
|
|||
style="margin-left: 20px"
|
||||
placeholder="Select"
|
||||
>
|
||||
<template #prefix>{{ $t('monitor.networkCard') }}</template>
|
||||
<el-option v-for="item in netOptions" :key="item" :label="item" :value="item" />
|
||||
</el-select>
|
||||
<el-date-picker
|
||||
|
|
|
@ -80,8 +80,8 @@ const paginationConfig = reactive({
|
|||
pageSize: 10,
|
||||
total: 0,
|
||||
});
|
||||
const searchIP = ref();
|
||||
const searchStatus = ref();
|
||||
const searchIP = ref<string>('');
|
||||
const searchStatus = ref<string>('');
|
||||
|
||||
const search = async () => {
|
||||
let params = {
|
||||
|
|
|
@ -107,9 +107,9 @@ const paginationConfig = reactive({
|
|||
pageSize: 10,
|
||||
total: 0,
|
||||
});
|
||||
const searchName = ref();
|
||||
const searchGroup = ref();
|
||||
const searchStatus = ref();
|
||||
const searchName = ref<string>('');
|
||||
const searchGroup = ref<string>('');
|
||||
const searchStatus = ref<string>('');
|
||||
|
||||
const search = async () => {
|
||||
let params = {
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue