修改bug
This commit is contained in:
@@ -401,7 +401,7 @@ export default {
|
|||||||
activeLabel: 'table', // 当班数据tab
|
activeLabel: 'table', // 当班数据tab
|
||||||
activeLabelDay: 'table', // 当天数据tab
|
activeLabelDay: 'table', // 当天数据tab
|
||||||
fileName: '',
|
fileName: '',
|
||||||
headFormValue: {},
|
headFormValue:{},
|
||||||
dataListLoading: false,
|
dataListLoading: false,
|
||||||
tableProps,
|
tableProps,
|
||||||
factoryColumns: [],
|
factoryColumns: [],
|
||||||
@@ -702,6 +702,10 @@ export default {
|
|||||||
type: 'label',
|
type: 'label',
|
||||||
label: `刷新时间: ${this.formatCurrentTime()}`,
|
label: `刷新时间: ${this.formatCurrentTime()}`,
|
||||||
};
|
};
|
||||||
|
this.listQuery.timeType = 1;
|
||||||
|
if (this.$refs.searchBarForm) {
|
||||||
|
this.$refs.searchBarForm.formInline.timeType = 1;
|
||||||
|
}
|
||||||
if (timeItemIndex > -1) {
|
if (timeItemIndex > -1) {
|
||||||
this.formConfig.splice(timeItemIndex, 1, timeLabel);
|
this.formConfig.splice(timeItemIndex, 1, timeLabel);
|
||||||
} else {
|
} else {
|
||||||
@@ -1150,7 +1154,7 @@ export default {
|
|||||||
this.listQuery.lineId = undefined;
|
this.listQuery.lineId = undefined;
|
||||||
this.listQuery.processType = this.headFormValue.processType ? this.headFormValue.processType : [];
|
this.listQuery.processType = this.headFormValue.processType ? this.headFormValue.processType : [];
|
||||||
this.listQuery.reportType = this.headFormValue.reportType || undefined;
|
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
|
this.listQuery.searchType = this.headFormValue.searchType || undefined
|
||||||
if (this.listQuery.timeType === 2) {
|
if (this.listQuery.timeType === 2) {
|
||||||
const resGroup = await getProcessAutoReportNew(this.listQuery);
|
const resGroup = await getProcessAutoReportNew(this.listQuery);
|
||||||
|
|||||||
@@ -275,7 +275,7 @@ export default {
|
|||||||
fileName += this.listQuery.thick + '_';
|
fileName += this.listQuery.thick + '_';
|
||||||
}
|
}
|
||||||
// 添加时间戳避免文件名重复
|
// 添加时间戳避免文件名重复
|
||||||
fileName += + '.xlsx';
|
fileName + '.xlsx';
|
||||||
|
|
||||||
FileSaver.saveAs(blob, fileName);
|
FileSaver.saveAs(blob, fileName);
|
||||||
this.$message.success('导出成功');
|
this.$message.success('导出成功');
|
||||||
|
|||||||
@@ -406,7 +406,7 @@ export default {
|
|||||||
factoryColumns: [],
|
factoryColumns: [],
|
||||||
factoryColumnsDay: [],
|
factoryColumnsDay: [],
|
||||||
activeName: 'product',
|
activeName: 'product',
|
||||||
headFormValue: {},
|
headFormValue:{},
|
||||||
tableBtn: [],
|
tableBtn: [],
|
||||||
showData: [],
|
showData: [],
|
||||||
tableData: [],
|
tableData: [],
|
||||||
@@ -714,6 +714,10 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.formConfig.push(timeLabel);
|
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[0].selectOptions = this.timeTypeOptions.product; // 不含上一班
|
||||||
this.formConfig[3].type = ''; // 隐藏产线
|
this.formConfig[3].type = ''; // 隐藏产线
|
||||||
@@ -1120,7 +1124,7 @@ export default {
|
|||||||
this.listQuery.lineId = undefined;
|
this.listQuery.lineId = undefined;
|
||||||
this.listQuery.processType = this.headFormValue.processType ? this.headFormValue.processType : [];
|
this.listQuery.processType = this.headFormValue.processType ? this.headFormValue.processType : [];
|
||||||
this.listQuery.reportType = this.headFormValue.reportType || undefined;
|
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
|
this.listQuery.searchType = this.headFormValue.searchType || undefined
|
||||||
if (this.listQuery.timeType === 2) {
|
if (this.listQuery.timeType === 2) {
|
||||||
const resGroup = await getProcessAutoReportNew(this.listQuery);
|
const resGroup = await getProcessAutoReportNew(this.listQuery);
|
||||||
|
|||||||
Reference in New Issue
Block a user