first-dev
/
smart-cloud-ui
5
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

车辆与标识与围栏系统

server_2024_4_2_suzejing
xiaoSu 2024-04-08 16:58:14 +08:00
parent 69a51fe624
commit 5c3f971274
4 changed files with 105 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/system/fence.js
View File

@ -8,7 +8,7 @@ import fence from "@/views/system/fence/index.vue";
*/ */
export function fenceList(data){ export function fenceList(data){
return request({ return request({
url:'/fence/fence/list', url:'/business/fence/list',
method:"post", method:"post",
data:data data:data
}) })
@ -22,7 +22,7 @@ export function fenceList(data){
*/ */
export function fenceAdd(data) { export function fenceAdd(data) {
return request({ return request({
url: '/fence/fence/fenceAdd', url: '/business/fence/fenceAdd',
method: 'post', method: 'post',
data:data data:data
}) })
@ -35,7 +35,7 @@ export function fenceAdd(data) {
*/ */
export function fenceDelete(fenceId) { export function fenceDelete(fenceId) {
return request({ return request({
url: '/fence/fence/fenceDelete/'+fenceId, url: '/business/fence/fenceDelete/'+fenceId,
method: 'post' method: 'post'
}) })
} }
@ -48,7 +48,7 @@ export function fenceDelete(fenceId) {
*/ */
export function fenceUpdate(data) { export function fenceUpdate(data) {
return request({ return request({
url: '/fence/fence/fenceUpdate', url: '/business/fence/fenceUpdate',
method: 'post', method: 'post',
data data
}) })
@ -56,7 +56,7 @@ export function fenceUpdate(data) {
export function fenceUpdateMap(data) { export function fenceUpdateMap(data) {
return request({ return request({
url: '/fence/fence/fenceUpdateMap', url: '/business/fence/fenceUpdateMap',
method: 'post', method: 'post',
data data
}) })

12
src/api/system/markers.js
View File

@ -8,7 +8,7 @@ import fence from "@/views/system/fence/index.vue";
*/ */
export function markersList(data){ export function markersList(data){
return request({ return request({
url:'/markers/markers/list', url:'/business/markers/list',
method:"post", method:"post",
data:data data:data
}) })
@ -22,7 +22,7 @@ export function markersList(data){
*/ */
export function markersInsert(data) { export function markersInsert(data) {
return request({ return request({
url: '/markers/markers/insert', url: '/business/markers/insert',
method: 'post', method: 'post',
data:data data:data
}) })
@ -35,7 +35,7 @@ export function markersInsert(data) {
*/ */
export function insertMarkersFence(data) { export function insertMarkersFence(data) {
return request({ return request({
url: '/markers/markers/insertMarkersFence', url: '/business/markers/insertMarkersFence',
method: 'post', method: 'post',
data:data data:data
}) })
@ -48,7 +48,7 @@ export function insertMarkersFence(data) {
*/ */
export function markersDelete(markersId) { export function markersDelete(markersId) {
return request({ return request({
url: '/markers/markers/delete/'+markersId, url: '/business/markers/delete/'+markersId,
method: 'post' method: 'post'
}) })
} }
@ -60,7 +60,7 @@ export function markersDelete(markersId) {
*/ */
export function markersFenceList(markersId) { export function markersFenceList(markersId) {
return request({ return request({
url: '/markers/markers/markersFenceList/'+markersId, url: '/business/markers/markersFenceList/'+markersId,
method: 'post' method: 'post'
}) })
} }
@ -73,7 +73,7 @@ export function markersFenceList(markersId) {
*/ */
export function markersUpdate(data) { export function markersUpdate(data) {
return request({ return request({
url: '/markers/markers/update', url: '/business/markers/update',
method: 'post', method: 'post',
data data
}) })

10
src/api/system/vehicle.js
View File

@ -8,7 +8,7 @@ import fence from "@/views/system/fence/index.vue";
*/ */
export function vehicleList(data){ export function vehicleList(data){
return request({ return request({
url:'/vehicle/vehicle/list', url:'/business/vehicle/list',
method:"post", method:"post",
data:data data:data
}) })
@ -22,7 +22,7 @@ export function vehicleList(data){
*/ */
export function vehicleInsert(data) { export function vehicleInsert(data) {
return request({ return request({
url: '/vehicle/vehicle/vehicleInsert', url: '/business/vehicle/vehicleInsert',
method: 'post', method: 'post',
data:data data:data
}) })
@ -35,7 +35,7 @@ export function vehicleInsert(data) {
*/ */
export function insertMarkersFence(data) { export function insertMarkersFence(data) {
return request({ return request({
url: '/vehicle/vehicle/insertMarkersFence', url: '/business/vehicle/insertMarkersFence',
method: 'post', method: 'post',
data:data data:data
}) })
@ -48,7 +48,7 @@ export function insertMarkersFence(data) {
*/ */
export function vehicleDelete(fenceId) { export function vehicleDelete(fenceId) {
return request({ return request({
url: '/vehicle/vehicle/vehicleDelete/'+fenceId, url: '/business/vehicle/vehicleDelete/'+fenceId,
method: 'post' method: 'post'
}) })
} }
@ -61,7 +61,7 @@ export function vehicleDelete(fenceId) {
*/ */
export function vehicleUpdate(data) { export function vehicleUpdate(data) {
return request({ return request({
url: '/vehicle/vehicle/vehicleUpdate', url: '/business/vehicle/vehicleUpdate',
method: 'post', method: 'post',
data data
}) })

161
src/views/system/vehicle/index.vue
View File

@ -3,40 +3,34 @@
<div> <div>
<el-form :inline="true" :model="queryParams" class="demo-form-inline"> <el-form :inline="true" :model="queryParams" class="demo-form-inline">
<el-form-item label="围栏名称"> <el-form-item label="车辆VIN">
<el-input v-model="queryParams.vehicleVIN" placeholder="模糊查询车辆VIN"></el-input> <el-input v-model="queryParams.vehicleVIN" placeholder="车辆VIN"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="围栏名称"> <el-form-item label="车辆类型">
<el-input v-model="queryParams.vehicleTypeId" placeholder="模糊查询围栏名称"></el-input> <el-input v-model="queryParams.vehicleTypeId" placeholder="车辆类型"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="围栏名称"> <el-form-item label="电机厂商">
<el-input v-model="queryParams.motorBusiness" placeholder="模糊查询围栏名称"></el-input> <el-input v-model="queryParams.motorBusiness" placeholder="电机厂商"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="围栏名称"> <el-form-item label="电池厂商">
<el-input v-model="queryParams.batteryBusiness" placeholder="模糊查询围栏名称"></el-input> <el-input v-model="queryParams.batteryBusiness" placeholder="电池厂商"></el-input>
</el-form-item>
<el-form-item label="围栏名称">
<el-input v-model="queryParams.MotorID" placeholder="模糊查询围栏名称"></el-input>
</el-form-item>
<el-form-item label="围栏名称">
<el-input v-model="queryParams.BatteryID" placeholder="模糊查询围栏名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="围栏类型"> <el-form-item label="电机ID">
<el-select v-model="queryParams.fenceTypeId" placeholder="请选择围栏类型"> <el-input v-model="queryParams.MotorID" placeholder="电机ID"></el-input>
<el-option label="驶出" value="1">驶出</el-option>
<el-option label="驶入" value="2">驶入</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="围栏状态"> <el-form-item label="电池名称">
<el-select v-model="queryParams.fenceState" placeholder="请选择围栏状态"> <el-input v-model="queryParams.BatteryID" placeholder="电池ID"></el-input>
</el-form-item>
<el-form-item label="车辆状态">
<el-select v-model="queryParams.vehicleState" placeholder="请选择围栏状态">
<el-option label="正常" value="1">正常</el-option> <el-option label="正常" value="1">正常</el-option>
<el-option label="停用" value="2">停用</el-option> <el-option label="停用" value="2">停用</el-option>
</el-select> </el-select>
@ -47,35 +41,28 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-button type="primary" plain icon="el-icon-plus" @click="fencadd">新增</el-button> <el-button type="primary" plain icon="el-icon-plus" @click="vehicleAdd">新增</el-button>
<el-table :data="fenceList" style="width: 100%" ref="multipleTable"> <el-table :data="vehicleList" style="width: 100%" ref="multipleTable">
<el-table-column label="围栏名称" align="center" prop="fenceName" /> <el-table-column label="车辆VIN" align="center" prop="vehicleVIN" />
<el-table-column label="车辆VIN" align="center" prop="vehicleTypeId" />
<el-table-column <el-table-column label="车辆VIN" align="center" prop="motorBusiness" />
label="围栏类型" <el-table-column label="车辆VIN" align="center" prop="batteryBusiness" />
width="180"> <el-table-column label="车辆VIN" align="center" prop="motorID" />
<template slot-scope="scope"> <el-table-column label="车辆VIN" align="center" prop="batteryID" />
<span style="margin-left: 10px" v-if="scope.row.fenceTypeId==1">驶出</span> <el-table-column label="车辆VIN" align="center" prop="" />
<span style="margin-left: 10px" v-if="scope.row.fenceTypeId==2">驶入</span> <el-table-column label="车辆VIN" align="center" prop="vehicleVIN" />
</template> <el-table-column label="车辆VIN" align="center" prop="vehicleVIN" />
</el-table-column>
<el-table-column <el-table-column
label="围栏状态" label="围栏状态"
width="180"> width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px" v-if="scope.row.fenceState==1"><el-tag>正常</el-tag></span> <span style="margin-left: 10px" v-if="scope.row.vehicleState==1"><el-tag>正常</el-tag></span>
<span style="margin-left: 10px" v-if="scope.row.fenceState==2"><el-tag>停用</el-tag></span> <span style="margin-left: 10px" v-if="scope.row.vehicleState==2"><el-tag>停用</el-tag></span>
</template>
</el-table-column>
<el-table-column label="经纬度信息" width="280">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.fenceMessage }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -99,19 +86,33 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 围栏添加--> <!-- 围栏添加-->
<el-dialog :title="title" :visible.sync="dialogFormVisible"> <el-dialog :title="title" :visible.sync="dialogFormVisible">
<el-form :model="fences"> <el-form :model="vehicle">
<el-form-item label="围栏名称" :label-width="formLabelWidth"> <el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="fences.fenceName" autocomplete="off"></el-input> <el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="围栏类型" :label-width="formLabelWidth"> <el-form-item label="围栏类型" :label-width="formLabelWidth">
<el-select v-model="fences.fenceTypeId" placeholder="请选择活动区域"> <el-select v-model="vehicle.fenceTypeId" placeholder="请选择活动区域">
<el-option label="驶出" value="1">驶出</el-option> <el-option label="驶出" value="1">驶出</el-option>
<el-option label="驶入" value="2">驶入</el-option> <el-option label="驶入" value="2">驶入</el-option>
</el-select> </el-select>
@ -129,14 +130,34 @@
<!-- 修改电子围栏--> <!-- 修改电子围栏-->
<el-dialog :title="title" :visible.sync="dialogFormVisible1"> <el-dialog :title="title" :visible.sync="dialogFormVisible1">
<el-form :model="fences"> <el-form :model="vehicle">
<el-form-item label="围栏名称" :label-width="formLabelWidth1"> <el-form-item label="围栏名称" :label-width="formLabelWidth1">
<el-input v-model="fences.fenceName" autocomplete="off"></el-input> <el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="围栏名称" :label-width="formLabelWidth">
<el-input v-model="vehicle.fenceName" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="围栏类型" :label-width="formLabelWidth1"> <el-form-item label="围栏类型" :label-width="formLabelWidth1">
<el-select v-model="fences.fenceTypeId" placeholder="请选择活动区域"> <el-select v-model="vehicle.fenceTypeId" placeholder="请选择活动区域">
<el-option label="驶出" value="1">驶出</el-option> <el-option label="驶出" value="1">驶出</el-option>
<el-option label="驶入" value="2">驶入</el-option> <el-option label="驶入" value="2">驶入</el-option>
</el-select> </el-select>
@ -144,7 +165,7 @@
<el-form-item label="围栏状态"> <el-form-item label="围栏状态">
<el-radio-group v-model="fences.fenceState" :label-width="formLabelWidth1"> <el-radio-group v-model="vehicle.fenceState" :label-width="formLabelWidth1">
<el-radio :label="1">正常</el-radio> <el-radio :label="1">正常</el-radio>
<el-radio :label="2">停用</el-radio> <el-radio :label="2">停用</el-radio>
</el-radio-group> </el-radio-group>
@ -185,14 +206,14 @@ export default {
batteryBusiness: null, batteryBusiness: null,
MotorID: null, MotorID: null,
BatteryID: null, BatteryID: null,
vehicleState:null
}, },
total:0, total:0,
dialogFormVisible:false, dialogFormVisible:false,
formLabelWidth:'120px', formLabelWidth:'120px',
fences:{ vehicle:{},
},
title:'', title:'',
dialogFormVisible1:false, dialogFormVisible1:false,
formLabelWidth1:'120px', formLabelWidth1:'120px',
@ -224,57 +245,53 @@ export default {
//修改电子围栏 //修改电子围栏
handleEdit(obj) { handleEdit(obj) {
this.dialogFormVisible1 = true this.dialogFormVisible1 = true
this.fences = obj this.vehicle = obj
this.title = '修改电子围栏' this.title = '修改车辆信息'
}, },
updateAll() { updateAll() {
fenceUpdate(this.fences).then( vehicleUpdate(this.vehicle).then(
res => { res => {
this.$message.success(res.msg) this.$message.success(res.msg)
this.list() this.getList()
} }
) )
this.dialogFormVisible1=false; this.dialogFormVisible1=false;
}, },
//新增 //新增
fencadd() { vehicleAdd() {
this.fences = {} this.vehicle = {}
this.dialogFormVisible = true this.dialogFormVisible = true
this.title = '新增页面' this.title = '新增页面'
}, },
addAll() { addAll() {
fenceAdd(this.fences).then( vehicleInsert(this.vehicle).then(
res => { res => {
this.$message.success(res.msg) this.$message.success(res.msg)
this.list() this.getList()
} }
) )
this.dialogFormVisible = false this.dialogFormVisible = false
}, },
//删除电子围栏 //删除车辆信息
handleDelete(fenceId){ handleDelete(vehicleId){
fenceDelete(fenceId,'deleted').then( vehicleDelete(vehicleId,'deleted').then(
res=>{ res=>{
this.$message.success(res.msg) this.$message.success(res.msg)
this.list() this.getList()
} }
) )
}, },
//编辑围栏 //编辑车辆标识
handleWdit(obj) { handleWdit(obj) {
this.showMap=true this.vehicle = obj
this.showMapp=false
this.fences = obj
this.initAMap()
}, },
}, },