From 56953f77d1662f57366d0c6edc3a0bfb85555353 Mon Sep 17 00:00:00 2001
From: yyy <2605810609@qq.com>
Date: Mon, 7 Apr 2025 16:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B7=AF=E7=BA=BF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20=E5=87=BA=E5=8F=91=E7=82=B9=E5=BA=8F=E5=8F=B7=20?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E7=82=B9=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/map/map.ts                            |  7 +-
 .../components/locationSelectionDialog.vue    | 64 ++++++++++++++++---
 .../components-tool/editMapRouteDialog.vue    | 22 +++++++
 src/views/mapPage/realTimeMap/editMap.vue     | 14 ++--
 4 files changed, 92 insertions(+), 15 deletions(-)

diff --git a/src/api/map/map.ts b/src/api/map/map.ts
index 81a47a1d..2d2943d6 100644
--- a/src/api/map/map.ts
+++ b/src/api/map/map.ts
@@ -167,4 +167,9 @@ export const getRobotByFloorAndArea = async (params) => {
   return await request.post({ url: `/system/robot/information/getRobotByFloorAndArea`, params })
 }
 
-
+//根据点位获取库位信息列表
+export const getByMapItemId = async (mapId, mapItemId) => {
+  return await request.get({
+    url: `/system/ware/house-location/getByMapItemId?mapItemId=${mapItemId}&mapId=${mapId}`
+  })
+}
diff --git a/src/views/mapPage/components/locationSelectionDialog.vue b/src/views/mapPage/components/locationSelectionDialog.vue
index d63dfb6b..83a3caa3 100644
--- a/src/views/mapPage/components/locationSelectionDialog.vue
+++ b/src/views/mapPage/components/locationSelectionDialog.vue
@@ -37,7 +37,13 @@
           class="location-selection-map-item"
         >
           <template v-if="locationTypeNumber == 1">
-            <el-popover placement="top" trigger="click" :popper-style="{ padding: '0px' }">
+            <el-popover
+              placement="top"
+              trigger="click"
+              :popper-style="{ padding: '0px' }"
+              @before-enter="getByMapItemId(item, index)"
+              width="230"
+            >
               <template #reference>
                 <img
                   src="https://api.znkjfw.com/admin-api/infra/file/4/get/库位库存_png_179_1739326653035.png"
@@ -52,16 +58,22 @@
                   }"
                 />
               </template>
-              <div class="drop-down-menu">
+              <div class="current-item-list">
                 <!-- 楼层展开 -->
                 <div
-                  v-for="(floor, floorIndex) in item.dataList"
+                  v-for="(floor, floorIndex) in currentMapItemList"
                   :key="floorIndex"
-                  class="drop-down-menu-item"
+                  class="current-item"
                   :class="currentItem && currentItem.id == floor.id ? 'tool-active' : ''"
-                  @click="choosePoint(floor)"
+                  @click="chooseLocationPoint(floor)"
                 >
-                  {{ floor.locationNo }}
+                  <div>层数: 第{{ floorIndex + 1 }}层</div>
+                  <div class="mt-4px">库位号: {{ floor.locationNo }}</div>
+                  <div class="mt-4px"
+                    >库位状态: {{ floor.locationEnable === 1 ? '启用' : '禁用' }} /
+                    {{ floor.locationLock === 1 ? '正常' : '锁定' }} /
+                    {{ floor.locationUseStatus === 1 ? '占用' : '空闲' }}</div
+                  >
                 </div>
               </div>
             </el-popover>
@@ -245,7 +257,7 @@ const getAllNodeList = async () => {
     }
 
     //线库 laneId
