From c53d5fd1f68e9a681f8437d0b9fcc264dc4b65c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 12 六月 2020 15:14:19 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/utils/ruoyi.js | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 601b4ae..4d63f96 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
@@ -102,7 +104,6 @@
return str;
}
-
/**
* 鏋勯�犳爲鍨嬬粨鏋勬暟鎹�
* @param {*} data 鏁版嵁婧�
@@ -130,3 +131,4 @@
});
return treeData != '' ? treeData : data;
}
+
\ No newline at end of file
--
Gitblit v1.9.3