Pārlūkot izejas kodu

fix: 修复点位偏移

lxf 3 dienas atpakaļ
vecāks
revīzija
86adf3d9ef

+ 6 - 1
src/components/allGarden.vue

@@ -285,7 +285,12 @@ function getFarmList() {
 
 function handleEnterFarm(item) {
     saveSelectedFarm(item);
-    ElMessage.success(t("garden.enterFarmSuccess"));
+    ElMessage({
+        message: t("garden.enterFarmSuccess"),
+        type: "success",
+        customClass: "restore-planting-message",
+        zIndex: 40000,
+    });
     router.back();
 }
 

+ 43 - 0
src/utils/selectedFarm.js

@@ -1,5 +1,48 @@
 /** 与 farmHeader / allGarden 一致的选中农场缓存读写 */
 
+export function getSelectedFarmFromStorage() {
+    try {
+        return JSON.parse(localStorage.getItem("selectedFarmData") || "{}");
+    } catch {
+        return {};
+    }
+}
+
+export function getSelectedFarmIdFromStorage() {
+    const stored = localStorage.getItem("selectedFarmId");
+    if (stored != null && stored !== "") return stored;
+    const farm = getSelectedFarmFromStorage();
+    const id = farm.farm_id ?? farm.id;
+    return id != null && id !== "" ? String(id) : "";
+}
+
+/**
+ * 保证 farm_id / zone_id 成对:
+ * - preferredZoneId 属于该农场 → 使用它
+ * - 不属于 → zoneId 返回 null(禁止错配请求)
+ * - 未指定 preferred → 回落该农场第一个分区
+ */
+export async function resolvePairedFarmZone(preferredZoneId) {
+    const farmId = getSelectedFarmIdFromStorage();
+    if (farmId === "") return { farmId: null, zoneId: null };
+
+    try {
+        const res = await VE_API.questionnaire.getZones({ farm_id: farmId });
+        const zones = Array.isArray(res?.data?.zones) ? res.data.zones : [];
+        if (!zones.length) return { farmId, zoneId: null };
+
+        if (preferredZoneId != null && preferredZoneId !== "") {
+            const hit = zones.find((z) => String(z.zone_id) === String(preferredZoneId));
+            if (hit) return { farmId, zoneId: hit.zone_id };
+            return { farmId, zoneId: null };
+        }
+        return { farmId, zoneId: zones[0].zone_id };
+    } catch (e) {
+        console.warn("[resolvePairedFarmZone] getZones failed", e);
+        return { farmId, zoneId: null };
+    }
+}
+
 function resolveFarmPointWkt(farm = {}) {
     if (farm.geom_wkt && /^POINT\s*\(/i.test(String(farm.geom_wkt).trim())) {
         return farm.geom_wkt;

+ 3 - 4
src/views/old_mini/agri_file/components/albumPanel.vue

@@ -80,6 +80,7 @@ import { useI18n } from "@/i18n";
 import FileMap from "../fileMap";
 import * as util from "@/common/ol_common.js";
 import { base_img_url2 } from "@/api/config";
+import { resolvePairedFarmZone } from "@/utils/selectedFarm";
 
 const props = defineProps({
     /** 当前是否为相册 Tab,用于切回时刷新地图尺寸 */
@@ -201,11 +202,9 @@ const getFarmCenter = () => {
     return DEFAULT_CENTER;
 };
 
-/** status=1 有范围;否则无范围,展示勾画遮罩 */
+/** status=1 有范围;否则无范围,展示勾画遮罩(zone 取当前农场分区列表,禁止用缓存旧 zone) */
 async function fetchFarmRangeStatus() {
-    const farm = getSelectedFarm();
-    const farmId = getSelectedFarmId() ?? farm.farm_id ?? farm.id;
-    const zoneId = farm.zone_id ?? farm.zoneId;
+    const { farmId, zoneId } = await resolvePairedFarmZone();
     if (farmId == null || farmId === "" || zoneId == null || zoneId === "") {
         noFarmRange.value = true;
         return;

+ 23 - 4
src/views/old_mini/agri_file/components/patrolPanel.vue

@@ -78,7 +78,7 @@
             <PhenologyTrackTimelineItem theme="dark" :list="cropArchiveList" />
         </div>
         <album-upload-popup v-model:show="showUploadPopup" @confirm="handleUploadConfirm" />
-        <tip-popup v-model:show="showSuccessPopup" type="executeSuccess" text="您已上传成功" text2="诊断报告正在生成,请稍后..." hideBtn>
+        <tip-popup class="restore-planting-success-popup" :zIndex="20000" v-model:show="showSuccessPopup" type="executeSuccess" text="您已上传成功" text2="诊断报告正在生成,请稍后..." hideBtn>
             <template #footer>
                 <div class="bottom-btn-container">
                     <div class="bottom-btn primary-btn" @click="handleComplete">完成</div>
@@ -301,18 +301,27 @@ const applySelectedZone = (zone) => {
     selectedZoneName.value = zone?.zone_name || "";
 };
 
+/** 记录上次拉分区的农场,切农场时丢弃旧 selectedZoneId */
+let lastZonesFarmId = null;
+
 const fetchZones = async () => {
     const farmId = getSelectedFarmId();
     if (farmId == null) {
+        lastZonesFarmId = null;
         zoneList.value = [];
         applySelectedZone(null);
         return;
     }
+    // 切农场后旧 zone 不属于新农场,先清空再拉,避免上传校验错配
+    if (lastZonesFarmId !== farmId) {
+        applySelectedZone(null);
+        lastZonesFarmId = farmId;
+    }
     try {
         const res = await VE_API.questionnaire.getZones({ farm_id: farmId });
         const zones = Array.isArray(res?.data?.zones) ? res.data.zones : [];
         zoneList.value = zones.reverse();
-        // 优先沿用当前选中;否则默认第一个
+        // 同农场内优先沿用当前选中;否则默认第一个
         const matched = zones.find((z) => z.zone_id === selectedZoneId.value);
         applySelectedZone(matched || zoneList.value[0] || null);
     } catch (e) {
@@ -473,9 +482,11 @@ const handleShare = (item) => {
 
 /** status=1 表示已勾画种植范围;信息不全 / 校验异常时不拦截上传 */
 const hasZoneRange = async (zoneId) => {
-    const farm = getSelectedFarm();
-    const farmId = farm.farm_id ?? farm.id ?? getSelectedFarmId();
+    const farmId = getSelectedFarmId();
     if (farmId == null || farmId === "" || zoneId == null || zoneId === "") return true;
+    // 分区必须落在当前农场分区列表内,防止卡片残留旧 zoneId
+    const belongsToFarm = zoneList.value.some((z) => String(z.zone_id) === String(zoneId));
+    if (!belongsToFarm) return false;
     try {
         const res = await VE_API.questionnaire.checkZoneRange({
             farm_id: farmId,
@@ -903,3 +914,11 @@ defineExpose({
     }
 }
 </style>
+
+<style lang="scss">
+.restore-planting-success-popup {
+    &.tip-popup {
+        z-index: 20000 !important;
+    }
+}
+</style>

+ 11 - 11
src/views/old_mini/agri_file/pages/abnormalTrack.vue

@@ -7,7 +7,7 @@
             :showClose="false"
             @goback="handleBack"
         />
-        <div class="abnormal-track-body" v-loading="loading" element-loading-background="rgba(15, 15, 15, 0.55)">
+        <div class="abnormal-track-body" v-loading="loading" element-loading-background="rgba(15, 15, 15, 0.55)" element-loading-text="加载中...">
             <div class="abnormal-hero">
                 <div class="abnormal-hero__share" @click="handleShare">
                     <Icon name="share" color="rgba(255,255,255,0.85)" />
@@ -150,6 +150,7 @@ import albumUploadPopup from "../components/albumUploadPopup.vue";
 import tipPopup from "@/components/popup/tipPopup.vue";
 import { useI18n } from "@/i18n";
 import { base_img_url2 } from "@/api/config";
+import { resolvePairedFarmZone } from "@/utils/selectedFarm";
 import wx from "weixin-js-sdk";
 
 const { t } = useI18n();
@@ -289,8 +290,7 @@ const formatLocalDate = (date) => {
 // ---------- 业务逻辑 ----------
 const fetchAbnormalInteract = async () => {
     const farm = getSelectedFarm();
-    const farmId = getSelectedFarmId();
-    const zId = zoneId.value || farm.zone_id || farm.zoneId;
+    const { farmId, zoneId: zId } = await resolvePairedFarmZone(zoneId.value);
     const cropType = resolveCropType(farm);
     if (farmId == null || zId == null || zId === "" || !cropType) {
         interactList.value = [];
@@ -302,9 +302,6 @@ const fetchAbnormalInteract = async () => {
         farm_id: farmId,
         zone_id: zId,
         calc_date: formatLocalDate(new Date()),
-        // farm_id: 321,
-        // zone_id: 46,
-        // calc_date: "2025-08-30",
     };
     queryContext.value = { ...params };
     loading.value = true;
@@ -331,9 +328,7 @@ const fetchAbnormalInteract = async () => {
 
 /** status=1 有范围无需勾画;status=0 无范围需要勾画 */
 const fetchZoneRangeStatus = async () => {
-    const farm = getSelectedFarm();
-    const farmId = farm.farm_id ?? farm.id;
-    const zId = zoneId.value || farm.zone_id || farm.zoneId;
+    const { farmId, zoneId: zId } = await resolvePairedFarmZone(zoneId.value);
     if (farmId == null || farmId === "" || zId == null || zId === "") {
         needDraw.value = true;
         return;
@@ -392,11 +387,16 @@ const handleUploadConfirm = async ({ images, date } = {}) => {
         return;
     }
     const farm = getSelectedFarm();
+    const { farmId, zoneId: pairedZoneId } = await resolvePairedFarmZone(zoneId.value);
+    if (farmId == null || pairedZoneId == null || pairedZoneId === "") {
+        ElMessage.warning("当前农场与分区不匹配,请返回后重试");
+        return;
+    }
     try {
         const res = await VE_API.questionnaire.uploadImages({
             cloud_url,
-            farm_id: farm.farm_id ?? farm.id ?? "",
-            zone_id: zoneId.value || "",
+            farm_id: farmId,
+            zone_id: pairedZoneId,
             category_code: farm.category_code || "",
             zone_name: farm.variety_name || "",
             create_time: date,

+ 7 - 1
src/views/old_mini/agri_file/pages/addZone.vue

@@ -453,7 +453,13 @@ const handleFarmNameConfirm = async (regionName) => {
         showDrawSuccessPopup.value = true;
         return;
     }
-    ElMessage.success(t("agriFile.drawFarmAreaSuccess"));
+    ElMessage({
+        message: t("agriFile.drawFarmAreaSuccess"),
+        type: "success",
+        customClass: "restore-planting-message",
+        zIndex: 40000,
+    });
+    // ElMessage.success(t("agriFile.drawFarmAreaSuccess"));
     if (!isAbnormal.value && targetUrl.value) {
         setTimeout(() => {
             const query = { showUpload: "1" };

+ 16 - 6
src/views/old_mini/agri_file/pages/growthTrack.vue

@@ -145,6 +145,7 @@ import leaveConfirmPopup from "@/components/popup/leaveConfirmPopup.vue";
 import tipPopup from "@/components/popup/tipPopup.vue";
 import { useI18n } from "@/i18n";
 import { base_img_url2 } from "@/api/config";
+import { resolvePairedFarmZone } from "@/utils/selectedFarm";
 import wx from "weixin-js-sdk";
 
 const { t } = useI18n();
@@ -257,8 +258,13 @@ const applyTaskIndex = (index) => {
 };
 
 const fetchInternalInteractTasks = async () => {
+    const { zoneId } = await resolvePairedFarmZone(id.value);
+    if (zoneId == null || zoneId === "") {
+        interactTasks.value = [];
+        return;
+    }
     try {
-        const res = await VE_API.questionnaire.getInternalInteractTasks({ zone_id: id.value });
+        const res = await VE_API.questionnaire.getInternalInteractTasks({ zone_id: zoneId });
         const tasks = res?.data?.interact_tasks;
         interactTasks.value = Array.isArray(tasks) ? tasks : [];
         applyTaskIndex(0);
@@ -270,9 +276,8 @@ const fetchInternalInteractTasks = async () => {
 
 /** status=1 有范围无需勾画;status=0 无范围需要勾画 */
 const fetchZoneRangeStatus = async () => {
-    const farm = getSelectedFarm();
-    const farmId = farm.farm_id ?? farm.id;
-    const zoneId = id.value || farm.zone_id || farm.zoneId;
+    // 路由 zone 必须属于当前农场,禁止 farm_id/zone_id 跨农场错配
+    const { farmId, zoneId } = await resolvePairedFarmZone(id.value);
     if (farmId == null || farmId === "" || zoneId == null || zoneId === "") {
         needDraw.value = true;
         return;
@@ -363,11 +368,16 @@ const handleUploadConfirm = async ({ images, date } = {}) => {
         return;
     }
     const farm = getSelectedFarm();
+    const { farmId, zoneId } = await resolvePairedFarmZone(id.value);
+    if (farmId == null || zoneId == null || zoneId === "") {
+        ElMessage.warning("当前农场与分区不匹配,请返回后重试");
+        return;
+    }
     try {
         const res = await VE_API.questionnaire.uploadImages({
             cloud_url,
-            farm_id: farm.farm_id ?? farm.id ?? "",
-            zone_id: id.value || "",
+            farm_id: farmId,
+            zone_id: zoneId,
             category_code: farm.category_code || "",
             zone_name: farm.variety_name || "",
             create_time: date,

+ 13 - 9
src/views/old_mini/agri_file/pages/soilRootTrack.vue

@@ -7,7 +7,7 @@
             :showClose="false"
             @goback="handleBack"
         />
-        <div class="soil-root-track-body" v-loading="loading" element-loading-background="rgba(15, 15, 15, 0.55)">
+        <div class="soil-root-track-body" v-loading="loading" element-loading-background="rgba(15, 15, 15, 0.55)" element-loading-text="加载中...">
             <div class="soil-root-hero">
                 <div class="soil-root-hero__share" @click="handleShare">
                     <Icon name="share" color="rgba(255,255,255,0.85)" />
@@ -247,6 +247,7 @@ import customHeader from "@/components/customHeader.vue";
 import albumUploadPopup from "../components/albumUploadPopup.vue";
 import tipPopup from "@/components/popup/tipPopup.vue";
 import { useI18n } from "@/i18n";
+import { resolvePairedFarmZone } from "@/utils/selectedFarm";
 import { base_img_url2, base_img_url3 } from "@/api/config";
 import wx from "weixin-js-sdk";
 
@@ -391,8 +392,8 @@ const formatLocalDate = (date) => {
 // 与 data.sections(土壤条件判断:质地/酸碱/墒情/氮磷钾/持水)
 const fetchSoilRootInteract = async () => {
     const farm = getSelectedFarm();
-    const zId = zoneId.value || farm.zone_id || farm.zoneId;
-    if (zId == null || zId === "") {
+    const { farmId, zoneId: zId } = await resolvePairedFarmZone(zoneId.value);
+    if (farmId == null || zId == null || zId === "") {
         interactList.value = [];
         stressInfo.value = {};
         soilSections.value = [];
@@ -400,7 +401,7 @@ const fetchSoilRootInteract = async () => {
     }
     // 提交上下文:confirmAbnormalInteract 需完整参数,取本地农场信息补全
     queryContext.value = {
-        farm_id: farm.farm_id ?? farm.id ?? "",
+        farm_id: farmId,
         zone_id: zId,
         calc_date: formatLocalDate(new Date()),
         crop_type: resolveCropType(farm),
@@ -432,9 +433,7 @@ const fetchSoilRootInteract = async () => {
 
 /** status=1 有范围无需勾画;status=0 无范围需要勾画 */
 const fetchZoneRangeStatus = async () => {
-    const farm = getSelectedFarm();
-    const farmId = farm.farm_id ?? farm.id;
-    const zId = zoneId.value || farm.zone_id || farm.zoneId;
+    const { farmId, zoneId: zId } = await resolvePairedFarmZone(zoneId.value);
     if (farmId == null || farmId === "" || zId == null || zId === "") {
         needDraw.value = true;
         return;
@@ -493,11 +492,16 @@ const handleUploadConfirm = async ({ images, date } = {}) => {
         return;
     }
     const farm = getSelectedFarm();
+    const { farmId, zoneId: pairedZoneId } = await resolvePairedFarmZone(zoneId.value);
+    if (farmId == null || pairedZoneId == null || pairedZoneId === "") {
+        ElMessage.warning("当前农场与分区不匹配,请返回后重试");
+        return;
+    }
     try {
         const res = await VE_API.questionnaire.uploadImages({
             cloud_url,
-            farm_id: farm.farm_id ?? farm.id ?? "",
-            zone_id: zoneId.value || "",
+            farm_id: farmId,
+            zone_id: pairedZoneId,
             category_code: farm.category_code || "",
             zone_name: farm.variety_name || "",
             create_time: date,

+ 3 - 9
src/views/old_mini/growth_report/components/CropAlertPanel.vue

@@ -17,7 +17,7 @@
                             <el-avatar class="crop-avatar" shape="square" :size="42" :src="resolvedCropAvatar" />
                             <div class="crop-detail">
                                 <div class="crop-name">{{ currentCropName }}</div>
-                                <div class="crop-subtitle">花芽分化期</div>
+                                <div class="crop-subtitle">休眠期待完善</div>
                             </div>
                         </div>
                         <div class="switch-wrap">
@@ -418,12 +418,6 @@ const hasFarm = computed(() => {
     return !!resolveFarmId();
 });
 
-/** 保证有zone_id */
-const resolveZoneId = () => {
-    const farm = getSelectedFarm();
-    return farm.zone_id || "";
-};
-
 const formatLocalDate = (date) => {
     const y = date.getFullYear();
     const m = String(date.getMonth() + 1).padStart(2, "0");
@@ -431,11 +425,11 @@ const formatLocalDate = (date) => {
     return `${y}-${m}-${d}`;
 };
 
-/** 用当前选中农场 + 分区 + 当天日期(zone 只信面板选中态,避免缓存滞后) */
+/** 用当前选中农场 + 分区 + 当天日期(zone 只信面板选中态,禁止回退缓存旧 zone) */
 const getQueryParams = () => {
     return {
         farm_id: resolveFarmId(),
-        zone_id: selectedZoneId.value || resolveZoneId(),
+        zone_id: selectedZoneId.value,
         date: formatLocalDate(new Date()),
     };
 };

+ 21 - 16
src/views/old_mini/growth_report/index.vue

@@ -197,22 +197,23 @@ const resolveMapCenterPoint = (farm = getSelectedFarm()) => {
 
 const currentMapPoint = ref(resolveMapCenterPoint());
 
-const getSelectedZoneId = () => {
-    const farm = getSelectedFarm();
-    return farm.zone_id ?? farm.zoneId ?? "";
-};
-
 const syncSelectedFarmId = () => {
-    selectedFarmId.value = String(
+    const next = String(
         localStorage.getItem("selectedFarmId") || getSelectedFarm().farm_id || getSelectedFarm().id || ""
     );
+    // 切农场后旧 panelZoneId 属于上一农场,必须先清掉再等 CropAlertPanel 回传
+    if (next !== selectedFarmId.value) {
+        panelZoneId.value = null;
+    }
+    selectedFarmId.value = next;
 };
 
 /** status=1 有范围;否则展示勾画引导(无农场不展示) */
 async function fetchFarmRangeStatus() {
     const farm = getSelectedFarm();
     const farmId = selectedFarmId.value || farm.farm_id || farm.id;
-    const zoneId = panelZoneId.value ?? getSelectedZoneId();
+    // 只信面板当前分区,禁止回退 selectedFarmData.zone_id(易与 farm_id 错配)
+    const zoneId = panelZoneId.value;
     // 无农场不展示勾画引导
     if (farmId == null || farmId === "") {
         noFarmRange.value = false;
@@ -335,8 +336,13 @@ function buildInteractCards(data = {}, ctx = {}) {
         cards.push({ key, kind: "options", icon, title, options, raw: section, ...ctx });
     };
 
-    // 1. 物候:问题 + 选项
-    pushOptionsCard("pheno", data.pheno, periodIcon);
+    // 1. 物候:问题 + 选项;status 有值(已提交)则不再展示(0/空 视为无值)
+    const phenoStatus = data.pheno?.status;
+    const phenoAnswered =
+        phenoStatus != null && phenoStatus !== "" && Number(phenoStatus) !== 0;
+    if (!phenoAnswered) {
+        pushOptionsCard("pheno", data.pheno, periodIcon);
+    }
 
     // 2. 异常:结论标题 + 描述 + 立即巡园
     if (data.abnormal) {
@@ -390,10 +396,10 @@ function dismissCurrentCard() {
     }
 }
 
-/** 选项即答案:物候/土壤根系提交后切到下一张卡 */
+/** 选项卡(物候/土壤)提交成功后才切下一张 */
 async function submitInteractOption(item) {
     const card = currentCard.value;
-    if (!card || interactSubmitting.value) return;
+    if (!card || card.kind !== "options" || interactSubmitting.value) return;
     selectedOptionId.value = item.id;
     interactSubmitting.value = true;
     try {
@@ -434,7 +440,7 @@ async function handleInteractOptionClick(item) {
     await submitInteractOption(item);
 }
 
-/** 异常卡「立即巡园」→ 异常互动巡园要点页 */
+/** 异常卡「立即巡园」只跳转,不切到下一张(避免直接跳到土壤) */
 const handlePatrolNow = () => {
     const card = currentCard.value;
     if (!card) return;
@@ -445,13 +451,13 @@ const handlePatrolNow = () => {
             ...(card.zoneId !== "" ? { zoneId: card.zoneId } : {}),
         },
     });
-    dismissCurrentCard();
 };
 
 /** 首页巡园要点:getTypesTask 一次返回 pheno / abnormal / soil_root */
 async function fetchInteractTask() {
     const farm = getSelectedFarm();
-    const zoneId = panelZoneId.value ?? getSelectedZoneId();
+    // 与 checkZoneRange 一致:只用面板选中分区,避免缓存旧 zone
+    const zoneId = panelZoneId.value;
     const farmId = selectedFarmId.value || farm.farm_id || farm.id;
     const cropType = resolveCropCode(farm);
     if (
@@ -679,8 +685,7 @@ onActivated(() => {
     const applied = applySelectedLocation();
     if (!applied) syncMapFromSelectedFarm();
     initMap();
-    fetchFarmRangeStatus();
-    fetchInteractTask();
+    // 范围校验 / 互动卡片等 CropAlertPanel 通过 zoneChange 回传后再拉,避免旧 zone 竞态
 });
 </script>
 

+ 60 - 21
src/views/old_mini/work_execute/index.js

@@ -2,8 +2,7 @@ import * as KMap from "@/utils/ol-map/KMap";
 import * as util from "@/common/ol_common.js";
 import config from "@/api/config.js";
 import Style from "ol/style/Style";
-import Photo from "ol-ext/style/Photo";
-import { Icon, Stroke } from "ol/style.js";
+import { Icon } from "ol/style.js";
 import { newPoint } from "@/utils/map";
 
 /** 对齐 albumPanel `.zone-marker__label` 视觉 */
@@ -12,9 +11,40 @@ const LABEL_PAD_X = 10;
 const LABEL_HEIGHT = 26;
 const LABEL_BORDER = 1;
 const LABEL_RADIUS = 25;
-const LABEL_DPR = window.devicePixelRatio || 2;
+/** 标签底边相对点位顶部的间距(CSS px) */
+const LABEL_GAP = 26;
+
+const POINT_ICON_SRC = require("@/assets/img/home/garden-point.png");
+const POINT_SCALE = 0.5;
+/** garden-point.png 原始尺寸;位移按渲染后宽高计算,避免 PC/手机写死像素不一致 */
+const POINT_NATURAL_SIZE = [59, 76];
+
+function getDpr() {
+  const dpr = Number(window.devicePixelRatio) || 1;
+  return dpr > 0 ? dpr : 1;
+}
+
+function getPointRenderSize() {
+  return {
+    width: POINT_NATURAL_SIZE[0] * POINT_SCALE,
+    height: POINT_NATURAL_SIZE[1] * POINT_SCALE,
+  };
+}
+
+/** 标签:底边锚在坐标上,再上移到点位顶部之上 */
+function getLabelDisplacement() {
+  const { height } = getPointRenderSize();
+  return [0, height + LABEL_GAP];
+}
+
+/** 角标:相对针尖偏右上,贴在点位右上角 */
+function getBadgeDisplacement() {
+  const { width, height } = getPointRenderSize();
+  return [width * 0.9, height * 1.2];
+}
 
 function createPillLabel(text) {
+  const dpr = getDpr();
   const canvas = document.createElement("canvas");
   const ctx = canvas.getContext("2d");
   const labelText = text || "";
@@ -26,9 +56,9 @@ function createPillLabel(text) {
   const height = innerH + LABEL_BORDER * 2;
   const radius = Math.min(LABEL_RADIUS, height / 2);
 
-  canvas.width = Math.ceil(width * LABEL_DPR);
-  canvas.height = Math.ceil(height * LABEL_DPR);
-  ctx.scale(LABEL_DPR, LABEL_DPR);
+  canvas.width = Math.ceil(width * dpr);
+  canvas.height = Math.ceil(height * dpr);
+  ctx.scale(dpr, dpr);
   ctx.imageSmoothingEnabled = true;
   ctx.imageSmoothingQuality = "high";
 
@@ -60,19 +90,20 @@ function createPillLabel(text) {
   // 中文字体 middle 基线视觉偏下,略上移
   ctx.fillText(labelText, Math.round(width / 2), Math.round(height / 2) - 1);
 
-  return canvas.toDataURL();
+  return { src: canvas.toDataURL(), dpr };
 }
 
 /** 分区数量角标:金底深字小圆点,叠加在点位右上角 */
 function createCountBadge(count) {
+  const dpr = getDpr();
   const canvas = document.createElement("canvas");
   const ctx = canvas.getContext("2d");
   const radius = 11;
   const pad = 2;
   const size = (radius + pad) * 2;
-  canvas.width = size * LABEL_DPR;
-  canvas.height = size * LABEL_DPR;
-  ctx.scale(LABEL_DPR, LABEL_DPR);
+  canvas.width = Math.ceil(size * dpr);
+  canvas.height = Math.ceil(size * dpr);
+  ctx.scale(dpr, dpr);
   ctx.imageSmoothingEnabled = true;
   ctx.imageSmoothingQuality = "high";
 
@@ -87,7 +118,7 @@ function createCountBadge(count) {
   ctx.textBaseline = "middle";
   ctx.fillText(String(count), radius + pad, radius + pad + 0.5);
 
-  return canvas.toDataURL();
+  return { src: canvas.toDataURL(), dpr };
 }
 
 /**
@@ -104,12 +135,13 @@ class IndexMap {
 
     this.borderStyle = new Style({
       image: new Icon({
-        src: require("@/assets/img/home/garden-point.png"),
-        scale: 0.5,
+        src: POINT_ICON_SRC,
+        scale: POINT_SCALE,
+        // 底边对准坐标,保证针尖落点一致
+        anchor: [0.5, 1],
         onload: function () {
           that.gardenPointLayer.layer.changed();
         },
-        danchor: [0.5,1],
       }),
     });
 
@@ -117,14 +149,20 @@ class IndexMap {
       minZoom: 6,
       maxZoom: 22,
       style: (feature) => {
-        const labelText = this.onlyName ? feature.get("farmName") : ((feature.get("executeDate") + ' ' + feature.get("farmName")) || feature.get("mapInfo") || "");
+        const labelText = this.onlyName
+          ? feature.get("farmName")
+          : ((feature.get("executeDate") + " " + feature.get("farmName")) ||
+              feature.get("mapInfo") ||
+              "");
         if (!this.labelStyleCache[labelText]) {
+          const label = createPillLabel(labelText);
           this.labelStyleCache[labelText] = new Style({
             image: new Icon({
-              src: createPillLabel(labelText),
-              scale: 1 / LABEL_DPR,
+              src: label.src,
+              // canvas 已按 DPR 绘制,缩回 CSS 像素,PC/手机视觉尺寸一致
+              scale: 1 / label.dpr,
               anchor: [0.5, 1],
-              displacement: [0, 36],
+              displacement: getLabelDisplacement(),
             }),
           });
         }
@@ -134,12 +172,13 @@ class IndexMap {
         if (count != null && count !== "" && Number(count) > 0) {
           const badgeKey = `count_${count}`;
           if (!this.countStyleCache[badgeKey]) {
+            const badge = createCountBadge(count);
             this.countStyleCache[badgeKey] = new Style({
               image: new Icon({
-                src: createCountBadge(count),
-                scale: 1 / LABEL_DPR,
+                src: badge.src,
+                scale: 1 / badge.dpr,
                 anchor: [0.5, 0.5],
-                displacement: [24, 22],
+                displacement: getBadgeDisplacement(),
               }),
             });
           }