-    if (locationTypeNumber.value == 2 && item.laneId !== null) {
+    if (item.type === 2 && locationTypeNumber.value == 2 && item.laneId !== null) {
       item.locationX = Number(item.locationX) * (imgBgObj.showWidth / imgBgObj.width)
       item.locationY = Number(item.locationY) * (imgBgObj.showWidth / imgBgObj.width)
       item.dataList = JSONBigInt({ storeAsString: true }).parse(item.dataJson)
@@ -263,7 +275,7 @@ const getAllNodeList = async () => {
     }
 
     //区域 areaId
-    if (locationTypeNumber.value == 3 && item?.areaId !== null) {
+    if (item.type === 2 && locationTypeNumber.value == 3 && item?.areaId !== null) {
       item.locationX = Number(item.locationX) * (imgBgObj.showWidth / imgBgObj.width)
       item.locationY = Number(item.locationY) * (imgBgObj.showWidth / imgBgObj.width)
       item.dataList = JSONBigInt({ storeAsString: true }).parse(item.dataJson)
@@ -285,6 +297,13 @@ const getAllNodeList = async () => {
     }
   })
 }
+//库位
+const currentMapItemList = ref([])
+const getByMapItemId = async (item, index) => {
+  let list = await MapApi.getByMapItemId(imgBgObj.positionMapId, item.id)
+  currentMapItemList.value = list.reverse()
+}
+
 //将节点实际宽高cm转换成px
 const cmConversionPx = (cWidth, cHeight) => {
   let pWidth = (Number(cWidth) / imgBgObj.resolution / 100) * (imgBgObj.showWidth / imgBgObj.width)
@@ -301,6 +320,18 @@ const choosePoint = (item) => {
   currentItem.value = item
 }
 
+const chooseLocationPoint = (item) => {
+  if (item.locationEnable === 0) {
+    message.warning('该库位已被禁用')
+  } else if (item.locationLock === 0) {
+    message.warning('该库位已被锁定')
+  } else if (item.locationUseStatus === 1) {
+    message.warning('该库位已被占用')
+  } else {
+    currentItem.value = item
+  }
+}
+
 const submitAddForm = () => {
   if (currentItem.value) {
     emit('locationSelectionDialogSuccess', currentItem.value)
@@ -389,6 +420,23 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
   }
 }
 
+.current-item-list {
+  .current-item {
+    width: 230px;
+    font-family:
+      PingFangSC,
+      PingFang SC;
+    font-weight: 500;
+    font-size: 14px;
+    color: #606266;
+    cursor: pointer;
+    border: 1px solid rgba(0, 0, 0, 0);
+    position: relative;
+    border-bottom: 1px solid #e9e9e9;
+    padding: 12px 20px;
+  }
+}
+
 .tool-active {
   background: #ebf1ff !important;
 }
diff --git a/src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue b/src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue
index a98e0fd1..ed8f418a 100644
--- a/src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue
+++ b/src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue
@@ -8,6 +8,28 @@
     @close="dialogClose"
   >
     <el-form :model="form" label-width="120" ref="ruleFormRef" :rules="rules">
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="开始点位序号" prop="startingSortNum" required>
+            <el-input
+              style="width: 100%"
+              v-model="form.startingSortNum"
+              :min="0"
+              :disabled="true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开始点位序号" prop="endPointSortNum" required>
+            <el-input
+              style="width: 100%"
+              v-model="form.endPointSortNum"
+              :min="0"
+              :disabled="true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="30">
         <el-col :span="12">
           <el-form-item label="开始点位x轴" prop="startPointX" required>
diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue
index 01feda40..870df84b 100644
--- a/src/views/mapPage/realTimeMap/editMap.vue
+++ b/src/views/mapPage/realTimeMap/editMap.vue
@@ -459,7 +459,7 @@
                 :x2="Number(state.currentDrawX)"
                 :y2="Number(state.currentDrawY)"
                 stroke="#00329F"
-                stroke-width="3"
+                stroke-width="4"
               />
               <template v-if="state.mapRouteList.length > 0">
                 <template v-for="(curve, index) in state.mapRouteList" :key="index">
@@ -498,7 +498,7 @@
                       :x2="Number(curve.endPointX)"
                       :y2="Number(curve.endPointY)"
                       :stroke="curve.isSelected ? '#f48924' : '#00329F'"
-                      stroke-width="3"
+                      stroke-width="4"
                       @click="handleChooseRoute(curve, index)"
                       @dblclick="handleEditRoute(curve, index)"
                     />
@@ -517,7 +517,7 @@
                       :d="getLineMidArrowPath(curve)"
                       stroke="none"
                       fill="black"
-                      stroke-width="3"
+                      stroke-width="4"
                       :marker-start="curve.direction === 2 ? 'url(#backward-arrow)' : ''"
                       :marker-end="
                         curve.direction === 2 ? 'url(#forward-arrow)' : 'url(#forward-arrow)'
@@ -530,7 +530,7 @@
                       id="curvePath"
                       :d="getCurvePath(curve)"
                       :stroke="curve.isSelected ? '#f48924' : '#00329F'"
-                      stroke-width="3"
+                      stroke-width="4"
                       fill="none"
                       @click="handleChooseRoute(curve, index)"
                       @dblclick="handleEditRoute(curve, index)"
@@ -551,7 +551,7 @@
                       :d="getBezierMidArrowPath(curve)"
                       stroke="none"
                       fill="black"
-                      stroke-width="3"
+                      stroke-width="4"
                       :marker-start="curve.direction === 2 ? 'url(#backward-arrow)' : ''"
                       :marker-end="
                         curve.direction === 2 ? 'url(#forward-arrow)' : 'url(#forward-arrow)'
@@ -1936,7 +1936,9 @@ const endDrawSelection = (event) => {
             beginWidth: state.startDrawPoint.locationWidePx, //起点宽
             beginHigh: state.startDrawPoint.locationDeepPx, //	起点高
             endWidth: endPoint.locationWidePx, //	终点宽
-            endHigh: endPoint.locationDeepPx //	终点高
+            endHigh: endPoint.locationDeepPx, //	终点高
+            startingSortNum: state.startDrawPoint.sortNum,
+            endPointSortNum: endPoint.sortNum
           })
           addEditHistory()
         }