From f51b955b0ae0e0cec622bd7467f350cb59f8f4da Mon Sep 17 00:00:00 2001 From: yyy <2605810609@qq.com> Date: Tue, 1 Apr 2025 10:53:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.local | 4 +- src/api/map/map.ts | 7 + src/views/board/device/index.vue | 215 +- .../realTimeMap/components/storeDialog.vue | 55 +- .../mapPage/realTimeMap/editMap copy.vue | 3186 +++++++++++++++++ 5 files changed, 3297 insertions(+), 170 deletions(-) create mode 100644 src/views/mapPage/realTimeMap/editMap copy.vue diff --git a/.env.local b/.env.local index 8eb2bb63..c8407918 100644 --- a/.env.local +++ b/.env.local @@ -4,9 +4,9 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://192.168.0.74:48080' +# VITE_BASE_URL='http://192.168.0.74:48080' # VITE_BASE_URL='http://192.168.0.153:48080' -# VITE_BASE_URL='http://192.168.0.45:48080' +VITE_BASE_URL='http://192.168.0.45:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 VITE_UPLOAD_TYPE=server diff --git a/src/api/map/map.ts b/src/api/map/map.ts index eebd7874..3776bcf2 100644 --- a/src/api/map/map.ts +++ b/src/api/map/map.ts @@ -154,3 +154,10 @@ export const getListByMapId = async (mapId) => { url: `/system/robot/information/getListByMapId?mapId=` + mapId }) } +//批量更新库位 +export const updateBatchHouseLocation = async (data) => { + return await request.put({ + url: `/system/ware/house-location/updateBatch`, + data + }) +} diff --git a/src/views/board/device/index.vue b/src/views/board/device/index.vue index e2da76a9..c69ab587 100644 --- a/src/views/board/device/index.vue +++ b/src/views/board/device/index.vue @@ -6,31 +6,34 @@
设备看板
-
+
- - + +
- + - 新增设备 + 新增设备
- -
@@ -63,9 +66,14 @@
- +
- 不显示图片 + 不显示图片
@@ -76,7 +84,7 @@
编号
-
{{ item.deviceNo || ''}}
+
{{ item.deviceNo || '' }}
是否启用
@@ -102,111 +110,75 @@
- + From b4c5c432677987b14e8d60ce4d65a85cf5f97eed Mon Sep 17 00:00:00 2001 From: yyy <2605810609@qq.com> Date: Tue, 1 Apr 2025 10:59:02 +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 --- src/views/board/device/index.vue | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/views/board/device/index.vue b/src/views/board/device/index.vue index c69ab587..dec51b43 100644 --- a/src/views/board/device/index.vue +++ b/src/views/board/device/index.vue @@ -250,22 +250,23 @@ const deleteCar = (id) => { } const clockCar = (item) => { - let valueStr = item.robotTaskModel == 1 ? '锁定' : '解锁' - let data = JSON.parse(JSON.stringify(item)) - data.robotTaskModel = item.robotTaskModel == 1 ? 0 : 1 - ElMessageBox.confirm(`您确定要${valueStr}此车辆吗?`, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }) - .then(() => { - DeviceApi.robotInformationUpdate(data).then((res) => { - getCarList() - message.success(`${valueStr}成功`) - }) - }) - .catch(() => {}) + // let valueStr = item.robotTaskModel == 1 ? '锁定' : '解锁' + // let data = JSON.parse(JSON.stringify(item)) + // data.robotTaskModel = item.robotTaskModel == 1 ? 0 : 1 + // ElMessageBox.confirm(`您确定要${valueStr}此车辆吗?`, '提示', { + // confirmButtonText: '确定', + // cancelButtonText: '取消', + // type: 'warning' + // }) + // .then(() => { + // DeviceApi.robotInformationUpdate(data).then((res) => { + // getCarList() + // message.success(`${valueStr}成功`) + // }) + // }) + // .catch(() => {}) } + //前往地图定位 const goToMap = (item) => { router.push({