UTC

2024-08-14 18:33:39 +08:00 · 2024-08-14 18:33:39 +08:00 · 08f716a956
commit 08f716a956
parent 6ddc96161f
4 changed files with 88 additions and 28 deletions
--- a/src/views/email/create.vue
+++ b/src/views/email/create.vue
@ -18,22 +18,22 @@
        <el-row>
          <el-col :span="10">
            <el-form-item label-width="120px" label="发送时间:" class="postInfo-container-item" prop="sendtime">
-              <el-date-picker v-model.number="postForm.sendtime" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" required />
+              <el-date-picker v-model.number="postForm.sendtime" type="datetime" :format="formattedUTCSendDate" value-format="timestamp" placeholder="Select date and time" required style="width:50%" />
            </el-form-item>
          </el-col>
          <el-col :span="10">
            <el-form-item label-width="120px" label="过期时间:" class="postInfo-container-item" prop="expiretime">
-              <el-date-picker v-model.number="postForm.expiretime" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" required />
+              <el-date-picker v-model.number="postForm.expiretime" type="datetime" :format="formattedUTCExpireDate" value-format="timestamp" placeholder="Select date and time" required style="width:50%" />
            </el-form-item>
          </el-col>
          <el-col v-show="userRegVisible" :span="10">
            <el-form-item label-width="120px" label="注册时间>=:" class="postInfo-container-item" prop="user_reg_start_time">
-              <el-date-picker v-model.number="postForm.user_reg_start_time" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" :required="userRegVisible" />
+              <el-date-picker v-model.number="postForm.user_reg_start_time" type="datetime" :format="formattedUTCRegStartDate" value-format="timestamp" placeholder="Select date and time" :required="userRegVisible" style="width:50%" />
            </el-form-item>
          </el-col>
          <el-col v-show="userRegVisible" :span="10">
            <el-form-item label-width="120px" label="注册时间<=:" class="postInfo-container-item" prop="user_reg_end_time">
-              <el-date-picker v-model.number="postForm.user_reg_end_time" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" :required="userRegVisible" />
+              <el-date-picker v-model.number="postForm.user_reg_end_time" type="datetime" :format="formattedUTCRegEndDate" value-format="timestamp" placeholder="Select date and time" :required="userRegVisible" style="width:50%" />
            </el-form-item>
          </el-col>
        </el-row>
@ -72,7 +72,7 @@ import { CommentDropdown } from '@/views/example/components/Dropdown'
 import Sticky from '@/components/Sticky/index.vue'
 import MDinput from '@/components/MDinput/index.vue'
 import { addMail, updateEmail } from '@/api/mail'
-import { parseTime } from '@/utils'
+import { parseUTCTime } from '@/utils'
 import { MAIL_TYPE_GROUP, MAIL_TYPE_ALL } from '@/constant/constant'
 import { ItemList } from '@/constant/itemids'

@ -133,6 +133,36 @@ export default {
      isupdate: false
    }
  },
