diff --git a/dist.zip b/dist.zip index 5abf6f28..3a3a8dca 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 2d3efcdf..9b2a871d 100644 --- a/src/views/core/monitoring/lineAuto/index.vue +++ b/src/views/core/monitoring/lineAuto/index.vue @@ -401,7 +401,7 @@ export default { activeLabel: 'table', // 当班数据tab activeLabelDay: 'table', // 当天数据tab fileName: '', - headFormValue: {}, + headFormValue:{}, dataListLoading: false, tableProps, factoryColumns: [], @@ -702,6 +702,10 @@ export default { type: 'label', label: `刷新时间: ${this.formatCurrentTime()}`, }; + this.listQuery.timeType = 1; + if (this.$refs.searchBarForm) { + this.$refs.searchBarForm.formInline.timeType = 1; + } if (timeItemIndex > -1) { this.formConfig.splice(timeItemIndex, 1, timeLabel); } else { @@ -1150,7 +1154,7 @@ export default { this.listQuery.lineId = undefined; this.listQuery.processType = this.headFormValue.processType ? this.headFormValue.processType : []; this.listQuery.reportType = this.headFormValue.reportType || undefined; - this.listQuery.timeType = this.headFormValue.timeType || undefined; + this.listQuery.timeType = this.headFormValue.timeType ? this.headFormValue.timeType : this.listQuery.timeType; this.listQuery.searchType = this.headFormValue.searchType || undefined if (this.listQuery.timeType === 2) { const resGroup = await getProcessAutoReportNew(this.listQuery); diff --git a/src/views/core/monitoring/nextClip/hisData.vue b/src/views/core/monitoring/nextClip/hisData.vue index 3989f2d7..7c1beb1d 100644 --- a/src/views/core/monitoring/nextClip/hisData.vue +++ b/src/views/core/monitoring/nextClip/hisData.vue @@ -275,7 +275,7 @@ export default { fileName += this.listQuery.thick + '_'; } // 添加时间戳避免文件名重复 - fileName += + '.xlsx'; + fileName + '.xlsx'; FileSaver.saveAs(blob, fileName); this.$message.success('导出成功'); diff --git a/src/views/core/monitoring/productAuto/index.vue b/src/views/core/monitoring/productAuto/index.vue index d29a88b4..f3695e53 100644 --- a/src/views/core/monitoring/productAuto/index.vue +++ b/src/views/core/monitoring/productAuto/index.vue @@ -406,7 +406,7 @@ export default { factoryColumns: [], factoryColumnsDay: [], activeName: 'product', - headFormValue: {}, + headFormValue:{}, tableBtn: [], showData: [], tableData: [], @@ -714,6 +714,10 @@ export default { } else { this.formConfig.push(timeLabel); } + this.listQuery.timeType = 1; + if (this.$refs.searchBarForm) { + this.$refs.searchBarForm.formInline.timeType = 1; + } // 按产品监控:显示产品工艺和类型,隐藏产线,时间维度移除上一班 this.formConfig[0].selectOptions = this.timeTypeOptions.product; // 不含上一班 this.formConfig[3].type = ''; // 隐藏产线 @@ -1120,7 +1124,7 @@ export default { this.listQuery.lineId = undefined; this.listQuery.processType = this.headFormValue.processType ? this.headFormValue.processType : []; this.listQuery.reportType = this.headFormValue.reportType || undefined; - this.listQuery.timeType = this.headFormValue.timeType || undefined; + this.listQuery.timeType = this.headFormValue.timeType ? this.headFormValue.timeType : this.listQuery.timeType; this.listQuery.searchType = this.headFormValue.searchType || undefined if (this.listQuery.timeType === 2) { const resGroup = await getProcessAutoReportNew(this.listQuery);