From 2fd3cbbd18fed5e83911bbc7ec626e488dc79f00 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 07 六月 2020 16:05:48 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue
---
ruoyi-ui/src/utils/ruoyi.js | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 380e3ce..dc18b91 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -17,6 +17,8 @@
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
+ } else if (typeof time === 'string') {
+ time = time.replace(new RegExp(/-/gm), '/');
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
--
Gitblit v1.9.2