修改函数命名防止冲突

ruoyi-ui/src/main.js

@@ -18,13 +18,13 @@ import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { dateFormat, resetForm, addDateRange, selectDictLabel } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel } from "@/utils/ruoyi";
 import Pagination from "@/components/Pagination";
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
-Vue.prototype.dateFormat = dateFormat
+Vue.prototype.parseTime = parseTime
 Vue.prototype.resetForm = resetForm
 Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel

ruoyi-ui/src/utils/ruoyi.js

@@ -4,12 +4,42 @@
  */
 
 // 日期格式化
-export function dateFormat(date, pattern) {
+export function parseTime(time, pattern) {
-	var d = new Date(date).Format("yyyy-MM-dd hh:mm:ss");
+	if (arguments.length === 0) {
-	if (pattern) {
+		return null
-		d = new Date(date).Format(pattern);
+	  }
-	}
+	  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
-	return d.toLocaleString();
+	  let date
+	  if (typeof time === 'object') {
+		date = time
+	  } else {
+		if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+		  time = parseInt(time)
+		}
+		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
 }
 
 // 表单重置
@@ -55,22 +85,4 @@ export function sprintf(str) {
 		return arg;
 	});
 	return flag ? str : '';
-}
+}
-
-Date.prototype.Format = function (fmt) {
-	var o = {
-		"M+": this.getMonth() + 1,                   // 月份
-		"d+": this.getDate(),                        // 日
-		"h+": this.getHours(),                       // 小时
-		"m+": this.getMinutes(),                     // 分
-		"s+": this.getSeconds(),                     // 秒
-		"q+": Math.floor((this.getMonth() + 3) / 3), // 季度
-		"S": this.getMilliseconds()                  // 毫秒
-	};
-	if (/(y+)/.test(fmt))
-		fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-	for (var k in o)
-		if (new RegExp("(" + k + ")").test(fmt))
-			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-	return fmt;
-}  

ruoyi-ui/src/views/monitor/logininfor/index.vue

@@ -65,7 +65,7 @@
       <el-table-column label="操作信息" align="center" prop="msg" />
       <el-table-column label="登录日期" align="center" prop="loginTime" width="180">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.loginTime) }}</span>
+          <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>
       </el-table-column>
     </el-table>

ruoyi-ui/src/views/monitor/operlog/index.vue

@@ -81,7 +81,7 @@
       <el-table-column label="操作状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="操作日期" align="center" prop="operTime" width="180">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.operTime) }}</span>
+          <span>{{ parseTime(scope.row.operTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -135,7 +135,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="操作时间：">{{ dateFormat(form.operTime) }}</el-form-item>
+            <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="异常信息：" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>

ruoyi-ui/src/views/system/config/index.vue

@@ -58,7 +58,7 @@
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ruoyi-ui/src/views/system/dept/index.vue

@@ -51,7 +51,7 @@
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="100"></el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ruoyi-ui/src/views/system/dict/data.vue

@@ -45,7 +45,7 @@
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ruoyi-ui/src/views/system/dict/index.vue

@@ -69,7 +69,7 @@
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ruoyi-ui/src/views/system/menu/index.vue

@@ -44,7 +44,7 @@
       <el-table-column prop="visible" label="	可见" :formatter="visibleFormat" width="80px"></el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">

ruoyi-ui/src/views/system/notice/index.vue

@@ -60,7 +60,7 @@
       <el-table-column label="创建者" align="center" prop="createBy" width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.createTime, 'yyyy-MM-dd') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ruoyi-ui/src/views/system/post/index.vue

@@ -43,7 +43,7 @@
       <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ruoyi-ui/src/views/system/role/index.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ dateFormat(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ruoyi-ui/src/views/system/user/index.vue

@@ -100,7 +100,7 @@
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="160">
             <template slot-scope="scope">
-              <span>{{ dateFormat(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column