From a3ab700ce0f4a9f6b1f7d574f569677962d2a584 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Mar 2022 15:17:04 +0800
Subject: [PATCH] 时间范围选择和样式修改
---
src/views/activitys/real.vue | 35 ++++++++++++++++-
src/views/activitys/real_xc.vue | 36 ++++++++++++++++-
src/views/activitys/real_px.vue | 38 ++++++++++++++++--
src/styles/element-ui.scss | 10 +++++
4 files changed, 108 insertions(+), 11 deletions(-)
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 2dcb4b2..716ce59 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -154,6 +154,16 @@
background-color: $inputB !important;
color: $fontColor !important;
}
+
+.el-range-input{
+ background-color: $inputB !important;
+ color: $fontColor !important;
+}
+
+.el-date-editor .el-range-separator{
+ color: $fontColor !important;
+}
+
.el-tree-node__content {
background-color: $mainB !important;
color: $fontColor !important;
diff --git a/src/views/activitys/real.vue b/src/views/activitys/real.vue
index 45fa5cc..2a994ef 100644
--- a/src/views/activitys/real.vue
+++ b/src/views/activitys/real.vue
@@ -200,19 +200,42 @@
},
],
},
-
{
label: "开始时间",
type: "datetime",
prop: "time",
width: 160,
+ addDisplay: false,
+ viewDisplay: false,
+ editDisplay: false,
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },{
+ label: "结束时间",
+ type: "datetime",
+ prop: "endtime",
+ width: 160,
+ addDisplay: false,
+ viewDisplay: false,
+ editDisplay: false,
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ {
+ label: "开始时间",
+ type: 'datetimerange',
+ hide: true,
+ prop: "timeList",
+ width: 160,
span: 12,
+ startPlaceholder: '任务开始时间',
+ endPlaceholder: '预估结束时间',
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
rules: [
{
required: true,
- message: "请选择报警时间",
+ message: "请选择时间范围",
trigger: "blur",
},
],
@@ -724,7 +747,8 @@
line: row.line, //路线
rname: row.rname, //标题
url: row.url, //封面
- time: row.time, //下发时间
+ time: row.timeList[0], //下发时间
+ endtime: row.timeList[1], //结束时间
province: row.$province, //省
city: row.$city, //城市
district: row.$district, //区县
@@ -777,6 +801,8 @@
},
rowUpdate(row, index, done, loading) {
let that = this;
+ row.time = row.timeList[0];
+ row.endtime = row.timeList[1];
update(row).then(
() => {
this.onLoad(this.page);
@@ -854,6 +880,9 @@
});
},
beforeOpen(done, type) {
+ this.form.timeList = [];
+ this.form["timeList"][0]= this.form["time"];
+ this.form["timeList"][1]= this.form["endtime"];
// console.log(type, "this.formthis.formthis.form");
// console.log(type);
// if (["edit", "view"].includes(type)) {
diff --git a/src/views/activitys/real_px.vue b/src/views/activitys/real_px.vue
index 69c163a..4af84e1 100644
--- a/src/views/activitys/real_px.vue
+++ b/src/views/activitys/real_px.vue
@@ -195,24 +195,47 @@
rules: [
{
required: true,
- message: "请选择报警时间",
+ message: "请选择培训标题",
trigger: "blur",
},
],
},
-
{
label: "开始时间",
type: "datetime",
prop: "time",
width: 160,
+ addDisplay: false,
+ viewDisplay: false,
+ editDisplay: false,
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },{
+ label: "结束时间",
+ type: "datetime",
+ prop: "endtime",
+ width: 160,
+ addDisplay: false,
+ viewDisplay: false,
+ editDisplay: false,
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ {
+ label: "开始时间",
+ type: 'datetimerange',
+ hide: true,
+ prop: "timeList",
+ width: 160,
span: 12,
+ startPlaceholder: '任务开始时间',
+ endPlaceholder: '预估结束时间',
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
rules: [
{
required: true,
- message: "请选择报警时间",
+ message: "请选择时间范围",
trigger: "blur",
},
],
@@ -752,12 +775,12 @@
var userId1 = this.userInfo.user_id;
var username = this.userInfo.nick_name;
var phone = this.userInfo.phone;
-
let d = {
line: row.line, //路线
rname: row.rname, //标题
url: row.url, //封面
- time: row.time, //下发时间
+ time: row.timeList[0], //下发时间
+ endtime: row.timeList[1], //结束时间
province: row.$province, //省
city: row.$city, //城市
district: row.$district, //区县
@@ -811,6 +834,8 @@
},
rowUpdate(row, index, done, loading) {
let that = this;
+ row.time = row.timeList[0];
+ row.endtime = row.timeList[1];
update(row).then(
() => {
this.onLoad(this.page);
@@ -888,6 +913,9 @@
});
},
beforeOpen(done, type) {
+ this.form.timeList = [];
+ this.form["timeList"][0]= this.form["time"];
+ this.form["timeList"][1]= this.form["endtime"];
// console.log(type, "this.formthis.formthis.form");
// console.log(type);
// if (["edit", "view"].includes(type)) {
diff --git a/src/views/activitys/real_xc.vue b/src/views/activitys/real_xc.vue
index 7ff82c4..c4a508e 100644
--- a/src/views/activitys/real_xc.vue
+++ b/src/views/activitys/real_xc.vue
@@ -195,7 +195,7 @@
rules: [
{
required: true,
- message: "请选择报警时间",
+ message: "请选择宣传标题",
trigger: "blur",
},
],
@@ -206,13 +206,37 @@
type: "datetime",
prop: "time",
width: 160,
+ addDisplay: false,
+ viewDisplay: false,
+ editDisplay: false,
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },{
+ label: "结束时间",
+ type: "datetime",
+ prop: "endtime",
+ width: 160,
+ addDisplay: false,
+ viewDisplay: false,
+ editDisplay: false,
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ {
+ label: "开始时间",
+ type: 'datetimerange',
+ hide: true,
+ prop: "timeList",
+ width: 160,
span: 12,
+ startPlaceholder: '任务开始时间',
+ endPlaceholder: '预估结束时间',
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
rules: [
{
required: true,
- message: "请选择报警时间",
+ message: "请选择时间范围",
trigger: "blur",
},
],
@@ -722,7 +746,8 @@
line: row.line, //路线
rname: row.rname, //标题
url: row.url, //封面
- time: row.time, //下发时间
+ time: row.timeList[0], //下发时间
+ endtime: row.timeList[1], //结束时间
province: row.$province, //省
city: row.$city, //城市
district: row.$district, //区县
@@ -775,6 +800,8 @@
},
rowUpdate(row, index, done, loading) {
let that = this;
+ row.time = row.timeList[0];
+ row.endtime = row.timeList[1];
update(row).then(
() => {
this.onLoad(this.page);
@@ -852,6 +879,9 @@
});
},
beforeOpen(done, type) {
+ this.form.timeList = [];
+ this.form["timeList"][0]= this.form["time"];
+ this.form["timeList"][1]= this.form["endtime"];
// console.log(type, "this.formthis.formthis.form");
// console.log(type);
// if (["edit", "view"].includes(type)) {
--
Gitblit v1.9.3