修改bug

This commit is contained in:
‘937886381’
2024-03-18 16:00:56 +08:00
parent a4994ca5ae
commit 94886eedde
28 changed files with 1006 additions and 369 deletions

View File

@@ -89,7 +89,9 @@
// import moment from 'moment';
import basicPageMixin from '@/mixins/lb/basicPageMixin';
import PieChart from './components/pieChart.vue';
import {
exportEquipmentTraceabilityExcel
} from '@/api/quality/deviceParameters';
export default {
name: 'EfficiencyAnalysis',
mixins: [basicPageMixin],
@@ -256,7 +258,7 @@ export default {
// parent: 'dateFilterType',
// 时间段选择
type: 'datePicker',
// label: '时间段',
label: '时间段',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -284,7 +286,13 @@ export default {
btnName: '查询',
name: 'search',
color: 'primary',
},
},
{
type: 'button',
btnName: '导出',
name: 'export',
color: 'warning',
},
// {
// type: 'separate',
// },
@@ -372,7 +380,24 @@ export default {
this.trendOpen = true;
break;
}
},
},
handleExport() {
// 处理查询参数
let params = { ...this.queryParams };
params.pageNo = undefined;
params.pageSize = undefined;
this.$modal
.confirm('是否确认导出设备状态追溯?')
.then(() => {
this.exportLoading = true;
return exportEquipmentTraceabilityExcel(params);
})
.then((response) => {
this.$download.excel(response, '设备状态追溯.xls');
this.exportLoading = false;
})
.catch(() => { });
},
/** 查询列表 */
async getList() {
this.loading = true;
@@ -404,7 +429,8 @@ export default {
`${payload.timeday} 23:59:59`,
];
}
} else {
} else {
this.handleExport()
this.queryParams.recordTime = null;
}
this.getList();

View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-01 14:55:51
* @LastEditors: zhp
* @LastEditTime: 2023-12-01 16:43:10
* @LastEditTime: 2024-03-15 15:22:59
* @Description:
-->
<template>
@@ -121,7 +121,7 @@ export default {
},
{
type: 'datePicker',
label: '工单开始时间',
label: '时间',
dateType: 'daterange',
format: 'yyyy-MM-dd',
valueFormat: "yyyy-MM-dd",

View File

@@ -263,7 +263,7 @@ export default {
width: 90,
prop: 'source',
label: '来源',
filter: (val) => ['平板端', '网页端'][val],
filter: (val) => val == 1 ? '平板端' : '网页端',
},
],
// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
@@ -457,7 +457,7 @@ export default {
return;
}
// 修改的提交
let str = this.form.checkPerson.join()
let str = this.form.checkPerson ? this.form.checkPerson.join() : null
this.form.checkPerson = str
if (this.form.id != null) {
updateQualityInspectionRecord(this.form).then((response) => {

View File

@@ -223,7 +223,7 @@ export default {
{
// width: 128,
prop: 'sumScrap',
label: '未检测总数',
label: '未通过检测总数',
},
{
// width: 128,