From 71c133cb546c6881266382facd3dee4baeaca91c Mon Sep 17 00:00:00 2001 From: Xiao Fan <461179989@qq.com> Date: Wed, 10 Apr 2024 21:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=82=96=E5=87=A14.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business/alarmLogs.js | 44 --- src/api/business/fault_code_info.js | 19 -- src/api/business/records.js | 18 +- src/api/system/car.js | 32 ++- src/main.js | 10 + src/utils/request.js | 2 +- src/views/business/alarmLogs/index.vue | 326 ---------------------- src/views/business/dict/index.vue | 350 ------------------------ src/views/business/faultCodes/index.vue | 233 ++++++++++++++-- src/views/business/faultLogs/index.vue | 233 ++++++++++++---- src/views/business/fence/map.vue | 1 + src/views/business/records/history.vue | 120 +++++++- src/views/system/car/index.vue | 140 ++++++---- src/views/system/dict/index.vue | 2 +- 14 files changed, 647 insertions(+), 883 deletions(-) delete mode 100644 src/api/business/alarmLogs.js delete mode 100644 src/views/business/alarmLogs/index.vue delete mode 100644 src/views/business/dict/index.vue diff --git a/src/api/business/alarmLogs.js b/src/api/business/alarmLogs.js deleted file mode 100644 index 67c5472..0000000 --- a/src/api/business/alarmLogs.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询报警记录列表 -export function listAlarmLogs(query) { - return request({ - url: '/business/alarmLogs/list', - method: 'get', - params: query - }) -} - -// 查询报警记录详细 -export function getAlarmLogs(alarmId) { - return request({ - url: '/business/alarmLogs/' + alarmId, - method: 'get' - }) -} - -// 新增报警记录 -export function addAlarmLogs(data) { - return request({ - url: '/business/alarmLogs', - method: 'post', - data - }) -} - -// 修改报警记录 -export function updateAlarmLogs(data) { - return request({ - url: '/business/alarmLogs', - method: 'put', - data - }) -} - -// 删除报警记录 -export function delAlarmLogs(alarmId) { - return request({ - url: '/business/alarmLogs/' + alarmId, - method: 'delete' - }) -} diff --git a/src/api/business/fault_code_info.js b/src/api/business/fault_code_info.js index 52d8add..f12e802 100644 --- a/src/api/business/fault_code_info.js +++ b/src/api/business/fault_code_info.js @@ -1,17 +1,7 @@ import request from '@/utils/request' -import FaultCodes from "@/views/business/faultCodes/index.vue"; // 查询故障码列表 export function listFaultCodes(query) { - return request({ - url: '/business/faultCodes/current/list', - method: 'get', - params: query - }) -} - -// 查询实时故障列表 -export function faultCodesCurrentList(query) { return request({ url: '/business/faultCodes/list', method: 'get', @@ -58,15 +48,6 @@ export function changeFaultCodesStatus(faultId, status){ }) } -// 修改故障码报警状态 -export function batchChangeAlarm(faultCodesList){ - return request({ - url: '/business/faultCodes/batchChangeAlarm', - method: 'put', - data: faultCodesList - }) -} - // 删除故障码 export function delFaultCodes(faultId) { return request({ diff --git a/src/api/business/records.js b/src/api/business/records.js index 1e38d16..383ae39 100644 --- a/src/api/business/records.js +++ b/src/api/business/records.js @@ -13,6 +13,22 @@ export function listRecords(query) { export function delRecords(recordsId) { return request({ url: '/business/records/delete/' + recordsId, - method: 'delete' + method: 'post' + }) +} + +// 根据ID获取历史车辆数据 +export function vehicleData(recordsId) { + return request({ + url: '/business/vehicleData/findVDByRecordsId/' + recordsId, + method: 'get' + }) +} + +// 获取历史经纬度 +export function getPosition(recordsId) { + return request({ + url: '/business/vehicleData/getPosition/' + recordsId, + method: 'get' }) } diff --git a/src/api/system/car.js b/src/api/system/car.js index 7175929..3c52a11 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 }) } @@ -17,6 +17,14 @@ export function selectFence(data) { }) } +export function selectMarking(data) { + return request({ + url: '/system/car/selectMarking', + method: 'get', + data + }) +} + export function exportA(data){ return request({ url: '/system/car/exportA', @@ -50,7 +58,18 @@ export function del(carIds) { }); } - +export function close(carVin) { + return request({ + url: '/system/car/close/'+carVin, + method: 'post' + }); +} +export function open(carVin) { + return request({ + url: '/system/car/open/'+carVin, + method: 'post' + }); +} @@ -62,3 +81,10 @@ export function findById(carId) { } + +export function getRealTimeDataTwo(vin) { + return request({ + url: '/analyze/realTimeDataTwo/' +vin, + method: 'post' + }) +} diff --git a/src/main.js b/src/main.js index 13c6cf2..a84e637 100644 --- a/src/main.js +++ b/src/main.js @@ -78,6 +78,16 @@ Vue.use(Element, { Vue.config.productionTip = false +//配置安全密钥 +window._AMapSecurityConfig = { + securityJsCode: 'bb3924cc27a38c7bf8caaab8300a76a9' //* 安全密钥 +} + +// 引入 echarts +import * as echarts from 'echarts' +Vue.prototype.$echarts = echarts + + new Vue({ el: '#app', router, 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/business/alarmLogs/index.vue b/src/views/business/alarmLogs/index.vue deleted file mode 100644 index f85fbd7..0000000 --- a/src/views/business/alarmLogs/index.vue +++ /dev/null @@ -1,326 +0,0 @@ - - - diff --git a/src/views/business/dict/index.vue b/src/views/business/dict/index.vue deleted file mode 100644 index b6d1cc4..0000000 --- a/src/views/business/dict/index.vue +++ /dev/null @@ -1,350 +0,0 @@ - - - diff --git a/src/views/business/faultCodes/index.vue b/src/views/business/faultCodes/index.vue index b0c94da..7761d23 100644 --- a/src/views/business/faultCodes/index.vue +++ b/src/views/business/faultCodes/index.vue @@ -20,7 +20,7 @@ + + 新增 + + + 修改 + + + 删除 + - + + @@ -57,6 +96,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ diff --git a/src/views/system/car/index.vue b/src/views/system/car/index.vue index fd4e6f2..b869eab 100644 --- a/src/views/system/car/index.vue +++ b/src/views/system/car/index.vue @@ -115,9 +115,10 @@ - + - + +