From bbdfe123927cf4554940e1d567825a72300b3a32 Mon Sep 17 00:00:00 2001 From: yyy <2605810609@qq.com> Date: Tue, 29 Apr 2025 17:25:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E6=94=B9:?= =?UTF-8?q?=E6=95=B4=E4=BD=93=E7=9C=8B=E6=9D=BF=E5=9B=BA=E5=AE=9A=E6=BB=A1?= =?UTF-8?q?=E5=B1=8F=E5=B9=95,=E4=BB=BB=E5=8A=A1=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=9B=BA=E5=AE=9A,=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=A0=8F=E5=9B=BA=E5=AE=9A=E3=80=82=E8=BD=A6=E8=BE=86=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E6=90=9C=E7=B4=A2=E6=A0=8F=E6=8F=90=E7=A4=BA=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E7=9A=84=E5=8F=AF=E6=90=9C=E7=B4=A2=E5=86=85=E5=AE=B9?= =?UTF-8?q?,=E5=90=8C=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.local | 4 +- src/api/map/map.ts | 4 +- src/views/board/allBoard/index.vue | 575 ++++++++---------- src/views/board/carBoard/index.vue | 46 +- .../components-tool/editNodeProperties.vue | 81 ++- .../realTimeMap/components/indexPage.vue | 18 +- src/views/mapPage/realTimeMap/editMap.vue | 11 +- src/views/mapPage/taskManagement/taskList.vue | 3 +- 8 files changed, 374 insertions(+), 368 deletions(-) diff --git a/.env.local b/.env.local index 78a5d223..2d26cfc9 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 62e5cf35..761bacc3 100644 --- a/src/api/map/map.ts +++ b/src/api/map/map.ts @@ -227,10 +227,10 @@ export const updatePositionChangePoint = async (data) => { } //根据排序查询点位信息 -export const getPositionChangePointBySortNum = async (data) => { +export const getPositionChangePointBySortNum = async (params) => { return await request.get({ url: `/system/position-change-point-binding/getItemBySortNum`, - data + params }) } diff --git a/src/views/board/allBoard/index.vue b/src/views/board/allBoard/index.vue index b7b8894e..b7c77f95 100644 --- a/src/views/board/allBoard/index.vue +++ b/src/views/board/allBoard/index.vue @@ -3,8 +3,8 @@
-
- +
+
@@ -51,8 +51,8 @@
-
- +
+
@@ -103,45 +103,34 @@
- -
-
-
-
执行中
-
- 查看更多 -
-
-
- - - - - - -
+
+
+
执行中
+
查看更多
+
+
+ + + + +
-
-
-
-
待执行
-
- 查看更多 -
-
-
- - - - - -
+ +
+
+
待执行
+
查看更多
+
+
+ + + +
-
-
- +
+
-
-
+ +
-
-
{{ - filterTypeFun(n.deviceType, typeList) - }}
-
+
+
{{ filterTypeFun(n.deviceType, typeList) }}
+
-
-
-
数量：
-
+
+
+
数量：
+
{{ n.totalNum || 0 }}
-
-
正常数量：
-
+
+
正常数量：
+
{{ n.normalNum || 0 }}
-
-
异常数量：
-
+
+
异常数量：
+
{{ n.abnormalNum || 0 }}
-
+
- -
-
-
-
异常信息
-
查看更多
-
-
- - - - + + +
-
-
-
-
车辆信息
-
查看更多
-
-
- - - - - - - + +
@@ -312,15 +293,20 @@ - diff --git a/src/views/board/carBoard/index.vue b/src/views/board/carBoard/index.vue index 1903312b..a02b5846 100644 --- a/src/views/board/carBoard/index.vue +++ b/src/views/board/carBoard/index.vue @@ -80,29 +80,25 @@
- - + @clear="getCarList" + > + +
-
新增车辆 - 新增车辆 -
@@ -750,20 +746,12 @@ onBeforeRouteLeave((to, from, next) => { display: flex; } .new-top-box-right-input-box { - display: flex; - align-items: center; - flex-shrink: 0; - border-radius: 4px; - padding: 0 12px; - border: 1px solid #e2e7f5; margin-right: 16px; - height: 36px; } .new-top-box-right-input { width: 225px; - height: 15px; - border: none; font-size: 13px; + height: 36px; } /* 兼容不同浏览器的写法 */ @@ -774,17 +762,7 @@ input::-webkit-input-placeholder { .new-top-box-right-button { width: 104px; height: 36px; - border: 1px solid #e2e7f5; - display: flex; - align-items: center; - justify-content: center; - font-family: - PingFangSC, - PingFang SC; - font-weight: 400; font-size: 13px; - color: #536387; - cursor: pointer; } .new-list-box { margin-top: 20px; diff --git a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue index 41c16565..c0d353ef 100644 --- a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue +++ b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue @@ -147,6 +147,27 @@
-->
+ + + + + +
{{ item.sortNum }}
@@ -385,6 +395,10 @@ const props = defineProps({ isFullScreen: { type: Boolean, default: () => false + }, + sortNumberShow: { + type: Boolean, + default: () => true } }) diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue index 43514713..40542f84 100644 --- a/src/views/mapPage/realTimeMap/editMap.vue +++ b/src/views/mapPage/realTimeMap/editMap.vue @@ -3029,7 +3029,7 @@ const getAllNodeList = async () => { item.resizable = false item.rotatable = false item.lockAspectRatio = true - } else if (item.type === 5 || item.type === 6) { + } else if (item.type === 6) { item.dataObj = {} item.dataList = [] item.locationDeep = 150 @@ -3072,6 +3072,15 @@ const getAllNodeList = async () => { item.resizable = true item.rotatable = false item.lockAspectRatio = true + } else if (item.type === 5) { + item.dataObj = JSONBigInt({ storeAsString: true }).parse(item.dataJson) + item.dataList = [] + item.locationDeep = 150 + item.locationWide = 150 + item.draggable = true + item.resizable = false + item.rotatable = false + item.lockAspectRatio = true } else if (item.type === 7) { item.dataObj = JSONBigInt({ storeAsString: true }).parse(item.dataJson) item.text = item.dataObj.text diff --git a/src/views/mapPage/taskManagement/taskList.vue b/src/views/mapPage/taskManagement/taskList.vue index 865a3398..1d503260 100644 --- a/src/views/mapPage/taskManagement/taskList.vue +++ b/src/views/mapPage/taskManagement/taskList.vue @@ -93,11 +93,12 @@ 取放货 停车 充电 - 充电 + 移动 仅取货 仅放货 扫描码 检测托盘类型 + 移动到点位