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

修改bug

Browse Source
This commit is contained in:
‘937886381’
2025-12-15 10:46:44 +08:00
parent f95d0473bf
commit a9645d03a9
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

2
src/views/core/monitoring/nextClip/hisData.vue
View File

@@ -275,7 +275,7 @@ export default {
fileName += this.listQuery.thick + '_';
}
// 添加时间戳避免文件名重复
fileName += + '.xlsx';
fileName + '.xlsx';
FileSaver.saveAs(blob, fileName);
this.$message.success('导出成功');

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

@@ -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);