From f29e2aae98bbb52672b67bff99556f3cf64d1bce Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 26 六月 2025 15:45:40 +0800
Subject: [PATCH] feat(eims): 优化设备管理功能和界面
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureImportVo.java | 4 ++++
eims-ui-mobile/src/pages/maint/maint-st.vue | 14 +++++++++++---
eims-ui/apps/web-antd/src/views/eims/insp-record/data.tsx | 3 +++
eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx | 3 +++
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java | 2 +-
5 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/eims-ui-mobile/src/pages/maint/maint-st.vue b/eims-ui-mobile/src/pages/maint/maint-st.vue
index 6a61c61..26848fd 100644
--- a/eims-ui-mobile/src/pages/maint/maint-st.vue
+++ b/eims-ui-mobile/src/pages/maint/maint-st.vue
@@ -118,13 +118,21 @@
const now = dayjs()
const planDate = dayjs(planTime)
- const diffDays = planDate.diff(now, 'day')
+
+ // 鑾峰彇璁″垝鏃ユ湡鎵�鍦ㄦ湀浠界殑鏈�鍚庝竴澶�
+ const planMonthEnd = planDate.endOf('month')
+
+ // 璁＄畻褰撳墠鏃ユ湡涓庤鍒掓湀鏈堝簳鐨勫樊鍊硷紙澶╂暟锛�
+ const diffDays = planMonthEnd.diff(now, 'day')
if (diffDays < 0) {
- // 瓒呰繃璁″垝鏃堕棿锛岀孩鑹茶儗鏅�
+ // 宸茬粡杩囦簡璁″垝鏈堢殑鏈堝簳锛岀孩鑹茶儗鏅�
return 'card-overdue'
} else if (diffDays <= 3) {
- // 璺濈璁″垝鏃堕棿涓夊ぉ浠ュ唴锛岄粍鑹茶儗鏅�
+ // 璺濈璁″垝鏈堟湀搴�3澶╀互鍐咃紝绾㈣壊鑳屾櫙
+ return 'card-overdue'
+ } else if (diffDays <= 10) {
+ // 璺濈璁″垝鏈堟湀搴�10澶╀互鍐咃紝榛勮壊鑳屾櫙
return 'card-urgent'
} else {
// 姝ｅ父鐘舵�侊紝鑳屾櫙棰滆壊涓嶅彉
diff --git a/eims-ui/apps/web-antd/src/views/eims/insp-record/data.tsx b/eims-ui/apps/web-antd/src/views/eims/insp-record/data.tsx
index 404f8fa..cd561ec 100644
--- a/eims-ui/apps/web-antd/src/views/eims/insp-record/data.tsx
+++ b/eims-ui/apps/web-antd/src/views/eims/insp-record/data.tsx
@@ -21,6 +21,9 @@
{
component: 'Input',
fieldName: 'params.searchValue',
+ componentProps: {
+ placeholder: '璇疯緭鍏ヨ澶囧悕绉版垨璧勪骇缂栧彿'
+ },
label: '鍏抽敭瀛�'
},
// {
diff --git a/eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx b/eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx
index bd70f6d..d39145f 100644
--- a/eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx
+++ b/eims-ui/apps/web-antd/src/views/eims/insp-st/data.tsx
@@ -23,6 +23,9 @@
{
component: 'Input',
fieldName: 'params.searchValue',
+ componentProps: {
+ placeholder: '璇疯緭鍏ヨ澶囧悕绉版垨璧勪骇缂栧彿'
+ },
label: '鍏抽敭瀛�'
},
{
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureImportVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureImportVo.java
index a33fc81..bd62cdf 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureImportVo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsFixtureImportVo.java
@@ -145,4 +145,8 @@
@ColumnWidth(15)
private String power;
+
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
}
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java
index 12d35eb..7e9e813 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/job/MaintPlanToOrderJob.java
@@ -60,7 +60,7 @@
Date oldNext = planVo.getMaintNextTime();
int day = DateUtils.differentDays(today, oldNext);
// 濡傛灉璁″垝鐢熸垚宸ュ崟鏃ユ湡澶т簬浠婂ぉ鍒欎笉鐢熸垚宸ュ崟
- if (day >= 10) {
+ if (day >= 1) {
continue;
}
--
Gitblit v1.9.3