zishuo/1Panel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 修改方法名

Browse Source
This commit is contained in:
zhengkunwang223
2023-01-16 15:55:53 +08:00
committed by zhengkunwang223
parent cc17499207
commit 3ffda84dee
33 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/container-log/index.vue
View File

@@ -33,7 +33,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { logContainer } from '@/api/modules/container'; import { logContainer } from '@/api/modules/container';
import i18n from '@/lang'; import i18n from '@/lang';
import { dateFromatForName } from '@/utils/util'; import { dateFormatForName } from '@/utils/util';
import { nextTick, reactive, ref, shallowRef } from 'vue'; import { nextTick, reactive, ref, shallowRef } from 'vue';
import { Codemirror } from 'vue-codemirror'; import { Codemirror } from 'vue-codemirror';
import { javascript } from '@codemirror/lang-javascript'; import { javascript } from '@codemirror/lang-javascript';
@@ -98,7 +98,7 @@ const onDownload = async () => {
const a = document.createElement('a'); const a = document.createElement('a');
a.style.display = 'none'; a.style.display = 'none';
a.href = downloadUrl; a.href = downloadUrl;
a.download = logSearch.container + '-' + dateFromatForName(new Date()) + '.log'; a.download = logSearch.container + '-' + dateFormatForName(new Date()) + '.log';
const event = new MouseEvent('click'); const event = new MouseEvent('click');
a.dispatchEvent(event); a.dispatchEvent(event);
}; };

10
frontend/src/utils/util.ts
View File

