From b9989d6d13e894b6be78fc7fcfa283f77eb55821 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 18 二月 2025 17:41:36 +0800
Subject: [PATCH] 1、调整设备维修时长与故障停机时长页面的时长精度为2且单位调整由分钟调整为小时 2、调整设备维修时长与故障停机时长页面的计算接口传参方式 3、解决设备维修时长与故障停机时长页面的计算弹窗中输入框非空校验无效的问题
---
src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeForm.vue | 4 +-
src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeForm.vue | 4 +-
src/api/mdc.js | 4 +-
src/views/mdc/base/modules/EquipmentFailureCloseTime/ComputeEquipmentFailureCloseTimeModal.vue | 46 +++++++++++++----------
src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeList.vue | 2
src/views/mdc/base/modules/EquipmentRepairTime/ComputeEquipmentRepairTimeModal.vue | 45 ++++++++++++----------
src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeList.vue | 2
7 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/src/api/mdc.js b/src/api/mdc.js
index 4518a4e..c4d8c62 100644
--- a/src/api/mdc.js
+++ b/src/api/mdc.js
@@ -45,7 +45,7 @@
// 璁＄畻OEE
computeOeeApi: params => postAction('/mdc/mdcOeeInfo/computeOee', params),
// 璁＄畻MTBF
- computeMTBFApi: params => postAction('/mdc/mdcDownTime/computeMtbf', params),
+ computeMTBFApi: ({ month }) => postAction(`/mdc/mdcDownTime/computeMtbf?month=${month}`),
// 璁＄畻MTTR
- computeMTTRApi: params => postAction('/mdc/mdcRepairInfo/computeMttr', params)
+ computeMTTRApi: ({ month }) => postAction(`/mdc/mdcRepairInfo/computeMttr?month=${month}`)
}
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/EquipmentFailureCloseTime/ComputeEquipmentFailureCloseTimeModal.vue b/src/views/mdc/base/modules/EquipmentFailureCloseTime/ComputeEquipmentFailureCloseTimeModal.vue
index 9a9a25a..ca97bb2 100644
--- a/src/views/mdc/base/modules/EquipmentFailureCloseTime/ComputeEquipmentFailureCloseTimeModal.vue
+++ b/src/views/mdc/base/modules/EquipmentFailureCloseTime/ComputeEquipmentFailureCloseTimeModal.vue
@@ -1,7 +1,7 @@
<template>
<a-modal title="璁＄畻MTBF" :visible="visible" :width="400" @cancel="handleModalClose" @ok="handleComputeMTBF"
:maskClosable="false">
- <a-form-model :model="model" :labelCol="labelColLong" :wrapperCol="wrapperColLong" :rules="validateRules">
+ <a-form-model ref="form" :model="model" :labelCol="labelColLong" :wrapperCol="wrapperColLong" :rules="validateRules">
<a-row>
<a-col :span="24">
<a-form-model-item label="鏈堜唤" prop="month">
@@ -41,27 +41,33 @@
},
methods: {
handleComputeMTBF() {
- mdcApi.computeMTBFApi(this.model)
- .then(res => {
- if (res.success) {
- this.$notification.success({
- message: '娑堟伅',
- description: res.message
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ mdcApi.computeMTBFApi(this.model)
+ .then(res => {
+ if (res.success) {
+ this.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ this.handleModalClose()
+ } else {
+ this.$notification.error({
+ message: '娑堟伅',
+ description: '璁＄畻澶辫触'
+ })
+ }
})
- this.handleModalClose()
- } else {
- this.$notification.error({
- message: '娑堟伅',
- description: '璁＄畻澶辫触'
+ .catch(err => {
+ this.$notification.error({
+ message: '娑堟伅',
+ description: '璁＄畻澶辫触'
+ })
})
- }
- })
- .catch(err => {
- this.$notification.error({
- message: '娑堟伅',
- description: '璁＄畻澶辫触'
- })
- })
+ }
+ })
+
},
handleModalClose() {
diff --git a/src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeForm.vue b/src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeForm.vue
index a110828..d302766 100644
--- a/src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeForm.vue
+++ b/src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeForm.vue
@@ -18,8 +18,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="鏁呴殰鍋滄満鏃堕暱(min)" prop="downLong">
- <a-input-number :min="0" v-model="model.downLong" placeholder="璇疯緭鍏ユ晠闅滃仠鏈烘椂闀�(min)"></a-input-number>
+ <a-form-model-item label="鏁呴殰鍋滄満鏃堕暱(h)" prop="downLong">
+ <a-input-number :min="0" :step="0.1" :precision="2" v-model="model.downLong" placeholder="璇疯緭鍏ユ晠闅滃仠鏈烘椂闀�(h)"></a-input-number>
</a-form-model-item>
</a-col>
</a-row>
diff --git a/src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeList.vue b/src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeList.vue
index a2601f7..4baa52d 100644
--- a/src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeList.vue
+++ b/src/views/mdc/base/modules/EquipmentFailureCloseTime/EquipmentFailureCloseTimeList.vue
@@ -135,7 +135,7 @@
width: 440
},
{
- title: '鏁呴殰鍋滄満鏃堕暱(min)',
+ title: '鏁呴殰鍋滄満鏃堕暱(h)',
align: 'center',
dataIndex: 'downLong',
width: 300
diff --git a/src/views/mdc/base/modules/EquipmentRepairTime/ComputeEquipmentRepairTimeModal.vue b/src/views/mdc/base/modules/EquipmentRepairTime/ComputeEquipmentRepairTimeModal.vue
index 53f0f11..7adc63d 100644
--- a/src/views/mdc/base/modules/EquipmentRepairTime/ComputeEquipmentRepairTimeModal.vue
+++ b/src/views/mdc/base/modules/EquipmentRepairTime/ComputeEquipmentRepairTimeModal.vue
@@ -1,7 +1,7 @@
<template>
<a-modal title="璁＄畻MTTR" :visible="visible" :width="400" @cancel="handleModalClose" @ok="handleComputeMTTR"
:maskClosable="false">
- <a-form-model :model="model" :labelCol="labelColLong" :wrapperCol="wrapperColLong" :rules="validateRules">
+ <a-form-model ref="form" :model="model" :labelCol="labelColLong" :wrapperCol="wrapperColLong" :rules="validateRules">
<a-row>
<a-col :span="24">
<a-form-model-item label="鏈堜唤" prop="month">
@@ -41,27 +41,32 @@
},
methods: {
handleComputeMTTR() {
- mdcApi.computeMTTRApi(this.model)
- .then(res => {
- if (res.success) {
- this.$notification.success({
- message: '娑堟伅',
- description: res.message
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ mdcApi.computeMTTRApi(this.model)
+ .then(res => {
+ if (res.success) {
+ this.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ this.handleModalClose()
+ } else {
+ this.$notification.error({
+ message: '娑堟伅',
+ description: '璁＄畻澶辫触'
+ })
+ }
})
- this.handleModalClose()
- } else {
- this.$notification.error({
- message: '娑堟伅',
- description: '璁＄畻澶辫触'
+ .catch(err => {
+ this.$notification.error({
+ message: '娑堟伅',
+ description: '璁＄畻澶辫触'
+ })
})
- }
- })
- .catch(err => {
- this.$notification.error({
- message: '娑堟伅',
- description: '璁＄畻澶辫触'
- })
- })
+ }
+ })
},
handleModalClose() {
diff --git a/src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeForm.vue b/src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeForm.vue
index 9267fc8..367085e 100644
--- a/src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeForm.vue
+++ b/src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeForm.vue
@@ -18,8 +18,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="缁翠慨鏃堕暱(min)" prop="repairLong">
- <a-input-number :min="0" v-model="model.repairLong" placeholder="璇疯緭鍏ョ淮淇椂闀�(min)"></a-input-number>
+ <a-form-model-item label="缁翠慨鏃堕暱(h)" prop="repairLong">
+ <a-input-number :min="0":step="0.1" :precision="2" v-model="model.repairLong" placeholder="璇疯緭鍏ョ淮淇椂闀�(h)"></a-input-number>
</a-form-model-item>
</a-col>
</a-row>
diff --git a/src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeList.vue b/src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeList.vue
index b1f97f1..804b85d 100644
--- a/src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeList.vue
+++ b/src/views/mdc/base/modules/EquipmentRepairTime/EquipmentRepairTimeList.vue
@@ -135,7 +135,7 @@
width: 440
},
{
- title: '缁翠慨鏃堕暱(min)',
+ title: '缁翠慨鏃堕暱(h)',
align: 'center',
dataIndex: 'repairLong',
width: 300
--
Gitblit v1.9.3