src/layout/components/AppView.vue

@@ -37,9 +37,7 @@ provide('reload', reload)
 
 <template>
   <section
-    v-if="
+    v-if="currentRoute.name === 'editMapPageRealTimeMap'"
-      currentRoute.name === 'editMapPageRealTimeMap' || currentRoute.name === 'MapPageRealTimeMap'
-    "
     :class="[
       'w-full bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
       {

src/styles/var.css

@@ -33,13 +33,12 @@
 
   --top-header-hover-color: #215bd8;
 
-  /* --top-tool-height: var(--logo-height); */
+  --top-tool-height: var(--logo-height);
-  --top-tool-height: 60px;
 
   --top-tool-p-x: 0;
 
   /* --tags-view-height: 35px;   开启面包屑时 */
-  --tags-view-height: 0px;
+  --tags-view-height: 16px;
   /* header start */
 
   /* tab menu start */

src/views/board/allBoard/index.vue

@@ -152,7 +152,7 @@
           />
         </div>
         <div style="width: 100%; padding-bottom: 120px" class="map-box-allBoard">
-          <indexPage ref="indexPageRef" :isAllBoard="true" :isFullScreen="true" />
+          <indexPage ref="indexPageRef" :isAllBoard="true" />
         </div>
         <div
           style="position: fixed; bottom: 20px"
@@ -314,9 +314,8 @@ import { ref, reactive, onMounted, onBeforeUnmount } from 'vue'
 import { dateFormatter } from '@/utils/formatTime'
 import * as ChartsApi from '@/api/boardCharts'
 import { DICT_TYPE, getIntDictOptions, getDictOptions } from '@/utils/dict'
-import indexPage from '../../mapPage/realTimeMap/components/indexPage.vue'
+import indexPage from './indexPage.vue'
 import * as MapApi from '@/api/map/map'
-
 const router = useRouter() // 路由对象
 const indexPageRef = ref(null)
 const typeList = ref([])

src/views/mapPage/locationList/index.vue

@@ -36,7 +36,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="线库名称" prop="laneName">
+      <el-form-item label="线库号" prop="laneName">
         <el-input
           v-model="queryParams.laneName"
           placeholder="请输入"
@@ -45,7 +45,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="区域名称" prop="areaName">
+      <el-form-item label="区域号" prop="areaName">
         <el-input
           v-model="queryParams.areaName"
           placeholder="请输入"
@@ -83,8 +83,8 @@
     >
       <el-table-column label="序号" type="index" align="center" width="60" />
       <el-table-column label="库位号" align="center" prop="locationNo" />
-      <el-table-column label="线库名称" prop="laneName" align="center" />
+      <el-table-column label="线库号" prop="laneName" align="center" />
-      <el-table-column label="区域名称" prop="areaName" align="center" />
+      <el-table-column label="区域号" prop="areaName" align="center" />
       <el-table-column label="物料信息" prop="skuInfo" align="center" show-overflow-tooltip />
       <el-table-column label="状态" prop="locationUseStatus" align="center">
         <template #default="scope">

src/views/mapPage/realTimeMap/components-tool/itemAreaSettingDialog.vue

@@ -92,7 +92,6 @@ const submitForm = async (formEl) => {
       message.success('设置成功')
       emit('itemAreaSettingSubmitSuccess', {
         ...res,
-        skuInfo: form.value.skuInfo,
         mapItemIds: form.value.mapItemIds
       })
     }

src/views/mapPage/realTimeMap/editMap.vue

@@ -351,7 +351,7 @@
                       所属线库：{{ item.laneName }}
                     </div>
                     <div class="item-tooltip-name" v-if="item.areaId && item.areaName">
-                      所属区域：{{ item.areaName }}
+                      所属线库：{{ item.areaName }}
                     </div>
                   </div>
                   <div v-else-if="item.type === 3">
@@ -1987,8 +1987,6 @@ const clickDrawSelectionArea = () => {
 
   // 清空框选区域
   state.allDrawSelectionAreaBox = []
-  //去重
-  state.drawSelectionPointList = deduplicateArrayById(state.drawSelectionPointList)
   //只要库位的
   let binLocation = state.drawSelectionPointList.filter((item) => item.type === 2)
   //只要路径点的
@@ -2147,17 +2145,6 @@ const GenerateStraightLinesSubmit = (pointList, form) => {
   })
   addEditHistory()
 }
