优化开始日期结束日期

master
fanluyan 2 years ago
parent cfc0fbb3b1
commit bd481af6bd

@ -37,7 +37,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="日期"> <el-form-item label="开始日期">
<!-- <el-date-picker <!-- <el-date-picker
v-model="formdata.timeVal" v-model="formdata.timeVal"
type="datetimerange" type="datetimerange"
@ -49,14 +49,18 @@
v-model="formdata.starttime" v-model="formdata.starttime"
type="datetime" type="datetime"
placeholder="开始日期" placeholder="开始日期"
value-format="timestamp"> value-format="timestamp"
>
</el-date-picker> </el-date-picker>
</el-form-item>
<el-form-item label="结束日期">
<el-date-picker <el-date-picker
v-model="formdata.endtime" v-model="formdata.endtime"
type="datetime" type="datetime"
placeholder="结束日期" placeholder="结束日期"
value-format="timestamp" value-format="timestamp"
class="ml10"> class="ml10"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="告警原因" class="gjbox"> <el-form-item label="告警原因" class="gjbox">
@ -271,7 +275,11 @@ export default {
// new Date(new Date().toLocaleDateString()).getTime(), // new Date(new Date().toLocaleDateString()).getTime(),
// new Date().getTime(), // new Date().getTime(),
// ]); // ]);
this.$set(this.formdata, "starttime", new Date(new Date().toLocaleDateString()).getTime()); this.$set(
this.formdata,
"starttime",
new Date(new Date().toLocaleDateString()).getTime()
);
this.$set(this.formdata, "endtime", new Date().getTime()); this.$set(this.formdata, "endtime", new Date().getTime());
this.getSearchdy(); this.getSearchdy();
this.getTableList(); this.getTableList();
@ -361,7 +369,11 @@ export default {
// //
onSubmit() { onSubmit() {
if (this.formdata.starttime > this.formdata.endtime) { if (this.formdata.starttime > this.formdata.endtime) {
return this.$message({ showClose: true, message: "开始日期不能大于结束日期", type: "warning" }); return this.$message({
showClose: true,
message: "开始日期不能大于结束日期",
type: "warning",
});
} }
this.getTableList(); this.getTableList();
}, },
@ -562,7 +574,7 @@ export default {
padding: 16px; padding: 16px;
border-radius: 4px; border-radius: 4px;
.searchBox { .searchBox {
.ml10{ .ml10 {
margin-left: 10px; margin-left: 10px;
} }
.el-form { .el-form {

@ -66,7 +66,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="日期"> <el-form-item label="开始日期">
<!-- <el-date-picker <!-- <el-date-picker
v-model="formdata.timeVal" v-model="formdata.timeVal"
type="datetimerange" type="datetimerange"
@ -78,14 +78,18 @@
v-model="formdata.starttime" v-model="formdata.starttime"
type="datetime" type="datetime"
placeholder="开始日期" placeholder="开始日期"
value-format="timestamp"> value-format="timestamp"
>
</el-date-picker> </el-date-picker>
</el-form-item>
<el-form-item label="结束日期">
<el-date-picker <el-date-picker
v-model="formdata.endtime" v-model="formdata.endtime"
type="datetime" type="datetime"
placeholder="结束日期" placeholder="结束日期"
value-format="timestamp" value-format="timestamp"
class="ml10"> class="ml10"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -227,7 +231,11 @@ export default {
// new Date(new Date().toLocaleDateString()).getTime(), // new Date(new Date().toLocaleDateString()).getTime(),
// new Date().getTime(), // new Date().getTime(),
// ]); // ]);
this.$set(this.formdata, "starttime", new Date(new Date().toLocaleDateString()).getTime()); this.$set(
this.formdata,
"starttime",
new Date(new Date().toLocaleDateString()).getTime()
);
this.$set(this.formdata, "endtime", new Date().getTime()); this.$set(this.formdata, "endtime", new Date().getTime());
this.getSearchdy(); this.getSearchdy();
}, },
@ -318,7 +326,11 @@ export default {
// //
onSubmit() { onSubmit() {
if (this.formdata.starttime > this.formdata.endtime) { if (this.formdata.starttime > this.formdata.endtime) {
return this.$message({ showClose: true, message: "开始日期不能大于结束日期", type: "warning" }); return this.$message({
showClose: true,
message: "开始日期不能大于结束日期",
type: "warning",
});
} }
this.getPicData(); this.getPicData();
}, },
@ -346,7 +358,7 @@ export default {
height: calc(100% - 32px); height: calc(100% - 32px);
padding: 16px; padding: 16px;
border-radius: 4px; border-radius: 4px;
.ml10{ .ml10 {
margin-left: 10px; margin-left: 10px;
} }
} }

Loading…
Cancel
Save