feat: 修改方法名

2023-01-16 15:55:53 +08:00
parent cc17499207
commit 3ffda84dee
33 changed files with 81 additions and 79 deletions
--- a/frontend/src/components/container-log/index.vue
+++ b/frontend/src/components/container-log/index.vue
@@ -33,7 +33,7 @@
 <script lang="ts" setup>
 import { logContainer } from '@/api/modules/container';
 import i18n from '@/lang';
-import { dateFromatForName } from '@/utils/util';
+import { dateFormatForName } from '@/utils/util';
 import { nextTick, reactive, ref, shallowRef } from 'vue';
 import { Codemirror } from 'vue-codemirror';
 import { javascript } from '@codemirror/lang-javascript';
@@ -98,7 +98,7 @@ const onDownload = async () => {
    const a = document.createElement('a');
    a.style.display = 'none';
    a.href = downloadUrl;
-    a.download = logSearch.container + '-' + dateFromatForName(new Date()) + '.log';
+    a.download = logSearch.container + '-' + dateFormatForName(new Date()) + '.log';
    const event = new MouseEvent('click');
    a.dispatchEvent(event);
 };
--- a/frontend/src/utils/util.ts
+++ b/frontend/src/utils/util.ts
@@ -35,7 +35,7 @@ export function getBrowserLang() {
    }
    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 y = date.getFullYear();
    let m: string | number = date.getMonth() + 1;
@@ -52,7 +52,7 @@ export function dateFromat(row: number, col: number, dataStr: any) {
 }

 //2016-01-12
