From 9e47591016e0f41a4538b29b89ac793f00c70234 Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Tue, 20 Aug 2024 15:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ingameannouncement/index.vue | 44 +++++++++++++++-----------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/views/ingameannouncement/index.vue b/src/views/ingameannouncement/index.vue
index 3bb811c..e11502e 100644
--- a/src/views/ingameannouncement/index.vue
+++ b/src/views/ingameannouncement/index.vue
@@ -92,16 +92,24 @@
           <el-input v-model="form.title" />
         </el-form-item>
         <el-form-item label="发送时间>=:" prop="begin_time">
-          <el-date-picker v-model.number="form.begin_time" type="datetime" :format="formattedUTCBeginTime" value-format="timestamp" placeholder="Select time" :picker-option="pickerOptions" required />
+          <!-- <el-date-picker v-model.number="form.begin_time" type="datetime" :format="formattedUTCBeginTime" value-format="timestamp" placeholder="Select time" :picker-option="pickerOptions" required /> -->
+          <el-time-picker v-model.number="form.begin_time" type="datetime" value-format="timestamp" placeholder="Select time" style="width: 150px" required />
+          UTC: {{ parseUTCTime(form.begin_time / 1000, '{h}:{i}:{s}') }}
         </el-form-item>
         <el-form-item label="发送时间<=:" prop="end_time">
-          <el-date-picker v-model.number="form.end_time" type="datetime" :format="formattedUTCEndTime" value-format="timestamp" placeholder="Select time" :picker-option="pickerOptions" required />
+          <!-- <el-date-picker v-model.number="form.end_time" type="datetime" :format="formattedUTCEndTime" value-format="timestamp" placeholder="Select time" :picker-option="pickerOptions" required /> -->
+          <el-time-picker v-model.number="form.end_time" type="datetime" value-format="timestamp" placeholder="Select time" style="width: 150px" required />
+          UTC: {{ parseUTCTime(form.end_time / 1000, '{h}:{i}:{s}') }}
         </el-form-item>
         <el-form-item label="开始日期>=:" prop="begin_date">
-          <el-date-picker v-model.number="form.begin_date" type="date" :format="formattedUTCBeginDate" value-format="timestamp" placeholder="Select date" required />
+          <!-- <el-date-picker v-model.number="form.begin_date" type="date" :format="formattedUTCBeginDate" value-format="timestamp" placeholder="Select date" required /> -->
+          <el-date-picker v-model.number="form.begin_date" type="date" value-format="timestamp" placeholder="Select date" style="width: 150px" required />
+          UTC: {{ parseUTCTime(form.begin_date / 1000, '{y}-{m}-{d}') }}
         </el-form-item>
         <el-form-item label="结束日期<=:" prop="end_date">
-          <el-date-picker v-model.number="form.end_date" type="date" :format="formattedUTCEndDate" value-format="timestamp" placeholder="Select date" required />
+          <!-- <el-date-picker v-model.number="form.end_date" type="date" :format="formattedUTCEndDate" value-format="timestamp" placeholder="Select date" required /> -->
+          <el-date-picker v-model.number="form.end_date" type="date" value-format="timestamp" placeholder="Select date" style="width: 150px" required />
+          UTC: {{ parseUTCTime(form.end_date / 1000, '{y}-{m}-{d}') }}
         </el-form-item>
         <el-form-item label="是否生效">
           <el-switch
@@ -174,20 +182,6 @@ export default {
     }
   },
   computed: {
-    formattedUTCBeginDate() {
-      if (!this.form.begin_date) {
-        return ''
-      }
-
-      return 'UTC: ' + parseUTCTime(this.form.begin_date / 1000, '{y}-{m}-{d}')
-    },
-    formattedUTCEndDate() {
-      if (!this.form.end_date) {
-        return ''
-      }
-
-      return 'UTC: ' + parseUTCTime(this.form.end_date / 1000, '{y}-{m}-{d}')
-    },
     formattedUTCBeginTime() {
       if (!this.form.begin_time) {
         return ''
@@ -201,6 +195,20 @@ export default {
       }
 
       return 'UTC: ' + parseUTCTime(this.form.end_time / 1000, '{h}:{i}:{s}')
+    },
+    formattedUTCBeginDate() {
+      if (!this.form.begin_date) {
+        return ''
+      }
+
+      return 'UTC: ' + parseUTCTime(this.form.begin_date / 1000, '{y}-{m}-{d}')
+    },
+    formattedUTCEndDate() {
+      if (!this.form.end_date) {
+        return ''
+      }
+
+      return 'UTC: ' + parseUTCTime(this.form.end_date / 1000, '{y}-{m}-{d}')
     }
   },
   created() {