地图编辑

src/store/modules/app.ts

@@ -62,7 +62,7 @@ export const useAppStore = defineStore('app', {
       tagsViewIcon: true, // 是否显示标签图标
       logo: true, // logo
       fixedHeader: true, // 固定toolheader
-      footer: true, // 显示页脚
+      footer: false, // 显示页脚
       greyMode: false, // 是否开始灰色模式，用于特殊悼念日
       fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
       layout: wsCache.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局

src/views/mapPage/example/转换成实际坐标demo.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="map-container" ref="mapContainer">
+    <!-- 地图 -->
+    <div
+      class="map"
+      :style="{
+        backgroundImage: `url(${mapImage})`,
+        transform: `scale(${scale})`,
+        transformOrigin: '0 0',
+        width: `${mapWidth}px`,
+        height: `${mapHeight}px`
+      }"
+      @click="addLocation"
+    >
+      <!-- 库位 -->
+      <div
+        v-for="(location, index) in locations"
+        :key="index"
+        class="location"
+        :style="{
+          left: `${location.projectX}px`,
+          top: `${location.projectY}px`,
+          transform: `scale(${scale})` // 反向缩放库位图片
+        }"
+      >
+        <img src="@/assets/location-icon.png" alt="库位" />
+      </div>
+    </div>
+
+    <!-- 放大缩小按钮 -->
+    <div class="controls">
+      <button @click="zoomIn">放大</button>
+      <button @click="zoomOut">缩小</button>
+      <button @click="saveLocations">保存</button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import mapImage from '@/assets/warehouse-map.png' // 扫描图路径
+import locationIcon from '@/assets/location-icon.png' // 库位图标路径
+
+const origin = [-54.4, -34.2]
+const resolution = 0.05
+
+const mapContainer = ref(null) // 地图容器
+const scale = ref(1) // 缩放比例
+const locations = ref([]) // 库位列表
+const mapWidth = ref(0) // 地图宽度
+const mapHeight = ref(0) // 地图高度
+
+// 加载地图图片并设置初始尺寸
+onMounted(() => {
+  const img = new Image()
+  img.src = mapImage
+  img.onload = () => {
+    mapWidth.value = img.width
+    mapHeight.value = img.height
+  }
+})
+
+// 添加库位
+const addLocation = (event) => {
+  const rect = mapContainer.value.getBoundingClientRect()
+  const scrollLeft = mapContainer.value.scrollLeft // 水平滚动条偏移量
+  const scrollTop = mapContainer.value.scrollTop // 垂直滚动条偏移量
+  const devicePixelRatio = window.devicePixelRatio || 1
+
+  // 计算页面坐标（考虑设备像素比和滚动条偏移量）
+  const projectX = (event.clientX - rect.left + scrollLeft) / scale.value / devicePixelRatio
+  const projectY = (event.clientY - rect.top + scrollTop) / scale.value / devicePixelRatio
+
+  // 转换为实际坐标
+  const actualX = (projectX - origin[0]) / resolution
+  const actualY = (projectY - origin[1]) / resolution
+
+  // 添加库位
+  locations.value.push({
+    projectX,
+    projectY,
+    actualX,
+    actualY
+  })
+}
+
+// 放大
+const zoomIn = () => {
+  scale.value *= 1.2
+}
+
+// 缩小
+const zoomOut = () => {
+  scale.value /= 1.2
+}
+
+// 保存点位坐标
+const saveLocations = () => {
+  console.log(
+    '项目点位坐标：',
+    locations.value.map((loc) => ({ x: loc.projectX, y: loc.projectY }))
+  )
+  console.log(
+    '实际现场点位坐标：',
+    locations.value.map((loc) => ({ x: loc.actualX, y: loc.actualY }))
+  )
+  alert('点位坐标已保存，请查看控制台输出。')
+}
+</script>
+
+<style scoped>
+.map-container {
+  position: relative;
+  width: 100%;
+  height: 80vh;
+  overflow: auto;
+  border: 1px solid #ccc;
+}
+
+.map {
+  background-size: contain;
+  background-repeat: no-repeat;
+  position: relative;
+}
+
+.location {
+  position: absolute;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+}
+
+.location img {
+  width: 100%;
+  height: 100%;
+}
+
+.controls {
+  position: fixed;
+  top: 110px;
+  right: 110px;
+  display: flex;
+  gap: 10px;
+}
+
+.controls button {
+  padding: 5px 10px;
+  font-size: 14px;
+  cursor: pointer;
+}
+</style>

