From c622702a7b9357a45df08361dfab4dcc690fc95c Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 29 九月 2025 08:43:50 +0800
Subject: [PATCH] fix:优化index.vue支持 selected
---
ruoyi-ui/src/views/system/gps/map.vue | 253 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 198 insertions(+), 55 deletions(-)
diff --git a/ruoyi-ui/src/views/system/gps/map.vue b/ruoyi-ui/src/views/system/gps/map.vue
index 972e902..6d0035e 100644
--- a/ruoyi-ui/src/views/system/gps/map.vue
+++ b/ruoyi-ui/src/views/system/gps/map.vue
@@ -26,6 +26,8 @@
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['00:00:00', '23:59:59']"
+ @change="handleDateRangeChange"
></el-date-picker>
</el-form-item>
<el-form-item>
@@ -56,7 +58,9 @@
>
<el-table-column label="鏃堕棿" align="center" prop="collectTime" />
<el-table-column label="閫熷害(km/h)" align="center" prop="speed" />
-
+ <el-table-column label="缁忓害" align="center" prop="longitude" />
+ <el-table-column label="绾害" align="center" prop="latitude" />
+ <el-table-column label="鏂瑰悜(掳)" align="center" prop="direction" />
</el-table>
</el-card>
</el-col>
@@ -127,11 +131,27 @@
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 1000,
deviceId: null,
appId: null,
sign: null,
- timestamp: null
+ timestamp: null,
+ vehicleNo: null,
+ beginTime: null,
+ endTime: null
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {
+ vehicleNo: null
+ },
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ vehicleNo: [
+ { required: true, message: "杞︾墝鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ ],
+ dateRange: [
+ { required: true, message: "璇烽�夋嫨鏃堕棿鑼冨洿", trigger: "change" }
+ ]
},
// 鍦板浘瀵硅薄
map: null,
@@ -156,9 +176,34 @@
created() {
// 鑾峰彇URL鍙傛暟
const query = this.$route.query;
- if (query.vehicleNo) {
- this.queryParams.vehicleNo = query.vehicleNo;
+ // if (query.vehicleNo) {
+ // this.queryParams.vehicleNo = query.vehicleNo;
+ // } else {
+ // this.$message.error('缂哄皯杞︾墝鍙峰弬鏁�');
+ // return;
+ // }
+ //鑾峰彇璁㈠崟鍙�
+ this.queryParams.orderId = query.orderId;
+ if(this.queryParams.orderId==null)
+ {
+ this.$message.error('缂哄皯璁㈠崟鍙峰弬鏁�');
+ return;
}
+
+ // 妫�鏌ユ椂闂村弬鏁�
+ // if (query.beginTime && query.endTime) {
+ // // 鏍煎紡鍖栨椂闂�
+ // this.dateRange = [
+ // this.formatDateTime(query.beginTime),
+ // this.formatDateTime(query.endTime)
+ // ];
+ // this.queryParams.beginTime = this.dateRange[0];
+ // this.queryParams.endTime = this.dateRange[1];
+ // } else {
+ // this.$message.error('缂哄皯鏃堕棿鑼冨洿鍙傛暟');
+ // return;
+ // }
+
// 璁剧疆璁よ瘉鍙傛暟
if (query.appId) {
this.queryParams.appId = query.appId;
@@ -169,19 +214,15 @@
if (query.timestamp) {
this.queryParams.timestamp = query.timestamp;
}
- // 璁剧疆鏃堕棿鑼冨洿
- if (query.beginTime && query.endTime) {
- this.dateRange = [query.beginTime, query.endTime];
- }
+
this.getList();
},
mounted() {
// 鍔ㄦ�佸姞杞界櫨搴﹀湴鍥続PI
- this.loadBMapScript().then(() => {
- this.initMap();
- window.initMapFlag=true;
- if(window.loadGpsList){
- this.drawTrack()
+ this.initMap().then(() => {
+ window.initMapFlag = true;
+ if (window.loadGpsList) {
+ this.drawTrack();
}
});
},
@@ -193,37 +234,67 @@
resolve(window.BMap);
return;
}
+
+ window.initBMap = () => {
+ console.log("鐧惧害鍦板浘API鍔犺浇鎴愬姛");
+ resolve(window.BMap);
+ };
+
const script = document.createElement("script");
script.type = "text/javascript";
script.src =
"https://api.map.baidu.com/api?v=3.0&ak=n5z5pKfAnaP3fYMR4RJOAQsR1wQ2avAn&callback=initBMap";
- script.onerror = reject;
- document.head.appendChild(script);
- window.initBMap = () => {
- // 鍔犺浇鍧愭爣杞崲搴�
- const convertorScript = document.createElement("script");
- convertorScript.type = "text/javascript";
- convertorScript.src =
- "https://api.map.baidu.com/getscript?v=3.0&ak=n5z5pKfAnaP3fYMR4RJOAQsR1wQ2avAn&services=&t=20230101100000";
- convertorScript.onload = () => {
- // 鍔犺浇鍧愭爣杞崲宸ュ叿
- const toolsScript = document.createElement("script");
- toolsScript.type = "text/javascript";
- toolsScript.src =
- "https://api.map.baidu.com/library/Convertor/1.4/src/Convertor_min.js";
- toolsScript.onload = () => {
- resolve(window.BMap);
- };
- document.head.appendChild(toolsScript);
- };
- document.head.appendChild(convertorScript);
+ script.onerror = (error) => {
+ console.error("鐧惧害鍦板浘API鍔犺浇澶辫触", error);
+ reject(error);
};
+ document.head.appendChild(script);
});
+ },
+ /** 鏍煎紡鍖栨椂闂� */
+ parseTime(time) {
+ const year = time.getFullYear();
+ const month = String(time.getMonth() + 1).padStart(2, '0');
+ const day = String(time.getDate()).padStart(2, '0');
+ const hours = String(time.getHours()).padStart(2, '0');
+ const minutes = String(time.getMinutes()).padStart(2, '0');
+ const seconds = String(time.getSeconds()).padStart(2, '0');
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ },
+ /** 澶勭悊鏃堕棿鏍煎紡 */
+ formatDateTime(dateTimeStr) {
+ if (!dateTimeStr) return '';
+ // 濡傛灉鏃堕棿瀛楃涓蹭笉鍖呭惈绉掞紝娣诲姞绉�
+ if (dateTimeStr.length === 16) { // yyyy-MM-dd HH:mm
+ return dateTimeStr + ':00';
+ }
+ return dateTimeStr;
},
/** 鏌ヨGPS鍒楄〃 */
getList() {
this.loading = true;
- anonymousList(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ // 鏋勫缓鏌ヨ鍙傛暟
+ const params = {
+ ...this.queryParams
+ };
+
+ // 濡傛灉娌℃湁閫夋嫨鏃堕棿鑼冨洿锛屽垯浣跨敤URL涓殑鏃堕棿
+ // if (!this.dateRange || this.dateRange.length === 0) {
+ // const query = this.$route.query;
+ // if (query.beginTime && query.endTime) {
+ // params.beginTime = query.beginTime;
+ // params.endTime = query.endTime;
+ // } else {
+ // this.$message.error('璇烽�夋嫨鏃堕棿鑼冨洿');
+ // this.loading = false;
+ // return;
+ // }
+ // } else {
+ // params.beginTime = this.dateRange[0];
+ // params.endTime = this.dateRange[1];
+ // }
+
+ anonymousList(params).then(response => {
this.gpsList = response.rows;
this.total = response.total;
this.loading = false;
@@ -231,40 +302,87 @@
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杞ㄨ抗澶辫触");
+ }
});
},
- async translatePoints(points) {
- // 灏哤GS84鍧愭爣杞崲涓虹櫨搴﹀潗鏍�
- var translatePoints = [];
- return new Promise((resolve, reject) => {
+ /** 鍧愭爣杞崲鏂规硶 */
+ translatePoint(point) {
+ return new Promise((resolve) => {
+ // 浣跨敤鐧惧害鍦板浘API鍐呯疆鐨勫潗鏍囪浆鎹�
const convertor = new BMap.Convertor();
- convertor.translate(points, 1, 5, (data) => {
+ const pointArr = [];
+ pointArr.push(point);
+ convertor.translate(pointArr, 1, 5, (data) => {
if (data.status === 0) {
- translatePoints = data.points;
- resolve(translatePoints);
+ resolve(data.points[0]);
+ } else {
+ // 濡傛灉杞崲澶辫触锛岃繑鍥炲師濮嬪潗鏍�
+ resolve(point);
}
});
});
},
+ /** 鎵归噺鍧愭爣杞崲 */
+ async translatePoints(points) {
+ const translatePoints = [];
+ for (const point of points) {
+ const translatedPoint = await this.translatePoint(point);
+ translatePoints.push(translatedPoint);
+ }
+ return translatePoints;
+ },
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
+ if (!this.queryParams.vehicleNo) {
+ this.$message.error('璇疯緭鍏ヨ溅鐗屽彿');
+ return;
+ }
+ if (!this.dateRange || this.dateRange.length !== 2) {
+ this.$message.error('璇烽�夋嫨鏃堕棿鑼冨洿');
+ return;
+ }
+ // 鏇存柊鏌ヨ鍙傛暟
+ this.queryParams.beginTime = this.dateRange[0];
+ this.queryParams.endTime = this.dateRange[1];
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.dateRange = [];
+ // 閲嶇疆涓哄綋澶╂椂闂磋寖鍥�
+ const today = new Date();
+ const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 0, 0, 0);
+ const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate(), 23, 59, 59);
+ this.dateRange = [this.parseTime(startTime), this.parseTime(endTime)];
this.resetForm("queryForm");
+ // 淇濈暀杞︾墝鍙�
+ this.queryParams.vehicleNo = this.$route.query.vehicleNo;
+ // 鏇存柊鏌ヨ鍙傛暟
+ this.queryParams.beginTime = this.dateRange[0];
+ this.queryParams.endTime = this.dateRange[1];
this.handleQuery();
},
/** 鍒濆鍖栧湴鍥� */
- initMap() {
- // 鍒涘缓鍦板浘瀹炰緥
- this.map = new BMap.Map("mapContainer");
- // 璁剧疆鍦板浘涓績鐐瑰拰缂╂斁绾у埆
- this.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11);
- // 鍚敤婊氳疆鏀惧ぇ缂╁皬
- this.map.enableScrollWheelZoom();
- console.log("initMap 鍒濆鍖栧湴鍥�")
+ async initMap() {
+ try {
+ await this.loadBMapScript();
+ // 鍒涘缓鍦板浘瀹炰緥
+ this.map = new BMap.Map("mapContainer");
+ // 璁剧疆鍦板浘涓績鐐瑰拰缂╂斁绾у埆
+ this.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11);
+ // 鍚敤婊氳疆鏀惧ぇ缂╁皬
+ this.map.enableScrollWheelZoom();
+ console.log("鍦板浘鍒濆鍖栨垚鍔�");
+ } catch (error) {
+ console.error("鍦板浘鍒濆鍖栧け璐�", error);
+ this.$message.error("鍦板浘鍔犺浇澶辫触锛岃鍒锋柊椤甸潰閲嶈瘯");
+ }
},
/** 璁＄畻涓ょ偣涔嬮棿鐨勮窛绂伙紙绫筹級 */
getDistance(point1, point2) {
@@ -307,7 +425,7 @@
);
const currentSegment = this.gpsList.slice(startIndex, endIndex);
- //鍏堣幏寰楁墍鏈夊潗鏍囨暟缁�
+ // 鑾峰彇鎵�鏈夊潗鏍囨暟缁�
const originPoints = currentSegment.map(
(item) => new BMap.Point(item.longitude, item.latitude)
);
@@ -315,10 +433,11 @@
this.gpsList.sort((a, b) => {
return new Date(b.collectTime) - new Date(a.collectTime);
}).forEach(item => {
- item.speed=item.speed/1000;
+ item.speed = item.speed/1000;
});
- //鎵归噺杞崲鍧愭爣
- var translatePoints = await this.translatePoints(originPoints);
+
+ // 鎵归噺杞崲鍧愭爣
+ const translatePoints = await this.translatePoints(originPoints);
// 鍒涘缓杞ㄨ抗鐐规暟缁�
const points = translatePoints;
@@ -562,6 +681,30 @@
}
this.isPlaying = false;
},
+ /** 澶勭悊鏃堕棿鑼冨洿鍙樺寲 */
+ handleDateRangeChange(val) {
+ if (val && val.length === 2) {
+ // 鏍煎紡鍖栨椂闂�
+ this.dateRange = [
+ this.formatDateTime(val[0]),
+ this.formatDateTime(val[1])
+ ];
+
+ // 妫�鏌ョ粨鏉熸椂闂存槸鍚﹀寘鍚叿浣撴椂闂�
+ const endDate = new Date(this.dateRange[1]);
+ const hasSpecificTime = endDate.getHours() !== 0 || endDate.getMinutes() !== 0;
+
+ if (!hasSpecificTime) {
+ // 濡傛灉娌℃湁鍏蜂綋鏃堕棿锛岃缃负23:59:59
+ endDate.setHours(23, 59, 59);
+ this.dateRange[1] = this.parseTime(endDate);
+ }
+
+ // 鏇存柊鏌ヨ鍙傛暟
+ this.queryParams.beginTime = this.dateRange[0];
+ this.queryParams.endTime = this.dateRange[1];
+ }
+ },
},
beforeDestroy() {
this.stopPlayback();
--
Gitblit v1.9.1