+  computed: {
+    formattedUTCSendDate() {
+      if (!this.postForm.sendtime) {
+        return ''
+      }
+
+      return 'UTC:' + parseUTCTime(this.postForm.sendtime / 1000)
+    },
+    formattedUTCExpireDate() {
+      if (!this.postForm.expiretime) {
+        return ''
+      }
+
+      return 'UTC: ' + parseUTCTime(this.postForm.expiretime / 1000)
+    },
+    formattedUTCRegStartDate() {
+      if (!this.postForm.user_reg_start_time) {
+        return ''
+      }
+
+      return 'UTC: ' + parseUTCTime(this.postForm.user_reg_start_time / 1000)
+    },
+    formattedUTCRegEndDate() {
+      if (!this.postForm.user_reg_end_time) {
+        return ''
+      }
+
+      return 'UTC: ' + parseUTCTime(this.postForm.user_reg_end_time / 1000)
+    }
+  },
  watch: {
    'postForm.mailtype'(val) {
      switch (val) {
@ -179,7 +209,7 @@ export default {
    }
  },
  methods: {
-    parseTime,
+    parseUTCTime,
    submitForm() {
      const data = JSON.parse(JSON.stringify(this.postForm))
      data.sendtime = data.sendtime / 1000
--- a/src/views/email/list.vue
+++ b/src/views/email/list.vue
@ -22,25 +22,25 @@
        <el-row>
          <el-col :span="5">
            <el-form-item label-width="120px" label="创建时间>=" class="postInfo-container-item" prop="createtime.start">
-              <el-date-picker v-model.number="postForm.createtime.start" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" />
+              <el-date-picker v-model.number="postForm.createtime.start" type="datetime" :format="formattedUTCCreateStartDate" value-format="timestamp" placeholder="Select date and time" style="width:105%" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label-width="120px" label="创建时间<=" class="postInfo-container-item" prop="createtime.end">
-              <el-date-picker v-model.number="postForm.createtime.end" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" />
+              <el-date-picker v-model.number="postForm.createtime.end" type="datetime" :format="formattedUTCCreateEndDate" value-format="timestamp" placeholder="Select date and time" style="width:105%" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label-width="120px" label="发送时间>=" class="postInfo-container-item" prop="sendtime.start">
-              <el-date-picker v-model.number="postForm.sendtime.start" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" />
+              <el-date-picker v-model.number="postForm.sendtime.start" type="datetime" :format="formattedUTCSendStartDate" value-format="timestamp" placeholder="Select date and time" style="width:105%" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label-width="120px" label="发送时间<=" class="postInfo-container-item" prop="sendtime.end">
-              <el-date-picker v-model.number="postForm.sendtime.end" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" />
+              <el-date-picker v-model.number="postForm.sendtime.end" type="datetime" :format="formattedUTCSendEndDate" value-format="timestamp" placeholder="Select date and time" style="width:105%" />
            </el-form-item>
          </el-col>
-          <el-button style="margin-left: 10px;" type="success" @click="submitForm()">
+          <el-button style="margin-left: 30px;" type="success" @click="submitForm()">
            查询
          </el-button>
        </el-row>
@ -84,23 +84,23 @@
          />
          <el-table-column
            prop="sendtime"
-            label="发送时间"
+            label="发送时间UTC"
            width="160"
          >
            <template slot-scope="{row}">
              <span>
-                {{ parseTime(row.sendtime) }}
+                {{ parseUTCTime(row.sendtime) }}
              </span>
            </template>
          </el-table-column>
          <el-table-column
            prop="expiretime"
-            label="过期时间"
+            label="过期时间UTC"
            width="160"
          >
            <template slot-scope="{row}">
              <span>
-                {{ parseTime(row.expiretime) }}
+                {{ parseUTCTime(row.expiretime) }}
              </span>
            </template>
          </el-table-column>
@ -144,7 +144,7 @@
 <script>
 // import Pagination from '@/components/Pagination/index.vue'
 import { delMail, getMailList } from '@/api/mail'
-import { parseTime } from '@/utils'
+import { parseUTCTime } from '@/utils'

 export default {
  components: {
@ -212,12 +212,42 @@ export default {
      querydata: null
    }
  },
+  computed: {
+    formattedUTCCreateStartDate() {
+      if (!this.postForm.createtime.start) {
+        return ''
+      }
+
+      return 'UTC:' + parseUTCTime(this.postForm.createtime.start / 1000)
+    },
+    formattedUTCCreateEndDate() {
+      if (!this.postForm.createtime.end) {
+        return ''
+      }
+
+      return 'UTC: ' + parseUTCTime(this.postForm.createtime.end / 1000)
+    },
+    formattedUTCSendStartDate() {
+      if (!this.postForm.sendtime.start) {
+        return ''
+      }
+
+      return 'UTC: ' + parseUTCTime(this.postForm.sendtime.start / 1000)
+    },
+    formattedUTCSendEndDate() {
+      if (!this.postForm.sendtime.end) {
+        return ''
+      }
+
+      return 'UTC: ' + parseUTCTime(this.postForm.sendtime.end / 1000)
+    }
+  },
  created() {
    this.querydata = JSON.parse(JSON.stringify(this.postForm))
    this.getList(this.querydata)
  },
  methods: {
-    parseTime,
+    parseUTCTime,
    getList(data) {
      if (data.createtime.start === '' || data.createtime.end === '') {
        data.createtime.start = 0
--- a/src/views/email/user_group_list.vue
+++ b/src/views/email/user_group_list.vue
@ -36,21 +36,21 @@
      </el-table-column>
      <el-table-column
        prop="createtime"
-        label="创建时间"
+        label="创建时间UTC"
      >
        <template slot-scope="{row}">
          <span>
-            {{ parseTime(row.createtime) }}
+            {{ parseUTCTime(row.createtime) }}
          </span>
        </template>
      </el-table-column>
      <el-table-column
        prop="modifytime"
-        label="修改时间"
+        label="修改时间UTC"
      >
        <template slot-scope="{row}">
          <span>
-            {{ parseTime(row.modifytime) }}
+            {{ parseUTCTime(row.modifytime) }}
          </span>
        </template>
      </el-table-column>
@ -100,7 +100,7 @@
 <script>
 // import Pagination from '@/components/Pagination/index.vue'
 import { addGroup, updatGroup, getGroupList, delGroup } from '@/api/mail_user_group'
-import { parseTime } from '@/utils'
+import { parseUTCTime } from '@/utils'

 export default {
  components: {
@ -129,7 +129,7 @@ export default {
    this.getList()
  },
  methods: {
-    parseTime,
+    parseUTCTime,
    handleDialogClose() {
      this.getList()
    },
--- a/src/views/ingameannouncement/index.vue
+++ b/src/views/ingameannouncement/index.vue
@ -87,20 +87,20 @@
      </el-table-column>
    </el-table>
    <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">
-      <el-form ref="form" :rules="rules" :model="form" label-position="left" label-width="80px" style="width: 400px; margin-left:50px;">
+      <el-form ref="form" :rules="rules" :model="form" label-position="left" label-width="100px" style="width: 400px; margin-left:50px;">
        <el-form-item label="公告标题" prop="title">
          <el-input v-model="form.title" />
        </el-form-item>
-        <el-form-item label-width="120px" label="发送时间>=:" prop="begin_time">
+        <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-form-item>
-        <el-form-item label-width="120px" label="发送时间<=:" prop="end_time">
+        <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-form-item>
-        <el-form-item label-width="120px" label="开始日期>=:" prop="begin_date">
+        <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-form-item>
-        <el-form-item label-width="120px" label="结束日期<=:" prop="end_date">
+        <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-form-item>
        <el-form-item label="是否生效">