|
@@ -8,7 +8,7 @@
|
|
|
:showClose="false"
|
|
:showClose="false"
|
|
|
@goback="handleBack"
|
|
@goback="handleBack"
|
|
|
/>
|
|
/>
|
|
|
- <div class="work-detail-content">
|
|
|
|
|
|
|
+ <div class="work-detail-content" v-loading="detailLoading">
|
|
|
<!-- 顶部状态:标准 / 气象 / 异常 / 已完成 -->
|
|
<!-- 顶部状态:标准 / 气象 / 异常 / 已完成 -->
|
|
|
<div class="content-status" :class="`is-${statusCardMode}`">
|
|
<div class="content-status" :class="`is-${statusCardMode}`">
|
|
|
<div class="status-tags">
|
|
<div class="status-tags">
|
|
@@ -168,7 +168,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<!-- 农资信息:图4,数据先写死 -->
|
|
<!-- 农资信息:图4,数据先写死 -->
|
|
|
- <div class="box-wrap stage-card material-card">
|
|
|
|
|
|
|
+ <!-- <div class="box-wrap stage-card material-card">
|
|
|
<div class="work-info">
|
|
<div class="work-info">
|
|
|
<div class="section-title">
|
|
<div class="section-title">
|
|
|
<span class="title-bar"></span>
|
|
<span class="title-bar"></span>
|
|
@@ -184,10 +184,10 @@
|
|
|
<div class="plan-row__value">{{ materialNotes }}</div>
|
|
<div class="plan-row__value">{{ materialNotes }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div> -->
|
|
|
|
|
|
|
|
<!-- 农服信息:图4 -->
|
|
<!-- 农服信息:图4 -->
|
|
|
- <div class="box-wrap stage-card service-card">
|
|
|
|
|
|
|
+ <!-- <div class="box-wrap stage-card service-card">
|
|
|
<div class="work-info">
|
|
<div class="work-info">
|
|
|
<div class="section-title">
|
|
<div class="section-title">
|
|
|
<span class="title-bar"></span>
|
|
<span class="title-bar"></span>
|
|
@@ -202,7 +202,7 @@
|
|
|
<div class="plan-row__value">{{ serviceParams }}</div>
|
|
<div class="plan-row__value">{{ serviceParams }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div> -->
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
@@ -232,15 +232,14 @@ import AgriMaterialTable from "./components/agriMaterialTable.vue";
|
|
|
import WKT from "ol/format/WKT.js";
|
|
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 MANUAL_SCHEME_KEYS = ["人工方案", "人工"];
|
|
|
const MACHINE_SCHEME_KEYS = ["机械方案", "机械"];
|
|
const MACHINE_SCHEME_KEYS = ["机械方案", "机械"];
|
|
|
|
|
+const COMPLETED_STATUS_CODES = new Set(["finished", "completed", "done"]);
|
|
|
|
|
+const COMPLETED_STATUS_RE = /已完成|已执行|已认证|本人完成/;
|
|
|
|
|
|
|
|
const route = useRoute();
|
|
const route = useRoute();
|
|
|
const { locale } = useI18n();
|
|
const { locale } = useI18n();
|
|
|
const router = useRouter();
|
|
const router = useRouter();
|
|
|
-const statusVal = computed(() => pageParams.value?.statusVal ?? null);
|
|
|
|
|
|
|
|
|
|
function isTruthyFlag(value) {
|
|
function isTruthyFlag(value) {
|
|
|
return value === 1 || value === "1" || value === true || value === "true";
|
|
return value === 1 || value === "1" || value === true || value === "true";
|
|
@@ -283,20 +282,37 @@ const toQueryNum = (v) => {
|
|
|
return Number.isNaN(n) ? undefined : n;
|
|
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 isFwTaskMode = computed(() => {
|
|
|
const p = pageParams.value || {};
|
|
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 fwTaskQuery = computed(() => {
|
|
|
const p = pageParams.value || {};
|
|
const p = pageParams.value || {};
|
|
|
return {
|
|
return {
|
|
|
|
|
+ farm_id: toQueryNum(p.farm_id) ?? getSelectedFarmId(),
|
|
|
zone_id: toQueryNum(p.zone_id),
|
|
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 miniJson = ref(null);
|
|
|
const farmData = ref({});
|
|
const farmData = ref({});
|
|
|
-/** 列表缓存 / 旧详情接口归一后的任务数据 */
|
|
|
|
|
|
|
+/** getTaskDetail / 旧监控详情归一后的任务数据 */
|
|
|
const taskDetail = ref(null);
|
|
const taskDetail = ref(null);
|
|
|
|
|
+const detailLoading = ref(false);
|
|
|
|
|
|
|
|
const wktFmt = new WKT();
|
|
const wktFmt = new WKT();
|
|
|
const MAP_CENTER_FALLBACK = "POINT(113.1093017627431 22.57454083668)";
|
|
const MAP_CENTER_FALLBACK = "POINT(113.1093017627431 22.57454083668)";
|
|
@@ -343,18 +360,29 @@ function destroyWorkDetailMap() {
|
|
|
areaMap.destroyMap();
|
|
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() {
|
|
function initWorkDetailMap() {
|
|
|
nextTick(() => {
|
|
nextTick(() => {
|
|
|
if (!mapContainer.value) return;
|
|
if (!mapContainer.value) return;
|
|
|
areaMap.destroyMap();
|
|
areaMap.destroyMap();
|
|
|
if (isFwTaskMode.value) {
|
|
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;
|
|
return;
|
|
|
}
|
|
}
|
|
|
const zones = farmZones.value;
|
|
const zones = farmZones.value;
|
|
@@ -387,14 +415,6 @@ const farmWorkTypeObj = {
|
|
|
8: "标准调节类",
|
|
8: "标准调节类",
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
-function readFwTaskCache() {
|
|
|
|
|
- try {
|
|
|
|
|
- return parseMaybeJson(sessionStorage.getItem(FW_TASK_CACHE_KEY));
|
|
|
|
|
- } catch {
|
|
|
|
|
- return null;
|
|
|
|
|
- }
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
/** 按当前人工/机械方案取文案;字符串直接返回 */
|
|
/** 按当前人工/机械方案取文案;字符串直接返回 */
|
|
|
function pickSchemeText(value, method = "machine") {
|
|
function pickSchemeText(value, method = "machine") {
|
|
|
if (value == null || value === "") return "";
|
|
if (value == null || value === "") return "";
|
|
@@ -412,66 +432,103 @@ function pickSchemeText(value, method = "machine") {
|
|
|
return first != null ? String(first) : "";
|
|
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 {
|
|
return {
|
|
|
- ...raw,
|
|
|
|
|
- fw_status: statusText,
|
|
|
|
|
|
|
+ ...data,
|
|
|
|
|
+ fw_status: data.fw_status || "",
|
|
|
fw_explain:
|
|
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 = () => {
|
|
const getDetail = () => {
|
|
|
if (isFwTaskMode.value) {
|
|
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;
|
|
return;
|
|
|
}
|
|
}
|
|
|
taskDetail.value = null;
|
|
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, () => {
|
|
watch(locale, () => {
|
|
|
getDetail();
|
|
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 executeMethod = ref("machine");
|
|
|
|
|
|
|
|
const currentMethodDetail = computed(() => {
|
|
const currentMethodDetail = computed(() => {
|
|
@@ -508,13 +601,22 @@ const currentMethodDetail = computed(() => {
|
|
|
|
|
|
|
|
const formatTitleDate = (dateStr) => {
|
|
const formatTitleDate = (dateStr) => {
|
|
|
if (!dateStr) return "";
|
|
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(() => {
|
|
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";
|
|
return "08/18";
|
|
|
});
|
|
});
|
|
|
|
|
+
|
|
|
const displayName = computed(() => {
|
|
const displayName = computed(() => {
|
|
|
const data = taskDetail.value;
|
|
const data = taskDetail.value;
|
|
|
if (data) {
|
|
if (data) {
|
|
@@ -523,13 +625,13 @@ const displayName = computed(() => {
|
|
|
if (byMethod) return byMethod;
|
|
if (byMethod) return byMethod;
|
|
|
if (typeof data.fw_name === "string" && data.fw_name) return data.fw_name;
|
|
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 remainingDays = 3;
|
|
|
|
|
|
|
|
-/** 农情研判底部指标:接口未接好前写死 */
|
|
|
|
|
|
|
+/** 农情研判底部指标:接口未返回,写死 */
|
|
|
const analysisStats = [
|
|
const analysisStats = [
|
|
|
{ value: "60", unit: "%", label: "系统估算抽梢率", highlight: false },
|
|
{ value: "60", unit: "%", label: "系统估算抽梢率", highlight: false },
|
|
|
{ value: "5", unit: "天", label: "比去年慢", highlight: true },
|
|
{ value: "5", unit: "天", label: "比去年慢", highlight: true },
|
|
@@ -542,14 +644,17 @@ const MOCK_EXPLAIN =
|
|
|
const displayExplain = computed(
|
|
const displayExplain = computed(
|
|
|
() =>
|
|
() =>
|
|
|
taskDetail.value?.fw_explain ||
|
|
taskDetail.value?.fw_explain ||
|
|
|
|
|
+ taskDetail.value?.fw_simple_explain ||
|
|
|
farmData.value?.interaction_reason ||
|
|
farmData.value?.interaction_reason ||
|
|
|
MOCK_EXPLAIN
|
|
MOCK_EXPLAIN
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
|
|
+/** 种植方案「农情研判」行:接口无 fw_trigger,用简要说明 / 异常类型 */
|
|
|
const displayPlanAnalysis = computed(
|
|
const displayPlanAnalysis = computed(
|
|
|
() =>
|
|
() =>
|
|
|
currentMethodDetail.value?.fw_trigger ||
|
|
currentMethodDetail.value?.fw_trigger ||
|
|
|
- currentMethodDetail.value?.trigger_cond ||
|
|
|
|
|
|
|
+ currentMethodDetail.value?.fw_simple_explain ||
|
|
|
|
|
+ taskDetail.value?.abnormal_type ||
|
|
|
displayExplain.value ||
|
|
displayExplain.value ||
|
|
|
"触发条件触发条件触发条件触发条件触发条件触发条件"
|
|
"触发条件触发条件触发条件触发条件触发条件触发条件"
|
|
|
);
|
|
);
|
|
@@ -580,13 +685,14 @@ const displayAreaCode = computed(() => {
|
|
|
return "ws0gefwg9tdn";
|
|
return "ws0gefwg9tdn";
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
-/** 农资表格:先写死,对齐设计稿 */
|
|
|
|
|
|
|
+/** 农资表格:接口未返回 materials,写死 */
|
|
|
const materialRows = computed(() => [
|
|
const materialRows = computed(() => [
|
|
|
{ id: "mock-1", effect: "促梢", name: "高钾复合肥 15-5-25", brand: "金正大", dosage: "8kg" },
|
|
{ id: "mock-1", effect: "促梢", name: "高钾复合肥 15-5-25", brand: "金正大", dosage: "8kg" },
|
|
|
{ id: "mock-2", effect: "生根", name: "腐植酸水溶肥", brand: "芭田", dosage: "2kg" },
|
|
{ id: "mock-2", effect: "生根", name: "腐植酸水溶肥", brand: "芭田", dosage: "2kg" },
|
|
|
{ id: "mock-3", effect: "补微", name: "螯合硼锌", brand: "撒可富", dosage: "50g" },
|
|
{ id: "mock-3", effect: "补微", name: "螯合硼锌", brand: "撒可富", dosage: "50g" },
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
|
|
+/** 农资执行参数:接口无独立字段,暂复用方案参数;无则写死 */
|
|
|
const materialUsage = computed(
|
|
const materialUsage = computed(
|
|
|
() =>
|
|
() =>
|
|
|
currentMethodDetail.value?.usage_method ||
|
|
currentMethodDetail.value?.usage_method ||
|
|
@@ -595,6 +701,7 @@ const materialUsage = computed(
|
|
|
"执行参数执行参数执行参数执行参数执行参数执行参数执行参数执行参数执行参数执行参数"
|
|
"执行参数执行参数执行参数执行参数执行参数执行参数执行参数执行参数执行参数执行参数"
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
|
|
+/** 农资注意事项:接口无独立字段,暂复用方案注意事项;无则写死 */
|
|
|
const materialNotes = computed(
|
|
const materialNotes = computed(
|
|
|
() =>
|
|
() =>
|
|
|
currentMethodDetail.value?.material_atten ||
|
|
currentMethodDetail.value?.material_atten ||
|
|
@@ -603,26 +710,39 @@ const materialNotes = computed(
|
|
|
"注意事项注意事项注意事项注意事项注意事项注意事项注意事项注意事项注意事项"
|
|
"注意事项注意事项注意事项注意事项注意事项注意事项注意事项注意事项注意事项"
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
-/** 农服信息:先写死 */
|
|
|
|
|
|
|
+/** 农服信息:接口未返回,写死 */
|
|
|
const serviceMethod = "具体方式";
|
|
const serviceMethod = "具体方式";
|
|
|
const serviceParams = "参数";
|
|
const serviceParams = "参数";
|
|
|
|
|
|
|
|
|
|
+const taskTypeCode = computed(() => taskDetail.value?._taskTypeCode || "");
|
|
|
|
|
+
|
|
|
/** 异常类农事 */
|
|
/** 异常类农事 */
|
|
|
const isAbnormalWork = computed(() => {
|
|
const isAbnormalWork = computed(() => {
|
|
|
|
|
+ if (taskTypeCode.value === "abnormal") return true;
|
|
|
if (Number(farmData.value?.farm_work_type) === 5) return true;
|
|
if (Number(farmData.value?.farm_work_type) === 5) return true;
|
|
|
return isTruthyFlag(pageParams.value?.isAbnormal);
|
|
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 showAbnormalTag = computed(() => isAbnormalWork.value);
|
|
|
-const showHighRiskTag = computed(() => isTruthyFlag(pageParams.value?.isHighRisk));
|
|
|
|
|
|
|
+/** 高风险:接口未返回,写死为 false */
|
|
|
|
|
+const showHighRiskTag = computed(() => false);
|
|
|
const showNormalTag = computed(() => {
|
|
const showNormalTag = computed(() => {
|
|
|
|
|
+ if (taskTypeCode.value === "standard") return true;
|
|
|
if (isTruthyFlag(pageParams.value?.isNormal)) return true;
|
|
if (isTruthyFlag(pageParams.value?.isNormal)) return true;
|
|
|
if (showWeatherTag.value || showAbnormalTag.value) return false;
|
|
if (showWeatherTag.value || showAbnormalTag.value) return false;
|
|
|
return isFwTaskMode.value;
|
|
return isFwTaskMode.value;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
+const statusVal = computed(() => {
|
|
|
|
|
+ if (taskDetail.value?._completed) return "completed";
|
|
|
|
|
+ if (isCompletedDetail(taskDetail.value || {})) return "completed";
|
|
|
|
|
+ return "pending";
|
|
|
|
|
+});
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 顶部状态卡形态:
|
|
* 顶部状态卡形态:
|
|
|
* completed / weather(建议执行)/ abnormal(去巡园)/ pending(待执行)
|
|
* completed / weather(建议执行)/ abnormal(去巡园)/ pending(待执行)
|
|
@@ -637,7 +757,7 @@ const statusCardMode = computed(() => {
|
|
|
/** 标准类待执行文案 */
|
|
/** 标准类待执行文案 */
|
|
|
const displayStatusText = computed(() => {
|
|
const displayStatusText = computed(() => {
|
|
|
if (isFwTaskMode.value) {
|
|
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] || "待执行";
|
|
return farmWorkTypeObj[farmData.value?.farm_work_type] || "待执行";
|
|
|
});
|
|
});
|
|
@@ -668,23 +788,19 @@ const handleBack = () => {
|
|
|
|
|
|
|
|
const handleShare = () => {
|
|
const handleShare = () => {
|
|
|
const workName = displayName.value || farmData.value?.work_name || "农事详情";
|
|
const workName = displayName.value || farmData.value?.work_name || "农事详情";
|
|
|
|
|
+ const done = statusVal.value === "completed";
|
|
|
const query = {
|
|
const query = {
|
|
|
askInfo: { title: "转发农事", content: "是否分享给好友" },
|
|
askInfo: { title: "转发农事", content: "是否分享给好友" },
|
|
|
- shareText: `${workName} 已触发,请在最佳农时内及时执行`,
|
|
|
|
|
|
|
+ shareText: done
|
|
|
|
|
+ ? `${workName} 已完成,请点击查看吧!`
|
|
|
|
|
+ : `${workName} 已触发,请在最佳农时内及时执行`,
|
|
|
targetUrl: "work_detail",
|
|
targetUrl: "work_detail",
|
|
|
paramsPage: JSON.stringify(
|
|
paramsPage: JSON.stringify(
|
|
|
isFwTaskMode.value
|
|
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,
|
|
fromShare: 1,
|
|
|
}
|
|
}
|
|
|
: {
|
|
: {
|
|
@@ -692,7 +808,7 @@ const handleShare = () => {
|
|
|
fromShare: 1,
|
|
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({
|
|
wx.miniProgram.navigateTo({
|
|
|
url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,
|
|
url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,
|