src/views/mapPage/realTimeMap/editMap.vue

@@ -115,24 +115,23 @@
     </div>
   </div>
 
-  <div class="map-box" ref="imgWrap" :style="{ cursor: state.cursorStyle }">
+  <div class="map-container" ref="mapContainer" :style="{ cursor: state.cursorStyle }">
     <div
-      class="map-box-inner"
+      class="map-bg"
+      :style="{
+        backgroundImage: `url(${imgBgObj.imgUrl})`,
+        transform: `scale(${state.imageChangeMultiple})`,
+        transformOrigin: '0 0',
+        width: `${imgBgObj.width}px`,
+        height: `${imgBgObj.height}px`
+      }"
       @mousedown.stop="startDrawSelection"
       @mousemove.stop="updateDrawSelection"
       @mouseup.stop="endDrawSelection"
     >
-      <img
-        :src="imgBgObj.imgUrl"
-        :style="{
-          width: imgBgObj.width + 'px',
-          height: imgBgObj.height + 'px'
-        }"
-        id="mapBg"
-      />
       <div
         ref="mapBackgroundRef"
-        class="map-box-inner-dot"
+        class="map-box-inner"
         @click="mapClick"
         :class="state.isShowGrid ? 'grid-show' : ''"
         :style="{
@@ -155,9 +154,9 @@
           @resizestop="(x, y, width, height) => resizeEnd(x, y, width, height, item, index)"
           @activated="() => activatedHandle(item, index)"
           @deactivated="deactivatedHandle"
-          :draggable="item.draggable"
-          :resizable="item.resizable"
-          :rotatable="item.rotatable"
+          :draggable="item.draggable && !state.prohibitedOperation"
+          :resizable="item.resizable && !state.prohibitedOperation"
+          :rotatable="item.rotatable && !state.prohibitedOperation"
           :lock-aspect-ratio="item.lockAspectRatio"
           style="border: none"
         >
@@ -212,7 +211,7 @@
             src="https://api.znkjfw.com/admin-api/infra/file/4/get/区域_png_179_1739327151876.png"
             alt=""
             :style="{
-              width: item.locationWide + 'px',
+              width: item.locationWidee + 'px',
               height: item.locationDeep + 'px',
               border: currentItemIndex === index ? '1px dashed #000' : 'none'
             }"
@@ -324,6 +323,7 @@
       />
     </div>
   </div>
+
   <!-- 节点编辑 -->
   <editNodeProperties
     ref="editNodePropertiesRef"
