From de6a67308f76ffeb4ac5aab7353eb20895858184 Mon Sep 17 00:00:00 2001 From: Xiao Fan <461179989@qq.com> Date: Sun, 31 Mar 2024 16:59:22 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=82=96=E5=87=A13.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/car.js | 17 +++++-- src/views/system/car/index.vue | 83 +++++++++++++++++++++++----------- 2 files changed, 70 insertions(+), 30 deletions(-) diff --git a/src/api/system/car.js b/src/api/system/car.js index 7175929..02bf9f6 100644 --- a/src/api/system/car.js +++ b/src/api/system/car.js @@ -1,11 +1,11 @@ import request from '@/utils/request' // 查询菜单列表 -export function list(data) { +export function list(params) { return request({ url: '/system/car/list', method: 'get', - data + params }) } @@ -50,7 +50,18 @@ export function del(carIds) { }); } - +export function updateStateClose(carId) { + return request({ + url: '/system/car/updateStateClose/'+carId, + method: 'post' + }); +} +export function updateStateOpen(carId) { + return request({ + url: '/system/car/updateStateOpen/'+carId, + method: 'post' + }); +} diff --git a/src/views/system/car/index.vue b/src/views/system/car/index.vue index fd4e6f2..3e2489d 100644 --- a/src/views/system/car/index.vue +++ b/src/views/system/car/index.vue @@ -130,6 +130,22 @@ + From 3eab5881788b7f70152f362a9921b5f723fcaf56 Mon Sep 17 00:00:00 2001 From: Xiao Fan <461179989@qq.com> Date: Sat, 6 Apr 2024 21:55:27 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=82=96=E5=87=A14.6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 + src/api/system/car.js | 13 +++++++ src/router/index.js | 15 ++++++++ src/views/system/car/index.vue | 10 +++++ src/views/system/track/index.vue | 66 ++++++++++++++++++++++++-------- 5 files changed, 91 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 2ed93d6..090a24e 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,9 @@ "nprogress": "0.2.0", "quill": "1.3.7", "screenfull": "5.0.2", + "sockjs-client": "^1.6.1", "sortablejs": "1.10.2", + "stompjs": "^2.3.3", "vue": "2.6.12", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", diff --git a/src/api/system/car.js b/src/api/system/car.js index fac54b3..d3d873d 100644 --- a/src/api/system/car.js +++ b/src/api/system/car.js @@ -73,3 +73,16 @@ export function findById(carId) { } +export function getRealTimeData() { + return request({ + url: '/analyze/realTimeData', + method: 'get' + }) +} + +export function getRealTimeDataTwo(vin) { + return request({ + url: '/analyze/realTimeDataTwo/' +vin, + method: 'post' + }) +} diff --git a/src/router/index.js b/src/router/index.js index bb897e5..d0134c6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,7 +87,22 @@ export const constantRoutes = [ meta: { title: '个人中心', icon: 'user' } } ] + }, + { + path: '/track', + component: Layout, + hidden: true, + redirect: 'track', + children: [ + { + path: 'index', + component: () => import('@/views/system/track/index'), + name: 'track', + meta: { title: '实时轨迹' } + } + ] } + ] // 动态路由，基于用户权限动态去加载 diff --git a/src/views/system/car/index.vue b/src/views/system/car/index.vue index 6613b12..b167944 100644 --- a/src/views/system/car/index.vue +++ b/src/views/system/car/index.vue @@ -160,6 +160,15 @@ @click="handleDelete(scope.row)" v-hasPermi="['system:car:remove']" >删除 + 实时轨迹查询 @@ -218,6 +227,7 @@ @@ -70,4 +101,9 @@ export default { width: 25%; height: 250px; } +.amap-marker-icon { + border: none !important; /* 移除Marker的边框 */ + box-shadow: none !important; /* 移除Marker的阴影 */ + } + From 1e9f7abf010fbaeb0df95a572832b9248929ee87 Mon Sep 17 00:00:00 2001 From: Xiao Fan <461179989@qq.com> Date: Mon, 8 Apr 2024 10:20:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=82=96=E5=87=A14.8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/system/car/index.vue | 2 +- src/views/system/track/index.vue | 88 ++++++++++++++++---------------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index ffb0d21..48c5ab8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -55,7 +55,7 @@ service.interceptors.request.use(config => { const s_url = sessionObj.url; // 请求地址 const s_data = sessionObj.data; // 请求数据 const s_time = sessionObj.time; // 请求时间 - const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 + const interval = 500; // 间隔时间(ms)，小于此时间视为重复提交 if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) { const message = '数据正在处理，请勿重复提交'; console.warn(`[${s_url}]: ` + message) diff --git a/src/views/system/car/index.vue b/src/views/system/car/index.vue index b167944..65baffc 100644 --- a/src/views/system/car/index.vue +++ b/src/views/system/car/index.vue @@ -163,7 +163,7 @@ +
+
+
+ {{carData}} +
+ +
+ +