diff --git a/README.md b/README.md index cf2bc13..5664002 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,16 @@ npm install --registry=https://registry.npmmirror.com npm run dev ``` +```bash +# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题 +npm install --registry=https://registry.npmmirror.com +``` + +```bash +# 安装高德地图依赖 +npm i @amap/amap-jsapi-loader--save +``` + 浏览器访问 http://localhost:80 ## 发布 diff --git a/package.json b/package.json index 6a46cc5..2ed93d6 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "url": "https://gitee.com/y_project/MuYu-Cloud.git" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@riophae/vue-treeselect": "0.4.0", "axios": "0.24.0", "clipboard": "2.0.8", diff --git a/src/api/business/fence.js b/src/api/business/fence.js new file mode 100644 index 0000000..b55175f --- /dev/null +++ b/src/api/business/fence.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询电子围栏列表 +export function listFence(query) { + return request({ + url: '/business/fence/list', + method: 'get', + params: query + }) +} + +// 查询电子围栏详细 +export function getFence(fenceId) { + return request({ + url: '/business/fence/findById/' + fenceId, + method: 'get' + }) +} + +// 新增电子围栏 +export function addFence(data) { + return request({ + url: '/business/fence/insert', + method: 'post', + data: data + }) +} + +// 修改电子围栏 +export function updateFence(data) { + return request({ + url: '/business/fence/update', + method: 'post', + data: data + }) +} + +// 删除电子围栏 +export function delFence(fenceId) { + return request({ + url: '/business/fence/delete/' + fenceId, + method: 'delete' + }) +} + +// 保存电子围栏 +export function savePolygon(data) { + return request({ + url: '/business/fence/savePolygon', + method: 'post', + data: data + }) +} diff --git a/src/api/business/records.js b/src/api/business/records.js new file mode 100644 index 0000000..1e38d16 --- /dev/null +++ b/src/api/business/records.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 查询车辆历史轨迹列表 +export function listRecords(query) { + return request({ + url: '/business/records/list', + method: 'get', + params: query + }) +} + +// 删除车辆历史轨迹 +export function delRecords(recordsId) { + return request({ + url: '/business/records/delete/' + recordsId, + method: 'delete' + }) +} diff --git a/src/router/index.js b/src/router/index.js index bb897e5..f036532 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,6 +87,34 @@ export const constantRoutes = [ meta: { title: '个人中心', icon: 'user' } } ] + }, + { + path: '/fence', + component: Layout, + hidden: true, + redirect: 'fence', + children: [ + { + path: 'map', + component: () => import('@/views/business/fence/map'), + name: 'fenMap', + meta: { title: '地图' } + } + ] + }, + { + path: '/vehicleData', + component: Layout, + hidden: true, + redirect: 'vehicleData', + children: [ + { + path: 'data', + component: () => import('@/views/business/records/history'), + name: 'vehicleData', + meta: { title: '历史轨迹' } + } + ] } ] @@ -162,7 +190,7 @@ export const dynamicRoutes = [ meta: { title: '修改生成配置', activeMenu: '/tool/gen' } } ] - } + }, ] // 防止连续点击多次路由报错 diff --git a/src/views/business/faultLogs/index.vue b/src/views/business/faultLogs/index.vue index 5a683b1..40ebcd4 100644 --- a/src/views/business/faultLogs/index.vue +++ b/src/views/business/faultLogs/index.vue @@ -44,8 +44,6 @@ - - @@ -74,8 +72,8 @@ @@ -175,6 +173,26 @@ export default { this.resetForm("queryForm") this.handleQuery() }, + /**忽略/解决*/ + handleUpdateDisposeStatus(row, vehicle_dispose_status){ + this.$confirm('确认要'+ vehicle_dispose_status +'故障吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + const newRow = {...row, alarmFlag: 'N', disposeStatus: 0,} + console.log(newRow) + addFaultLogs(row).then(res => { + if (res.code === 200) { + this.$message.success("操作成功") + this.getList() + } else { + this.msgError(res.msg) + } + }) + }).catch(() => { + }) + } }, //声明周期 - 创建完成（可以访问当前this实例）, created() { diff --git a/src/views/business/fence/index.vue b/src/views/business/fence/index.vue new file mode 100644 index 0000000..3e3c13b --- /dev/null +++ b/src/views/business/fence/index.vue @@ -0,0 +1,300 @@ + + + diff --git a/src/views/business/fence/map.vue b/src/views/business/fence/map.vue new file mode 100644 index 0000000..c26a65d --- /dev/null +++ b/src/views/business/fence/map.vue @@ -0,0 +1,101 @@ + + + diff --git a/src/views/business/records/history.vue b/src/views/business/records/history.vue new file mode 100644 index 0000000..7929f2c --- /dev/null +++ b/src/views/business/records/history.vue @@ -0,0 +1,75 @@ + + + diff --git a/src/views/business/records/index.vue b/src/views/business/records/index.vue new file mode 100644 index 0000000..17a28aa --- /dev/null +++ b/src/views/business/records/index.vue @@ -0,0 +1,278 @@ + + + diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index d73f74d..65df2a8 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -218,7 +218,7 @@ export default { // 查询参数 voEnterpriseInfo: { pageNum: 1, - pageSize: 10, + pageSize: 30, dictName: undefined, dictType: undefined, status: undefined