diff --git a/dist.zip b/dist.zip index e867c6e2..5b9b3543 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/views/core/monitoring/lineAuto/index.vue b/src/views/core/monitoring/lineAuto/index.vue index 0d0381bd..57f72122 100644 --- a/src/views/core/monitoring/lineAuto/index.vue +++ b/src/views/core/monitoring/lineAuto/index.vue @@ -1195,8 +1195,11 @@ export default { pageSize: 100, pageNo: 1, total: 0, - timeType: this.activeName === 'productLine' ? 3 : 1, + timeType: 3, }; + this.formConfig[1].type = ''; + this.formConfig[6].type = ''; + this.formConfig[7].type = ''; // 重置后默认是当天,添加刷新时间 const resetTimeIndex = this.formConfig.findIndex(item => item.label?.includes('刷新时间') @@ -1264,6 +1267,9 @@ export default { this.listQuery.timeType = this.headFormValue.timeType ? this.headFormValue.timeType : this.listQuery.timeType; this.listQuery.searchType = this.headFormValue.searchType || undefined if (this.listQuery.timeType === 2) { + if (!this.listQuery.startTime && !this.listQuery.endTime) { + return this.$modal.msgError('请选择时间'); + } const resGroup = await getProcessAutoReportNew(this.listQuery); console.log('resGroup', resGroup); diff --git a/src/views/core/monitoring/productAuto/index.vue b/src/views/core/monitoring/productAuto/index.vue index 559c0105..e215d081 100644 --- a/src/views/core/monitoring/productAuto/index.vue +++ b/src/views/core/monitoring/productAuto/index.vue @@ -1265,7 +1265,7 @@ export default { break; case 'reset': this.$refs.searchBarForm.resetForm(); - this.$refs.searchBarForm.formInline.timeType = 1; + this.$refs.searchBarForm.formInline.timeType = 3; this.formConfig[0].selectOptions = this.activeName === 'product' ? this.timeTypeOptions.productLine : this.timeTypeOptions.product; @@ -1273,8 +1273,11 @@ export default { pageSize: 100, pageNo: 1, total: 0, - timeType: this.activeName === 'productLine' ? 3 : 1, + timeType: 3, }; + this.formConfig[1].type = ''; + this.formConfig[6].type = ''; + this.formConfig[7].type = ''; const resetTimeIndex = this.formConfig.findIndex(item => item.label?.includes('刷新时间') ); @@ -1341,6 +1344,9 @@ export default { this.listQuery.timeType = this.headFormValue.timeType ? this.headFormValue.timeType : this.listQuery.timeType; this.listQuery.searchType = this.headFormValue.searchType || undefined if (this.listQuery.timeType === 2) { + if (!this.listQuery.startTime && !this.listQuery.endTime) { + return this.$modal.msgError('请选择时间'); + } const resGroup = await getProcessAutoReportNew(this.listQuery); console.log('resGroup', resGroup);