Merge remote-tracking branch 'origin/master'

jiangping

2025-01-16 1da4ccbf33281b669c40488be047700a298927de

 screen/src/views/LogisticsCenter.vue

@@ -56,8 +56,8 @@
                    </div>
                    <div class="hover_wrap">
                      <div class="triangle"></div>
                      <div class="title">调拨出库量：{{ StockOutData.currentProvinceNum || 0 }}箱</div>
                      <div class="title">其他出库量：{{ StockOutData.currentOtherNum || 0 }}箱</div>
                      <div class="title" v-if="StockOutData.currentProvinceNum || StockOutData.currentProvinceNum == 0">调拨出库量：{{ StockOutData.currentProvinceNum.toFixed(0) }}箱</div>
                      <div class="title" v-if="StockOutData.currentOtherNum || StockOutData.currentOtherNum == 0">其他出库量：{{ StockOutData.currentOtherNum.toFixed(0) }}箱</div>
                    </div>
                  </div>

@@ -1031,7 +1031,7 @@
      image: fahuoImg, // 图标图片URL
      imageSize: new AMap.Size(28, 32), // 图标实际大小
    }),
    title: '标记点1', // 鼠标悬停时显示的标题
    title: obj.deliveryEnterprise, // 鼠标悬停时显示的标题
  })
  map.add(marker1)
  const marker2 = new AMap.Marker({
@@ -1041,7 +1041,7 @@
      image: shouImg, // 图标图片URL
      imageSize: new AMap.Size(28, 32), // 图标实际大小
    }),
    title: '标记点1', // 鼠标悬停时显示的标题
    title: obj.receiveEnterprise, // 鼠标悬停时显示的标题
  })
  map.add(marker2)
  // 绘制轨迹
@@ -2569,7 +2569,6 @@
    }

    .title {
      font-weight: 600;
      color: #e2ebfd;
    }
  }