From 5330eb812cdcc02cace0648b008092b24c6e2236 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 17:44:50 +0800
Subject: [PATCH] 1、利用率走势分析和利用率分段分析页面优化表格数据加载方式，实现滚动条触底加载，解决数据量较大时网页请求速度慢问题 2、报警分析页面调整图表样式，更换表格组件为ant-design表格 3、登录页面登录后若用户密码为初始密码或密码已过期则出现修改密码弹窗
---
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