@@ -35,7 +35,7 @@ export function getBrowserLang() {
} }
return defaultBrowserLang; return defaultBrowserLang;
} }
export function dateFromat(row: number, col: number, dataStr: any) { export function dateFormat(row: any, col: any, dataStr: any) {
const date = new Date(dataStr); const date = new Date(dataStr);
const y = date.getFullYear(); const y = date.getFullYear();
let m: string | number = date.getMonth() + 1; let m: string | number = date.getMonth() + 1;
@@ -52,7 +52,7 @@ export function dateFromat(row: number, col: number, dataStr: any) {
} }
//2016-01-12 //2016-01-12
export function dateFromatSimple(dataStr: any) { export function dateFormatSimple(dataStr: any) {
const date = new Date(dataStr); const date = new Date(dataStr);
const y = date.getFullYear(); const y = date.getFullYear();
let m: string | number = date.getMonth() + 1; let m: string | number = date.getMonth() + 1;
@@ -63,7 +63,7 @@ export function dateFromatSimple(dataStr: any) {
} }
// 20221013151302 // 20221013151302
export function dateFromatForName(dataStr: any) { export function dateFormatForName(dataStr: any) {
const date = new Date(dataStr); const date = new Date(dataStr);
const y = date.getFullYear(); const y = date.getFullYear();
let m: string | number = date.getMonth() + 1; let m: string | number = date.getMonth() + 1;
@@ -80,7 +80,7 @@ export function dateFromatForName(dataStr: any) {
} }
// 10-13 \n 15:13 // 10-13 \n 15:13
export function dateFromatWithoutYear(dataStr: any) { export function dateFormatWithoutYear(dataStr: any) {
const date = new Date(dataStr); const date = new Date(dataStr);
let m: string | number = date.getMonth() + 1; let m: string | number = date.getMonth() + 1;
m = m < 10 ? `0${String(m)}` : m; m = m < 10 ? `0${String(m)}` : m;
@@ -94,7 +94,7 @@ export function dateFromatWithoutYear(dataStr: any) {
} }
// 20221013151302 // 20221013151302
export function dateFromatForSecond(dataStr: any) { export function dateFormatForSecond(dataStr: any) {
const date = new Date(dataStr); const date = new Date(dataStr);
let h: string | number = date.getHours(); let h: string | number = date.getHours();
h = h < 10 ? `0${String(h)}` : h; h = h < 10 ? `0${String(h)}` : h;

4
frontend/src/views/app-store/installed/backup/index.vue
View File

@@ -33,7 +33,7 @@
<el-table-column <el-table-column
prop="createdAt" prop="createdAt"
:label="$t('app.backupdate')" :label="$t('app.backupdate')"
:formatter="dateFromat" :formatter="dateFormat"
show-overflow-tooltip show-overflow-tooltip
/> />
<fu-table-operations <fu-table-operations
@@ -73,7 +73,7 @@ import { DelAppBackups, GetAppBackups, InstalledOp } from '@/api/modules/app';
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import ComplexTable from '@/components/complex-table/index.vue'; import ComplexTable from '@/components/complex-table/index.vue';
import Header from '@/components/drawer-header/index.vue'; import Header from '@/components/drawer-header/index.vue';
import { dateFromat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import i18n from '@/lang'; import i18n from '@/lang';
import { useDeleteData } from '@/hooks/use-delete-data'; import { useDeleteData } from '@/hooks/use-delete-data';

4
frontend/src/views/container/compose/detail/index.vue
View File

@@ -95,7 +95,7 @@
<el-table-column <el-table-column
prop="createTime" prop="createTime"
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFromat" :formatter="dateFormat"
show-overflow-tooltip show-overflow-tooltip
/> />
<fu-table-operations <fu-table-operations
@@ -130,7 +130,7 @@ import TerminalDialog from '@/views/container/container/terminal/index.vue';
import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.vue'; import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.vue';
import ComplexTable from '@/components/complex-table/index.vue'; import ComplexTable from '@/components/complex-table/index.vue';
import Status from '@/components/status/index.vue'; import Status from '@/components/status/index.vue';
import { dateFromat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { composeOperator, ContainerOperator, inspect, searchContainer } from '@/api/modules/container'; import { composeOperator, ContainerOperator, inspect, searchContainer } from '@/api/modules/container';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import i18n from '@/lang'; import i18n from '@/lang';

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

@@ -71,7 +71,7 @@
<el-table-column <el-table-column
prop="createTime" prop="createTime"
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFromat" :formatter="dateFormat"
show-overflow-tooltip show-overflow-tooltip
/> />
<fu-table-operations <fu-table-operations
@@ -107,7 +107,7 @@ import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.vue';
import Status from '@/components/status/index.vue'; import Status from '@/components/status/index.vue';
import Submenu from '@/views/container/index.vue'; import Submenu from '@/views/container/index.vue';
import { reactive, onMounted, ref } from 'vue'; import { reactive, onMounted, ref } from 'vue';
import { dateFromat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { ContainerOperator, inspect, loadDockerStatus, searchContainer } from '@/api/modules/container'; import { ContainerOperator, inspect, loadDockerStatus, searchContainer } from '@/api/modules/container';
import { Container } from '@/api/interface/container'; import { Container } from '@/api/interface/container';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';

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

@@ -49,7 +49,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { logContainer } from '@/api/modules/container'; import { logContainer } from '@/api/modules/container';
import i18n from '@/lang'; import i18n from '@/lang';
import { dateFromatForName } from '@/utils/util'; import { dateFormatForName } from '@/utils/util';
import { nextTick, reactive, ref, shallowRef } from 'vue'; import { nextTick, reactive, ref, shallowRef } from 'vue';
import { Codemirror } from 'vue-codemirror'; import { Codemirror } from 'vue-codemirror';
import { javascript } from '@codemirror/lang-javascript'; import { javascript } from '@codemirror/lang-javascript';
@@ -114,7 +114,7 @@ const onDownload = async () => {
const a = document.createElement('a'); const a = document.createElement('a');
a.style.display = 'none'; a.style.display = 'none';
a.href = downloadUrl; a.href = downloadUrl;
a.download = logSearch.container + '-' + dateFromatForName(new Date()) + '.log'; a.download = logSearch.container + '-' + dateFormatForName(new Date()) + '.log';
const event = new MouseEvent('click'); const event = new MouseEvent('click');
a.dispatchEvent(event); a.dispatchEvent(event);
}; };

4
frontend/src/views/container/container/monitor/index.vue
View File

@@ -50,7 +50,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue'; import { ref } from 'vue';
import { ContainerStats } from '@/api/modules/container'; import { ContainerStats } from '@/api/modules/container';
import { dateFromatForSecond } from '@/utils/util'; import { dateFormatForSecond } from '@/utils/util';
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import i18n from '@/lang'; import i18n from '@/lang';
@@ -142,7 +142,7 @@ const loadData = async () => {
if (netRxDatas.value.length > 20) { if (netRxDatas.value.length > 20) {
netRxDatas.value.splice(0, 1); netRxDatas.value.splice(0, 1);
} }
timeDatas.value.push(dateFromatForSecond(res.data.shotTime)); timeDatas.value.push(dateFormatForSecond(res.data.shotTime));
if (timeDatas.value.length > 20) { if (timeDatas.value.length > 20) {
timeDatas.value.splice(0, 1); timeDatas.value.splice(0, 1);
} }

4
frontend/src/views/container/image/index.vue
View File

@@ -33,7 +33,7 @@
<el-table-column :label="$t('container.size')" prop="size" min-width="70" fix /> <el-table-column :label="$t('container.size')" prop="size" min-width="70" fix />
<el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix> <el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix>
<template #default="{ row }"> <template #default="{ row }">
{{ dateFromat(0, 0, row.createdAt) }} {{ dateFormatSimple(row.createdAt) }}
</template> </template>
</el-table-column> </el-table-column>
<fu-table-operations <fu-table-operations
@@ -81,7 +81,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import ComplexTable from '@/components/complex-table/index.vue'; import ComplexTable from '@/components/complex-table/index.vue';
import { reactive, onMounted, ref } from 'vue'; import { reactive, onMounted, ref } from 'vue';
import { dateFromat } from '@/utils/util'; import { dateFormatSimple } from '@/utils/util';
import Submenu from '@/views/container/index.vue'; import Submenu from '@/views/container/index.vue';
import { Container } from '@/api/interface/container'; import { Container } from '@/api/interface/container';
import LayoutContent from '@/layout/layout-content.vue'; import LayoutContent from '@/layout/layout-content.vue';

4
frontend/src/views/container/network/index.vue
View File

@@ -63,7 +63,7 @@
prop="createdAt" prop="createdAt"
min-width="90" min-width="90"
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFromat" :formatter="dateFormat"
/> />
<fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix /> <fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix />
</ComplexTable> </ComplexTable>
@@ -82,7 +82,7 @@ import CreateDialog from '@/views/container/network/create/index.vue';
import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.vue'; import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.vue';
import Submenu from '@/views/container/index.vue'; import Submenu from '@/views/container/index.vue';
import { reactive, onMounted, ref } from 'vue'; import { reactive, onMounted, ref } from 'vue';
import { dateFromat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { deleteNetwork, searchNetwork, inspect, loadDockerStatus } from '@/api/modules/container'; import { deleteNetwork, searchNetwork, inspect, loadDockerStatus } from '@/api/modules/container';
import { Container } from '@/api/interface/container'; import { Container } from '@/api/interface/container';
import i18n from '@/lang'; import i18n from '@/lang';

4
frontend/src/views/container/repo/index.vue
View File

@@ -46,7 +46,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix> <el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix>
<template #default="{ row }"> <template #default="{ row }">
{{ dateFromat(0, 0, row.createdAt) }} {{ dateFormatSimple(row.createdAt) }}
</template> </template>
</el-table-column> </el-table-column>
<fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" /> <fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" />
@@ -65,7 +65,7 @@ import OperatorDialog from '@/views/container/repo/operator/index.vue';
import DeleteDialog from '@/views/container/repo/delete/index.vue'; import DeleteDialog from '@/views/container/repo/delete/index.vue';
import Submenu from '@/views/container/index.vue'; import Submenu from '@/views/container/index.vue';
import { reactive, onMounted, ref } from 'vue'; import { reactive, onMounted, ref } from 'vue';
import { dateFromat } from '@/utils/util'; import { dateFormatSimple } from '@/utils/util';
import { Container } from '@/api/interface/container'; import { Container } from '@/api/interface/container';
import { loadDockerStatus, searchImageRepo } from '@/api/modules/container'; import { loadDockerStatus, searchImageRepo } from '@/api/modules/container';
import i18n from '@/lang'; import i18n from '@/lang';

4
frontend/src/views/container/template/index.vue
View File

@@ -39,7 +39,7 @@
<el-table-column :label="$t('container.description')" prop="description" min-width="200" fix /> <el-table-column :label="$t('container.description')" prop="description" min-width="200" fix />
<el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix> <el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix>
<template #default="{ row }"> <template #default="{ row }">
{{ dateFromat(0, 0, row.createdAt) }} {{ dateFormatSimple(row.createdAt) }}
</template> </template>
</el-table-column> </el-table-column>
<fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" /> <fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" />
@@ -86,7 +86,7 @@ import { Codemirror } from 'vue-codemirror';
import { javascript } from '@codemirror/lang-javascript'; import { javascript } from '@codemirror/lang-javascript';
import { oneDark } from '@codemirror/theme-one-dark'; import { oneDark } from '@codemirror/theme-one-dark';
import { reactive, onMounted, ref } from 'vue'; import { reactive, onMounted, ref } from 'vue';
import { dateFromat } from '@/utils/util'; import { dateFormatSimple } from '@/utils/util';
import { Container } from '@/api/interface/container'; import { Container } from '@/api/interface/container';
import OperatorDialog from '@/views/container/template/operator/index.vue'; import OperatorDialog from '@/views/container/template/operator/index.vue';
import { deleteComposeTemplate, loadDockerStatus, searchComposeTemplate } from '@/api/modules/container'; import { deleteComposeTemplate, loadDockerStatus, searchComposeTemplate } from '@/api/modules/container';

4
frontend/src/views/container/volume/index.vue
View File

@@ -52,7 +52,7 @@
prop="createdAt" prop="createdAt"
min-width="90" min-width="90"
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFromat" :formatter="dateFormat"
/> />
<fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix /> <fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix />
</ComplexTable> </ComplexTable>
@@ -71,7 +71,7 @@ import CreateDialog from '@/views/container/volume/create/index.vue';
import Submenu from '@/views/container/index.vue'; import Submenu from '@/views/container/index.vue';
import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.vue'; import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.vue';
import { reactive, onMounted, ref } from 'vue'; import { reactive, onMounted, ref } from 'vue';
import { dateFromat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { deleteVolume, searchVolume, inspect, loadDockerStatus } from '@/api/modules/container'; import { deleteVolume, searchVolume, inspect, loadDockerStatus } from '@/api/modules/container';
import { Container } from '@/api/interface/container'; import { Container } from '@/api/interface/container';
import i18n from '@/lang'; import i18n from '@/lang';

10
frontend/src/views/cronjob/record/index.vue
View File

@@ -29,7 +29,7 @@
> >
<el-icon v-if="item.status === 'Success'"><Select /></el-icon> <el-icon v-if="item.status === 'Success'"><Select /></el-icon>
<el-icon v-if="item.status === 'Failed'"><CloseBold /></el-icon> <el-icon v-if="item.status === 'Failed'"><CloseBold /></el-icon>
{{ dateFromat(0, 0, item.startTime) }} {{ dateFormatSimple(item.startTime) }}
</li> </li>
</ul> </ul>
<div style="margin-top: 10px; margin-bottom: 5px; font-size: 12px; float: right"> <div style="margin-top: 10px; margin-bottom: 5px; font-size: 12px; float: right">
@@ -164,7 +164,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('commons.search.timeStart')"> <el-form-item :label="$t('commons.search.timeStart')">
{{ dateFromat(0, 0, currentRecord?.startTime) }} {{ dateFormatSimple(currentRecord?.startTime) }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@@ -232,7 +232,7 @@ import { Cronjob } from '@/api/interface/cronjob';
import { loadZero } from '@/utils/util'; import { loadZero } from '@/utils/util';
import { loadBackupName } from '@/views/setting/helper'; import { loadBackupName } from '@/views/setting/helper';
import { searchRecords, download } from '@/api/modules/cronjob'; import { searchRecords, download } from '@/api/modules/cronjob';
import { dateFromat, dateFromatForName } from '@/utils/util'; import { dateFormatSimple, dateFormatForName } from '@/utils/util';
import i18n from '@/lang'; import i18n from '@/lang';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { LoadFile } from '@/api/modules/files'; import { LoadFile } from '@/api/modules/files';
@@ -362,9 +362,9 @@ const onDownload = async (recordID: number, backupID: number) => {
a.style.display = 'none'; a.style.display = 'none';
a.href = downloadUrl; a.href = downloadUrl;
if (dialogData.value.rowData!.type === 'database') { if (dialogData.value.rowData!.type === 'database') {
a.download = dateFromatForName(currentRecord.value?.startTime) + '.sql.gz'; a.download = dateFormatForName(currentRecord.value?.startTime) + '.sql.gz';
} else { } else {
a.download = dateFromatForName(currentRecord.value?.startTime) + '.tar.gz'; a.download = dateFormatForName(currentRecord.value?.startTime) + '.tar.gz';
} }
const event = new MouseEvent('click'); const event = new MouseEvent('click');
a.dispatchEvent(event); a.dispatchEvent(event);

4
frontend/src/views/database/mysql/backup/index.vue
View File

@@ -21,7 +21,7 @@
<el-table-column <el-table-column
prop="createdAt" prop="createdAt"
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFromat" :formatter="dateFormat"
show-overflow-tooltip show-overflow-tooltip
/> />
@@ -34,7 +34,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import ComplexTable from '@/components/complex-table/index.vue'; import ComplexTable from '@/components/complex-table/index.vue';
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import { dateFromat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { useDeleteData } from '@/hooks/use-delete-data'; import { useDeleteData } from '@/hooks/use-delete-data';
import { backup, recover } from '@/api/modules/database'; import { backup, recover } from '@/api/modules/database';
import i18n from '@/lang'; import i18n from '@/lang';

4
frontend/src/views/database/mysql/index.vue
View File

@@ -86,7 +86,7 @@
<el-table-column <el-table-column
prop="createdAt" prop="createdAt"
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFromat" :formatter="dateFormat"
show-overflow-tooltip show-overflow-tooltip
/> />
<fu-table-operations <fu-table-operations
@@ -196,7 +196,7 @@ import AppResources from '@/views/database/mysql/check/index.vue';
import Setting from '@/views/database/mysql/setting/index.vue'; import Setting from '@/views/database/mysql/setting/index.vue';
import AppStatus from '@/components/app-status/index.vue'; import AppStatus from '@/components/app-status/index.vue';
import Submenu from '@/views/database/index.vue'; import Submenu from '@/views/database/index.vue';
import { dateFromat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import { import {
deleteCheckMysqlDB, deleteCheckMysqlDB,

4
frontend/src/views/database/mysql/setting/slow-log/index.vue
View File

@@ -57,7 +57,7 @@ import { LoadFile } from '@/api/modules/files';
import ConfirmDialog from '@/components/confirm-dialog/index.vue'; import ConfirmDialog from '@/components/confirm-dialog/index.vue';
import { updateMysqlVariables } from '@/api/modules/database'; import { updateMysqlVariables } from '@/api/modules/database';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { dateFromatForName } from '@/utils/util'; import { dateFormatForName } from '@/utils/util';
import i18n from '@/lang'; import i18n from '@/lang';
import { loadBaseDir } from '@/api/modules/setting'; import { loadBaseDir } from '@/api/modules/setting';
@@ -141,7 +141,7 @@ const onDownload = async () => {
const a = document.createElement('a'); const a = document.createElement('a');
a.style.display = 'none'; a.style.display = 'none';
a.href = downloadUrl; a.href = downloadUrl;
a.download = mysqlName.value + '-slowlogs-' + dateFromatForName(new Date()) + '.log'; a.download = mysqlName.value + '-slowlogs-' + dateFormatForName(new Date()) + '.log';
const event = new MouseEvent('click'); const event = new MouseEvent('click');
a.dispatchEvent(event); a.dispatchEvent(event);
}; };

4
frontend/src/views/database/mysql/upload/index.vue
View File

@@ -48,7 +48,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix> <el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix>
<template #default="{ row }"> <template #default="{ row }">
{{ dateFromat(0, 0, row.modTime) }} {{ dateFormatSimple(row.modTime) }}
</template> </template>
</el-table-column> </el-table-column>
<fu-table-operations <fu-table-operations
@@ -66,7 +66,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import ComplexTable from '@/components/complex-table/index.vue'; import ComplexTable from '@/components/complex-table/index.vue';
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import { computeSize, dateFromat } from '@/utils/util'; import { computeSize, dateFormatSimple } from '@/utils/util';
import { useDeleteData } from '@/hooks/use-delete-data'; import { useDeleteData } from '@/hooks/use-delete-data';
import { recoverByUpload } from '@/api/modules/database'; import { recoverByUpload } from '@/api/modules/database';
import i18n from '@/lang'; import i18n from '@/lang';

6
frontend/src/views/home/index.vue
View File

@@ -157,7 +157,7 @@ import App from '@/views/home/app/index.vue';
import CardWithHeader from '@/components/card-with-header/index.vue'; import CardWithHeader from '@/components/card-with-header/index.vue';
import i18n from '@/lang'; import i18n from '@/lang';
import { Dashboard } from '@/api/interface/dashboard'; import { Dashboard } from '@/api/interface/dashboard';
import { dateFromatForSecond, computeSize } from '@/utils/util'; import { dateFormatForSecond, computeSize } from '@/utils/util';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { loadBaseInfo, loadCurrentInfo } from '@/api/modules/dashboard'; import { loadBaseInfo, loadCurrentInfo } from '@/api/modules/dashboard';
import { getIOOptions, getNetworkOptions } from '@/api/modules/monitor'; import { getIOOptions, getNetworkOptions } from '@/api/modules/monitor';
@@ -341,11 +341,11 @@ const onLoadCurrentInfo = async () => {
} }
currentChartInfo.ioCount = Number(((res.data.ioCount - currentInfo.value.ioCount) / 3).toFixed(2)); currentChartInfo.ioCount = Number(((res.data.ioCount - currentInfo.value.ioCount) / 3).toFixed(2));
timeIODatas.value.push(dateFromatForSecond(res.data.shotTime)); timeIODatas.value.push(dateFormatForSecond(res.data.shotTime));
if (timeIODatas.value.length > 20) { if (timeIODatas.value.length > 20) {
timeIODatas.value.splice(0, 1); timeIODatas.value.splice(0, 1);
} }
timeNetDatas.value.push(dateFromatForSecond(res.data.shotTime)); timeNetDatas.value.push(dateFormatForSecond(res.data.shotTime));
if (timeNetDatas.value.length > 20) { if (timeNetDatas.value.length > 20) {
timeNetDatas.value.splice(0, 1); timeNetDatas.value.splice(0, 1);
} }

4
frontend/src/views/host/file-management/detail/index.vue
View File

@@ -11,7 +11,7 @@
<el-descriptions-item :label="$t('file.user')">{{ data.user }}</el-descriptions-item> <el-descriptions-item :label="$t('file.user')">{{ data.user }}</el-descriptions-item>
<el-descriptions-item :label="$t('file.group')">{{ data.group }}</el-descriptions-item> <el-descriptions-item :label="$t('file.group')">{{ data.group }}</el-descriptions-item>
<el-descriptions-item :label="$t('commons.table.updatedAt')"> <el-descriptions-item :label="$t('commons.table.updatedAt')">
{{ dateFromat(0, 0, data.modTime) }} {{ dateFormatSimple(data.modTime) }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-col> </el-col>
@@ -23,7 +23,7 @@
import { GetFileContent } from '@/api/modules/files'; import { GetFileContent } from '@/api/modules/files';
import { computeSize } from '@/utils/util'; import { computeSize } from '@/utils/util';
import { ref } from 'vue'; import { ref } from 'vue';
import { dateFromat } from '@/utils/util'; import { dateFormatSimple } from '@/utils/util';
interface InfoProps { interface InfoProps {
path: string; path: string;

4
frontend/src/views/host/file-management/index.vue
View File

@@ -116,7 +116,7 @@
<el-table-column <el-table-column
:label="$t('file.updateTime')" :label="$t('file.updateTime')"
prop="modTime" prop="modTime"
:formatter="dateFromat" :formatter="dateFormat"
min-width="150" min-width="150"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@@ -187,7 +187,7 @@ import {
SaveFileContent, SaveFileContent,
ComputeDirSize, ComputeDirSize,
} from '@/api/modules/files'; } from '@/api/modules/files';
import { computeSize, dateFromat, getIcon, getRandomStr } from '@/utils/util'; import { computeSize, dateFormat, getIcon, getRandomStr } from '@/utils/util';
import { File } from '@/api/interface/file'; import { File } from '@/api/interface/file';
import { useDeleteData } from '@/hooks/use-delete-data'; import { useDeleteData } from '@/hooks/use-delete-data';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';

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

@@ -114,7 +114,7 @@ import { ref, reactive, onMounted, onBeforeUnmount } from 'vue';
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import { loadMonitor, getNetworkOptions } from '@/api/modules/monitor'; import { loadMonitor, getNetworkOptions } from '@/api/modules/monitor';
import { Monitor } from '@/api/interface/monitor'; import { Monitor } from '@/api/interface/monitor';
import { dateFromatWithoutYear } from '@/utils/util'; import { dateFormatWithoutYear } from '@/utils/util';
import i18n from '@/lang'; import i18n from '@/lang';
const zoomStart = ref(); const zoomStart = ref();
@@ -211,7 +211,7 @@ const search = async (param: string) => {
switch (item.param) { switch (item.param) {
case 'base': case 'base':
let baseDate = item.date.map(function (item: any) { let baseDate = item.date.map(function (item: any) {
return dateFromatWithoutYear(item); return dateFormatWithoutYear(item);
}); });
if (param === 'cpu' || param === 'all') { if (param === 'cpu' || param === 'all') {
let cpuData = item.value.map(function (item: any) { let cpuData = item.value.map(function (item: any) {
@@ -241,7 +241,7 @@ const search = async (param: string) => {
break; break;
case 'network': case 'network':
let networkDate = item.date.map(function (item: any) { let networkDate = item.date.map(function (item: any) {
return dateFromatWithoutYear(item); return dateFormatWithoutYear(item);
}); });
let networkUp = item.value.map(function (item: any) { let networkUp = item.value.map(function (item: any) {
return item.up.toFixed(2); return item.up.toFixed(2);
@@ -327,7 +327,7 @@ function initLoadCharts(item: Monitor.MonitorData) {
grid: { left: '7%', right: '7%', bottom: '20%' }, grid: { left: '7%', right: '7%', bottom: '20%' },
xAxis: { xAxis: {
data: item.date.map(function (item: any) { data: item.date.map(function (item: any) {
return dateFromatWithoutYear(item); return dateFormatWithoutYear(item);
}), }),
}, },
yAxis: [ yAxis: [
@@ -425,7 +425,7 @@ function initIOCharts(item: Monitor.MonitorData) {
grid: { left: '7%', right: '7%', bottom: '20%' }, grid: { left: '7%', right: '7%', bottom: '20%' },
xAxis: { xAxis: {
data: item.date.map(function (item: any) { data: item.date.map(function (item: any) {
return dateFromatWithoutYear(item); return dateFormatWithoutYear(item);
}), }),
}, },
yAxis: [ yAxis: [
@@ -482,7 +482,7 @@ function changeChartSize() {
} }
onMounted(() => { onMounted(() => {
zoomStart.value = dateFromatWithoutYear(new Date(new Date().setHours(0, 0, 0, 0))); zoomStart.value = dateFormatWithoutYear(new Date(new Date().setHours(0, 0, 0, 0)));
loadNetworkOptions(); loadNetworkOptions();
window.addEventListener('resize', changeChartSize); window.addEventListener('resize', changeChartSize);
}); });

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

@@ -28,7 +28,7 @@
<el-table-column <el-table-column
prop="createdAt" prop="createdAt"
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFromat" :formatter="dateFormat"
show-overflow-tooltip show-overflow-tooltip
/> />
</ComplexTable> </ComplexTable>
@@ -41,8 +41,8 @@
<script setup lang="ts"> <script setup lang="ts">
import ComplexTable from '@/components/complex-table/index.vue'; import ComplexTable from '@/components/complex-table/index.vue';
import ConfirmDialog from '@/components/confirm-dialog/index.vue'; import ConfirmDialog from '@/components/confirm-dialog/index.vue';
import { dateFromat } from '@/utils/util';
import LayoutContent from '@/layout/layout-content.vue'; import LayoutContent from '@/layout/layout-content.vue';
import { dateFormat } from '@/utils/util';
import { cleanLogs, getLoginLogs } from '@/api/modules/log'; import { cleanLogs, getLoginLogs } from '@/api/modules/log';
import Submenu from '@/views/log/index.vue'; import Submenu from '@/views/log/index.vue';
import { onMounted, reactive, ref } from '@vue/runtime-core'; import { onMounted, reactive, ref } from '@vue/runtime-core';

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

@@ -39,7 +39,7 @@
<el-table-column <el-table-column
prop="createdAt" prop="createdAt"
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFromat" :formatter="dateFormat"
show-overflow-tooltip show-overflow-tooltip
/> />
</ComplexTable> </ComplexTable>
@@ -53,7 +53,7 @@
<script setup lang="ts"> <script setup lang="ts">
import ComplexTable from '@/components/complex-table/index.vue'; import ComplexTable from '@/components/complex-table/index.vue';
import ConfirmDialog from '@/components/confirm-dialog/index.vue'; import ConfirmDialog from '@/components/confirm-dialog/index.vue';
import { dateFromat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import LayoutContent from '@/layout/layout-content.vue'; import LayoutContent from '@/layout/layout-content.vue';
import { cleanLogs, getOperationLogs } from '@/api/modules/log'; import { cleanLogs, getOperationLogs } from '@/api/modules/log';
import Submenu from '@/views/log/index.vue'; import Submenu from '@/views/log/index.vue';

4
frontend/src/views/setting/backup-account/index.vue
View File

@@ -191,7 +191,7 @@
{{ sftpData.bucket }} {{ sftpData.bucket }}
</el-form-item> </el-form-item>
<el-form-item :label="$t('commons.table.createdAt')"> <el-form-item :label="$t('commons.table.createdAt')">
{{ dateFromat(0, 0, sftpData.createdAt) }} {{ dateFormatSimple(sftpData.createdAt) }}
</el-form-item> </el-form-item>
</div> </div>
<el-alert v-else center style="height: 167px; background-color: #e2e4ec" :closable="false"> <el-alert v-else center style="height: 167px; background-color: #e2e4ec" :closable="false">
@@ -214,7 +214,7 @@
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { dateFromat } from '@/utils/util'; import { dateFormatSimple } from '@/utils/util';
import { onMounted, ref } from 'vue'; import { onMounted, ref } from 'vue';
import LayoutContent from '@/layout/layout-content.vue'; import LayoutContent from '@/layout/layout-content.vue';
import { getBackupList, deleteBackup } from '@/api/modules/backup'; import { getBackupList, deleteBackup } from '@/api/modules/backup';

6
frontend/src/views/setting/safe/index.vue
View File

@@ -186,7 +186,9 @@ import LayoutContent from '@/layout/layout-content.vue';
import { updatePassword, updateSetting, getMFA, bindMFA, getSettingInfo } from '@/api/modules/setting'; import { updatePassword, updateSetting, getMFA, bindMFA, getSettingInfo } from '@/api/modules/setting';
import i18n from '@/lang'; import i18n from '@/lang';
import { Rules } from '@/global/form-rules'; import { Rules } from '@/global/form-rules';
import { dateFromat } from '@/utils/util'; import { dateFormatSimple } from '@/utils/util';
const emit = defineEmits(['search']);
import { GlobalStore } from '@/store'; import { GlobalStore } from '@/store';
import router from '@/routers'; import router from '@/routers';
@@ -377,7 +379,7 @@ const submitTimeout = async (formEl: FormInstance | undefined) => {
loading.value = false; loading.value = false;
search(); search();
loadTimeOut(); loadTimeOut();
form.expirationTime = dateFromat(0, 0, time); form.expirationTime = dateFormatSimple(time);
timeoutVisiable.value = false; timeoutVisiable.value = false;
}) })
.catch(() => { .catch(() => {

6
frontend/src/views/website/ssl/detail/index.vue
View File

@@ -29,10 +29,10 @@
{{ ssl.type }} {{ ssl.type }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('ssl.startDate')"> <el-descriptions-item :label="$t('ssl.startDate')">
{{ dateFromat(0, 0, ssl.startDate) }} {{ dateFormatSimple(ssl.startDate) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('website.expireDate')"> <el-descriptions-item :label="$t('website.expireDate')">
{{ dateFromat(0, 0, ssl.expireDate) }} {{ dateFormatSimple(ssl.expireDate) }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
@@ -61,7 +61,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { GetSSL } from '@/api/modules/website'; import { GetSSL } from '@/api/modules/website';
import { ref } from 'vue'; import { ref } from 'vue';
import { dateFromat, getProvider } from '@/utils/util'; import { dateFormatSimple, getProvider } from '@/utils/util';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import i18n from '@/lang'; import i18n from '@/lang';
import useClipboard from 'vue-clipboard3'; import useClipboard from 'vue-clipboard3';

4
frontend/src/views/website/ssl/index.vue
View File

@@ -46,7 +46,7 @@
<el-table-column <el-table-column
prop="expireDate" prop="expireDate"
:label="$t('website.expireDate')" :label="$t('website.expireDate')"
:formatter="dateFromat" :formatter="dateFormat"
show-overflow-tooltip show-overflow-tooltip
/> />
<fu-table-operations <fu-table-operations
@@ -76,7 +76,7 @@ import AcmeAccount from './acme-account/index.vue';
import Renew from './renew/index.vue'; import Renew from './renew/index.vue';
import Create from './create/index.vue'; import Create from './create/index.vue';
import Detail from './detail/index.vue'; import Detail from './detail/index.vue';
import { dateFromat, getProvider } from '@/utils/util'; import { dateFormat, getProvider } from '@/utils/util';
import i18n from '@/lang'; import i18n from '@/lang';
import { Website } from '@/api/interface/website'; import { Website } from '@/api/interface/website';
import { useDeleteData } from '@/hooks/use-delete-data'; import { useDeleteData } from '@/hooks/use-delete-data';

4
frontend/src/views/website/website/backup/index.vue
View File

@@ -24,7 +24,7 @@
<el-table-column <el-table-column
prop="createdAt" prop="createdAt"
:label="$t('commons.table.date')" :label="$t('commons.table.date')"
:formatter="dateFromat" :formatter="dateFormat"
show-overflow-tooltip show-overflow-tooltip
/> />
<fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix /> <fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix />
@@ -35,7 +35,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import ComplexTable from '@/components/complex-table/index.vue'; import ComplexTable from '@/components/complex-table/index.vue';
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import { dateFromat } from '@/utils/util'; import { dateFormat } from '@/utils/util';
import { useDeleteData } from '@/hooks/use-delete-data'; import { useDeleteData } from '@/hooks/use-delete-data';
import i18n from '@/lang'; import i18n from '@/lang';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';

4
frontend/src/views/website/website/config/basic/https/index.vue
View File

@@ -72,7 +72,7 @@
{{ websiteSSL.acmeAccount.email }} {{ websiteSSL.acmeAccount.email }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('website.expireDate')"> <el-descriptions-item :label="$t('website.expireDate')">
{{ dateFromat(1, 1, websiteSSL.expireDate) }} {{ dateFormatSimple(websiteSSL.expireDate) }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-form-item> </el-form-item>
@@ -123,7 +123,7 @@ import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
import { computed, onMounted, reactive, ref } from 'vue'; import { computed, onMounted, reactive, ref } from 'vue';
import i18n from '@/lang'; import i18n from '@/lang';
import { Rules } from '@/global/form-rules'; import { Rules } from '@/global/form-rules';
import { dateFromat, getProvider } from '@/utils/util'; import { dateFormatSimple, getProvider } from '@/utils/util';
const props = defineProps({ const props = defineProps({
id: { id: {

4
frontend/src/views/website/website/config/log/log-fiile/index.vue
View File

@@ -42,7 +42,7 @@ import { javascript } from '@codemirror/lang-javascript';
import { oneDark } from '@codemirror/theme-one-dark'; import { oneDark } from '@codemirror/theme-one-dark';
import { computed, nextTick, onMounted, onUnmounted, ref, shallowRef } from 'vue'; import { computed, nextTick, onMounted, onUnmounted, ref, shallowRef } from 'vue';
import { OpWebsiteLog } from '@/api/modules/website'; import { OpWebsiteLog } from '@/api/modules/website';
import { dateFromatForName } from '@/utils/util'; import { dateFormatForName } from '@/utils/util';
const extensions = [javascript(), oneDark]; const extensions = [javascript(), oneDark];
const props = defineProps({ const props = defineProps({
@@ -129,7 +129,7 @@ const onDownload = async () => {
const a = document.createElement('a'); const a = document.createElement('a');
a.style.display = 'none'; a.style.display = 'none';
a.href = downloadUrl; a.href = downloadUrl;
a.download = logType.value + '-' + dateFromatForName(new Date()) + '.log'; a.download = logType.value + '-' + dateFormatForName(new Date()) + '.log';
const event = new MouseEvent('click'); const event = new MouseEvent('click');
a.dispatchEvent(event); a.dispatchEvent(event);
}; };

6
frontend/src/views/website/website/index.vue
View File

@@ -106,7 +106,7 @@
{{ $t('website.neverExpire') }} {{ $t('website.neverExpire') }}
</span> </span>
<span v-else @click="openDatePicker(row, $index)"> <span v-else @click="openDatePicker(row, $index)">
{{ dateFromatSimple(row.expireDate) }} {{ dateFormatSimple(row.expireDate) }}
</span> </span>
</div> </div>
</template> </template>
@@ -152,7 +152,7 @@ import i18n from '@/lang';
import router from '@/routers'; import router from '@/routers';
import { App } from '@/api/interface/app'; import { App } from '@/api/interface/app';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import { dateFromatSimple } from '@/utils/util'; import { dateFormatSimple } from '@/utils/util';
const shortcuts = [ const shortcuts = [
{ {
@@ -269,7 +269,7 @@ const pickerVisibility = (visibility: boolean, row: any) => {
}; };
const submitDate = (row: any) => { const submitDate = (row: any) => {
const reqDate = dateFromatSimple(row.expireDate); const reqDate = dateFormatSimple(row.expireDate);
const req = { const req = {
id: row.id, id: row.id,
primaryDomain: row.primaryDomain, primaryDomain: row.primaryDomain,

4
frontend/src/views/website/website/status/index.vue
View File

@@ -18,7 +18,7 @@
<span v-if="isEver(props.expireDate)"> <span v-if="isEver(props.expireDate)">
{{ $t('website.neverExpire') }} {{ $t('website.neverExpire') }}
</span> </span>
<span v-else>{{ dateFromatSimple(props.expireDate) }}</span> <span v-else>{{ dateFormatSimple(props.expireDate) }}</span>
</el-tag> </el-tag>
</div> </div>
</el-col> </el-col>
@@ -27,7 +27,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import Status from '@/components/status/index.vue'; import Status from '@/components/status/index.vue';
import { dateFromatSimple } from '@/utils/util'; import { dateFormatSimple } from '@/utils/util';
const props = defineProps({ const props = defineProps({
primaryDomain: { primaryDomain: {
type: String, type: String,

4
frontend/src/views/website/website/upload/index.vue
View File

@@ -46,7 +46,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix> <el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix>
<template #default="{ row }"> <template #default="{ row }">
{{ dateFromat(0, 0, row.modTime) }} {{ dateFormatSimple(row.modTime) }}
</template> </template>
</el-table-column> </el-table-column>
<fu-table-operations <fu-table-operations
@@ -64,7 +64,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import ComplexTable from '@/components/complex-table/index.vue'; import ComplexTable from '@/components/complex-table/index.vue';
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import { computeSize, dateFromat } from '@/utils/util'; import { computeSize, dateFormatSimple } from '@/utils/util';
import { useDeleteData } from '@/hooks/use-delete-data'; import { useDeleteData } from '@/hooks/use-delete-data';
import i18n from '@/lang'; import i18n from '@/lang';
import { ElMessage, UploadFile, UploadFiles, UploadInstance, UploadProps } from 'element-plus'; import { ElMessage, UploadFile, UploadFiles, UploadInstance, UploadProps } from 'element-plus';