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

Merge pull request 'projects/mesxc-zhp' (#266) from projects/mesxc-zhp into projects/mesxc-test

Browse Source 
Reviewed-on: #266
This commit is contained in:
朱菊兰 2024-03-22 14:24:24 +08:00
commit a1262bd640
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -1,8 +1,8 @@
### ###
# @Author: Do not edit # @Author: Do not edit
# @Date: 2023-08-29 09:40:39 # @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-03-22 10:28:37 # @LastEditTime: 2024-03-22 14:18:33
# @LastEditors: DY # @LastEditors: zhp
# @Description: # @Description:
### ###
# 开发环境配置 # 开发环境配置

17
src/views/quality/monitoring/equipmentTraceability/index.vue
View File

@ -244,7 +244,7 @@ export default {
rangeSeparator: '-', rangeSeparator: '-',
startPlaceholder: '开始时间', startPlaceholder: '开始时间',
endPlaceholder: '结束时间', endPlaceholder: '结束时间',
param: 'timerange', param: 'recordTime',
}, },
// { // {
// parent: 'dateFilterType', // parent: 'dateFilterType',
@ -270,6 +270,7 @@ export default {
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
color: 'warning', color: 'warning',
}, },
// { // {
// type: 'separate', // type: 'separate',
@ -381,7 +382,7 @@ export default {
}, },
/** 查询列表 */ /** 查询列表 */
async getList() { async getList() {
this.loading = true; this.loading = true
const { code, data } = await this.$axios({ const { code, data } = await this.$axios({
url: '/analysis/equipment-analysis/efficiency', url: '/analysis/equipment-analysis/efficiency',
method: 'get', method: 'get',
@ -402,14 +403,14 @@ export default {
if (btnName == 'search') { if (btnName == 'search') {
this.queryParams.workOrderId = payload.workOrderId || null; this.queryParams.workOrderId = payload.workOrderId || null;
// this.queryParams.lineId = payload.lineId || null; // this.queryParams.lineId = payload.lineId || null;
if (0 == payload.dateFilterType) { // if (0 == payload.dateFilterType) {
this.queryParams.recordTime = payload.timerange; this.queryParams.recordTime = payload.recordTime;
} else if (1 == payload.dateFilterType) { // } else if (1 == payload.dateFilterType) {
this.queryParams.recordTime = [ this.queryParams.recordTime = [
`${payload.timeday} 00:00:00`, payload.recordTime[0],
`${payload.timeday} 23:59:59`, payload.recordTime[1],
]; ];
} // }
} else { } else {
this.handleExport() this.handleExport()
this.queryParams.recordTime = null; this.queryParams.recordTime = null;