From 43059ff2fb651f905164d508efe5b2de3abfa0ab Mon Sep 17 00:00:00 2001 From: guoapeng Date: Fri, 25 Jul 2025 16:53:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E6=96=B0=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/FTDatetime/index.vue | 108 +++++++++++++++++++++++++++++ src/components/system/EditDate/index.vue | 21 ++---- src/layouts/default.vue | 14 +--- src/main.ts | 2 + 4 files changed, 120 insertions(+), 25 deletions(-) create mode 100644 src/components/common/FTDatetime/index.vue diff --git a/src/components/common/FTDatetime/index.vue b/src/components/common/FTDatetime/index.vue new file mode 100644 index 0000000..bfc82ad --- /dev/null +++ b/src/components/common/FTDatetime/index.vue @@ -0,0 +1,108 @@ + + + diff --git a/src/components/system/EditDate/index.vue b/src/components/system/EditDate/index.vue index 36e96a1..5c5cc7d 100644 --- a/src/components/system/EditDate/index.vue +++ b/src/components/system/EditDate/index.vue @@ -3,21 +3,16 @@ import { useServerTime } from 'hooks/useServerTime' import { FtMessage } from 'libs/message' import { ref } from 'vue' +const props = defineProps({ + datetime: { + type: Number, + default: 0, + }, +}) const emits = defineEmits(['ok', 'close']) -const { serverTime, setDateTime } = useServerTime() - -console.log(serverTime.value) const form = ref<{ epochMilli?: number }>({ - epochMilli: serverTime.value, -}) - -let onceFlag = false -watch(() => serverTime.value, () => { - if (!onceFlag) { - onceFlag = true - form.value.epochMilli = serverTime.value - } + epochMilli: props.datetime, }) const formRef = ref() @@ -34,8 +29,6 @@ const okHandle = async () => { if (!valid) { return } - await setDateTime(form.value.epochMilli as number) - FtMessage.success('修改成功') emits('ok') } catch (e) { diff --git a/src/layouts/default.vue b/src/layouts/default.vue index 39f40d4..17b1008 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -3,14 +3,13 @@ import { getContainerList } from 'apis/container' import { craftList } from 'apis/crafts' import { getSolsList } from 'apis/solution' import logoutIcon from 'assets/images/logout.svg' +import FtDatetime from 'components/common/FTDatetime/index.vue' import CheckCraft from 'components/home/CheckCraft/index.vue' import Liquid from 'components/home/Liquid/index.vue' import Check from 'components/system/Check/index.vue' -import EditDate from 'components/system/EditDate/index.vue' import Stop from 'components/system/Stop/index.vue' import { ElMessageBox } from 'element-plus' import { useActivateDebug } from 'hooks/useActivateDebug' -import { useServerTime } from 'hooks/useServerTime' import { FtMessage } from 'libs/message' import { isClose, socket } from 'libs/socket' import { authRoutes } from 'router/routes' @@ -21,12 +20,6 @@ import { useRouter } from 'vue-router' const { handleLogoClick } = useActivateDebug() -const { currentTime, openDialog, closeDialog, editVisible } = useServerTime() - -watch(() => currentTime.value, () => { - systemStore.currentTime = currentTime.value -}) - const systemStore = useSystemStore() const router = useRouter() @@ -189,8 +182,8 @@ const containerStatus = computed(() => { -
- {{ currentTime }} +
+
@@ -305,7 +298,6 @@ const containerStatus = computed(() => { - diff --git a/src/main.ts b/src/main.ts index 7fdb599..4879421 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,7 @@ import * as ElementPlusIconsVue from '@element-plus/icons-vue' import FtButton from 'components/common/FTButton/index.vue' import FtChart from 'components/common/FTChart/index.vue' +import FtDatetime from 'components/common/FTDatetime/index.vue' import FtDialog from 'components/common/FTDialog/index.vue' import FtStream from 'components/common/FTStream/index.vue' import FtTable from 'components/common/FTTable/index.vue' @@ -23,6 +24,7 @@ app.component('FtButton', FtButton) app.component('FtDialog', FtDialog) app.component('FtStream', FtStream) app.component('FtChart', FtChart) +app.component('FtDatetime', FtDatetime) app .use(router) .use(ElementPlus, { locale, zIndex: 3000 })