From 548a64caae571c1f25fda4d1cbb6f32787dc4939 Mon Sep 17 00:00:00 2001 From: yyy <2605810609@qq.com> Date: Wed, 5 Mar 2025 09:33:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mapPage/realTimeMap/editMap.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue index 7b040d7b..7d1ea4a6 100644 --- a/src/views/mapPage/realTimeMap/editMap.vue +++ b/src/views/mapPage/realTimeMap/editMap.vue @@ -2212,7 +2212,10 @@ const disposeEventPoint = (x, y) => { } } // 传入实际现场的数据，转换成浏览器坐标的数据 -const convertActualToBrowser = (pointX, pointY) => {} +const convertActualToBrowser = (x, y) => { + let browserX = point.x - warehouse.x0 + let browserY = point.x - warehouse.x0 +} //将节点实际宽高cm转换成px const cmConversionPx = (cWidth, cHeight) => { let pWidth = Number(cWidth) / imgBgObj.resolution / 100 @@ -2260,6 +2263,7 @@ const getBezierMidArrowPath = (item) => { } document.onmousedown = function (e) { + // convertActualToBrowser(-54.4, -34.2) //左击 if (e.button == 2) { state.selectedCurve = '' From b37d7e750572bbe4e3139cc15d7ec4507ea0fde5 Mon Sep 17 00:00:00 2001 From: yyy <2605810609@qq.com> Date: Wed, 5 Mar 2025 10:05:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mapPage/realTimeMap/editMap.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue index 7d1ea4a6..9d577d31 100644 --- a/src/views/mapPage/realTimeMap/editMap.vue +++ b/src/views/mapPage/realTimeMap/editMap.vue @@ -276,6 +276,7 @@ effect="dark" :content="item.sortNum || '节点未保存'" placement="top" + trigger="click" >
{ } // 传入实际现场的数据，转换成浏览器坐标的数据 const convertActualToBrowser = (x, y) => { - let browserX = point.x - warehouse.x0 - let browserY = point.x - warehouse.x0 + let browserX = Math.max(Number(x) - imgBgObj.origin[0], 0) + let browserY = Math.max( + imgBgObj.origin[1] + Number(imgBgObj.height) * imgBgObj.resolution - Number(y), + 0 + ) + + console.log(browserX, browserY) } //将节点实际宽高cm转换成px const cmConversionPx = (cWidth, cHeight) => { @@ -2263,7 +2269,6 @@ const getBezierMidArrowPath = (item) => { } document.onmousedown = function (e) { - // convertActualToBrowser(-54.4, -34.2) //左击 if (e.button == 2) { state.selectedCurve = '' From c4d9ddee352ef4d7c7727a4fc6e37863758bc2c6 Mon Sep 17 00:00:00 2001 From: yyy <2605810609@qq.com> Date: Wed, 5 Mar 2025 10:32:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../realTimeMap/components/indexPage.vue | 24 ++++++++----------- src/views/mapPage/realTimeMap/editMap.vue | 15 ++++++++---- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue index f67fc331..2a08f94c 100644 --- a/src/views/mapPage/realTimeMap/components/indexPage.vue +++ b/src/views/mapPage/realTimeMap/components/indexPage.vue @@ -832,20 +832,16 @@ const linkWebSocket = (url) => { } const test = () => { ElMessage({ - message: () => - h( - 'div', - { - onClick: () => lookError(), - style: { cursor: 'pointer' } - }, - - ), - dangerouslyUseHTMLString: true, - showClose: false, - duration: 2000, // 让消息持续显示，直到用户关闭 - message:`${111111}` - }) + message: () => + h('div', { + onClick: () => lookError(), + style: { cursor: 'pointer' } + }), + dangerouslyUseHTMLString: true, + showClose: false, + duration: 2000, // 让消息持续显示，直到用户关闭 + message: `${111111}` + }) } const lookError = () => { console.log('点击了') diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue index 9d577d31..9c4b6ffd 100644 --- a/src/views/mapPage/realTimeMap/editMap.vue +++ b/src/views/mapPage/realTimeMap/editMap.vue @@ -295,6 +295,7 @@ src="https://api.znkjfw.com/admin-api/infra/file/4/get/库位库存_png_179_1739326653035.png" alt="" :style="{ + verticalAlign: 'top', width: item.locationWidePx + 'px', height: item.locationDeepPx + 'px', border: state.currentItemIndex === index ? '1px dashed #000' : 'none' @@ -309,6 +310,7 @@ " alt="" :style="{ + verticalAlign: 'top', width: item.locationWidePx + 'px', height: item.locationDeepPx + 'px', border: state.currentItemIndex === index ? '1px dashed #000' : 'none' @@ -320,6 +322,7 @@ src="https://api.znkjfw.com/admin-api/infra/file/4/get/停车场-01_png_179_1739326933020.png" alt="" :style="{ + verticalAlign: 'top', width: item.locationWidePx + 'px', height: item.locationDeepPx + 'px', border: state.currentItemIndex === index ? '1px dashed #000' : 'none' @@ -331,6 +334,7 @@ src="https://api.znkjfw.com/admin-api/infra/file/4/get/区域_png_179_1739327151876.png" alt="" :style="{ + verticalAlign: 'top', width: item.locationWidePx + 'px', height: item.locationDeepPx + 'px', border: state.currentItemIndex === index ? '1px dashed #000' : 'none' @@ -342,6 +346,7 @@ src="https://api.znkjfw.com/admin-api/infra/file/4/get/等待点_png_179_1739326991439.png" alt="" :style="{ + verticalAlign: 'top', width: item.locationWidePx + 'px', height: item.locationDeepPx + 'px', border: state.currentItemIndex === index ? '1px dashed #000' : 'none' @@ -381,7 +386,7 @@ :x2="Number(state.currentDrawX)" :y2="Number(state.currentDrawY)" stroke="#00329F" - stroke-width="5" + stroke-width="4" />