@@ -418,7 +418,7 @@ const activatedHandle = (item, index) => {
   currentItemIndex.value = index
 
   //节点编辑
-  if (toolbarSwitchType.value === 'editNode' && item.type !== 7) {
+  if (toolbarSwitchType.value === 'editNode') {
     editNodePropertiesRef.value.open(JSON.parse(JSON.stringify(item)))
   }
 }
@@ -476,7 +476,7 @@ const mapClick = (e) => {
       locationDeep: 16,
       locationWide: 16,
       angle: 0,
-      draggable: false,
+      draggable: true,
       resizable: false,
       rotatable: false,
       lockAspectRatio: false, //横纵比
@@ -737,7 +737,9 @@ const state = reactive({
   inputBoxValue: '', //输入的值
   isShowLayer: false, //图层显示
   measureDistancesPoints: [], // 存储点击的点位
-  measureDistancesNum: 0 // 存储两点之间的距离
+  measureDistancesNum: 0, // 存储两点之间的距离
+  imageChangeMultiple: 1, //图片放大缩小的倍数
+  prohibitedOperation: false //禁止操作 在框选测距等操作时，禁止所有拖动等操作
 })
 const toolbarClick = (item) => {
   let type = item.switchType
@@ -782,6 +784,17 @@ const toolbarClick = (item) => {
     state.measureDistancesNum = 0 // 清空存储两点之间的距离
   }
 
+  //禁止操作 在框选测距等操作时，禁止所有拖动等操作
+  if (
+    toolbarSwitchType.value === 'ranging' ||
+    toolbarSwitchType.value === 'lineLibrary' ||
+    toolbarSwitchType.value === 'region'
+  ) {
+    state.prohibitedOperation = true
+  } else {
+    state.prohibitedOperation = false
+  }
+
   switch (type) {
     case 'open':
       // 打开
@@ -903,18 +916,16 @@ const toolbarClick = (item) => {
       break
     case 'larger':
       //放大
-      if (imgBgObj.width < 10000) {
-        imgBgObj.width *= 1.2
-        imgBgObj.height *= 1.2
+      if (state.imageChangeMultiple < 3) {
+        state.imageChangeMultiple *= 1.2
       } else {
         message.warning('不能在放大了')
       }
       break
     case 'smaller':
       //缩小
-      if (imgBgObj.width > 500) {
-        imgBgObj.width *= 0.8
-        imgBgObj.height *= 0.8
+      if (state.imageChangeMultiple > 0.3) {
+        state.imageChangeMultiple *= 0.8
       } else {
         message.warning('不能在缩小了')
       }
@@ -964,8 +975,8 @@ const startDrawSelection = (event) => {
 
   const backgroundRect = mapBackgroundRef.value.getBoundingClientRect()
 
-  const x = Number(event.clientX) - backgroundRect.left
-  const y = event.clientY - backgroundRect.top
+  const x = disposeEventPoints(event).x
+  const y = disposeEventPoints(event).y
 
   // 确保点击在背景区域内
   if (x >= 0 && x <= backgroundRect.width && y >= 0 && y <= backgroundRect.height) {
@@ -981,9 +992,8 @@ const startDrawSelection = (event) => {
 const updateDrawSelection = (event) => {
   if (toolbarSwitchType.value !== 'lineLibrary' && toolbarSwitchType.value !== 'region') return
   if (state.drawSelectionAreaShow) {
-    const backgroundRect = mapBackgroundRef.value.getBoundingClientRect()
-    const x = event.clientX - backgroundRect.left
-    const y = event.clientY - backgroundRect.top
+    const x = disposeEventPoints(event).x
+    const y = disposeEventPoints(event).y
 
     state.drawSelectionAreaBox.width = Number(x) - Number(state.drawSelectionStartPoint.x)
     state.drawSelectionAreaBox.height = Number(y) - Number(state.drawSelectionStartPoint.y)
@@ -1112,33 +1122,26 @@ const computedLineWidth = computed(() => {
 // 处理点击事件
 const measureDistancesClick = (event) => {
   // 获取点击点相对于整个页面的坐标
-  const x = event.clientX
-  const y = event.clientY
+
+  const x = disposeEventPoints(event).x
+  const y = disposeEventPoints(event).y
 
   // 检查点击是否发生在背景区域内
-  const backgroundRect = mapBackgroundRef.value.getBoundingClientRect()
-  if (
-    x >= backgroundRect.left &&
-    x <= backgroundRect.right &&
-    y >= backgroundRect.top &&
-    y <= backgroundRect.bottom
-  ) {
+  if (state.measureDistancesPoints.length === 2) {
+    // 如果已经有两个点，清空信息
+    state.measureDistancesPoints = []
+    state.measureDistancesNum = null
+  } else {
+    // 记录点击的点位（相对于背景区域的坐标）
+    const offsetX = x
+    const offsetY = y
+    state.measureDistancesPoints.push({ x: offsetX, y: offsetY })
     if (state.measureDistancesPoints.length === 2) {
-      // 如果已经有两个点，清空信息
-      state.measureDistancesPoints = []
-      state.measureDistancesNum = null
-    } else {
-      // 记录点击的点位（相对于背景区域的坐标）
-      const offsetX = x - backgroundRect.left
-      const offsetY = y - backgroundRect.top
-      state.measureDistancesPoints.push({ x: offsetX, y: offsetY })
-      if (state.measureDistancesPoints.length === 2) {
-        // 计算两点之间的距离
-        state.measureDistancesNum = calculateDistance(
-          state.measureDistancesPoints[0],
-          state.measureDistancesPoints[1]
-        )
-      }
+      // 计算两点之间的距离
+      state.measureDistancesNum = calculateDistance(
+        state.measureDistancesPoints[0],
+        state.measureDistancesPoints[1]
+      )
     }
   }
 }
@@ -1150,7 +1153,9 @@ const imgBgObj = reactive({
   width: '',
   height: '',
   floor: '',
-  area: ''
+  area: '',
+  resolution: 0.05,
+  origin: [-54.4, -34.2]
 })
 //接收参数
 const { query } = useRoute() // 查询参数
@@ -1201,7 +1206,7 @@ const getAllNodeList = async () => {
       item.dataList = []
       item.locationDeep = 16
       item.locationWide = 16
-      item.draggable = false
+      item.draggable = true
       item.resizable = false
       item.rotatable = false
       item.lockAspectRatio = true
@@ -1211,7 +1216,7 @@ const getAllNodeList = async () => {
       item.locationDeep = item.dataList[0].locationDeep
       item.locationWide = item.dataList[0].locationWide
       item.draggable = true
-      item.resizable = false
+      item.resizable = true
       item.rotatable = false
       item.lockAspectRatio = true
     } else if (item.type === 3 || item.type === 4) {
@@ -1220,7 +1225,7 @@ const getAllNodeList = async () => {
       item.locationDeep = item.dataObj.locationDeep
       item.locationWide = item.dataObj.locationWide
       item.draggable = true
-      item.resizable = false
+      item.resizable = true
       item.rotatable = false
       item.lockAspectRatio = true
     } else if (item.type === 7) {
@@ -1285,33 +1290,50 @@ const layerSelectionSuccess = (typeList) => {
   })
 }
 
+//处理数据
+const disposeEventPoints = (event) => {
+  const rect = mapBackgroundRef.value.getBoundingClientRect()
+  const scrollLeft = mapBackgroundRef.value.scrollLeft // 水平滚动条偏移量
+  const scrollTop = mapBackgroundRef.value.scrollTop // 垂直滚动条偏移量
+  const devicePixelRatio = window.devicePixelRatio || 1
+
+  // 计算页面坐标（考虑设备像素比和滚动条偏移量）
+  const x = (event.clientX - rect.left + scrollLeft) / state.imageChangeMultiple / devicePixelRatio
+  const y = (event.clientY - rect.top + scrollTop) / state.imageChangeMultiple / devicePixelRatio
+
+  // 转换为实际坐标
+  const actualLocationX = (x - imgBgObj.origin[0]) / imgBgObj.resolution
+  const actualLocationY = (y - imgBgObj.origin[1]) / imgBgObj.resolution
+
+  return {
+    x,
+    y,
+    actualLocationX,
+    actualLocationY
+  }
+}
+
 onMounted(() => {
   getMapList()
 })
 </script>
 
 <style lang="scss" scoped>
-.map-box {
-  width: 100%;
+.map-container {
   position: relative;
-
-  .map-box-inner {
+  width: 100%;
+  overflow: auto;
+  border: 1px solid #ccc;
+  // height: 80vh;
+  .map-bg {
+    background-size: contain;
+    background-repeat: no-repeat;
     position: relative;
-    width: 100%;
-
-    .map-box-inner-dot {
-      position: absolute;
-      top: 0;
-      left: 0;
-    }
-
-    .grid-show {
-      background: linear-gradient(-90deg, rgba(0, 0, 0, 0.1) 1px, transparent 1px),
-        linear-gradient(rgba(0, 0, 0, 0.1) 1px, transparent 1px);
-      background-size:
-        10px 10px,
-        10px 10px;
-    }
+  }
+  .map-box-inner {
+    position: absolute;
+    top: 0;
+    left: 0;
   }
 }
 
@@ -1411,4 +1433,12 @@ onMounted(() => {
   width: 80px;
   margin-left: 4px;
 }
+
+.grid-show {
+  background: linear-gradient(-90deg, rgba(0, 0, 0, 0.1) 1px, transparent 1px),
+    linear-gradient(rgba(0, 0, 0, 0.1) 1px, transparent 1px);
+  background-size:
+    10px 10px,
+    10px 10px;
+}
 </style>

src/views/mapPage/realTimeMap/test.vue

@@ -17,10 +17,7 @@
     <!-- 背景区域 -->
     <div
       ref="background"
-      @mousedown="startSelection"
-      @mousemove="updateSelection"
-      @mouseup="endSelection"
-      style="margin-left: 200px; height: 100vh; position: relative; background-color: #fff"
+      style="margin-left: 200px; height: 200vh; position: relative; background-color: #fff"
     >
       <!-- 其他定位元素（如图片） -->
       <img
@@ -29,146 +26,112 @@
         alt="示例图片"
       />
 
-      <!-- 绘制框选区域 -->
-      <div
-        v-for="(rect, index) in selectionRects"
-        :key="index"
-        :style="{
-          position: 'absolute',
-          left: `${rect.x}px`,
-          top: `${rect.y}px`,
-          width: `${rect.width}px`,
-          height: `${rect.height}px`,
-          border: '2px solid blue',
-          backgroundColor: 'rgba(0, 0, 255, 0.1)'
-        }"
-      ></div>
+      <!-- 显示测量结果 -->
+      <div v-if="distance !== null" style="position: fixed; top: 20px; left: 220px">
+        距离：{{ distance.toFixed(2) }} 像素
+      </div>
 
-      <!-- 当前框选区域 -->
-      <div
-        v-if="isSelecting"
-        :style="{
-          position: 'absolute',
-          left: `${selectionBox.x}px`,
-          top: `${selectionBox.y}px`,
-          width: `${selectionBox.width}px`,
-          height: `${selectionBox.height}px`,
-          border: '2px dashed red',
-          backgroundColor: 'rgba(255, 0, 0, 0.1)'
-        }"
-      ></div>
-
-      <!-- 绘制点位 -->
-      <div
-        v-for="(point, index) in points"
-        :key="index"
-        :style="{
-          position: 'absolute',
-          left: `${point.x}px`,
-          top: `${point.y}px`,
-          width: '10px',
-          height: '10px',
-          backgroundColor: isPointSelected(point) ? 'red' : 'black',
-          borderRadius: '50%'
-        }"
-      ></div>
+      <!-- 绘制点和连线 -->
+      <template v-if="points.length > 0">
+        <div
+          v-for="(point, index) in points"
+          :key="index"
+          :style="{
+            position: 'absolute',
+            left: `${point.x}px`,
+            top: `${point.y}px`,
+            width: '10px',
+            height: '10px',
+            backgroundColor: 'red',
+            borderRadius: '50%'
+          }"
+        ></div>
+        <div
+          v-if="points.length === 2"
+          :style="{
+            position: 'absolute',
+            left: `${points[0].x}px`,
+            top: `${points[0].y}px`,
+            width: `${lineWidth}px`,
+            height: '2px',
+            backgroundColor: 'blue',
+            transform: `rotate(${lineAngle}deg)`,
+            transformOrigin: '0 0'
+          }"
+        ></div>
+      </template>
     </div>
-
-    <!-- 确定按钮 -->
-    <button @click="confirmSelection" style="position: fixed; top: 20px; left: 220px">
-      确定
-    </button>
   </div>
 </template>
 
-<script>
-import { ref, computed, onMounted } from 'vue'
+<script setup>
+const points = ref([]) // 存储点击的点位
+const distance = ref(null) // 存储两点之间的距离
+const background = ref()
 
-export default {
-  setup() {
-    const background = ref(null) // 背景区域的 DOM 元素
-    const points = ref([
-      { x: 10, y: 10 },
-      { x: 30, y: 100 },
-      { x: 40, y: 40 },
-      { x: 230, y: 400 },
-      { x: 750, y: 640 }
-    ]) // 点位数组
-    const isSelecting = ref(false) // 是否正在框选
-    const selectionBox = ref({ x: 0, y: 0, width: 0, height: 0 }) // 当前框选区域
-    const selectionRects = ref([]) // 所有框选区域
-    const startPos = ref({ x: 0, y: 0 }) // 框选起始位置
+// 计算两点之间的距离
+const calculateDistance = (point1, point2) => {
+  const dx = point2.x - point1.x
+  const dy = point2.y - point1.y
+  return Math.sqrt(dx * dx + dy * dy)
+}
 
-    // 判断点位是否在框选区域内
-    const isPointInRect = (point, rect) => {
-      return (
-        point.x >= rect.x &&
-        point.x <= rect.x + rect.width &&
-        point.y >= rect.y &&
-        point.y <= rect.y + rect.height
-      )
-    }
+// 计算连线的角度
+const lineAngle = computed(() => {
+  if (points.value.length === 2) {
+    const dx = points.value[1].x - points.value[0].x
+    const dy = points.value[1].y - points.value[0].y
+    return Math.atan2(dy, dx) * (180 / Math.PI)
+  }
+  return 0
+})
 
-    // 判断点位是否被选中
-    const isPointSelected = (point) => {
-      return selectionRects.value.some((rect) => isPointInRect(point, rect))
-    }
+// 计算连线的长度
+const lineWidth = computed(() => {
+  if (points.value.length === 2) {
+    return calculateDistance(points.value[0], points.value[1])
+  }
+  return 0
+})
 
-    // 开始框选
-    const startSelection = (event) => {
-      const backgroundRect = background.value.getBoundingClientRect()
-      const x = event.clientX - backgroundRect.left
-      const y = event.clientY - backgroundRect.top
+// 处理点击事件
+const handleClick = (event) => {
+  // 获取点击点相对于整个页面的坐标（考虑滚动条）
+  const x = event.clientX + window.scrollX
+  const y = event.clientY + window.scrollY
 
-      // 确保点击在背景区域内
-      if (x >= 0 && x <= backgroundRect.width && y >= 0 && y <= backgroundRect.height) {
-        isSelecting.value = true
-        startPos.value = { x, y }
-        selectionBox.value = { x, y, width: 0, height: 0 }
+  // 检查点击是否发生在背景区域内
+  const backgroundRect = background.value.getBoundingClientRect()
+  if (
+    x >= backgroundRect.left + window.scrollX &&
+    x <= backgroundRect.right + window.scrollX &&
+    y >= backgroundRect.top + window.scrollY &&
+    y <= backgroundRect.bottom + window.scrollY
+  ) {
+    if (points.value.length === 2) {
+      // 如果已经有两个点，清空信息
+      points.value = []
+      distance.value = null
+    } else {
+      // 记录点击的点位
+      points.value.push({ x, y })
+      if (points.value.length === 2) {
+        // 计算两点之间的距离
+        distance.value = calculateDistance(points.value[0], points.value[1])
       }
     }
-
-    // 更新框选区域
-    const updateSelection = (event) => {
-      if (isSelecting.value) {
-        const backgroundRect = background.value.getBoundingClientRect()
-        const x = event.clientX - backgroundRect.left
-        const y = event.clientY - backgroundRect.top
-
-        selectionBox.value.width = x - startPos.value.x
-        selectionBox.value.height = y - startPos.value.y
-      }
-    }
-
-    // 结束框选
-    const endSelection = () => {
-      if (isSelecting.value) {
-        isSelecting.value = false
-        selectionRects.value.push({ ...selectionBox.value })
-      }
-    }
-
-    // 点击确定按钮
-    const confirmSelection = () => {
-      const selectedPoints = points.value.filter((point) => isPointSelected(point))
-      console.log('选中的点位：', selectedPoints)
-      alert(`选中的点位：${JSON.stringify(selectedPoints)}`)
-    }
-
-    return {
-      background,
-      points,
-      isSelecting,
-      selectionBox,
-      selectionRects,
-      startSelection,
-      updateSelection,
-      endSelection,
-      confirmSelection,
-      isPointSelected
-    }
   }
 }
+
+// 监听全局点击事件
+onMounted(() => {
+  window.addEventListener('click', handleClick)
+})
+
+// 移除全局点击事件监听
+onUnmounted(() => {
+  window.removeEventListener('click', handleClick)
+})
 </script>
 
 <style scoped>