From 6de8b8a3e3790b874045d20b77bb7aa71dcdfb37 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 29 Jun 2021 08:17:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity
---
src/views/article/article.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/article/article.vue b/src/views/article/article.vue
index b4f02c7..c2652a0 100644
--- a/src/views/article/article.vue
+++ b/src/views/article/article.vue
@@ -100,10 +100,10 @@
},
{
label: "发布时间",
- prop: "datetime",
+ prop: "dateTime",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
searchRange:true,
hide: true,
addDisplay: false,
@@ -123,8 +123,8 @@
editDisplay: false,
viewDisplay: false,
type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss"
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss"
},
{
label: "资讯内容",
@@ -268,15 +268,15 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- const {datetime} = this.query;
+ const {dateTime} = this.query;
let values = {
...params,
};
- if (datetime) {
+ if (dateTime) {
values = {
...params,
- startTime: datetime[0],
- endTime: datetime[1],
+ startTime: dateTime[0],
+ endTime: dateTime[1],
...this.query
};
values.datetime = null;
--
Gitblit v1.9.3