From 53bf1e11c46964e15ab2d334457066ed3b68c98d Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 06 六月 2025 12:57:57 +0800
Subject: [PATCH] refactor(lb-eims):调整代码和更新配置- 注释掉 EimsEquImportVo 中的 @ExcelProperty 注解 - 优化 EimsEquImportListener 中的异常日志输出- 更新 snailjob 监控页面的 iframe 源地址- 修改移动端项目的 API 基础 URL - 优化移动端页面跳转逻辑 - 改进维修请求列表的接单操作流程
---
eims-ui-mobile/src/pages/maint/order-detail.vue | 4 +++-
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java | 2 +-
eims-ui-mobile/env/.env | 4 ++--
eims-ui/apps/web-antd/src/views/monitor/snailjob/index.vue | 2 +-
eims-ui-mobile/src/pages/inspect/insp-record.vue | 4 +++-
eims-ui-mobile/src/pages/repair/req-list.vue | 19 ++++++++++++++-----
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java | 2 +-
7 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/eims-ui-mobile/env/.env b/eims-ui-mobile/env/.env
index ba2fa4c..c2a782d 100644
--- a/eims-ui-mobile/env/.env
+++ b/eims-ui-mobile/env/.env
@@ -7,8 +7,8 @@
# h5閮ㄧ讲缃戠珯鐨刡ase锛岄厤缃埌 manifest.config.ts 閲岀殑 h5.router.base
VITE_APP_PUBLIC_BASE=/
-VITE_SERVER_BASEURL = 'http://192.168.12.33:8080'
-VITE_UPLOAD_BASEURL = 'http://192.168.12.33:8080/resource/oss/upload'
+VITE_SERVER_BASEURL = 'http://lanpucloud.cn:8091'
+VITE_UPLOAD_BASEURL = 'http://lanpucloud.cn:8091/resource/oss/upload'
# 鏈変簺鍚屽鍙兘闇�瑕佸湪寰俊灏忕▼搴忛噷闈㈡牴鎹� develop銆乼rial銆乺elease 鍒嗗埆璁剧疆涓婁紶鍦板潃锛屽弬鑰冧唬鐮佸涓嬨��
# 涓嬮潰鐨勫彉閲忓鏋滄病鏈夎缃紝浼氶粯璁や娇鐢� VITE_SERVER_BASEURL or VITE_UPLOAD_BASEURL
diff --git a/eims-ui-mobile/src/pages/inspect/insp-record.vue b/eims-ui-mobile/src/pages/inspect/insp-record.vue
index f566511..a276635 100644
--- a/eims-ui-mobile/src/pages/inspect/insp-record.vue
+++ b/eims-ui-mobile/src/pages/inspect/insp-record.vue
@@ -269,7 +269,9 @@
updateData(resolve)
},
})
- .then(() => {})
+ .then(() => {
+ goBack()
+ })
.catch((error) => {
console.log(error)
})
diff --git a/eims-ui-mobile/src/pages/maint/order-detail.vue b/eims-ui-mobile/src/pages/maint/order-detail.vue
index e9571df..beed4f1 100644
--- a/eims-ui-mobile/src/pages/maint/order-detail.vue
+++ b/eims-ui-mobile/src/pages/maint/order-detail.vue
@@ -204,7 +204,9 @@
updateOrder(data, resolve)
},
})
- .then(() => {})
+ .then(() => {
+ goBack()
+ })
.catch((error) => {
console.log(error)
})
diff --git a/eims-ui-mobile/src/pages/repair/req-list.vue b/eims-ui-mobile/src/pages/repair/req-list.vue
index 4db9c85..5759003 100644
--- a/eims-ui-mobile/src/pages/repair/req-list.vue
+++ b/eims-ui-mobile/src/pages/repair/req-list.vue
@@ -120,7 +120,7 @@
</view>
<view v-if="isSelectReq">
<wd-button size="small" icon="edit-outline" @click.stop="handleSelectReq(item)">
- 閫変腑
+ 鎺ュ崟
</wd-button>
</view>
</view>
@@ -263,10 +263,19 @@
* @param item
*/
function handleSelectReq(item: any) {
- if (isSelectReq.value) {
- emitSelectReq(item)
- uni.navigateBack()
- }
+ // 寮瑰嚭纭鏄惁鎺ュ崟寮圭獥
+ message.confirm({
+ msg: '纭畾鎺ュ崟锛�',
+ title: '鎻愮ず',
+ beforeConfirm: ({ resolve }) => {
+ resolve(true)
+ // 鎺ュ崟閫昏緫澶勭悊
+ if (isSelectReq.value) {
+ emitSelectReq(item)
+ uni.navigateBack()
+ }
+ },
+ })
}
/**
diff --git a/eims-ui/apps/web-antd/src/views/monitor/snailjob/index.vue b/eims-ui/apps/web-antd/src/views/monitor/snailjob/index.vue
index 6b40353..8590659 100644
--- a/eims-ui/apps/web-antd/src/views/monitor/snailjob/index.vue
+++ b/eims-ui/apps/web-antd/src/views/monitor/snailjob/index.vue
@@ -1,3 +1,3 @@
<template>
- <iframe class="size-full" src="http://localhost:8800/snail-job"></iframe>
+ <iframe class="size-full" src="http://lanpucloud.cn:8092/snail-job"></iframe>
</template>
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java
index bb43e80..e19707f 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsEquImportVo.java
@@ -129,7 +129,7 @@
/**
* 闄勪欢
*/
- @ExcelProperty(value = "闄勪欢")
+// @ExcelProperty(value = "闄勪欢")
private Long attachId;
/**
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
index 2fd2310..7f9b90c 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/listener/EimsEquImportListener.java
@@ -156,7 +156,7 @@
if (exception instanceof ExcelDataConvertException) {
ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException) exception;
log.error("绗瑊}琛岋紝绗瑊}鍒楄В鏋愬紓甯革紝鏁版嵁涓�:{}", excelDataConvertException.getRowIndex(),
- excelDataConvertException.getColumnIndex(), excelDataConvertException.getCellData());
+ excelDataConvertException.getColumnIndex(), excelDataConvertException.getCellData().getData());
}
}
--
Gitblit v1.9.3