From 07e3e588a730569b8f1cd3227c8649208337e4b0 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 十二月 2023 13:35:36 +0800
Subject: [PATCH] 1、调整网站标题为MDC智慧车间 2、设备管理页面新增弹窗中统一编码选择弹窗中的查询区域样式调整 3、设备参数阈值管理页面添加参数阈值弹窗中原默认驱动类型为空，现调整为首位数据，且无参数时显示请选择参数 4、加工数量管理页面新增弹窗中选择标准加工时间弹窗中的查询区域样式调整 5、加班管理页面新增弹窗中班次选择弹窗中的查询区域样式调整
---
src/views/eam/modules/predictiveWorkOrder/boms/PredictiveWarn.vue | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/views/eam/modules/predictiveWorkOrder/boms/PredictiveWarn.vue b/src/views/eam/modules/predictiveWorkOrder/boms/PredictiveWarn.vue
index e41a7c2..a59477f 100644
--- a/src/views/eam/modules/predictiveWorkOrder/boms/PredictiveWarn.vue
+++ b/src/views/eam/modules/predictiveWorkOrder/boms/PredictiveWarn.vue
@@ -58,17 +58,22 @@
isDel: {
type: Boolean,
default: false
+ },
+ orderId:{
+ type: String,
+ default:'',
+ required: false
}
},
mounted() {
},
watch: {
- planId:{
+ orderId:{
immediate:true,
handler(val){
- if (this.planId) {
- this.queryParam.planId = val
+ if (this.orderId) {
+ this.queryParam.workOrderId = val
this.queryParam.delFlag = 0
this.loadData(1)
}
@@ -91,7 +96,7 @@
},
{
title: '鏉′欢',
- dataIndex: 'conditionalRelationName',
+ dataIndex: 'parameterCondition_dictText',
align: 'center',
width:200
},
@@ -108,27 +113,14 @@
width:200
},
{
- title: '鎶ヨ鍛ㄦ湡',
- dataIndex: 'warnCycle',
- align: 'center',
- width:200
- },
- {
- title: '鎶ヨ鍛ㄦ湡鍗曚綅',
- dataIndex: 'cycleUnitName',
- align: 'center',
- width:200
- },
- {
- title: '鎶ヨ娆℃暟',
- dataIndex: 'times',
+ title: '妫�娴嬫椂闂�',
+ dataIndex: 'collectTime',
align: 'center',
width:200
},
],
url: {
- list: '/eam/predictiveworkplanwarn/pagePredictiveWorkPlanWarn',
- delete: '/eam/predictiveworkplanwarn/delete'
+ list: '/eam/predictiveworkplanwarn/getHistoryPage',
}
}
},
--
Gitblit v1.9.3