Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf

src/views/mapPage/realTimeMap/editMap.vue

@@ -276,6 +276,7 @@
                 effect="dark"
                 :content="item.sortNum || '节点未保存'"
                 placement="top"
+                trigger="click"
               >
                 <div
                   v-if="item.type === 1 && item.layerSelectionShow"
@@ -2212,7 +2213,15 @@ const disposeEventPoint = (x, y) => {
   }
 }
 // 传入实际现场的数据，转换成浏览器坐标的数据
-const convertActualToBrowser = (pointX, pointY) => {}
+const convertActualToBrowser = (x, y) => {
+  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) => {
   let pWidth = Number(cWidth) / imgBgObj.resolution / 100