#266 projects/mesxc-zhp

已合併
juzi 6 月之前 將 2 次代碼提交從 projects/mesxc-zhp合併至 projects/mesxc-test
  1. +2
    -2
      .env.dev
  2. +9
    -8
      src/views/quality/monitoring/equipmentTraceability/index.vue

+ 2
- 2
.env.dev 查看文件

@@ -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
# @LastEditors: DY
# @LastEditTime: 2024-03-22 14:18:33
# @LastEditors: zhp
# @Description: # @Description:
### ###
# 开发环境配置 # 开发环境配置


+ 9
- 8
src/views/quality/monitoring/equipmentTraceability/index.vue 查看文件

@@ -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) {
this.queryParams.recordTime = payload.timerange;
} else if (1 == payload.dateFilterType) {
// if (0 == payload.dateFilterType) {
this.queryParams.recordTime = payload.recordTime;
// } else if (1 == payload.dateFilterType) {
this.queryParams.recordTime = [ this.queryParams.recordTime = [
`${payload.timeday} 00:00:00`,
`${payload.timeday} 23:59:59`,
payload.recordTime[0],
payload.recordTime[1],
]; ];
}
// }
} else { } else {
this.handleExport() this.handleExport()
this.queryParams.recordTime = null; this.queryParams.recordTime = null;


Loading…
取消
儲存