From 5c3f9712747a4f063433c9e656790d5fbf5c8e69 Mon Sep 17 00:00:00 2001 From: Su ZeJing <3039179835@qq.com> Date: Mon, 8 Apr 2024 16:58:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=B8=8E=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E4=B8=8E=E5=9B=B4=E6=A0=8F=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/fence.js | 10 +- src/api/system/markers.js | 12 +-- src/api/system/vehicle.js | 10 +- src/views/system/vehicle/index.vue | 161 ++++++++++++++++------------- 4 files changed, 105 insertions(+), 88 deletions(-) diff --git a/src/api/system/fence.js b/src/api/system/fence.js index 70e0e7c..a2ac88b 100644 --- a/src/api/system/fence.js +++ b/src/api/system/fence.js @@ -8,7 +8,7 @@ import fence from "@/views/system/fence/index.vue"; */ export function fenceList(data){ return request({ - url:'/fence/fence/list', + url:'/business/fence/list', method:"post", data:data }) @@ -22,7 +22,7 @@ export function fenceList(data){ */ export function fenceAdd(data) { return request({ - url: '/fence/fence/fenceAdd', + url: '/business/fence/fenceAdd', method: 'post', data:data }) @@ -35,7 +35,7 @@ export function fenceAdd(data) { */ export function fenceDelete(fenceId) { return request({ - url: '/fence/fence/fenceDelete/'+fenceId, + url: '/business/fence/fenceDelete/'+fenceId, method: 'post' }) } @@ -48,7 +48,7 @@ export function fenceDelete(fenceId) { */ export function fenceUpdate(data) { return request({ - url: '/fence/fence/fenceUpdate', + url: '/business/fence/fenceUpdate', method: 'post', data }) @@ -56,7 +56,7 @@ export function fenceUpdate(data) { export function fenceUpdateMap(data) { return request({ - url: '/fence/fence/fenceUpdateMap', + url: '/business/fence/fenceUpdateMap', method: 'post', data }) diff --git a/src/api/system/markers.js b/src/api/system/markers.js index e7c794f..d5817c4 100644 --- a/src/api/system/markers.js +++ b/src/api/system/markers.js @@ -8,7 +8,7 @@ import fence from "@/views/system/fence/index.vue"; */ export function markersList(data){ return request({ - url:'/markers/markers/list', + url:'/business/markers/list', method:"post", data:data }) @@ -22,7 +22,7 @@ export function markersList(data){ */ export function markersInsert(data) { return request({ - url: '/markers/markers/insert', + url: '/business/markers/insert', method: 'post', data:data }) @@ -35,7 +35,7 @@ export function markersInsert(data) { */ export function insertMarkersFence(data) { return request({ - url: '/markers/markers/insertMarkersFence', + url: '/business/markers/insertMarkersFence', method: 'post', data:data }) @@ -48,7 +48,7 @@ export function insertMarkersFence(data) { */ export function markersDelete(markersId) { return request({ - url: '/markers/markers/delete/'+markersId, + url: '/business/markers/delete/'+markersId, method: 'post' }) } @@ -60,7 +60,7 @@ export function markersDelete(markersId) { */ export function markersFenceList(markersId) { return request({ - url: '/markers/markers/markersFenceList/'+markersId, + url: '/business/markers/markersFenceList/'+markersId, method: 'post' }) } @@ -73,7 +73,7 @@ export function markersFenceList(markersId) { */ export function markersUpdate(data) { return request({ - url: '/markers/markers/update', + url: '/business/markers/update', method: 'post', data }) diff --git a/src/api/system/vehicle.js b/src/api/system/vehicle.js index 055fff4..5274de5 100644 --- a/src/api/system/vehicle.js +++ b/src/api/system/vehicle.js @@ -8,7 +8,7 @@ import fence from "@/views/system/fence/index.vue"; */ export function vehicleList(data){ return request({ - url:'/vehicle/vehicle/list', + url:'/business/vehicle/list', method:"post", data:data }) @@ -22,7 +22,7 @@ export function vehicleList(data){ */ export function vehicleInsert(data) { return request({ - url: '/vehicle/vehicle/vehicleInsert', + url: '/business/vehicle/vehicleInsert', method: 'post', data:data }) @@ -35,7 +35,7 @@ export function vehicleInsert(data) { */ export function insertMarkersFence(data) { return request({ - url: '/vehicle/vehicle/insertMarkersFence', + url: '/business/vehicle/insertMarkersFence', method: 'post', data:data }) @@ -48,7 +48,7 @@ export function insertMarkersFence(data) { */ export function vehicleDelete(fenceId) { return request({ - url: '/vehicle/vehicle/vehicleDelete/'+fenceId, + url: '/business/vehicle/vehicleDelete/'+fenceId, method: 'post' }) } @@ -61,7 +61,7 @@ export function vehicleDelete(fenceId) { */ export function vehicleUpdate(data) { return request({ - url: '/vehicle/vehicle/vehicleUpdate', + url: '/business/vehicle/vehicleUpdate', method: 'post', data }) diff --git a/src/views/system/vehicle/index.vue b/src/views/system/vehicle/index.vue index d757af9..1dd7ef3 100644 --- a/src/views/system/vehicle/index.vue +++ b/src/views/system/vehicle/index.vue @@ -3,40 +3,34 @@
- - + + - - + + - - + + - - - - - - - - - - + + - - - 驶出 - 驶入 - + + - - + + + + + + + 正常 停用 @@ -47,35 +41,28 @@ - 新增 + 新增 - + - - - - - + + + + + + + + + - - - - @@ -99,19 +86,33 @@ @pagination="getList" /> - - + - + + + + + + + + + + + + + + + + - + 驶出 驶入 @@ -129,14 +130,34 @@ - + - + + + + + + + + + + + + + + + + + + + + + - + 驶出 驶入 @@ -144,7 +165,7 @@ - + 正常 停用 @@ -185,14 +206,14 @@ export default { batteryBusiness: null, MotorID: null, BatteryID: null, + vehicleState:null + }, total:0, dialogFormVisible:false, formLabelWidth:'120px', - fences:{ - - }, + vehicle:{}, title:'', dialogFormVisible1:false, formLabelWidth1:'120px', @@ -224,57 +245,53 @@ export default { //修改电子围栏 handleEdit(obj) { this.dialogFormVisible1 = true - this.fences = obj - this.title = '修改电子围栏' + this.vehicle = obj + this.title = '修改车辆信息' }, updateAll() { - fenceUpdate(this.fences).then( + vehicleUpdate(this.vehicle).then( res => { this.$message.success(res.msg) - this.list() + this.getList() } ) this.dialogFormVisible1=false; }, //新增 - fencadd() { - this.fences = {} + vehicleAdd() { + this.vehicle = {} this.dialogFormVisible = true this.title = '新增页面' }, - addAll() { - fenceAdd(this.fences).then( + vehicleInsert(this.vehicle).then( res => { this.$message.success(res.msg) - this.list() + this.getList() } ) this.dialogFormVisible = false }, - //删除电子围栏 - handleDelete(fenceId){ - fenceDelete(fenceId,'deleted').then( + //删除车辆信息 + handleDelete(vehicleId){ + vehicleDelete(vehicleId,'deleted').then( res=>{ this.$message.success(res.msg) - this.list() + this.getList() } ) }, - //编辑围栏 + //编辑车辆标识 handleWdit(obj) { - this.showMap=true - this.showMapp=false - this.fences = obj - this.initAMap() + this.vehicle = obj }, },