-//去重
-const deduplicateArrayById = (arr) => {
-  const idSet = new Set()
-  return arr.filter((item) => {
-    if (idSet.has(item.id)) {
-      return false
-    }
-    idSet.add(item.id)
-    return true
-  })
-}
 
 //将一个数组中的点位 按照第一个和最后一个排成一条直线
 const mapPointsToLine = (points, startPointId, endPointId) => {
@@ -2169,61 +2156,35 @@ const mapPointsToLine = (points, startPointId, endPointId) => {
     return
   }
 
-  const dx = endPoint.locationX - startPoint.locationX
+  const dx = startPoint.locationX - endPoint.locationX
-  const dy = endPoint.locationY - startPoint.locationY
+  const dy = startPoint.locationY - endPoint.locationY
-  const length = Math.sqrt(dx * dx + dy * dy)
 
+  // 处理垂直直线的情况
+  if (dx === 0) {
     return points.map((point) => {
-    if (point.id === startPointId || point.id === endPointId) {
+      if (point === endPoint || point === startPoint) {
         return point
       }
-
-    const vx = point.locationX - startPoint.locationX
-    const vy = point.locationY - startPoint.locationY
-    const dotProduct = vx * dx + vy * dy
-    const projectionLength = dotProduct / length
-
-    const t = Math.max(0, Math.min(1, projectionLength / length))
-
-    const newX = startPoint.locationX + t * dx
-    const newY = startPoint.locationY + t * dy
-
       return {
         ...point,
-      locationX: newX,
+        locationX: endPoint.locationX
+      }
+    })
+  }
+
+  const slope = dy / dx
+  const intercept = endPoint.locationY - slope * endPoint.locationX
+
+  return points.map((point) => {
+    if (point === endPoint || point === startPoint) {
+      return point
+    }
+    const newY = slope * point.locationX + intercept
+    return {
+      ...point,
       locationY: newY
     }
   })
-
-  // const dx = startPoint.locationX - endPoint.locationX
-  // const dy = startPoint.locationY - endPoint.locationY
-
-  // // 处理垂直直线的情况
-  // if (dx === 0) {
-  //   return points.map((point) => {
-  //     if (point === endPoint || point === startPoint) {
-  //       return point
-  //     }
-  //     return {
-  //       ...point,
-  //       locationX: endPoint.locationX
-  //     }
-  //   })
-  // }
-
-  // const slope = dy / dx
-  // const intercept = endPoint.locationY - slope * endPoint.locationX
-
-  // return points.map((point) => {
-  //   if (point === endPoint || point === startPoint) {
-  //     return point
-  //   }
-  //   const newY = slope * point.locationX + intercept
-  //   return {
-  //     ...point,
-  //     locationY: newY
-  //   }
-  // })
 }
 
 //计算是不是在同一条直线的
@@ -2760,7 +2721,6 @@ const itemAreaSettingSubmitSuccess = (obj) => {
       item.areaId = obj.id
       item.dataList.forEach((node) => {
         node.areaName = obj.areaName
-        node.skuInfo = obj.skuInfo
         node.areaId = obj.id
       })
     }
@@ -2772,6 +2732,7 @@ const lineLibraryManagementDelete = (mapItemIds) => {
     if (mapItemIds.includes(item.id)) {
       item.laneId = undefined
       item.dataList.forEach((node) => {
+        ;``
         node.laneName = undefined
         node.laneId = undefined
       })
@@ -2785,7 +2746,6 @@ const itemAreaManagementDelete = (mapItemIds) => {
       item.areaId = undefined
       item.dataList.forEach((node) => {
         node.areaName = undefined
-        node.skuInfo = undefined
         node.areaId = undefined
       })
     }
@@ -2812,7 +2772,6 @@ const itemAreaManagementEdit = (obj) => {
       item.areaId = obj.id
       item.dataList.forEach((node) => {
         node.areaName = obj.areaName
-        node.skuInfo = obj.skuInfo
         node.areaId = obj.id
       })
     }
@@ -2993,15 +2952,13 @@ const handleWheel = (event) => {
       if (state.imageChangeMultiple < 4) {
         state.imageChangeMultiple += 0.2
       } else {
-        state.imageChangeMultiple = 3.8
         message.warning('不能在放大了')
       }
     } else {
       //缩小
-      if (state.imageChangeMultiple > 0.4) {
+      if (state.imageChangeMultiple > 0.2) {
-        state.imageChangeMultiple -= 0.1
+        state.imageChangeMultiple -= 0.2
       } else {
-        state.imageChangeMultiple = 0.3
         message.warning('不能在缩小了')
       }
     }
@@ -3071,7 +3028,8 @@ onUnmounted(() => {
   }
 
   .top-tool {
-    margin-bottom: 2px;
+    margin-top: 5px;
+    margin-bottom: 3px;
     .top-tool-list {
       display: flex;
       align-items: center;

src/views/mapPage/realTimeMap/index.vue

@@ -1,31 +1,29 @@
 <template>
-  <div class="page">
+  <ContentWrap>
-    <div class="top-div">
+    <div style="display: flex; align-items: center">
       <el-cascader
         v-model="mapValue"
         :options="list"
         @change="handleChangeMap"
         style="width: 160px"
       />
-      <div class="line"></div>
+      <div style="width: 1px; height: 25px; background: #e5e5e5; margin: 0 16px"></div>
-      <el-button @click="createTask" icon="CirclePlus" style="color: #536387"> 新建任务 </el-button>
+      <el-button @click="createTask" :icon="'CirclePlus'" style="color: #536387"
-      <el-button @click="editMap" icon="EditPen" style="color: #536387">地图编辑</el-button>
+        >新建任务</el-button
-      <el-button type="danger" @click="emergencyStop" icon="Remove">一键急停</el-button>
+      >
+      <el-button @click="editMap" :icon="'EditPen'" style="color: #536387">地图编辑</el-button>
+      <el-button type="danger" @click="emergencyStop" :icon="'Remove'">一键急停</el-button>
     </div>
+  </ContentWrap>
 
   <div class="main-content">
     <!-- <div @click="downAgv">导出zip</div> -->
     <!-- 首页 -->
-      <indexPage ref="indexPageRef" :isFullScreen="false" />
+    <indexPage ref="indexPageRef" />
   </div>
 
   <!-- 新建任务的弹窗 -->
-    <createTaskDialog
+  <createTaskDialog v-if="mapValue.length" ref="createTaskDialogRef" :positionMapId="mapValue[1]" />
-      v-if="mapValue.length"
-      ref="createTaskDialogRef"
-      :positionMapId="mapValue[1]"
-    />
-  </div>
 </template>
 
 <script setup>
@@ -130,6 +128,7 @@ const getList = async () => {
 const handleChangeMap = async (e) => {
   let item = findChildrenByValues(list.value, e)
   indexPageRef.value.getMapData(item)
+  console.log(item)
   router.replace({
     name: 'MapPageRealTimeMap',
     query: {
@@ -192,33 +191,7 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-.page {
-  position: absolute;
-  width: 100%;
-
-  .top-div {
-    display: flex;
-    align-items: center;
-    padding: 0 12px;
-    height: 60px;
-    box-shadow: rgba(0, 0, 0, 0.06) 0px 2px 3px;
-    background-color: #fff;
-    position: absolute;
-    z-index: 999;
-    top: 0;
-    left: 0;
-    right: 0;
-
-    .line {
-      width: 1px;
-      height: 25px;
-      background: #e5e5e5;
-      margin: 0 16px;
-    }
-  }
-
 .main-content {
-    margin-top: 62px;
+  // background-color: #fff;
-  }
 }
 </style>