From 9ea148d7260769daf75cc7e822675e431dd6728c Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 15 五月 2025 18:26:46 +0800
Subject: [PATCH] fix:修复地图报错信息
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 4 ++--
ruoyi-admin/src/main/resources/application-prod.yml | 6 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java | 4 +++-
ruoyi-ui/src/views/system/gps/map.vue | 8 ++++++++
ruoyi-admin/src/main/resources/application.yml | 2 +-
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
index 4e3c7b8..35d6238 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -132,8 +132,8 @@
ServiceOrderAppVo model = new ServiceOrderAppVo();
model.setMethod("ServiceOrder_APP"); // 璁剧疆鎺ュ彛鍚嶇О
model.setAppId(scApp.getMinAppId()); // 璁剧疆鍟嗘埛 APPID
- model.setOrdClass(scApp.getOrderClass()); // 璁剧疆姘戣埅瀛楀吀orderClass
- model.setUserID(scApp.getUserId()); // 璁剧疆姘戣埅鍒嗗叕鍙窱d
+
+
model.setOrdType(tbOrders.getTypeCode().intValue());
model.setCoPhone(tbOrders.getLinkTel()); // 瀹㈡埛鑱旂郴鐢佃瘽
model.setCoName(tbOrders.getLinkPerson()); // 瀹㈡埛濮撳悕
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
index f966940..145b63d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
@@ -225,7 +225,9 @@
// 閫氳繃杞︾墝鍙疯幏鍙栬澶嘔D
VehicleInfo vehicleInfo = vehicleInfoService.selectVehicleInfoByPlateNumber(vehicleNo);
if (vehicleInfo == null) {
- throw new Error("鏈壘鍒拌杞﹁締瀵瑰簲鐨凣PS璁惧");
+
+ // throw new Error("鏈壘鍒拌杞﹁締瀵瑰簲鐨凣PS璁惧");
+ return getDataTable(new ArrayList<>());
}
// 澶勭悊寮�濮嬫椂闂�
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 317322f..12a4ebc 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -6,13 +6,13 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://127.0.0.1:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3307/mhyl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 2025@@gdmh$$
+ password: abcd1234
# 浠庡簱鏁版嵁婧�
# SQL Server鏁版嵁婧�
sqlserver:
- url: jdbc:sqlserver://127.0.0.1;databaseName=came
+ url: jdbc:sqlserver://39.108.160.52;databaseName=came
username: camesa
password: camesa
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ae08b40..0128223 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -56,7 +56,7 @@
basename: i18n/messages
profiles:
# 鐜 dev|test|prod
- active: dev
+ active: prod
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/ruoyi-ui/src/views/system/gps/map.vue b/ruoyi-ui/src/views/system/gps/map.vue
index 08bcec3..6d0035e 100644
--- a/ruoyi-ui/src/views/system/gps/map.vue
+++ b/ruoyi-ui/src/views/system/gps/map.vue
@@ -302,6 +302,14 @@
if(window.initMapFlag){
this.drawTrack();
}
+ }).catch(error => {
+ this.loading = false;
+ // 鏄剧ず鍙嬪ソ鐨勯敊璇彁绀�
+ if (error.message && error.message.includes("鏈壘鍒拌杞﹁締瀵瑰簲鐨凣PS璁惧")) {
+ this.$message.warning("璇ヨ溅杈嗘殏鏃燝PS璁惧淇℃伅");
+ } else {
+ this.$message.error(error.message || "鏌ヨGPS杞ㄨ抗澶辫触");
+ }
});
},
/** 鍧愭爣杞崲鏂规硶 */
--
Gitblit v1.9.1