From ea465aac6e9afb2d1badd5ab679b5e6d16616ea0 Mon Sep 17 00:00:00 2001 From: xhf <1424913779@qq.com> Date: Tue, 11 Feb 2025 11:45:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/parameterSetting/index.ts | 21 + src/views/board/carBoard/createEditDialog.vue | 11 +- src/views/board/carBoard/index.vue | 415 ++++++++- src/views/board/device/createEditDialog.vue | 292 ++++++ src/views/board/device/index.vue | 854 ++++++++++++++++++ src/views/parameterSetting/index.vue | 367 ++++++++ 6 files changed, 1934 insertions(+), 26 deletions(-) create mode 100644 src/api/parameterSetting/index.ts create mode 100644 src/views/board/device/createEditDialog.vue create mode 100644 src/views/board/device/index.vue create mode 100644 src/views/parameterSetting/index.vue diff --git a/src/api/parameterSetting/index.ts b/src/api/parameterSetting/index.ts new file mode 100644 index 00000000..fbc8bd3b --- /dev/null +++ b/src/api/parameterSetting/index.ts @@ -0,0 +1,21 @@ +import request from '@/config/axios' + + +//获得通用配置分页 固定参数 configType 1 +export const getCommonConfig = async (params) => { + return await request.get({ url: `/system/common/config/get`, params }) +} + +//更新通用配置 固定参数 configType 1 +export const updateCommonConfig = async (data) => { + return await request.put({ url: `/system/common/config/update`, data }) +} + +//创建通用配置 固定参数 configType 1 +export const createCommonConfig = async (data) => { + return await request.post({ url: `/system/common/config/create`, data }) +} + + + + diff --git a/src/views/board/carBoard/createEditDialog.vue b/src/views/board/carBoard/createEditDialog.vue index 276213c0..f1fe33fe 100644 --- a/src/views/board/carBoard/createEditDialog.vue +++ b/src/views/board/carBoard/createEditDialog.vue @@ -1,5 +1,5 @@ @@ -227,9 +227,10 @@ const resetForm = () => { diff --git a/src/views/board/device/createEditDialog.vue b/src/views/board/device/createEditDialog.vue new file mode 100644 index 00000000..276213c0 --- /dev/null +++ b/src/views/board/device/createEditDialog.vue @@ -0,0 +1,292 @@ + + + + diff --git a/src/views/board/device/index.vue b/src/views/board/device/index.vue new file mode 100644 index 00000000..d5c8d74b --- /dev/null +++ b/src/views/board/device/index.vue @@ -0,0 +1,854 @@ + + + + + diff --git a/src/views/parameterSetting/index.vue b/src/views/parameterSetting/index.vue new file mode 100644 index 00000000..e44b373a --- /dev/null +++ b/src/views/parameterSetting/index.vue @@ -0,0 +1,367 @@ + + + + + From d64e339249ca1d968b19dcfa887ec798117c5f89 Mon Sep 17 00:00:00 2001 From: xhf <1424913779@qq.com> Date: Tue, 11 Feb 2025 17:03:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.local | 2 +- src/api/device/index.ts | 56 ++ src/views/board/carBoard/createEditDialog.vue | 7 +- src/views/board/carBoard/index.vue | 226 +-------- src/views/board/device/index.vue | 477 +++++++----------- src/views/board/device/tabs.vue | 171 +++++++ 6 files changed, 412 insertions(+), 527 deletions(-) create mode 100644 src/api/device/index.ts create mode 100644 src/views/board/device/tabs.vue diff --git a/.env.local b/.env.local index f0650411..a3752946 100644 --- a/.env.local +++ b/.env.local @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://192.168.0.66:48080' +VITE_BASE_URL='http://192.168.0.74:48080' # VITE_BASE_URL='http://192.168.0.189:48080' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务 diff --git a/src/api/device/index.ts b/src/api/device/index.ts new file mode 100644 index 00000000..f53b2619 --- /dev/null +++ b/src/api/device/index.ts @@ -0,0 +1,56 @@ +import request from '@/config/axios' + +//agv 下载 +export const agvDownload = async (params) => { + return await request.download({ url: `/system/position-map/agvDownload`, params }) +} +//点位地图列表 +export const getPositionMapList = async (params) => { + return await request.get({ url: `/system/position-map/list`, params }) +} + +//删除车辆信息 +export const deleteRobotInformation = async (id: number) => { + return await request.delete({ url: `/system/robot/information/delete?id=` + id }) +} + +//查询所有车辆 +export const getAllRobot = async (data) => { + return await request.post({ url: `/system/robot/information/getAllRobot`, data }) +} +//获得车辆信息 详情 +export const getRobotInformation = async (params) => { + return await request.get({ url: `/system/robot/information/get`, params }) +} + +//分页查询设备列表 看板信息设备目前用的是这个 +export const deviceInformationPage = async (params) => { + return await request.get({ url: `/system/device/information/page`, params }) +} +//统计车辆待命-任务中-离线 +export const robotInformationStatistics = async (data) => { + return await request.post({ url: `/system/robot/information/statistics`, data }) +} + +// 创建车辆信息 +export const robotInformationCreate = async (data) => { + return await request.post({ url: `/system/robot/information/create`, data }) +} +// 编辑车辆信息 +export const robotInformationUpdate = async (data) => { + return await request.put({ url: `/system/robot/information/update`, data }) +} +//分页查询车辆列表 看板信息车辆目前用的是这个 +export const robotGetAllModel = async (params) => { + return await request.get({ url: `/system/robot/model/getAllModel`, params }) +} +// 范围选择 +export const robotPositionGetMap = async (params) => { + return await request.get({ url: `/system/position-map/getMap`, params }) +} +// 完整范围选择 +export const robotPositionGetMapAll = async (params) => { + return await request.get({ url: `/system/position-map/getAllMap`, params }) +} + + diff --git a/src/views/board/carBoard/createEditDialog.vue b/src/views/board/carBoard/createEditDialog.vue index f1fe33fe..90bb97b5 100644 --- a/src/views/board/carBoard/createEditDialog.vue +++ b/src/views/board/carBoard/createEditDialog.vue @@ -2,7 +2,7 @@ - + - + - % + % + 建议自动充电电量大于30% diff --git a/src/views/board/carBoard/index.vue b/src/views/board/carBoard/index.vue index d5c8d74b..3d96dd9b 100644 --- a/src/views/board/carBoard/index.vue +++ b/src/views/board/carBoard/index.vue @@ -1,226 +1,5 @@