diff --git a/src/views/rules/Index.vue b/src/views/rules/Index.vue index 1ad110e..9d259f7 100644 --- a/src/views/rules/Index.vue +++ b/src/views/rules/Index.vue @@ -104,7 +104,8 @@ export default { }, watch: { form: { - handler() { }, + handler() { + }, deep: true } }, @@ -127,8 +128,8 @@ export default { pageSize: this.tableConfig.pageSize, ruleType: this.form.ruleType, ruleNameLike: this.form.ruleName, - startCreatedDate: this.formattedDate[0], - endCreatedDate: this.formattedDate[1] + startCreatedDate: this.formattedDate.length > 1 ? this.formattedDate[0] + ' 00:00:00' : "", + endCreatedDate: this.formattedDate.length > 1 ? this.formattedDate[1] + ' 23:59:59' : "", // times: this.formattedDate } @@ -241,7 +242,7 @@ export default { 全部规则 + :value="reverseRuleType(item)" /> @@ -255,7 +256,8 @@ export default { + start-placeholder="开始日期" end-placeholder="结束日期" + :picker-options="form.pickerOptions"> @@ -275,11 +277,14 @@ export default {
+ @currentChange="handleCurrentChange" @sizeChange="handleSizeChange" + :currentPage="tableConfig.currentPage" + :pageSize="tableConfig.pageSize" />
- - + + diff --git a/src/views/track/Index.vue b/src/views/track/Index.vue index 32744fd..42431d5 100644 --- a/src/views/track/Index.vue +++ b/src/views/track/Index.vue @@ -123,8 +123,8 @@ export default { // // 上传状态 // documentStatus: this.form.documentStatus, // // 任务时间 - startCreatedDate: this.formattedDate.length > 1 ? this.formattedDate[0] + ' 00:00:00' : this.formattedDate[0], - endCreatedDate: this.formattedDate.length > 1 ? this.formattedDate[1] + ' 23:59:59' : this.formattedDate[1], + startCreatedDate: this.formattedDate.length > 1 ? this.formattedDate[0] + ' 00:00:00' : "", + endCreatedDate: this.formattedDate.length > 1 ? this.formattedDate[1] + ' 23:59:59' : "", knowledgeNameLike: this.form.knowledgeName, documentStatus: this.form.documentStatus }