diff --git a/package.json b/package.json index b7a9e66..a4c6453 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "author": "Micheal", "license": "MIT", "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", + "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve", + "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src" diff --git a/src/api/firmtable.js b/src/api/firmtable.js new file mode 100644 index 0000000..b9e3b77 --- /dev/null +++ b/src/api/firmtable.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +export function getFirmList(form) { + return request({ + url: '/firm/company/firm/firmInfoList', + method: 'post', + data:form + }) +} + +export function delCar(firmId) { + return request({ + url: '/firm?firmId='+firmId, + method: 'post' + }) +} + +export function updateCar(carForm) { + return request({ + url: '/history/car/updateCar', + method: 'post', + data:carForm + }) +} + + +export function insertCar(carInsert) { + return request({ + url: '/history/car/insertCar', + method: 'post', + data:carInsert + }) +} + +export function getList() { + return request({ + url: '/history/listHistoricalTrack', + method: 'get' + }) +} + +export function deleteRecord(recordId) { + return request({ + url: '/history/delHistoricalTrack?recordId='+recordId, + method: 'post', + data:recordId + }) +} diff --git a/src/views/company/firm.vue b/src/views/company/firm.vue index e367465..ade4173 100644 --- a/src/views/company/firm.vue +++ b/src/views/company/firm.vue @@ -1,14 +1,864 @@ - - - + diff --git a/src/views/vehicle/record.vue b/src/views/vehicle/record.vue index 171a99f..64d5c9e 100644 --- a/src/views/vehicle/record.vue +++ b/src/views/vehicle/record.vue @@ -105,23 +105,23 @@ export default { }); this.map.add(this.marker) - // 绘制轨迹 - this.polyline = new AMap.Polyline({ - path: this.lineArr, - showDir: true, - strokeColor: "#28F", //线颜色 - // strokeOpacity: 1, //线透明度 - strokeWeight: 6, //线宽 - // strokeStyle: "solid" //线样式 - }); - this.map.add(this.polyline) - - // 走过的路径 - this.passedPolyline = new AMap.Polyline({ - strokeColor: "#AF5", //线颜色 - strokeWeight: 6, //线宽 - }); - this.map.add(this.passedPolyline) + // // 绘制轨迹 + // this.polyline = new AMap.Polyline({ + // path: this.lineArr, + // showDir: true, + // strokeColor: "#28F", //线颜色 + // // strokeOpacity: 1, //线透明度 + // strokeWeight: 6, //线宽 + // // strokeStyle: "solid" //线样式 + // }); + // this.map.add(this.polyline) + // + // // 走过的路径 + // this.passedPolyline = new AMap.Polyline({ + // strokeColor: "#AF5", //线颜色 + // strokeWeight: 6, //线宽 + // }); + // this.map.add(this.passedPolyline) // 监听marker移动 this.marker.on('moving', (e) => { @@ -154,7 +154,6 @@ export default {

{{currentObject}}

-