From 824e60d65da4e54de2af4f424c3931e970357399 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 14 Jul 2021 10:05:13 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfptweb-publicSecurity
---
src/views/article/article.vue | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/views/article/article.vue b/src/views/article/article.vue
index b4f02c7..3a5d6e7 100644
--- a/src/views/article/article.vue
+++ b/src/views/article/article.vue
@@ -68,6 +68,7 @@
prop: "title",
span: 24,
row: true,
+ searchSpan:5,
search: true,
rules: [{
required: true,
@@ -78,6 +79,8 @@
{
label: "资讯封面",
prop: "url",
+ // align:'center',
+ width:80,
type: 'upload',
listType: 'picture-img',
action: '/api/blade-resource/oss/endpoint/put-file',
@@ -92,6 +95,8 @@
label: "资讯来源",
prop: "sourceName",
search: true,
+ searchSpan:4,
+ span: 24,
rules: [{
required: true,
message: "请输入资讯类型",
@@ -99,11 +104,31 @@
}]
},
{
+ label: "资讯类型",
+ prop: "articleType",
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ searchSpan: 3,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=articleType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ search:true,
+ type:"select",
+ rules: [{
+ required: true,
+ message: "请选择资讯类型",
+ trigger: "blur"
+ }],
+ },
+ {
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 +148,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 +293,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