From d93c39b805f6d90711716b2ec4715e59cb132705 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Fri, 18 Jul 2025 10:18:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home/DateTime/index.vue | 27 +++++++++++----------------
 src/views/main/index.vue               |  2 +-
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/components/home/DateTime/index.vue b/src/components/home/DateTime/index.vue
index 5f8ab8d..2341236 100644
--- a/src/components/home/DateTime/index.vue
+++ b/src/components/home/DateTime/index.vue
@@ -6,7 +6,7 @@ import { ref, watch } from 'vue'
 
 const emits = defineEmits(['ok', 'cancel'])
 
-const { serverTime, setDateTime, closeDialog } = useServerTime()
+const { serverTime, setDateTime } = useServerTime()
 console.log('serverTime', serverTime.value)
 
 let onceFlag = false
@@ -22,21 +22,16 @@ console.log(form.value)
 
 const formRef = ref()
 
-const okLoading = ref(false)
-const okHandle = () => {
-  formRef.value.validate(async (valid: any) => {
-    if (!valid) {
-      return
-    }
-    console.log(form.value)
-    okLoading.value = true
-    await setDateTime(form.value.epochMilli as number)
-    setTimeout(() => {
-      okLoading.value = false
-      FtMessage.success('保存成功')
-      closeDialog()
-    }, 300)
-  })
+const okHandle = async () => {
+  const valid = await formRef.value.validate()
+  if (!valid) {
+    return
+  }
+  await setDateTime(form.value.epochMilli as number)
+  setTimeout(() => {
+    FtMessage.success('保存成功')
+    emits('ok')
+  }, 300)
 }
 
 const cancel = () => {
diff --git a/src/views/main/index.vue b/src/views/main/index.vue
index a20fc81..5ddc137 100644
--- a/src/views/main/index.vue
+++ b/src/views/main/index.vue
@@ -250,7 +250,7 @@ const backHandle = () => {
     <Stop v-if="systemStore.systemStatus.stopPressed" />
     <Check v-if="checkVisible" @ok="ok" @cancel="cancel" />
     <Environment v-if="environmentVisible" @cancel="cancel" />
-    <DatetimeEdit v-if="editVisible" @cancel="closeDialog" />
+    <DatetimeEdit v-if="editVisible" @ok="closeDialog" @cancel="closeDialog" />
   </el-container>
 </template>