|
|
@@ -10,15 +10,12 @@
|
|
|
<div class="dashboard-journal">
|
|
|
<div class="journal-title flex">
|
|
|
<div class="title">个人日志</div>
|
|
|
- <!-- <div class="search flex-wrap">
|
|
|
+ <div class="search flex-wrap">
|
|
|
<div class="j-date">
|
|
|
<el-date-picker v-model="value1" size="small" @change="pickerChange" value-format="yyyy-MM-dd HH:mm:ss" class="j-date-input" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
|
</div>
|
|
|
<Search @getSearchData="getSearchData" @clearSearchData="clearSearch" :isTitle="false" :isSlot="false" />
|
|
|
- </div> -->
|
|
|
- <div class="search">
|
|
|
- <Search @getSearchData="getSearchData" @clearSearchData="clearSearch" :isTitle="false" :isSlot="false" />
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="journal-content">
|
|
|
@@ -125,22 +122,22 @@ export default {
|
|
|
},
|
|
|
getSearchData (val) {
|
|
|
const dates = this.value1;
|
|
|
- // if (dates && dates.length) {
|
|
|
- // this.BeginTime = dates[0];
|
|
|
- // this.EndTime = dates[1];
|
|
|
- // }
|
|
|
+ if (dates && dates.length) {
|
|
|
+ this.BeginTime = dates[0];
|
|
|
+ this.EndTime = dates[1];
|
|
|
+ }
|
|
|
this.Msg = val;
|
|
|
this.getLogList({
|
|
|
Msg: this.Msg,
|
|
|
- BeginTime: "",
|
|
|
- EndTime: "",
|
|
|
+ BeginTime: this.BeginTime,
|
|
|
+ EndTime: this.EndTime,
|
|
|
});
|
|
|
},
|
|
|
clearSearch () {
|
|
|
this.getLogList({
|
|
|
Msg: "",
|
|
|
- BeginTime: "",
|
|
|
- EndTime: "",
|
|
|
+ BeginTime: this.BeginTime,
|
|
|
+ EndTime: this.EndTime,
|
|
|
});
|
|
|
},
|
|
|
pickerChange (val) {
|
