From 319dfc2de3db01f11ccdda006e8555a5f06a6e1b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 09 Oct 2019 17:21:43 +0800
Subject: [PATCH] 修改函数命名防止冲突
---
ruoyi-ui/src/views/monitor/operlog/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue
index b7d4f99..9ea7f77 100644
--- a/ruoyi-ui/src/views/monitor/operlog/index.vue
+++ b/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>
--
Gitblit v1.9.2