From a2178731e2e44e17e7c8dc33e88a5a19d0080067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 21 May 2022 11:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8dayjs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/ruoyi.js                | 80 +++++++++++++++++--------------
 src/views/system/notice/index.vue |  2 +-
 2 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 48b7038..6ab253a 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -1,49 +1,57 @@
 const baseURL =
   import.meta.env.VITE_APP_BASE_API
+import dayjs from 'dayjs'
 /**
  * 通用js方法封装处理
  * Copyright (c) 2019 ruoyi
  */
 
-// 日期格式化
-export function parseTime(time, pattern) {
+/**
+ * 日期格式化
+ * @param {*} time 
+ * @param {* } pattern 'YYYY-MM-DD HH:mm:ss'
+ * @returns 
+ */
+export function parseTime(time, pattern = 'YYYY-MM-DD HH:mm:ss') {
   if (arguments.length === 0 || !time) {
     return null
   }
-  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'object') {
-    date = time
-  } else {
-    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
-      time = parseInt(time)
-    } else if (typeof time === 'string') {
-      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
-    }
-    if ((typeof time === 'number') && (time.toString().length === 10)) {
-      time = time * 1000
-    }
-    date = new Date(time)
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  }
-  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key]
-    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
-    if (result.length > 0 && value < 10) {
-      value = '0' + value
-    }
-    return value || 0
-  })
-  return time_str
+
+  return dayjs(time).format(pattern)
+  // const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  // let date
+  // if (typeof time === 'object') {
+  //   date = time
+  // } else {
+  //   if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+  //     time = parseInt(time)
+  //   } else if (typeof time === 'string') {
+  //     time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+  //   }
+  //   if ((typeof time === 'number') && (time.toString().length === 10)) {
+  //     time = time * 1000
+  //   }
+  //   date = new Date(time)
+  // }
+  // const formatObj = {
+  //   y: date.getFullYear(),
+  //   m: date.getMonth() + 1,
+  //   d: date.getDate(),
+  //   h: date.getHours(),
+  //   i: date.getMinutes(),
+  //   s: date.getSeconds(),
+  //   a: date.getDay()
+  // }
+  // const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+  //   let value = formatObj[key]
+  //   // Note: getDay() returns 0 on Sunday
+  //   if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+  //   if (result.length > 0 && value < 10) {
+  //     value = '0' + value
+  //   }
+  //   return value || 0
+  // })
+  // return time_str
 }
 
 // 表单重置
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 28de15e..f2b0e1d 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -53,7 +53,7 @@
       <el-table-column label="创建者" align="center" prop="createBy" width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, 'YYYY-MM-DD') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">