Explorar el Código

fix: 转发,接口

lxf hace 2 días
padre
commit
c297dbcf73

+ 10 - 1
src/api/modules/pheno.js

@@ -17,5 +17,14 @@ module.exports = {
         url: config.base_new_url + "questionnaire/update_zone_name",
         type: "post",
     },
-
+    // 农事已完成
+    updateTaskFinish: {
+        url: config.base_new_url + "questionnaire/fw_task_finish",
+        type: "post",
+    },
+    // 农事详情查询
+    getTaskDetail: {
+        url: config.base_new_url + "questionnaire/fw_task_detail",
+        type: "get",
+    },
 }

+ 2 - 1
src/api/modules/questionnaire.js

@@ -32,7 +32,8 @@ module.exports = {
         type: "get",
     },
     // 分区农事任务列表:GET /api/questionnaire/zone_fw_task_list
-    // 参数 zone_id + farm_id + crop_type(单次返回近 7 天窗口,data.days 内每日含 fw_tasks/weather_work/abnormal_fw_tasks)
+    // 参数 zone_id + farm_id + crop_type
+    // 返回 data.days[]:每日 tasks[](task_type_code: standard/abnormal/weather)+ 顶层 lat/lng/zone_id
     getZoneFwTaskList: {
         url: config.base_new_url + "questionnaire/zone_fw_task_list",
         type: "get",

BIN
src/assets/img/home/invite-service.png


BIN
src/assets/img/home/invite.png


+ 29 - 15
src/components/allGarden.vue

@@ -112,14 +112,14 @@
         </div>
 
         <div class="invite-bar">
-            <div class="invite-btn secondary-btn" @click="handleInviteFarmer">
-                <img class="invite-btn-icon" src="@/assets/img/home/user-icon.png" alt="">
-                <span>{{ t("garden.inviteFarmer") }}</span>
-            </div>
-            <div class="invite-btn" @click="handleInviteService">
-                <img class="invite-btn-icon" src="@/assets/img/home/user-icon.png" alt="">
+            <div class="invite-btn secondary-btn" @click="handleInvite('service')">
+                <img class="invite-btn-icon" src="@/assets/img/home/invite-service.png" alt="">
                 <span>{{ t("garden.inviteService") }}</span>
             </div>
+            <div class="invite-btn" @click="handleInvite('farmer')">
+                <img class="invite-btn-icon" src="@/assets/img/home/invite.png" alt="">
+                <span>{{ t("garden.inviteFarmer") }}</span>
+            </div>
         </div>
     </div>
 </template>
@@ -134,6 +134,7 @@ import { useI18n } from "@/i18n";
 import customHeader from "@/components/customHeader.vue";
 import IndexMap from "@/views/old_mini/work_execute/index.js";
 import { Icon } from 'vant';
+import wx from "weixin-js-sdk";
 
 const { t } = useI18n();
 const router = useRouter();
@@ -302,12 +303,28 @@ function handleForward() {
     ElMessage.info(t("garden.forwardTip"));
 }
 
-function handleInviteFarmer() {
-    ElMessage.info(t("garden.inviteTip"));
-}
-
-function handleInviteService() {
-    ElMessage.info(t("garden.inviteTip"));
+/** 与 growth_report 一致:跳转小程序分享页邀请完善信息 */
+function handleInvite(type) {
+    const isService = type === "service";
+    let inviteName = "好友";
+    try {
+        const userInfo = JSON.parse(localStorage.getItem("localUserInfo") || "{}");
+        inviteName = userInfo.nickName || userInfo.userName || userInfo.name || inviteName;
+    } catch {
+        // ignore
+    }
+    const inviteType = isService ? "service" : "farmer";
+    const adminId = localStorage.getItem("MINI_USER_ID") || "";
+    const query = {
+        askInfo: { title: "邀请完善信息", content: "是否分享该邀请给好友" },
+        shareText: isService ? "邀请您完善农服信息" : "邀请您完善地块种植信息",
+        targetUrl: `invite_welcome`,
+        paramsPage: JSON.stringify({ inviteName, inviteType, adminId }),
+        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/field.png",
+    };
+    wx.miniProgram.navigateTo({
+        url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,
+    });
 }
 
 watch(filteredFarmList, () => {
@@ -681,9 +698,6 @@ onActivated(() => {
 
     .invite-btn-icon {
         width: 16px;
-        height: 16px;
-        filter: brightness(0) saturate(100%);
-        opacity: 0.85;
     }
 }
 </style>

+ 7 - 5
src/views/old_mini/agri_file/components/patrolPanel.vue

@@ -192,11 +192,9 @@ const mapSectionToPatrol = (section = {}, type, ctx = {}) => {
         section.pheno_name ||
         "";
     const issue =
-        section.highlight ||
         section.interact_theme ||
         section.interaction_theme ||
-        section.interaction_reason ||
-        section.interact_reason ||
+        section.interaction_reason
         "";
     const level = section.level || (isSoil ? "一级" : "");
     const urgencyText =
@@ -453,19 +451,23 @@ const handleShare = (item) => {
     const zoneId = resolveCardZoneId(item);
     let targetUrl;
     let pageName;
+    let coverImg;
     if (type === "soil") {
         targetUrl = "soil_root_track";
         pageName = t("agriFile.patrolSoilTitle");
+        coverImg = "https://birdseye-img.sysuimars.com/farm-h5/growth_cover.png";
     } else if (type === "abnormal") {
         targetUrl = "abnormal_track";
         pageName = t("agriFile.patrolAbnormalTitle");
+        coverImg = "https://birdseye-img.sysuimars.com/farm-h5/abnormal_cover.png";
     } else {
         targetUrl = "growth_track";
         pageName = t("agriFile.patrolGrowthTitle");
+        coverImg = "https://birdseye-img.sysuimars.com/farm-h5/growth_cover.png";
     }
     const query = {
         askInfo: { title: "转发巡园要点", content: "是否分享给好友" },
-        shareText: item?.title || "速长窗口不追肥?后期发育慢人一步,直接掉队!",
+        shareText: item?.issue || "巡园要点",
         targetUrl,
         paramsPage: JSON.stringify({
             id: zoneId,
@@ -473,7 +475,7 @@ const handleShare = (item) => {
             ...(zoneId !== "" ? { zoneId } : {}),
             pageName,
         }),
-        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/field.png",
+        imageUrl: coverImg,
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,

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

@@ -269,16 +269,17 @@ const handleReportClick = (item) => {
 };
 
 const handleShare = (item) => {
+    const shareText = item?.type === 'warning' ? '预警报告已生成,请点击查看吧!' : '胁迫报告已生成,请点击查看吧!';
     const query = {
         askInfo: { title: "转发报告", content: "是否分享给好友" },
-        shareText: item?.title || "报告",
+        shareText,
         targetUrl: "alert_detail",
         paramsPage: JSON.stringify({
-            title: item?.title || "具体预警",
+            title: item?.title || "报告",
             type: item?.type || "warning",
             fromShare: 1,
         }),
-        imageUrl: item?.cover || "https://birdseye-img.sysuimars.com/farm-h5/field.png",
+        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/report_cover.png",
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,

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

@@ -357,7 +357,7 @@ const handleShare = () => {
             fromShare: 1,
             ...(route.query.pageName ? { pageName: route.query.pageName } : {}),
         }),
-        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/field.png",
+        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/abnormal_cover.png",
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,

+ 2 - 2
src/views/old_mini/agri_file/pages/growthTrack.vue

@@ -298,14 +298,14 @@ const fetchZoneRangeStatus = async () => {
 const handleShare = () => {
     const query = {
         askInfo: { title: "转发巡园要点", content: "是否分享给好友" },
-        shareText: reason.value || "速长窗口不追肥?后期发育慢人一步,直接掉队!",
+        shareText: reason.value || "物候跟踪巡园要点",
         targetUrl: "growth_track",
         paramsPage: JSON.stringify({
             id: id.value,
             fromShare: 1,
             ...(route.query.pageName ? { pageName: route.query.pageName } : {}),
         }),
-        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/field.png",
+        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/growth_cover.png",
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,

+ 2 - 2
src/views/old_mini/agri_file/pages/soilRootTrack.vue

@@ -454,7 +454,7 @@ const fetchZoneRangeStatus = async () => {
 const handleShare = () => {
     const query = {
         askInfo: { title: "转发巡园要点", content: "是否分享给好友" },
-        shareText: theme.value || "连阴雨泡根,根系发黑缺氧,赶紧排水护根!",
+        shareText: theme.value || "土壤根系巡园要点",
         targetUrl: "soil_root_track",
         paramsPage: JSON.stringify({
             id: route.query.id,
@@ -462,7 +462,7 @@ const handleShare = () => {
             fromShare: 1,
             ...(route.query.pageName ? { pageName: route.query.pageName } : {}),
         }),
-        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/field.png",
+        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/growth_cover.png",
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,

+ 143 - 58
src/views/old_mini/growth_report/alert_detail.vue

@@ -1,77 +1,88 @@
 <template>
     <div class="alert-detail-page">
-        <custom-header :name="pageTitle" />
+        <custom-header
+            :name="pageTitle"
+            :isClose="isFromShare"
+            :showClose="false"
+        />
         <div class="alert-detail-body" v-loading="loading">
-            <!-- 综合研判 -->
-            <div v-if="analysis.summary || analysis.crop.name" class="analysis-top">
-                <div class="analysis-card">
-                    <div class="analysis-card__content">
-                        <div class="section-card__title">综合研判</div>
-                        <div v-if="analysis.summary" class="section-card__desc">{{ analysis.summary }}</div>
-                    </div>
-                </div>
-                <div v-if="analysis.crop.name || analysis.crop.metrics.length" class="crop-panel">
-                    <div class="crop-panel__content">
-                        <div class="crop-panel__head">
-                            <img class="crop-panel__cover" :src="analysis.crop.cover" alt="" />
-                            <span class="crop-panel__name">{{ analysis.crop.name }}</span>
-                            <span class="crop-panel__tag">当前作物</span>
+            <div class="alert-detail-content">
+                <!-- 综合研判 -->
+                <div v-if="analysis.summary || analysis.crop.name" class="analysis-top">
+                    <div class="analysis-card">
+                        <div class="analysis-card__content">
+                            <div class="section-card__title">综合研判</div>
+                            <div v-if="analysis.summary" class="section-card__desc">{{ analysis.summary }}</div>
                         </div>
-                        <div v-if="analysis.crop.metrics.length" class="crop-panel__list">
-                            <div v-for="item in analysis.crop.metrics" :key="item.label" class="crop-metric">
-                                <img class="crop-metric__icon" :src="item.icon" alt="" />
-                                <div class="crop-metric__content">
-                                    <div class="crop-metric__label">{{ item.label }}</div>
-                                    <div class="crop-metric__value">{{ item.value }}</div>
+                    </div>
+                    <div v-if="analysis.crop.name || analysis.crop.metrics.length" class="crop-panel">
+                        <div class="crop-panel__content">
+                            <div class="crop-panel__head">
+                                <img class="crop-panel__cover" :src="analysis.crop.cover" alt="" />
+                                <span class="crop-panel__name">{{ analysis.crop.name }}</span>
+                                <span class="crop-panel__tag">当前作物</span>
+                            </div>
+                            <div v-if="analysis.crop.metrics.length" class="crop-panel__list">
+                                <div v-for="item in analysis.crop.metrics" :key="item.label" class="crop-metric">
+                                    <img class="crop-metric__icon" :src="item.icon" alt="" />
+                                    <div class="crop-metric__content">
+                                        <div class="crop-metric__label">{{ item.label }}</div>
+                                        <div class="crop-metric__value">{{ item.value }}</div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <!-- 巡园结果与分析 -->
-            <div v-if="patrolResults.length" class="section-card">
-                <div class="section-card__wrap">
-                    <div class="section-card__title">巡园结果与分析</div>
-                    <div class="patrol-list">
-                        <div v-for="item in patrolResults" :key="item.id" class="patrol-item">
-                            <img v-if="item.cover" class="patrol-item__cover" :src="item.cover" alt="" />
-                            <div class="patrol-item__body">
-                                <div class="patrol-item__title">{{ item.title }}</div>
-                                <div class="patrol-item__desc">{{ item.desc }}</div>
+                <!-- 巡园结果与分析 -->
+                <div v-if="patrolResults.length" class="section-card">
+                    <div class="section-card__wrap">
+                        <div class="section-card__title">巡园结果与分析</div>
+                        <div class="patrol-list">
+                            <div v-for="item in patrolResults" :key="item.id" class="patrol-item">
+                                <img v-if="item.cover" class="patrol-item__cover" :src="item.cover" alt="" />
+                                <div class="patrol-item__body">
+                                    <div class="patrol-item__title">{{ item.title }}</div>
+                                    <div class="patrol-item__desc">{{ item.desc }}</div>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <!-- 诊断研判分析 -->
-            <div v-if="diagnosisList.length" class="section-card">
-                <div class="section-card__wrap">
-                    <div class="section-card__title">诊断研判分析</div>
-                    <div class="diag-list">
-                        <div v-for="item in diagnosisList" :key="item.id" class="diag-item">
-                            <span v-if="item.tag" class="diag-item__tag">{{ item.tag }}</span>
-                            <div v-if="item.title" class="diag-item__title">{{ item.title }}</div>
-                            <div v-if="item.desc" class="diag-item__desc">{{ item.desc }}</div>
+                <!-- 诊断研判分析 -->
+                <div v-if="diagnosisList.length" class="section-card">
+                    <div class="section-card__wrap">
+                        <div class="section-card__title">诊断研判分析</div>
+                        <div class="diag-list">
+                            <div v-for="item in diagnosisList" :key="item.id" class="diag-item">
+                                <span v-if="item.tag" class="diag-item__tag">{{ item.tag }}</span>
+                                <div v-if="item.title" class="diag-item__title">{{ item.title }}</div>
+                                <div v-if="item.desc" class="diag-item__desc">{{ item.desc }}</div>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <!-- 农事建议 -->
-            <div v-if="adviceList.length" class="section-card">
-                <div class="section-card__wrap">
-                    <div class="section-card__title">农事建议</div>
-                    <div class="advice-list">
-                        <div v-for="item in adviceList" :key="item.id" class="advice-item">
-                            <div class="advice-item__title">{{ item.title }}</div>
-                            <div class="advice-item__desc">{{ item.desc }}</div>
+                <!-- 农事建议 -->
+                <div v-if="adviceList.length" class="section-card">
+                    <div class="section-card__wrap">
+                        <div class="section-card__title">农事建议</div>
+                        <div class="advice-list">
+                            <div v-for="item in adviceList" :key="item.id" class="advice-item">
+                                <div class="advice-item__title">{{ item.title }}</div>
+                                <div class="advice-item__desc">{{ item.desc }}</div>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
+
+            <!-- 分享 -->
+            <div class="share-btn" @click="handleShare">
+                <div class="share-btn__text">转发报告</div>
+            </div>
         </div>
     </div>
 </template>
@@ -81,6 +92,7 @@ import { computed, onMounted, ref } from "vue";
 import { useRoute } from "vue-router";
 import customHeader from "@/components/customHeader.vue";
 import { resolveCropIcon } from "@/utils/cropIcon";
+import wx from "weixin-js-sdk";
 
 const route = useRoute();
 
@@ -89,6 +101,31 @@ const DETAIL_TYPE = {
     STRESS: "stress",
 };
 
+function isTruthyFlag(value) {
+    return value === 1 || value === "1" || value === true || value === "true";
+}
+
+function parseMaybeJson(value) {
+    if (value == null || value === "") return null;
+    if (typeof value === "object") return value;
+    try {
+        return JSON.parse(value);
+    } catch {
+        return null;
+    }
+}
+
+/** 分享进入:不展示返回箭头 */
+const isFromShare = computed(() => {
+    if (isTruthyFlag(route.query.fromShare)) return true;
+    const paramsPage = parseMaybeJson(route.query.paramsPage);
+    if (isTruthyFlag(paramsPage?.fromShare)) return true;
+    const miniJson = parseMaybeJson(route.query.miniJson);
+    if (isTruthyFlag(miniJson?.fromShare)) return true;
+    if (isTruthyFlag(parseMaybeJson(miniJson?.paramsPage)?.fromShare)) return true;
+    return false;
+});
+
 const phenologyIcon = require("@/assets/img/common/header-icon-3.png");
 const weatherIcon = require("@/assets/img/common/header-icon-1.png");
 const soilIcon = require("@/assets/img/common/header-icon-2.png");
@@ -250,8 +287,8 @@ const fetchDetail = async () => {
             ? VE_API.questionnaire.getWeatherStress
             : VE_API.questionnaire.getWeatherRisk
         : type === DETAIL_TYPE.STRESS
-        ? VE_API.questionnaire.getPointStressReport
-        : VE_API.questionnaire.getPointRiskReport;
+            ? VE_API.questionnaire.getPointStressReport
+            : VE_API.questionnaire.getPointRiskReport;
     const params = farmParams || countyParams;
     if (!params) return;
 
@@ -266,6 +303,26 @@ const fetchDetail = async () => {
     }
 };
 
+/** 转发仍落到本页 alert_detail,带 fromShare 隐藏返回箭头 */
+const handleShare = () => {
+    const type = detailType.value;
+    const shareText = type === 'warning' ? '预警报告已生成,请点击查看吧!' : '胁迫报告已生成,请点击查看吧!';
+    const query = {
+        askInfo: { title: "转发报告", content: "是否分享给好友" },
+        shareText: shareText,
+        targetUrl: "alert_detail",
+        paramsPage: JSON.stringify({
+            title: pageTitle.value || "具体预警",
+            type,
+            fromShare: 1,
+        }),
+        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/report_cover.png",
+    };
+    wx.miniProgram.navigateTo({
+        url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,
+    });
+};
+
 onMounted(() => {
     fetchDetail();
 });
@@ -279,18 +336,28 @@ onMounted(() => {
 }
 
 .alert-detail-body {
-    padding: 24px 12px 24px;
     box-sizing: border-box;
     overflow-y: auto;
-    height: calc(100vh - 40px);
+    height: calc(100vh - 40px - env(safe-area-inset-bottom));
+    display: flex;
+    flex-direction: column;
+
+    .alert-detail-content {
+        flex: 1;
+        padding: 24px 12px 10px;
+        overflow-y: auto;
+    }
+
+    .share-btn {
+        flex-shrink: 0;
+    }
 
     :deep(.el-loading-mask) {
         background-color: rgba(11, 11, 11, 0.7);
     }
 }
 
-.analysis-top {
-}
+.analysis-top {}
 
 .analysis-card {
     padding: 1px;
@@ -566,7 +633,7 @@ onMounted(() => {
     box-sizing: border-box;
     counter-increment: advice-idx;
 
-    & + & {
+    &+& {
         border-top: 1px solid rgba(255, 255, 255, 0.08);
     }
 
@@ -599,4 +666,22 @@ onMounted(() => {
         white-space: pre-line;
     }
 }
+
+.share-btn {
+    padding-top: 6px;
+    border-top: 1px solid rgba(255, 255, 255, 0.06);
+    background: rgba(18, 18, 20, 1);
+
+
+    .share-btn__text {
+        margin: 0 12px calc(22px + env(safe-area-inset-bottom)) 12px;
+        border-radius: 10px;
+        background: linear-gradient(90deg, #FFEBC9 0%, #FFCA6D 100%);
+        width: calc(100% - 24px);
+        height: 44px;
+        color: #000000;
+        line-height: 44px;
+        text-align: center;
+    }
+}
 </style>

+ 227 - 111
src/views/old_mini/work_detail/index.vue

@@ -8,7 +8,7 @@
             :showClose="false"
             @goback="handleBack"
         />
-        <div class="work-detail-content">
+        <div class="work-detail-content" v-loading="detailLoading">
             <!-- 顶部状态:标准 / 气象 / 异常 / 已完成 -->
             <div class="content-status" :class="`is-${statusCardMode}`">
                 <div class="status-tags">
@@ -168,7 +168,7 @@
                 </div>
 
                 <!-- 农资信息:图4,数据先写死 -->
-                <div class="box-wrap stage-card material-card">
+                <!-- <div class="box-wrap stage-card material-card">
                     <div class="work-info">
                         <div class="section-title">
                             <span class="title-bar"></span>
@@ -184,10 +184,10 @@
                             <div class="plan-row__value">{{ materialNotes }}</div>
                         </div>
                     </div>
-                </div>
+                </div> -->
 
                 <!-- 农服信息:图4 -->
-                <div class="box-wrap stage-card service-card">
+                <!-- <div class="box-wrap stage-card service-card">
                     <div class="work-info">
                         <div class="section-title">
                             <span class="title-bar"></span>
@@ -202,7 +202,7 @@
                             <div class="plan-row__value">{{ serviceParams }}</div>
                         </div>
                     </div>
-                </div>
+                </div> -->
             </div>
         </div>
 
@@ -232,15 +232,14 @@ import AgriMaterialTable from "./components/agriMaterialTable.vue";
 import WKT from "ol/format/WKT.js";
 
 // ---------- 常量 ----------
-/** 与 work_execute 列表约定:点击任务写入的缓存 key */
-const FW_TASK_CACHE_KEY = "WORK_EXECUTE_FW_TASK_DETAIL";
 const MANUAL_SCHEME_KEYS = ["人工方案", "人工"];
 const MACHINE_SCHEME_KEYS = ["机械方案", "机械"];
+const COMPLETED_STATUS_CODES = new Set(["finished", "completed", "done"]);
+const COMPLETED_STATUS_RE = /已完成|已执行|已认证|本人完成/;
 
 const route = useRoute();
 const { locale } = useI18n();
 const router = useRouter();
-const statusVal = computed(() => pageParams.value?.statusVal ?? null);
 
 function isTruthyFlag(value) {
     return value === 1 || value === "1" || value === true || value === "true";
@@ -283,20 +282,37 @@ const toQueryNum = (v) => {
     return Number.isNaN(n) ? undefined : n;
 };
 
-/** 列表进入:带 fromZoneList,或旧链路 zone_id + date + 人工/机械 id */
+function getSelectedFarm() {
+    try {
+        return JSON.parse(localStorage.getItem("selectedFarmData") || "{}");
+    } catch {
+        return {};
+    }
+}
+
+function getSelectedFarmId() {
+    const stored = localStorage.getItem("selectedFarmId");
+    if (stored != null && stored !== "") return Number(stored);
+    const farm = getSelectedFarm();
+    const id = farm.farm_id ?? farm.id;
+    return id != null && id !== "" ? Number(id) : null;
+}
+
+/** 列表 / 分享进入:带 farm_id + zone_id + fw_code */
 const isFwTaskMode = computed(() => {
     const p = pageParams.value || {};
-    if (isTruthyFlag(p.fromZoneList)) return true;
-    return hasQueryValue(p.zone_id) && hasQueryValue(p.date) && (hasQueryValue(p.manual_id) || hasQueryValue(p.mechanical_id));
+    return (
+        hasQueryValue(p.fw_code) &&
+        (hasQueryValue(p.zone_id) || hasQueryValue(p.farm_id))
+    );
 });
 
 const fwTaskQuery = computed(() => {
     const p = pageParams.value || {};
     return {
+        farm_id: toQueryNum(p.farm_id) ?? getSelectedFarmId(),
         zone_id: toQueryNum(p.zone_id),
-        date: p.date,
-        manual_id: toQueryNum(p.manual_id),
-        mechanical_id: toQueryNum(p.mechanical_id),
+        fw_code: p.fw_code != null ? String(p.fw_code) : "",
     };
 });
 
@@ -309,8 +325,9 @@ const syncMiniJsonFromRoute = () => {
 
 const miniJson = ref(null);
 const farmData = ref({});
-/** 列表缓存 / 旧详情接口归一后的任务数据 */
+/** getTaskDetail / 旧监控详情归一后的任务数据 */
 const taskDetail = ref(null);
+const detailLoading = ref(false);
 
 const wktFmt = new WKT();
 const MAP_CENTER_FALLBACK = "POINT(113.1093017627431 22.57454083668)";
@@ -343,18 +360,29 @@ function destroyWorkDetailMap() {
     areaMap.destroyMap();
 }
 
+/** 详情接口无经纬度时:优先选中农场点位 */
+function resolveFwMapPoint() {
+    const farm = getSelectedFarm();
+    const candidates = [
+        farm.farm_location,
+        farm.wkt,
+        farm.geom_wkt,
+        localStorage.getItem("selectedFarmPoint"),
+    ];
+    for (const item of candidates) {
+        if (typeof item === "string" && /^POINT\s*\(/i.test(item.trim())) {
+            return item.trim();
+        }
+    }
+    return MAP_CENTER_FALLBACK;
+}
+
 function initWorkDetailMap() {
     nextTick(() => {
         if (!mapContainer.value) return;
         areaMap.destroyMap();
         if (isFwTaskMode.value) {
-            const lat = Number(pageParams.value?.lat);
-            const lng = Number(pageParams.value?.lng);
-            const point =
-                Number.isFinite(lat) && Number.isFinite(lng)
-                    ? `POINT(${lng} ${lat})`
-                    : MAP_CENTER_FALLBACK;
-            areaMap.initMap(point, mapContainer.value);
+            areaMap.initMap(resolveFwMapPoint(), mapContainer.value);
             return;
         }
         const zones = farmZones.value;
@@ -387,14 +415,6 @@ const farmWorkTypeObj = {
     8: "标准调节类",
 };
 
-function readFwTaskCache() {
-    try {
-        return parseMaybeJson(sessionStorage.getItem(FW_TASK_CACHE_KEY));
-    } catch {
-        return null;
-    }
-}
-
 /** 按当前人工/机械方案取文案;字符串直接返回 */
 function pickSchemeText(value, method = "machine") {
     if (value == null || value === "") return "";
@@ -412,66 +432,103 @@ function pickSchemeText(value, method = "machine") {
     return first != null ? String(first) : "";
 }
 
-/** 列表缓存 → 详情页统一结构(兼容旧 manual/mechanical 形态) */
-function normalizeCachedTask(cache) {
-    const raw = cache?.raw;
-    if (!raw || typeof raw !== "object") return null;
-    const meta = cache.meta || {};
-    const statusText = raw.status_text || raw.fw_status || meta.statusText || "";
+function isCompletedDetail(data = {}) {
+    const code = String(data.fw_status_code || "").toLowerCase();
+    if (COMPLETED_STATUS_CODES.has(code)) return true;
+    return COMPLETED_STATUS_RE.test(String(data.fw_status || ""));
+}
+
+/** getTaskDetail → 详情页结构;人工/机械取 data.manual / data.mechanical */
+function normalizeApiDetail(data) {
+    if (!data || typeof data !== "object") return null;
+    const manualRaw = data.manual && typeof data.manual === "object" ? data.manual : null;
+    const mechanicalRaw =
+        data.mechanical && typeof data.mechanical === "object" ? data.mechanical : null;
+    const mapMethod = (raw, method) => {
+        if (!raw) return null;
+        return {
+            ...raw,
+            // 接口无 fw_trigger:用简要说明 / 异常类型兜底
+            fw_trigger:
+                pickSchemeText(raw.fw_trigger, method) ||
+                data.abnormal_type ||
+                pickSchemeText(raw.fw_simple_explain, method) ||
+                "",
+            fw_precrip: pickSchemeText(raw.fw_precrip, method),
+            fw_params: pickSchemeText(raw.fw_params, method),
+            fw_atten: pickSchemeText(raw.fw_atten, method),
+            fw_simple_explain: pickSchemeText(raw.fw_simple_explain, method),
+            materials: raw.materials || raw.agri_materials || data.materials || [],
+        };
+    };
     return {
-        ...raw,
-        fw_status: statusText,
+        ...data,
+        fw_status: data.fw_status || "",
         fw_explain:
-            typeof raw.fw_explain === "string"
-                ? raw.fw_explain
-                : pickSchemeText(raw.fw_explain, "manual") ||
-                  pickSchemeText(raw.fw_explain_simple, "manual") ||
-                  pickSchemeText(raw.fw_simple_explain, "manual"),
-        // 人工 / 机械方案字段按列表结构拆开,供切换 Tab 使用
-        manual: {
-            fw_trigger: pickSchemeText(raw.fw_trigger, "manual") || raw.abnormal_type || "",
-            fw_precrip: pickSchemeText(raw.fw_precrip, "manual"),
-            fw_params: pickSchemeText(raw.fw_params, "manual"),
-            fw_atten: pickSchemeText(raw.fw_atten, "manual"),
-            materials: raw.materials || raw.agri_materials || [],
-        },
-        mechanical: {
-            fw_trigger: pickSchemeText(raw.fw_trigger, "machine") || raw.abnormal_type || "",
-            fw_precrip: pickSchemeText(raw.fw_precrip, "machine"),
-            fw_params: pickSchemeText(raw.fw_params, "machine"),
-            fw_atten: pickSchemeText(raw.fw_atten, "machine"),
-            materials: raw.materials || raw.agri_materials || [],
-        },
-        _displayNameManual: pickSchemeText(raw.fw_name, "manual"),
-        _displayNameMachine: pickSchemeText(raw.fw_name, "machine"),
+            (typeof data.fw_explain === "string" && data.fw_explain) ||
+            data.fw_simple_explain ||
+            "",
+        manual: mapMethod(manualRaw, "manual"),
+        mechanical: mapMethod(mechanicalRaw, "machine"),
+        _displayNameManual: manualRaw?.fw_name || data.fw_name || "",
+        _displayNameMachine: mechanicalRaw?.fw_name || data.fw_name || "",
+        _completed: isCompletedDetail(data),
+        _taskTypeCode: String(data.task_type_code || "").toLowerCase(),
+        _planDate: data.plan_date || data.trigger_date || "",
     };
 }
 
-/** 优先用列表写入的缓存,不再请求 fw_task_details */
-const applyCachedFwTask = () => {
-    const cache = readFwTaskCache();
-    const normalized = normalizeCachedTask(cache);
-    if (!normalized) return false;
-    farmData.value = {};
-    taskDetail.value = normalized;
-    initWorkDetailMap();
-    return true;
+function syncExecuteMethodByDetail(detail) {
+    if (detail?.mechanical) {
+        executeMethod.value = "machine";
+        return;
+    }
+    if (detail?.manual) {
+        executeMethod.value = "manual";
+    }
+}
+
+const fetchFwTaskDetail = async () => {
+    const farmId = fwTaskQuery.value.farm_id;
+    const zoneId = fwTaskQuery.value.zone_id;
+    const fwCode = fwTaskQuery.value.fw_code;
+    if (farmId == null || zoneId == null || zoneId === "" || !fwCode) {
+        farmData.value = {};
+        taskDetail.value = null;
+        initWorkDetailMap();
+        return;
+    }
+    detailLoading.value = true;
+    try {
+        const res = await VE_API.pheno.getTaskDetail({
+            farm_id: farmId,
+            zone_id: zoneId,
+            fw_code: fwCode,
+        });
+        if (res?.code === 200 && res?.data) {
+            const normalized = normalizeApiDetail(res.data);
+            farmData.value = {};
+            taskDetail.value = normalized;
+            syncExecuteMethodByDetail(normalized);
+            initWorkDetailMap();
+            return;
+        }
+        farmData.value = {};
+        taskDetail.value = null;
+        initWorkDetailMap();
+    } catch (e) {
+        console.warn("[work_detail] getTaskDetail failed", e);
+        farmData.value = {};
+        taskDetail.value = null;
+        initWorkDetailMap();
+    } finally {
+        detailLoading.value = false;
+    }
 };
 
 const getDetail = () => {
     if (isFwTaskMode.value) {
-        if (applyCachedFwTask()) return;
-        // 无缓存(如刷新丢 session)时不再打旧详情接口,仅保留 query 基础信息
-        farmData.value = {};
-        taskDetail.value = {
-            fw_name: pageParams.value?.fw_name || "",
-            fw_status: statusVal.value === "pending" ? "待执行" : statusVal.value || "",
-            manual: { fw_trigger: "--" },
-            mechanical: { fw_trigger: "--" },
-            _displayNameManual: pageParams.value?.fw_name || "",
-            _displayNameMachine: pageParams.value?.fw_name || "",
-        };
-        initWorkDetailMap();
+        fetchFwTaskDetail();
         return;
     }
     taskDetail.value = null;
@@ -485,19 +542,55 @@ const getDetail = () => {
     });
 };
 
-const handleComplete = () => {
-    console.log("handleComplete");
+const handleComplete = async () => {
+    if (statusVal.value === "completed" || !isFwTaskMode.value) return;
+    const farmId = fwTaskQuery.value.farm_id;
+    const zoneId = fwTaskQuery.value.zone_id;
+    const fwCode = fwTaskQuery.value.fw_code;
+    const fwType =
+        taskDetail.value?._taskTypeCode ||
+        (showAbnormalTag.value ? "abnormal" : showWeatherTag.value ? "weather" : "standard");
+    const calcDate =
+        taskDetail.value?._planDate ||
+        taskDetail.value?.plan_date ||
+        taskDetail.value?.trigger_date ||
+        "";
+    if (farmId == null || zoneId == null || !fwCode) return;
+    try {
+        const res = await VE_API.pheno.updateTaskFinish({
+            farm_id: farmId,
+            zone_id: zoneId,
+            fw_code: fwCode,
+            calc_date: calcDate,
+            fw_type: fwType,
+        });
+        if (res?.code === 200) {
+            await fetchFwTaskDetail();
+        }
+    } catch (e) {
+        console.warn("[work_detail] updateTaskFinish failed", e);
+    }
 };
 
 watch(locale, () => {
     getDetail();
 });
 
-// 执行方式切换:机械 / 人工
-const methodTabs = [
-    { label: "机械方式", value: "machine" },
-    { label: "人工方式", value: "manual" },
-];
+// 执行方式切换:机械 / 人工(按接口实际返回的方案动态显示)
+const methodTabs = computed(() => {
+    const tabs = [];
+    if (taskDetail.value?.mechanical) {
+        tabs.push({ label: "机械方式", value: "machine" });
+    }
+    if (taskDetail.value?.manual) {
+        tabs.push({ label: "人工方式", value: "manual" });
+    }
+    if (tabs.length) return tabs;
+    return [
+        { label: "机械方式", value: "machine" },
+        { label: "人工方式", value: "manual" },
+    ];
+});
 const executeMethod = ref("machine");
 
 const currentMethodDetail = computed(() => {
@@ -508,13 +601,22 @@ const currentMethodDetail = computed(() => {
 
 const formatTitleDate = (dateStr) => {
     if (!dateStr) return "";
-    return String(dateStr).replace(/^\d{4}-(\d{2})-(\d{2})$/, "$1/$2");
+    const text = String(dateStr).trim();
+    const dayPart = text.includes(" ") ? text.split(" ")[0] : text;
+    return dayPart.replace(/^\d{4}-(\d{2})-(\d{2})$/, "$1/$2");
 };
 
 const displayDate = computed(() => {
-    if (pageParams.value?.date) return formatTitleDate(pageParams.value.date);
+    const fromDetail =
+        taskDetail.value?._planDate ||
+        taskDetail.value?.plan_date ||
+        taskDetail.value?.trigger_date ||
+        "";
+    if (fromDetail) return formatTitleDate(fromDetail);
+    // 接口无日期时写死
     return "08/18";
 });
+
 const displayName = computed(() => {
     const data = taskDetail.value;
     if (data) {
@@ -523,13 +625,13 @@ const displayName = computed(() => {
         if (byMethod) return byMethod;
         if (typeof data.fw_name === "string" && data.fw_name) return data.fw_name;
     }
-    return pageParams.value?.fw_name || farmData.value?.work_name || "";
+    return farmData.value?.work_name || "农事名称";
 });
 
-/** 顶部剩余天数:接口未接好前写死 */
+/** 顶部剩余天数:接口未返回,写死 */
 const remainingDays = 3;
 
-/** 农情研判底部指标:接口未接好前写死 */
+/** 农情研判底部指标:接口未返回,写死 */
 const analysisStats = [
     { value: "60", unit: "%", label: "系统估算抽梢率", highlight: false },
     { value: "5", unit: "天", label: "比去年慢", highlight: true },
@@ -542,14 +644,17 @@ const MOCK_EXPLAIN =
 const displayExplain = computed(
     () =>
         taskDetail.value?.fw_explain ||
+        taskDetail.value?.fw_simple_explain ||
         farmData.value?.interaction_reason ||
         MOCK_EXPLAIN
 );
 
+/** 种植方案「农情研判」行:接口无 fw_trigger,用简要说明 / 异常类型 */
 const displayPlanAnalysis = computed(
     () =>
         currentMethodDetail.value?.fw_trigger ||
-        currentMethodDetail.value?.trigger_cond ||
+        currentMethodDetail.value?.fw_simple_explain ||
+        taskDetail.value?.abnormal_type ||
         displayExplain.value ||
         "触发条件触发条件触发条件触发条件触发条件触发条件"
 );
@@ -580,13 +685,14 @@ const displayAreaCode = computed(() => {
     return "ws0gefwg9tdn";
 });
 
-/** 农资表格:先写死,对齐设计稿 */
+/** 农资表格:接口未返回 materials,写死 */
 const materialRows = computed(() => [
     { id: "mock-1", effect: "促梢", name: "高钾复合肥 15-5-25", brand: "金正大", dosage: "8kg" },
     { id: "mock-2", effect: "生根", name: "腐植酸水溶肥", brand: "芭田", dosage: "2kg" },
     { id: "mock-3", effect: "补微", name: "螯合硼锌", brand: "撒可富", dosage: "50g" },
 ]);
 
+/** 农资执行参数:接口无独立字段,暂复用方案参数;无则写死 */
 const materialUsage = computed(
     () =>
         currentMethodDetail.value?.usage_method ||
@@ -595,6 +701,7 @@ const materialUsage = computed(
         "执行参数执行参数执行参数执行参数执行参数执行参数执行参数执行参数执行参数执行参数"
 );
 
+/** 农资注意事项:接口无独立字段,暂复用方案注意事项;无则写死 */
 const materialNotes = computed(
     () =>
         currentMethodDetail.value?.material_atten ||
@@ -603,26 +710,39 @@ const materialNotes = computed(
         "注意事项注意事项注意事项注意事项注意事项注意事项注意事项注意事项注意事项"
 );
 
-/** 农服信息:先写死 */
+/** 农服信息:接口未返回,写死 */
 const serviceMethod = "具体方式";
 const serviceParams = "参数";
 
+const taskTypeCode = computed(() => taskDetail.value?._taskTypeCode || "");
+
 /** 异常类农事 */
 const isAbnormalWork = computed(() => {
+    if (taskTypeCode.value === "abnormal") return true;
     if (Number(farmData.value?.farm_work_type) === 5) return true;
     return isTruthyFlag(pageParams.value?.isAbnormal);
 });
 
 /** 标题旁类型标签 */
-const showWeatherTag = computed(() => isTruthyFlag(pageParams.value?.isWeather));
+const showWeatherTag = computed(
+    () => taskTypeCode.value === "weather" || isTruthyFlag(pageParams.value?.isWeather)
+);
 const showAbnormalTag = computed(() => isAbnormalWork.value);
-const showHighRiskTag = computed(() => isTruthyFlag(pageParams.value?.isHighRisk));
+/** 高风险:接口未返回,写死为 false */
+const showHighRiskTag = computed(() => false);
 const showNormalTag = computed(() => {
+    if (taskTypeCode.value === "standard") return true;
     if (isTruthyFlag(pageParams.value?.isNormal)) return true;
     if (showWeatherTag.value || showAbnormalTag.value) return false;
     return isFwTaskMode.value;
 });
 
+const statusVal = computed(() => {
+    if (taskDetail.value?._completed) return "completed";
+    if (isCompletedDetail(taskDetail.value || {})) return "completed";
+    return "pending";
+});
+
 /**
  * 顶部状态卡形态:
  * completed / weather(建议执行)/ abnormal(去巡园)/ pending(待执行)
@@ -637,7 +757,7 @@ const statusCardMode = computed(() => {
 /** 标准类待执行文案 */
 const displayStatusText = computed(() => {
     if (isFwTaskMode.value) {
-        return taskDetail.value?.fw_status || (statusVal.value === "pending" ? "待执行" : statusVal.value) || "待执行";
+        return taskDetail.value?.fw_status || "待执行";
     }
     return farmWorkTypeObj[farmData.value?.farm_work_type] || "待执行";
 });
@@ -668,23 +788,19 @@ const handleBack = () => {
 
 const handleShare = () => {
     const workName = displayName.value || farmData.value?.work_name || "农事详情";
+    const done = statusVal.value === "completed";
     const query = {
         askInfo: { title: "转发农事", content: "是否分享给好友" },
-        shareText: `${workName}  已触发,请在最佳农时内及时执行`,
+        shareText: done
+            ? `${workName}  已完成,请点击查看吧!`
+            : `${workName}  已触发,请在最佳农时内及时执行`,
         targetUrl: "work_detail",
         paramsPage: JSON.stringify(
             isFwTaskMode.value
                 ? {
-                    ...fwTaskQuery.value,
-                    statusVal: statusVal.value,
-                    lat: pageParams.value?.lat,
-                    lng: pageParams.value?.lng,
-                    fw_name: displayName.value,
-                    isNormal: pageParams.value?.isNormal,
-                    isAbnormal: pageParams.value?.isAbnormal,
-                    isWeather: pageParams.value?.isWeather,
-                    isHighRisk: pageParams.value?.isHighRisk,
-                    fromZoneList: 1,
+                    farm_id: fwTaskQuery.value.farm_id,
+                    zone_id: fwTaskQuery.value.zone_id,
+                    fw_code: fwTaskQuery.value.fw_code,
                     fromShare: 1,
                 }
                 : {
@@ -692,7 +808,7 @@ const handleShare = () => {
                     fromShare: 1,
                 }
         ),
-        imageUrl: "https://birdseye-img.sysuimars.com/birdseye-look-mini/work_img.png",
+        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/work_cover.png",
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,

+ 15 - 14
src/views/old_mini/work_execute/components/calendar.vue

@@ -15,10 +15,9 @@
                 <div class="day-box">
                     <span class="days-week">{{ day.isToday ? "今" : day.dayOfWeek }}</span>
                     <span class="days-one">{{ day.day }}</span>
-                    <span v-if="day.typeName?.lengthVal" class="day-dot" />
+                    <span v-if="day.typeName?.pendingCount" class="type-num">{{ day.typeName.pendingCount }}</span>
                 </div>
                 <div v-if="day.solarTerm" class="solar-term">{{ day.solarTerm }}</div>
-                <div v-if="day.typeName?.lengthVal" class="type-num">{{ day.typeName.lengthVal }}</div>
             </div>
         </div>
     </div>
@@ -80,7 +79,7 @@ const calendarDays = computed(() => {
     return daysList;
 });
 
-// 根据日期获取农事数据(优先用 executeDateFull,兼容旧字段)
+/** 当天农事:角标只统计待完成(pending)数量 */
 function getTaskByDate(dateStr) {
     if (!taskListData.value || taskListData.value.length === 0) {
         return null;
@@ -96,10 +95,13 @@ function getTaskByDate(dateStr) {
         return null;
     }
 
-    // 日历外侧默认展示人工农事名称
+    const pendingCount = matchedTasks.filter((task) => task.status !== "completed").length;
+    if (pendingCount <= 0) return null;
+
     const farmWorkName = matchedTasks[0]?.farmName || matchedTasks[0]?.title || "";
     return {
-        lengthVal: matchedTasks.length,
+        pendingCount,
+        lengthVal: pendingCount,
         farmWorkName,
     };
 }
@@ -327,13 +329,12 @@ defineExpose({
             color: rgba(255, 255, 255, 1);
         }
 
-        .day-dot {
+        .day-pending {
             display: block;
-            width: 4px;
-            height: 4px;
             margin: 2px auto 0;
-            border-radius: 50%;
-            background: rgba(255, 255, 255, 0.5);
+            font-size: 10px;
+            line-height: 12px;
+            color: rgba(255, 255, 255, 0.55);
         }
 
         .solar-term {
@@ -369,8 +370,8 @@ defineExpose({
                 color: #ffd489;
             }
 
-            .day-dot {
-                background: #ffd489;
+            .day-pending {
+                color: #ffd489;
             }
         }
 
@@ -383,8 +384,8 @@ defineExpose({
                 color: #ffd489;
             }
 
-            .day-dot {
-                background: #ffd489;
+            .day-pending {
+                color: #ffd489;
             }
         }
     }

+ 20 - 12
src/views/old_mini/work_execute/index.js

@@ -11,8 +11,8 @@ const LABEL_PAD_X = 10;
 const LABEL_HEIGHT = 26;
 const LABEL_BORDER = 1;
 const LABEL_RADIUS = 25;
-/** 标签底边相对点位顶部的间距(CSS px) */
-const LABEL_GAP = 26;
+/** 标签底边相对点位顶部的间距(CSS px);保持紧凑,整组视觉上下居中 */
+const LABEL_GAP = 10;
 
 const POINT_ICON_SRC = require("@/assets/img/home/garden-point.png");
 const POINT_SCALE = 0.5;
@@ -31,16 +31,24 @@ function getPointRenderSize() {
   };
 }
 
-/** 标签:底边锚在坐标上,再上移到点位顶部之上 */
-function getLabelDisplacement() {
+/**
+ * OL6 Icon.displacement 与「未缩放图片像素」同坐标系(getAnchor 里直接加减),
+ * Canvas 按 dpr 绘制后再 scale:1/dpr 时,位移也必须乘 dpr,否则手机上偏移被缩小、文字压住点位。
+ */
+function getLabelDisplacement(dpr = 1, onlyName) {
   const { height } = getPointRenderSize();
-  return [0, height + LABEL_GAP];
+  // const that = this;
+  // const onlyName = that.onlyName;
+  if (onlyName) {
+    return [0, (height - 16) * dpr];
+  }
+  return [0, (height - LABEL_GAP) * dpr];
 }
 
-/** 角标:相对针尖偏右上,贴在点位右上角 */
-function getBadgeDisplacement() {
+/** 角标:贴在点位右上肩部,避免整体视觉偏高 */
+function getBadgeDisplacement(dpr = 1) {
   const { width, height } = getPointRenderSize();
-  return [width * 0.9, height * 1.2];
+  return [width * 0.6 * dpr, height * 0.4 * dpr];
 }
 
 function createPillLabel(text) {
@@ -138,7 +146,7 @@ class IndexMap {
         src: POINT_ICON_SRC,
         scale: POINT_SCALE,
         // 底边对准坐标,保证针尖落点一致
-        anchor: [0.5, 1],
+        // anchor: [0.5, 1],
         onload: function () {
           that.gardenPointLayer.layer.changed();
         },
@@ -159,10 +167,10 @@ class IndexMap {
           this.labelStyleCache[labelText] = new Style({
             image: new Icon({
               src: label.src,
-              // canvas 已按 DPR 绘制,缩回 CSS 像素,PC/手机视觉尺寸一致
+              // canvas 已按 DPR 绘制,缩回 CSS 像素;位移同步乘 dpr
               scale: 1 / label.dpr,
               anchor: [0.5, 1],
-              displacement: getLabelDisplacement(),
+              displacement: getLabelDisplacement(label.dpr, this.onlyName),
             }),
           });
         }
@@ -178,7 +186,7 @@ class IndexMap {
                 src: badge.src,
                 scale: 1 / badge.dpr,
                 anchor: [0.5, 0.5],
-                displacement: getBadgeDisplacement(),
+                displacement: getBadgeDisplacement(badge.dpr),
               }),
             });
           }

+ 132 - 84
src/views/old_mini/work_execute/index.vue

@@ -92,7 +92,11 @@
                                     <Icon size="14" color="rgba(255, 255, 255, 0.6)" name="share" />
                                     派发工人
                                 </div>
-                                <div class="card-btn card-btn--primary" @click.stop="handleViewDetail(item)">
+                                <div
+                                    class="card-btn card-btn--primary"
+                                    :class="{ disabled: completeSubmittingId === item.id }"
+                                    @click.stop="handleMarkComplete(item)"
+                                >
                                     <img src="@/assets/img/farm/shield.png" alt="我已完成" class="complete-icon">
                                     我已完成
                                 </div>
@@ -119,6 +123,7 @@
 import { computed, nextTick, onActivated, onDeactivated, onMounted, ref } from "vue";
 import { useStore } from "vuex";
 import { useRouter } from "vue-router";
+import { ElMessage } from "element-plus";
 import IndexMap from "./index";
 import customCalendar from "./components/calendar.vue";
 import farmHeader from "@/components/farmHeader.vue";
@@ -133,17 +138,17 @@ import { Icon } from 'vant';
 
 
 // ---------- 常量 ----------
-/** 任务类型:fw_tasks 标准农事 / weather_work 气象农事 / abnormal_fw_tasks 异常农事 */
+/** 任务类型:对应接口 task_type_code */
 const TASK_KIND = {
     NORMAL: "normal",
     WEATHER: "weather",
     ABNORMAL: "abnormal",
 };
-/** 方案文案优先取人工,接口里标准任务是字符串,气象/异常是按方案拆开的对象 */
+/** 方案文案优先取人工;标准/异常字段可能是「人工」「人工方案」 */
 const SCHEME_TEXT_KEYS = ["人工方案", "机械方案", "人工", "机械"];
 /** 列表进详情:整条任务缓存,详情页不再打 fw_task_details */
-const FW_TASK_CACHE_KEY = "WORK_EXECUTE_FW_TASK_DETAIL";
 const COMPLETED_STATUS_RE = /已完成|已执行|已认证|本人完成/;
+const COMPLETED_STATUS_CODES = new Set(["finished", "completed", "done"]);
 
 const { t } = useI18n();
 const store = useStore();
@@ -214,6 +219,8 @@ const zoneList = ref([]);
 const activeZoneId = ref(null);
 /** 按紧急程度:高风险优先 */
 const sortByUrgency = ref(false);
+/** 正在提交「我已完成」的卡片 id,防重复点击 */
+const completeSubmittingId = ref(null);
 
 // ---------- 计算属性 ----------
 const dayTaskList = computed(() =>
@@ -282,7 +289,24 @@ async function fetchZoneList() {
     }
 }
 
-const isCompletedStatus = (status) => COMPLETED_STATUS_RE.test(String(status || ""));
+/** 完成态:优先 fw_status_code,其次中文 fw_status */
+const isCompletedTask = (task = {}) => {
+    const code = String(task.fw_status_code || "").toLowerCase();
+    if (COMPLETED_STATUS_CODES.has(code)) return true;
+    return COMPLETED_STATUS_RE.test(String(task.fw_status || task.status_text || ""));
+};
+
+/** task_type_code → 卡片类型;兼容中文 task_type */
+const resolveTaskKind = (task = {}) => {
+    const code = String(task.task_type_code || "").toLowerCase();
+    if (code === "abnormal" || code.includes("abnormal")) return TASK_KIND.ABNORMAL;
+    if (code === "weather" || code.includes("weather")) return TASK_KIND.WEATHER;
+    if (code === "standard" || code === "normal" || code === "fw") return TASK_KIND.NORMAL;
+    const type = String(task.task_type || "");
+    if (type.includes("异常")) return TASK_KIND.ABNORMAL;
+    if (type.includes("气象")) return TASK_KIND.WEATHER;
+    return TASK_KIND.NORMAL;
+};
 
 const formatExecuteDate = (dateStr) => {
     if (!dateStr) return "";
@@ -307,28 +331,38 @@ const pickSchemeText = (value) => {
     return first != null ? String(first) : "";
 };
 
-/** 单条任务映射为卡片;kind 区分标准 / 气象 / 异常 */
+/** 单条 tasks[] → 卡片;kind 由 task_type_code 解析 */
 const mapTaskItem = (task, index, { dateStr, lat, lng, zoneId, kind }) => {
     const executeDateFull = task.date || dateStr;
-    const isWeather = kind === TASK_KIND.WEATHER;
-    const isAbnormal = kind === TASK_KIND.ABNORMAL;
+    const resolvedKind = kind || resolveTaskKind(task);
+    const isWeather = resolvedKind === TASK_KIND.WEATHER;
+    const isAbnormal = resolvedKind === TASK_KIND.ABNORMAL;
     const statusText = pickSchemeText(task.fw_status || task.status_text);
-    const completed = isCompletedStatus(statusText);
+    const completed = isCompletedTask(task);
     const prefix = isAbnormal ? "abnormal" : isWeather ? "weather" : "fw";
     const title = pickSchemeText(task.fw_name);
     const trigger = pickSchemeText(task.fw_trigger) || (isAbnormal ? task.abnormal_type || "" : "");
+    const uid =
+        task.task_id ??
+        task.manual_id ??
+        task.mechanical_id ??
+        pickSchemeText(task.fw_code) ??
+        index;
+    const fwType =
+        String(task.task_type_code || "").toLowerCase() ||
+        (isAbnormal ? "abnormal" : isWeather ? "weather" : "standard");
     return {
-        id: `${prefix}_${task.manual_id || task.mechanical_id || pickSchemeText(task.fw_code) || index}_${executeDateFull}_${index}`,
+        id: `${prefix}_${uid}_${executeDateFull}_${task.seq ?? index}`,
         status: completed ? "completed" : "pending",
         title,
         isHighRisk: false,
-        isNormal: kind === TASK_KIND.NORMAL,
+        isNormal: resolvedKind === TASK_KIND.NORMAL,
         isAbnormal,
         isWeather,
         cornerTip: statusText || (completed ? "已完成" : "待执行"),
         analysisSummary:
-            pickSchemeText(task.fw_explain_simple) ||
             pickSchemeText(task.fw_simple_explain) ||
+            pickSchemeText(task.fw_explain_simple) ||
             pickSchemeText(task.fw_explain),
         fw_trigger: trigger,
         areaCode: zoneId ? `分区 ${zoneId}` : "",
@@ -336,8 +370,11 @@ const mapTaskItem = (task, index, { dateStr, lat, lng, zoneId, kind }) => {
         executeDate: formatExecuteDate(executeDateFull),
         executeDateFull,
         zoneId,
+        taskId: task.task_id,
         manualId: task.manual_id,
         mechanicalId: task.mechanical_id,
+        fwCode: pickSchemeText(task.fw_code),
+        fwType,
         latitude: lat,
         longitude: lng,
         wkt: buildPointWkt(lng, lat, index),
@@ -346,31 +383,30 @@ const mapTaskItem = (task, index, { dateStr, lat, lng, zoneId, kind }) => {
     };
 };
 
-/** 合并三类农事;无单条日期时归到本次请求日 */
-const mapZoneTaskList = (data, requestDate) => {
-    const dateStr = requestDate || resolveRangeStart(data);
-    const lat = data.latitude ?? 22.970229;
-    const lng = data.longitude ?? 113.746646;
-    const zoneId = data.zone_id ?? getSelectedZoneId();
-    const ctx = { dateStr, lat, lng, zoneId };
-    const mapList = (raw, kind, offset) =>
-        (Array.isArray(raw) ? raw : [])
-            .filter(Boolean)
-            .map((task, index) => mapTaskItem(task, offset + index, { ...ctx, kind }));
-    const normalList = mapList(data.fw_tasks, TASK_KIND.NORMAL, 0);
-    const weatherList = mapList(data.weather_work, TASK_KIND.WEATHER, normalList.length);
-    const abnormalList = mapList(
-        data.abnormal_fw_tasks,
-        TASK_KIND.ABNORMAL,
-        normalList.length + weatherList.length
-    );
-    return { list: [...abnormalList, ...normalList, ...weatherList,], lat, lng, dateStr, zoneId };
-};
+/**
+ * 映射单日数据:新结构 day.tasks[];
+ * 兼容旧结构 fw_tasks / weather_work / abnormal_fw_tasks
+ */
+const mapDayTasks = (day, ctx = {}) => {
+    const dateStr = day?.date || ctx.dateStr || getTodayDate();
+    const baseCtx = {
+        dateStr,
+        lat: ctx.lat,
+        lng: ctx.lng,
+        zoneId: ctx.zoneId,
+    };
 
-const resolveRangeStart = (data) => {
-    if (data?.start_date) return data.start_date;
-    if (data?.date) return data.date;
-    return getTodayDate();
+    if (Array.isArray(day?.tasks)) {
+        const list = day.tasks
+            .filter(Boolean)
+            .map((task, index) =>
+                mapTaskItem(task, index, {
+                    ...baseCtx,
+                    kind: resolveTaskKind(task),
+                })
+            );
+        return { list, dateStr };
+    }
 };
 
 // ---------- 业务逻辑 ----------
@@ -453,24 +489,29 @@ const getMapMarkerList = () => {
 };
 
 /**
- * 单次请求接口(近 7 天窗口),遍历 data.days 合并全部农事卡片。
- * 切换日期只本地过滤列表,地图仍用完整 7 天点位。
+ * 单次请求近 7 天窗口:遍历 data.days[].tasks 合并卡片。
+ * 切换日期只本地过滤;地图用完整 7 天点位;经纬度取顶层 data.latitude/longitude。
  */
 const fetchZoneFwTaskList = async () => {
     try {
         const res = await VE_API.questionnaire.getZoneFwTaskList(resolveQueryParams());
         const data = res?.data || null;
-        const days = data && Array.isArray(data.days) ? data.days : [];
+        const days = Array.isArray(data?.days) ? data.days : [];
+        const lat = data?.latitude ?? null;
+        const lng = data?.longitude ?? null;
+        const zoneId = data?.zone_id ?? getSelectedZoneId();
+        const ctx = {
+            lat,
+            lng,
+            zoneId,
+            dateStr: data?.start_date || getTodayDate(),
+        };
         const merged = [];
         const seen = new Set();
-        let lat = null;
-        let lng = null;
         for (const day of days) {
             if (!day) continue;
-            const mapped = mapZoneTaskList(day, day.date || data.start_date);
-            if (lat == null && mapped.lat != null) lat = mapped.lat;
-            if (lng == null && mapped.lng != null) lng = mapped.lng;
-            for (const item of mapped.list) {
+            const { list } = mapDayTasks(day, ctx);
+            for (const item of list) {
                 if (seen.has(item.id)) continue;
                 seen.add(item.id);
                 merged.push(item);
@@ -519,70 +560,77 @@ const handleDateSelect = (date) => {
 };
 
 const handleForward = (item) => {
+    const doneStatus = item?.status === "completed";
     const workName = item?.title || item?.farmName || "农事详情";
     const query = {
         askInfo: { title: "转发农事", content: "是否分享给好友" },
-        shareText: `${workName}  已触发,请在最佳农时内及时执行`,
+        shareText: doneStatus
+            ? `${workName}  已完成,请点击查看吧!`
+            : `${workName}  已触发,请在最佳农时内及时执行`,
         targetUrl: "work_detail",
         paramsPage: JSON.stringify({
             ...buildFwTaskQuery(item),
             fromShare: 1,
         }),
-        imageUrl: "https://birdseye-img.sysuimars.com/birdseye-look-mini/work_img.png",
+        imageUrl: "https://birdseye-img.sysuimars.com/farm-h5/work_cover.png",
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,
     });
 };
 
+/** 详情页仅靠这三个参数调 getTaskDetail,不再透传整包列表数据 */
 const buildFwTaskQuery = (item) => ({
+    farm_id: getSelectedFarmId(),
     zone_id: item?.zoneId ?? getSelectedZoneId(),
-    date: item?.executeDateFull || getTodayDate(),
-    manual_id: item?.manualId,
-    mechanical_id: item?.mechanicalId,
-    statusVal: item?.status,
-    lat: item?.latitude,
-    lng: item?.longitude,
-    fw_name: item?.title || item?.farmName || "",
-    isNormal: item?.isNormal ? 1 : 0,
-    isAbnormal: item?.isAbnormal ? 1 : 0,
-    isWeather: item?.isWeather ? 1 : 0,
-    isHighRisk: item?.isHighRisk ? 1 : 0,
-    fromZoneList: 1,
+    fw_code: item?.fwCode || pickSchemeText(item?.rawTask?.fw_code) || "",
 });
 
-/** 写入详情页缓存:原始接口字段 + 列表侧元信息 */
-const saveFwTaskCache = (item) => {
-    if (!item?.rawTask) return;
-    sessionStorage.setItem(
-        FW_TASK_CACHE_KEY,
-        JSON.stringify({
-            raw: item.rawTask,
-            meta: {
-                zone_id: item.zoneId ?? getSelectedZoneId(),
-                date: item.executeDateFull || getTodayDate(),
-                lat: item.latitude,
-                lng: item.longitude,
-                statusVal: item.status,
-                statusText: item.cornerTip || "",
-                fw_name: item.title || item.farmName || "",
-                isNormal: item.isNormal ? 1 : 0,
-                isAbnormal: item.isAbnormal ? 1 : 0,
-                isWeather: item.isWeather ? 1 : 0,
-                isHighRisk: item.isHighRisk ? 1 : 0,
-            },
-        })
-    );
-};
-
 const handleViewDetail = (item) => {
-    saveFwTaskCache(item);
     router.push({
         path: "/work_detail",
         query: buildFwTaskQuery(item),
     });
 };
 
+/** 「我已完成」:调用 fw_task_finish,成功后刷新列表 */
+const handleMarkComplete = async (item) => {
+    if (!item || item.status === "completed" || completeSubmittingId.value) return;
+    const farmId = getSelectedFarmId();
+    const zoneId = item.zoneId ?? getSelectedZoneId();
+    const fwCode = item.fwCode || pickSchemeText(item.rawTask?.fw_code);
+    const calcDate = item.executeDateFull || getTodayDate();
+    const fwType =
+        item.fwType ||
+        String(item.rawTask?.task_type_code || "").toLowerCase() ||
+        (item.isAbnormal ? "abnormal" : item.isWeather ? "weather" : "standard");
+    if (farmId == null || zoneId == null || zoneId === "" || !fwCode) {
+        ElMessage.warning("任务信息不完整,无法完成");
+        return;
+    }
+    completeSubmittingId.value = item.id;
+    try {
+        const res = await VE_API.pheno.updateTaskFinish({
+            farm_id: farmId,
+            zone_id: zoneId,
+            fw_code: fwCode,
+            calc_date: calcDate,
+            fw_type: fwType,
+        });
+        if (res?.code === 200) {
+            ElMessage.success(res?.msg || "操作成功");
+            await fetchZoneFwTaskList();
+            return;
+        }
+        ElMessage.error(res?.msg || "提交失败,请稍后再试");
+    } catch (e) {
+        console.warn("[work_execute] updateTaskFinish failed", e);
+        ElMessage.error("提交失败,请稍后再试");
+    } finally {
+        completeSubmittingId.value = null;
+    }
+};
+
 const goCompleteFarmInfo = () => {
     router.push("/entry_information");
 };