mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/line-new-zhp' (#469) from projects/line-new-zhp into projects/line-new

Browse Source 
Reviewed-on: #469
This commit is contained in:
张昊鹏
2025-12-24 16:36:24 +08:00
parent a5fba28ff7 35fb0d8bfb
commit 00393f76c7
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

8
src/views/core/monitoring/lineAuto/index.vue
View File

@@ -1195,8 +1195,11 @@ export default {
pageSize: 100, pageSize: 100,
pageNo: 1, pageNo: 1,
total: 0, 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 => const resetTimeIndex = this.formConfig.findIndex(item =>
item.label?.includes('刷新时间') item.label?.includes('刷新时间')
@@ -1264,6 +1267,9 @@ export default {
this.listQuery.timeType = this.headFormValue.timeType ? this.headFormValue.timeType : this.listQuery.timeType; this.listQuery.timeType = this.headFormValue.timeType ? this.headFormValue.timeType : this.listQuery.timeType;
this.listQuery.searchType = this.headFormValue.searchType || undefined this.listQuery.searchType = this.headFormValue.searchType || undefined
if (this.listQuery.timeType === 2) { if (this.listQuery.timeType === 2) {
if (!this.listQuery.startTime && !this.listQuery.endTime) {
return this.$modal.msgError('请选择时间');
}
const resGroup = await getProcessAutoReportNew(this.listQuery); const resGroup = await getProcessAutoReportNew(this.listQuery);
console.log('resGroup', resGroup); console.log('resGroup', resGroup);

10
src/views/core/monitoring/productAuto/index.vue
View File

@@ -1265,7 +1265,7 @@ export default {
break; break;
case 'reset': case 'reset':
this.$refs.searchBarForm.resetForm(); this.$refs.searchBarForm.resetForm();
this.$refs.searchBarForm.formInline.timeType = 1; this.$refs.searchBarForm.formInline.timeType = 3;
this.formConfig[0].selectOptions = this.activeName === 'product' this.formConfig[0].selectOptions = this.activeName === 'product'
? this.timeTypeOptions.productLine ? this.timeTypeOptions.productLine
: this.timeTypeOptions.product; : this.timeTypeOptions.product;
@@ -1273,8 +1273,11 @@ export default {
pageSize: 100, pageSize: 100,
pageNo: 1, pageNo: 1,
total: 0, 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 => const resetTimeIndex = this.formConfig.findIndex(item =>
item.label?.includes('刷新时间') item.label?.includes('刷新时间')
); );
@@ -1341,6 +1344,9 @@ export default {
this.listQuery.timeType = this.headFormValue.timeType ? this.headFormValue.timeType : this.listQuery.timeType; this.listQuery.timeType = this.headFormValue.timeType ? this.headFormValue.timeType : this.listQuery.timeType;
this.listQuery.searchType = this.headFormValue.searchType || undefined this.listQuery.searchType = this.headFormValue.searchType || undefined
if (this.listQuery.timeType === 2) { if (this.listQuery.timeType === 2) {
if (!this.listQuery.startTime && !this.listQuery.endTime) {
return this.$modal.msgError('请选择时间');
}
const resGroup = await getProcessAutoReportNew(this.listQuery); const resGroup = await getProcessAutoReportNew(this.listQuery);
console.log('resGroup', resGroup); console.log('resGroup', resGroup);