-export function dateFromatSimple(dataStr: any) {
+export function dateFormatSimple(dataStr: any) {
    const date = new Date(dataStr);
    const y = date.getFullYear();
    let m: string | number = date.getMonth() + 1;
@@ -63,7 +63,7 @@ export function dateFromatSimple(dataStr: any) {
 }

 // 20221013151302
-export function dateFromatForName(dataStr: any) {
+export function dateFormatForName(dataStr: any) {
    const date = new Date(dataStr);
    const y = date.getFullYear();
    let m: string | number = date.getMonth() + 1;
@@ -80,7 +80,7 @@ export function dateFromatForName(dataStr: any) {
 }

 // 10-13 \n 15:13
-export function dateFromatWithoutYear(dataStr: any) {
+export function dateFormatWithoutYear(dataStr: any) {
    const date = new Date(dataStr);
    let m: string | number = date.getMonth() + 1;
    m = m < 10 ? `0${String(m)}` : m;
@@ -94,7 +94,7 @@ export function dateFromatWithoutYear(dataStr: any) {
 }

 // 20221013151302
-export function dateFromatForSecond(dataStr: any) {
+export function dateFormatForSecond(dataStr: any) {
    const date = new Date(dataStr);
    let h: string | number = date.getHours();
    h = h < 10 ? `0${String(h)}` : h;
--- a/frontend/src/views/app-store/installed/backup/index.vue
+++ b/frontend/src/views/app-store/installed/backup/index.vue
@@ -33,7 +33,7 @@
            <el-table-column
                prop="createdAt"
                :label="$t('app.backupdate')"
-                :formatter="dateFromat"
+                :formatter="dateFormat"
                show-overflow-tooltip
            />
            <fu-table-operations
@@ -73,7 +73,7 @@ import { DelAppBackups, GetAppBackups, InstalledOp } from '@/api/modules/app';
 import { reactive, ref } from 'vue';
 import ComplexTable from '@/components/complex-table/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 i18n from '@/lang';
 import { useDeleteData } from '@/hooks/use-delete-data';
--- a/frontend/src/views/container/compose/detail/index.vue
+++ b/frontend/src/views/container/compose/detail/index.vue
@@ -95,7 +95,7 @@
                    <el-table-column
                        prop="createTime"
                        :label="$t('commons.table.date')"
-                        :formatter="dateFromat"
+                        :formatter="dateFormat"
                        show-overflow-tooltip
                    />
                    <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 ComplexTable from '@/components/complex-table/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 { ElMessage, ElMessageBox } from 'element-plus';
 import i18n from '@/lang';
--- a/frontend/src/views/container/container/index.vue
+++ b/frontend/src/views/container/container/index.vue
@@ -71,7 +71,7 @@
                    <el-table-column
                        prop="createTime"
                        :label="$t('commons.table.date')"
-                        :formatter="dateFromat"
+                        :formatter="dateFormat"
                        show-overflow-tooltip
                    />
                    <fu-table-operations
@@ -107,7 +107,7 @@ import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.vue';
 import Status from '@/components/status/index.vue';
 import Submenu from '@/views/container/index.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 { Container } from '@/api/interface/container';
 import { ElMessage, ElMessageBox } from 'element-plus';
--- a/frontend/src/views/container/container/log/index.vue
+++ b/frontend/src/views/container/container/log/index.vue
@@ -49,7 +49,7 @@
 <script lang="ts" setup>
 import { logContainer } from '@/api/modules/container';
 import i18n from '@/lang';
-import { dateFromatForName } from '@/utils/util';
+import { dateFormatForName } from '@/utils/util';
 import { nextTick, reactive, ref, shallowRef } from 'vue';
 import { Codemirror } from 'vue-codemirror';
 import { javascript } from '@codemirror/lang-javascript';
@@ -114,7 +114,7 @@ const onDownload = async () => {
    const a = document.createElement('a');
    a.style.display = 'none';
    a.href = downloadUrl;
-    a.download = logSearch.container + '-' + dateFromatForName(new Date()) + '.log';
+    a.download = logSearch.container + '-' + dateFormatForName(new Date()) + '.log';
    const event = new MouseEvent('click');
    a.dispatchEvent(event);
 };
--- a/frontend/src/views/container/container/monitor/index.vue
+++ b/frontend/src/views/container/container/monitor/index.vue
@@ -50,7 +50,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import { ContainerStats } from '@/api/modules/container';
-import { dateFromatForSecond } from '@/utils/util';
+import { dateFormatForSecond } from '@/utils/util';
 import * as echarts from 'echarts';
 import i18n from '@/lang';

@@ -142,7 +142,7 @@ const loadData = async () => {
    if (netRxDatas.value.length > 20) {
        netRxDatas.value.splice(0, 1);
    }
-    timeDatas.value.push(dateFromatForSecond(res.data.shotTime));
+    timeDatas.value.push(dateFormatForSecond(res.data.shotTime));
    if (timeDatas.value.length > 20) {
        timeDatas.value.splice(0, 1);
    }
--- a/frontend/src/views/container/image/index.vue
+++ b/frontend/src/views/container/image/index.vue
@@ -33,7 +33,7 @@
                    <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>
                        <template #default="{ row }">
-                            {{ dateFromat(0, 0, row.createdAt) }}
+													{{ dateFormatSimple(row.createdAt) }}
                        </template>
                    </el-table-column>
                    <fu-table-operations
@@ -81,7 +81,7 @@
 <script lang="ts" setup>
 import ComplexTable from '@/components/complex-table/index.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 { Container } from '@/api/interface/container';
 import LayoutContent from '@/layout/layout-content.vue';
--- a/frontend/src/views/container/network/index.vue
+++ b/frontend/src/views/container/network/index.vue
@@ -63,7 +63,7 @@
                        prop="createdAt"
                        min-width="90"
                        :label="$t('commons.table.date')"
-                        :formatter="dateFromat"
+                        :formatter="dateFormat"
                    />
                    <fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix />
                </ComplexTable>
@@ -82,7 +82,7 @@ import CreateDialog from '@/views/container/network/create/index.vue';
 import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.vue';
 import Submenu from '@/views/container/index.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 { Container } from '@/api/interface/container';
 import i18n from '@/lang';
--- a/frontend/src/views/container/repo/index.vue
+++ b/frontend/src/views/container/repo/index.vue
@@ -46,7 +46,7 @@
                    </el-table-column>
                    <el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix>
                        <template #default="{ row }">
-                            {{ dateFromat(0, 0, row.createdAt) }}
+													{{ dateFormatSimple(row.createdAt) }}
                        </template>
                    </el-table-column>
                    <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 Submenu from '@/views/container/index.vue';
 import { reactive, onMounted, ref } from 'vue';
-import { dateFromat } from '@/utils/util';
+import { dateFormatSimple } from '@/utils/util';
 import { Container } from '@/api/interface/container';
 import { loadDockerStatus, searchImageRepo } from '@/api/modules/container';
 import i18n from '@/lang';
--- a/frontend/src/views/container/template/index.vue
+++ b/frontend/src/views/container/template/index.vue
@@ -39,7 +39,7 @@
                    <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>
                        <template #default="{ row }">
-                            {{ dateFromat(0, 0, row.createdAt) }}
+													{{ dateFormatSimple(row.createdAt) }}
                        </template>
                    </el-table-column>
                    <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 { oneDark } from '@codemirror/theme-one-dark';
 import { reactive, onMounted, ref } from 'vue';
-import { dateFromat } from '@/utils/util';
+import { dateFormatSimple } from '@/utils/util';
 import { Container } from '@/api/interface/container';
 import OperatorDialog from '@/views/container/template/operator/index.vue';
 import { deleteComposeTemplate, loadDockerStatus, searchComposeTemplate } from '@/api/modules/container';
--- a/frontend/src/views/container/volume/index.vue
+++ b/frontend/src/views/container/volume/index.vue
@@ -52,7 +52,7 @@
                        prop="createdAt"
                        min-width="90"
                        :label="$t('commons.table.date')"
-                        :formatter="dateFromat"
+                        :formatter="dateFormat"
                    />
                    <fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix />
                </ComplexTable>
@@ -71,7 +71,7 @@ import CreateDialog from '@/views/container/volume/create/index.vue';
 import Submenu from '@/views/container/index.vue';
 import CodemirrorDialog from '@/components/codemirror-dialog/codemirror.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 { Container } from '@/api/interface/container';
 import i18n from '@/lang';
--- a/frontend/src/views/cronjob/record/index.vue
+++ b/frontend/src/views/cronjob/record/index.vue
@@ -29,7 +29,7 @@
                        >
                            <el-icon v-if="item.status === 'Success'"><Select /></el-icon>
                            <el-icon v-if="item.status === 'Failed'"><CloseBold /></el-icon>
-                            {{ dateFromat(0, 0, item.startTime) }}
+                            {{ dateFormatSimple(item.startTime) }}
                        </li>
                    </ul>
                    <div style="margin-top: 10px; margin-bottom: 5px; font-size: 12px; float: right">
@@ -164,7 +164,7 @@
                        <el-row>
                            <el-col :span="8">
                                <el-form-item :label="$t('commons.search.timeStart')">
-                                    {{ dateFromat(0, 0, currentRecord?.startTime) }}
+                                    {{ dateFormatSimple(currentRecord?.startTime) }}
                                </el-form-item>
                            </el-col>
                            <el-col :span="8">
@@ -232,7 +232,7 @@ import { Cronjob } from '@/api/interface/cronjob';
 import { loadZero } from '@/utils/util';
 import { loadBackupName } from '@/views/setting/helper';
 import { searchRecords, download } from '@/api/modules/cronjob';
-import { dateFromat, dateFromatForName } from '@/utils/util';
+import { dateFormatSimple, dateFormatForName } from '@/utils/util';
 import i18n from '@/lang';
 import { ElMessage } from 'element-plus';
 import { LoadFile } from '@/api/modules/files';
@@ -362,9 +362,9 @@ const onDownload = async (recordID: number, backupID: number) => {
    a.style.display = 'none';
    a.href = downloadUrl;
    if (dialogData.value.rowData!.type === 'database') {
-        a.download = dateFromatForName(currentRecord.value?.startTime) + '.sql.gz';
+        a.download = dateFormatForName(currentRecord.value?.startTime) + '.sql.gz';
    } else {
-        a.download = dateFromatForName(currentRecord.value?.startTime) + '.tar.gz';
+        a.download = dateFormatForName(currentRecord.value?.startTime) + '.tar.gz';
    }
    const event = new MouseEvent('click');
    a.dispatchEvent(event);
--- a/frontend/src/views/database/mysql/backup/index.vue
+++ b/frontend/src/views/database/mysql/backup/index.vue
@@ -21,7 +21,7 @@
                <el-table-column
                    prop="createdAt"
                    :label="$t('commons.table.date')"
-                    :formatter="dateFromat"
+                    :formatter="dateFormat"
                    show-overflow-tooltip
                />

@@ -34,7 +34,7 @@
 <script lang="ts" setup>
 import ComplexTable from '@/components/complex-table/index.vue';
 import { reactive, ref } from 'vue';
-import { dateFromat } from '@/utils/util';
+import { dateFormat } from '@/utils/util';
 import { useDeleteData } from '@/hooks/use-delete-data';
 import { backup, recover } from '@/api/modules/database';
 import i18n from '@/lang';
--- a/frontend/src/views/database/mysql/index.vue
+++ b/frontend/src/views/database/mysql/index.vue
@@ -86,7 +86,7 @@
                        <el-table-column
                            prop="createdAt"
                            :label="$t('commons.table.date')"
-                            :formatter="dateFromat"
+                            :formatter="dateFormat"
                            show-overflow-tooltip
                        />
                        <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 AppStatus from '@/components/app-status/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 {
    deleteCheckMysqlDB,
--- a/frontend/src/views/database/mysql/setting/slow-log/index.vue
+++ b/frontend/src/views/database/mysql/setting/slow-log/index.vue
@@ -57,7 +57,7 @@ import { LoadFile } from '@/api/modules/files';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import { updateMysqlVariables } from '@/api/modules/database';
 import { ElMessage } from 'element-plus';
-import { dateFromatForName } from '@/utils/util';
+import { dateFormatForName } from '@/utils/util';
 import i18n from '@/lang';
 import { loadBaseDir } from '@/api/modules/setting';

@@ -141,7 +141,7 @@ const onDownload = async () => {
    const a = document.createElement('a');
    a.style.display = 'none';
    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');
    a.dispatchEvent(event);
 };
--- a/frontend/src/views/database/mysql/upload/index.vue
+++ b/frontend/src/views/database/mysql/upload/index.vue
@@ -48,7 +48,7 @@
                </el-table-column>
                <el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix>
                    <template #default="{ row }">
-                        {{ dateFromat(0, 0, row.modTime) }}
+                        {{ dateFormatSimple(row.modTime) }}
                    </template>
                </el-table-column>
                <fu-table-operations
@@ -66,7 +66,7 @@
 <script lang="ts" setup>
 import ComplexTable from '@/components/complex-table/index.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 { recoverByUpload } from '@/api/modules/database';
 import i18n from '@/lang';
--- a/frontend/src/views/home/index.vue
+++ b/frontend/src/views/home/index.vue
@@ -157,7 +157,7 @@ import App from '@/views/home/app/index.vue';
 import CardWithHeader from '@/components/card-with-header/index.vue';
 import i18n from '@/lang';
 import { Dashboard } from '@/api/interface/dashboard';
-import { dateFromatForSecond, computeSize } from '@/utils/util';
+import { dateFormatForSecond, computeSize } from '@/utils/util';
 import { useRouter } from 'vue-router';
 import { loadBaseInfo, loadCurrentInfo } from '@/api/modules/dashboard';
 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));

-    timeIODatas.value.push(dateFromatForSecond(res.data.shotTime));
+    timeIODatas.value.push(dateFormatForSecond(res.data.shotTime));
    if (timeIODatas.value.length > 20) {
        timeIODatas.value.splice(0, 1);
    }
-    timeNetDatas.value.push(dateFromatForSecond(res.data.shotTime));
+    timeNetDatas.value.push(dateFormatForSecond(res.data.shotTime));
    if (timeNetDatas.value.length > 20) {
        timeNetDatas.value.splice(0, 1);
    }
--- a/frontend/src/views/host/file-management/detail/index.vue
+++ b/frontend/src/views/host/file-management/detail/index.vue
@@ -11,7 +11,7 @@
                    <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('commons.table.updatedAt')">
-                        {{ dateFromat(0, 0, data.modTime) }}
+                        {{ dateFormatSimple(data.modTime) }}
                    </el-descriptions-item>
                </el-descriptions>
            </el-col>
@@ -23,7 +23,7 @@
 import { GetFileContent } from '@/api/modules/files';
 import { computeSize } from '@/utils/util';
 import { ref } from 'vue';
-import { dateFromat } from '@/utils/util';
+import { dateFormatSimple } from '@/utils/util';

 interface InfoProps {
    path: string;
--- a/frontend/src/views/host/file-management/index.vue
+++ b/frontend/src/views/host/file-management/index.vue
@@ -116,7 +116,7 @@
                    <el-table-column
                        :label="$t('file.updateTime')"
                        prop="modTime"
-                        :formatter="dateFromat"
+                        :formatter="dateFormat"
                        min-width="150"
                        show-overflow-tooltip
                    ></el-table-column>
@@ -187,7 +187,7 @@ import {
    SaveFileContent,
    ComputeDirSize,
 } 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 { useDeleteData } from '@/hooks/use-delete-data';
 import { ElMessage } from 'element-plus';
--- a/frontend/src/views/host/monitor/index.vue
+++ b/frontend/src/views/host/monitor/index.vue
@@ -114,7 +114,7 @@ import { ref, reactive, onMounted, onBeforeUnmount } from 'vue';
 import * as echarts from 'echarts';
 import { loadMonitor, getNetworkOptions } from '@/api/modules/monitor';
 import { Monitor } from '@/api/interface/monitor';
-import { dateFromatWithoutYear } from '@/utils/util';
+import { dateFormatWithoutYear } from '@/utils/util';
 import i18n from '@/lang';

 const zoomStart = ref();
@@ -211,7 +211,7 @@ const search = async (param: string) => {
        switch (item.param) {
            case 'base':
                let baseDate = item.date.map(function (item: any) {
-                    return dateFromatWithoutYear(item);
+                    return dateFormatWithoutYear(item);
                });
                if (param === 'cpu' || param === 'all') {
                    let cpuData = item.value.map(function (item: any) {
@@ -241,7 +241,7 @@ const search = async (param: string) => {
                break;
            case 'network':
                let networkDate = item.date.map(function (item: any) {
-                    return dateFromatWithoutYear(item);
+                    return dateFormatWithoutYear(item);
                });
                let networkUp = item.value.map(function (item: any) {
                    return item.up.toFixed(2);
@@ -327,7 +327,7 @@ function initLoadCharts(item: Monitor.MonitorData) {
        grid: { left: '7%', right: '7%', bottom: '20%' },
        xAxis: {
            data: item.date.map(function (item: any) {
-                return dateFromatWithoutYear(item);
+                return dateFormatWithoutYear(item);
            }),
        },
        yAxis: [
@@ -425,7 +425,7 @@ function initIOCharts(item: Monitor.MonitorData) {
        grid: { left: '7%', right: '7%', bottom: '20%' },
        xAxis: {
            data: item.date.map(function (item: any) {
-                return dateFromatWithoutYear(item);
+                return dateFormatWithoutYear(item);
            }),
        },
        yAxis: [
@@ -482,7 +482,7 @@ function changeChartSize() {
 }

 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();
    window.addEventListener('resize', changeChartSize);
 });
--- a/frontend/src/views/log/login/index.vue
+++ b/frontend/src/views/log/login/index.vue
@@ -28,7 +28,7 @@
                    <el-table-column
                        prop="createdAt"
                        :label="$t('commons.table.date')"
-                        :formatter="dateFromat"
+                        :formatter="dateFormat"
                        show-overflow-tooltip
                    />
                </ComplexTable>
@@ -41,8 +41,8 @@
 <script setup lang="ts">
 import ComplexTable from '@/components/complex-table/index.vue';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
-import { dateFromat } from '@/utils/util';
 import LayoutContent from '@/layout/layout-content.vue';
+import { dateFormat } from '@/utils/util';
 import { cleanLogs, getLoginLogs } from '@/api/modules/log';
 import Submenu from '@/views/log/index.vue';
 import { onMounted, reactive, ref } from '@vue/runtime-core';
--- a/frontend/src/views/log/operation/index.vue
+++ b/frontend/src/views/log/operation/index.vue
@@ -39,7 +39,7 @@
                    <el-table-column
                        prop="createdAt"
                        :label="$t('commons.table.date')"
-                        :formatter="dateFromat"
+                        :formatter="dateFormat"
                        show-overflow-tooltip
                    />
                </ComplexTable>
@@ -53,7 +53,7 @@
 <script setup lang="ts">
 import ComplexTable from '@/components/complex-table/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 { cleanLogs, getOperationLogs } from '@/api/modules/log';
 import Submenu from '@/views/log/index.vue';
--- a/frontend/src/views/setting/backup-account/index.vue
+++ b/frontend/src/views/setting/backup-account/index.vue
@@ -191,7 +191,7 @@
                                    {{ sftpData.bucket }}
                                </el-form-item>
                                <el-form-item :label="$t('commons.table.createdAt')">
-                                    {{ dateFromat(0, 0, sftpData.createdAt) }}
+																	{{ dateFormatSimple(sftpData.createdAt) }}
                                </el-form-item>
                            </div>
                            <el-alert v-else center style="height: 167px; background-color: #e2e4ec" :closable="false">
@@ -214,7 +214,7 @@
    </div>
 </template>
 <script setup lang="ts">
-import { dateFromat } from '@/utils/util';
+import { dateFormatSimple } from '@/utils/util';
 import { onMounted, ref } from 'vue';
 import LayoutContent from '@/layout/layout-content.vue';
 import { getBackupList, deleteBackup } from '@/api/modules/backup';
--- a/frontend/src/views/setting/safe/index.vue
+++ b/frontend/src/views/setting/safe/index.vue
@@ -186,7 +186,9 @@ import LayoutContent from '@/layout/layout-content.vue';
 import { updatePassword, updateSetting, getMFA, bindMFA, getSettingInfo } from '@/api/modules/setting';
 import i18n from '@/lang';
 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 router from '@/routers';

@@ -377,7 +379,7 @@ const submitTimeout = async (formEl: FormInstance | undefined) => {
                loading.value = false;
                search();
                loadTimeOut();
-                form.expirationTime = dateFromat(0, 0, time);
+                form.expirationTime = dateFormatSimple(time);
                timeoutVisiable.value = false;
            })
            .catch(() => {
--- a/frontend/src/views/website/ssl/detail/index.vue
+++ b/frontend/src/views/website/ssl/detail/index.vue
@@ -29,10 +29,10 @@
                        {{ ssl.type }}
                    </el-descriptions-item>
                    <el-descriptions-item :label="$t('ssl.startDate')">
-                        {{ dateFromat(0, 0, ssl.startDate) }}
+                        {{ dateFormatSimple(ssl.startDate) }}
                    </el-descriptions-item>
                    <el-descriptions-item :label="$t('website.expireDate')">
-                        {{ dateFromat(0, 0, ssl.expireDate) }}
+                        {{ dateFormatSimple(ssl.expireDate) }}
                    </el-descriptions-item>
                </el-descriptions>
            </div>
@@ -61,7 +61,7 @@
 <script lang="ts" setup>
 import { GetSSL } from '@/api/modules/website';
 import { ref } from 'vue';
-import { dateFromat, getProvider } from '@/utils/util';
+import { dateFormatSimple, getProvider } from '@/utils/util';
 import { ElMessage } from 'element-plus';
 import i18n from '@/lang';
 import useClipboard from 'vue-clipboard3';
--- a/frontend/src/views/website/ssl/index.vue
+++ b/frontend/src/views/website/ssl/index.vue
@@ -46,7 +46,7 @@
                <el-table-column
                    prop="expireDate"
                    :label="$t('website.expireDate')"
-                    :formatter="dateFromat"
+                    :formatter="dateFormat"
                    show-overflow-tooltip
                />
                <fu-table-operations
@@ -76,7 +76,7 @@ import AcmeAccount from './acme-account/index.vue';
 import Renew from './renew/index.vue';
 import Create from './create/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 { Website } from '@/api/interface/website';
 import { useDeleteData } from '@/hooks/use-delete-data';
--- a/frontend/src/views/website/website/backup/index.vue
+++ b/frontend/src/views/website/website/backup/index.vue
@@ -24,7 +24,7 @@
            <el-table-column
                prop="createdAt"
                :label="$t('commons.table.date')"
-                :formatter="dateFromat"
+                :formatter="dateFormat"
                show-overflow-tooltip
            />
            <fu-table-operations :buttons="buttons" :label="$t('commons.table.operate')" fix />
@@ -35,7 +35,7 @@
 <script lang="ts" setup>
 import ComplexTable from '@/components/complex-table/index.vue';
 import { reactive, ref } from 'vue';
-import { dateFromat } from '@/utils/util';
+import { dateFormat } from '@/utils/util';
 import { useDeleteData } from '@/hooks/use-delete-data';
 import i18n from '@/lang';
 import { ElMessage } from 'element-plus';
--- a/frontend/src/views/website/website/config/basic/https/index.vue
+++ b/frontend/src/views/website/website/config/basic/https/index.vue
@@ -72,7 +72,7 @@
                                {{ websiteSSL.acmeAccount.email }}
                            </el-descriptions-item>
                            <el-descriptions-item :label="$t('website.expireDate')">
-                                {{ dateFromat(1, 1, websiteSSL.expireDate) }}
+                                {{ dateFormatSimple(websiteSSL.expireDate) }}
                            </el-descriptions-item>
                        </el-descriptions>
                    </el-form-item>
@@ -123,7 +123,7 @@ import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
 import { computed, onMounted, reactive, ref } from 'vue';
 import i18n from '@/lang';
 import { Rules } from '@/global/form-rules';
-import { dateFromat, getProvider } from '@/utils/util';
+import { dateFormatSimple, getProvider } from '@/utils/util';

 const props = defineProps({
    id: {
--- a/frontend/src/views/website/website/config/log/log-fiile/index.vue
+++ b/frontend/src/views/website/website/config/log/log-fiile/index.vue
@@ -42,7 +42,7 @@ import { javascript } from '@codemirror/lang-javascript';
 import { oneDark } from '@codemirror/theme-one-dark';
 import { computed, nextTick, onMounted, onUnmounted, ref, shallowRef } from 'vue';
 import { OpWebsiteLog } from '@/api/modules/website';
-import { dateFromatForName } from '@/utils/util';
+import { dateFormatForName } from '@/utils/util';

 const extensions = [javascript(), oneDark];
 const props = defineProps({
@@ -129,7 +129,7 @@ const onDownload = async () => {
    const a = document.createElement('a');
    a.style.display = 'none';
    a.href = downloadUrl;
-    a.download = logType.value + '-' + dateFromatForName(new Date()) + '.log';
+    a.download = logType.value + '-' + dateFormatForName(new Date()) + '.log';
    const event = new MouseEvent('click');
    a.dispatchEvent(event);
 };
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -106,7 +106,7 @@
                                {{ $t('website.neverExpire') }}
                            </span>
                            <span v-else @click="openDatePicker(row, $index)">
-                                {{ dateFromatSimple(row.expireDate) }}
+                                {{ dateFormatSimple(row.expireDate) }}
                            </span>
                        </div>
                    </template>
@@ -152,7 +152,7 @@ import i18n from '@/lang';
 import router from '@/routers';
 import { App } from '@/api/interface/app';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { dateFromatSimple } from '@/utils/util';
+import { dateFormatSimple } from '@/utils/util';

 const shortcuts = [
    {
@@ -269,7 +269,7 @@ const pickerVisibility = (visibility: boolean, row: any) => {
 };

 const submitDate = (row: any) => {
-    const reqDate = dateFromatSimple(row.expireDate);
+    const reqDate = dateFormatSimple(row.expireDate);
    const req = {
        id: row.id,
        primaryDomain: row.primaryDomain,
--- a/frontend/src/views/website/website/status/index.vue
+++ b/frontend/src/views/website/website/status/index.vue
@@ -18,7 +18,7 @@
                        <span v-if="isEver(props.expireDate)">
                            {{ $t('website.neverExpire') }}
                        </span>
-                        <span v-else>{{ dateFromatSimple(props.expireDate) }}</span>
+                        <span v-else>{{ dateFormatSimple(props.expireDate) }}</span>
                    </el-tag>
                </div>
            </el-col>
@@ -27,7 +27,7 @@
 </template>
 <script lang="ts" setup>
 import Status from '@/components/status/index.vue';
-import { dateFromatSimple } from '@/utils/util';
+import { dateFormatSimple } from '@/utils/util';
 const props = defineProps({
    primaryDomain: {
        type: String,
--- a/frontend/src/views/website/website/upload/index.vue
+++ b/frontend/src/views/website/website/upload/index.vue
@@ -46,7 +46,7 @@
                </el-table-column>
                <el-table-column :label="$t('commons.table.createdAt')" min-width="80" fix>
                    <template #default="{ row }">
-                        {{ dateFromat(0, 0, row.modTime) }}
+                        {{ dateFormatSimple(row.modTime) }}
                    </template>
                </el-table-column>
                <fu-table-operations
@@ -64,7 +64,7 @@
 <script lang="ts" setup>
 import ComplexTable from '@/components/complex-table/index.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 i18n from '@/lang';
 import { ElMessage, UploadFile, UploadFiles, UploadInstance, UploadProps } from 'element-plus';