diff --git a/src/api/goods/breakdown.js b/src/api/goods/breakdown.js index 45a1e95..6799f51 100644 --- a/src/api/goods/breakdown.js +++ b/src/api/goods/breakdown.js @@ -1,11 +1,11 @@ import request from '@/utils/request' // 查询测试信息列表 -export function listBreakdown(data) { +export function listBreakdown(query) { return request({ url: '/rule/breakdown/list', method: 'get', - data + params: query }) } diff --git a/src/api/goods/map.js b/src/api/goods/map.js index eee20d2..b9137d2 100644 --- a/src/api/goods/map.js +++ b/src/api/goods/map.js @@ -18,7 +18,7 @@ export function selectFence(data) { }) } -// 查询企业列表 +// 查询车辆绑定围栏组及下属围栏 export function selectFenceGroupsById(carId) { return request({ url: '/rule/map/selectFenceGroupsById/' + carId, @@ -58,3 +58,13 @@ export function updateFence(fenceId) { method: 'post' }) } + +export function dbx(data) { + return request({ + url: 'https://tsapi.amap.com/v1/track/geofence/add/polygon', + method: 'post', + data + }) +} + + diff --git a/src/views/client/car/index.vue b/src/views/client/car/index.vue index 65cb52d..a5a8252 100644 --- a/src/views/client/car/index.vue +++ b/src/views/client/car/index.vue @@ -151,9 +151,10 @@ >删除 - + 查看围栏 + 查看故障报警 @@ -288,6 +289,9 @@ export default { fence(carId) { this.$router.push({path: '/client/sever/fence',query:{carId:carId}}) }, + breakdown(vin) { + this.$router.push({path: '/client/sever/breakdown',query:{vin:vin}}) + }, realTime(vin) { this.$router.push({path: '/client/sever/random',query:{vin:vin}}) diff --git a/src/views/client/sever/breakdown/index.vue b/src/views/client/sever/breakdown/index.vue index 8d1ffc2..9d44c2d 100644 --- a/src/views/client/sever/breakdown/index.vue +++ b/src/views/client/sever/breakdown/index.vue @@ -1,5 +1,34 @@ @@ -71,9 +101,13 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10 + pageSize: 10, + vin: this.$route.query.vin, + faultStartTime: null, + faultEndTime: null }, formInline: { + vin: this.$route.query.vin, faultStartTime: null, faultEndTime: null }, @@ -82,7 +116,6 @@ export default { /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; - console.log(this.queryParams) this.getList(); }, /** 重置按钮操作 */ @@ -138,11 +171,6 @@ export default { this.c = res.data }) - // setTimeout(() => { - // this.par() - // this.pie() - // },5000) - }, //柱状图 @@ -249,5 +277,18 @@ export default { } diff --git a/src/views/client/sever/fence/index.vue b/src/views/client/sever/fence/index.vue index 9840f9c..fcb6c0c 100644 --- a/src/views/client/sever/fence/index.vue +++ b/src/views/client/sever/fence/index.vue @@ -1,36 +1,37 @@