取放货点更改图标

.env.local

@@ -4,9 +4,9 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://10.10.7.132:48080'
+# VITE_BASE_URL='http://10.10.7.132:48080'
 # VITE_BASE_URL='http://10.10.100.15:48080'
-# VITE_BASE_URL='http://10.10.5.5:48080'
+VITE_BASE_URL='http://10.10.5.5:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

src/views/mapPage/components/locationSelectionDialog.vue

@@ -138,8 +138,10 @@
           <template v-else-if="locationTypeNumber == 4">
             <el-popover placement="top" trigger="hover" :popper-style="{ padding: '0px' }">
               <template #reference>
-                <div
+                <img
                   @click="choosePoint(item)"
+                  src="@/assets/imgs/indexPage/pick-up-point.png"
+                  alt=""
                   :style="{
                     position: 'absolute',
                     left: Number(item.locationX) - Number(item.locationWidePx) / 2 + 'px',
@@ -147,10 +149,9 @@
                     width: item.locationWidePx + 'px',
                     height: item.locationDeepPx + 'px',
                     zIndex: 999,
-                    backgroundColor: item.id == currentItem?.id ? '#5ecc62' : '#000',
+                    border: currentItem?.id == item.id ? '.0625rem dashed #000' : 'none'
-                    borderRadius: '50%'
                   }"
-                ></div>
+                />
               </template>
               <div class="drop-down-menu">
                 <div class="drop-down-menu">
@@ -358,8 +359,8 @@ const getAllNodeList = async () => {
       item.locationX = Number(item.locationX) * (imgBgObj.showWidth / imgBgObj.width)
       item.locationY = Number(item.locationY) * (imgBgObj.showWidth / imgBgObj.width)
       item.dataList = item.dataJson ? JSONBigInt({ storeAsString: true }).parse(item.dataJson) : []
-      item.locationDeepPx = 8
+      item.locationDeep = 150
-      item.locationWidePx = 8
+      item.locationWide = 150
 
       //要将实际的cm改成px
       if (item.locationWide && item.locationDeep) {

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

@@ -481,7 +481,7 @@ const typeChange = (type) => {
     form.value.locationDeep = Number(firstItem.locationDeep)
     form.value.locationWide = Number(firstItem.locationWide)
   } else {
-    if (type === 1 || type === 8) {
+    if (type === 1) {
       form.value.locationDeep = 40
       form.value.locationWide = 40
       form.value.locationDeepPx = 8

src/views/mapPage/realTimeMap/components/indexPage.vue

@@ -194,18 +194,7 @@
                   <div>
                     <!-- sortNum -->
                     <template v-if="legendObj.sortNumberShow && item.sortNum && sortNumberShow">
-                      <div
+                      <div class="sort-num-location" :style="getSortNumLocationStyle(item, index)">
-                        v-if="item.type === 8"
-                        class="sort-num"
-                        :style="getSortNumStyle(item, index)"
-                      >
-                        {{ item.sortNum }}
-                      </div>
-                      <div
-                        v-else
-                        class="sort-num-location"
-                        :style="getSortNumLocationStyle(item, index)"
-                      >
                         {{ item.sortNum }}
                       </div>
                     </template>
@@ -246,15 +235,12 @@
                       :style="nodeStyle(item, index)"
                     />
                     <!-- 取货点 -->
-                    <div
+                    <img
                       v-else-if="item.type === 8"
-                      :style="{
+                      src="@/assets/imgs/indexPage/pick-up-point.png"
-                        width: Number(item.locationWidePx) * Number(radio) + 'px',
+                      style="background: #fff"
-                        height: Number(item.locationDeepPx) * Number(radio) + 'px',
+                      :style="nodeStyle(item, index)"
-                        backgroundColor: '#000',
+                    />
-                        borderRadius: '50%'
-                      }"
-                    ></div>
                   </div>
                 </el-tooltip>
               </div>
@@ -887,8 +873,8 @@ const getAllNodeList = async (positionMapId) => {
     } else if (item.type === 8) {
       item.dataObj = {}
       item.dataList = item.dataJson ? JSONBigInt({ storeAsString: true }).parse(item.dataJson) : []
-      item.locationDeep = 40
+      item.locationDeep = 150
-      item.locationWide = 40
+      item.locationWide = 150
     }
     //要将实际的cm改成px
     if (item.locationWide && item.locationDeep) {

src/views/mapPage/realTimeMap/editMap.vue

@@ -570,7 +570,9 @@
                             ? '区域变更点'
                             : item.type == 6
                               ? '等待点'
-                              : ''
+                              : item.type == 8
+                                ? '取放货点'
+                                : ''
                       }}
                     </div>
                   </div>
@@ -579,7 +581,7 @@
                   <!-- sortNum -->
                   <template v-if="item.layerSelectionShow && state.isShowSortNum && item.sortNum">
                     <div
-                      v-if="item.type === 1 || item.type === 8"
+                      v-if="item.type === 1"
                       class="sort-num"
                       :style="getSortNumStyle(item, visibleMapPointIndices[i])"
                     >
@@ -606,7 +608,7 @@
                   </div>
                   <!-- 1 路径点和取放货点  -->
                   <div
-                    v-if="(item.type === 1 || item.type === 8) && item.layerSelectionShow"
+                    v-if="item.type === 1 && item.layerSelectionShow"
                     :style="{
                       width: item.locationWidePx + 'px',
                       height: item.locationDeepPx + 'px',
@@ -656,6 +658,13 @@
                     style="background: #fff"
                     :style="nodeStyle(item, visibleMapPointIndices[i])"
                   />
+                  <img
+                    v-if="item.type === 8 && item.layerSelectionShow"
+                    src="@/assets/imgs/indexPage/pick-up-point.png"
+                    alt=""
+                    style="background: #fff"
+                    :style="nodeStyle(item, visibleMapPointIndices[i])"
+                  />
                 </div>
               </el-tooltip>
             </div>
@@ -4362,8 +4371,8 @@ const getAllNodeList = async () => {
     } else if (item.type === 8) {
       item.dataObj = {}
       item.dataList = item.dataJson ? JSONBigInt({ storeAsString: true }).parse(item.dataJson) : []
-      item.locationDeep = 40
+      item.locationDeep = 150
-      item.locationWide = 40
+      item.locationWide = 150
       item.draggable = true
       item.resizable = false
       item.rotatable = false