Bläddra i källkod

feat:修改文字显示

wangsisi 4 dagar sedan
förälder
incheckning
e02b1ef640
2 ändrade filer med 23 tillägg och 4 borttagningar
  1. 3 3
      src/views/old_mini/agri_file/index.vue
  2. 20 1
      src/views/old_mini/work_execute/index.vue

+ 3 - 3
src/views/old_mini/agri_file/index.vue

@@ -574,10 +574,10 @@ async function fetchWeatherReportList() {
                 reportId: item.id,
                 type: "weather",
                 title: item.risk_name
-                    ? `气象报告: ${item.risk_name}`
+                    ? `历史气象报告: ${item.risk_name}`
                     : item.crop_name
-                      ? `气象报告: ${item.crop_name}`
-                      : "气象报告",
+                      ? `历史气象报告: ${item.crop_name}`
+                      : "历史气象报告",
                 desc: item.explain_simple || item.interact_explain || "",
                 date: formatReportDay(item.report_date),
                 // cover_url 相对路径需拼 base_img_url2

+ 20 - 1
src/views/old_mini/work_execute/index.vue

@@ -313,9 +313,28 @@ const activeTab = ref("pending");
 /** 待执行:按选中日期;已完成:全量(不按日期) */
 const pendingCount = computed(() => taskList.value.filter((item) => item.status === "pending").length);
 const completedCount = computed(() => mapTaskList.value.filter((item) => item.status === "completed").length);
+
+/** 解析农事时间用于排序;优先 workTime,其次 MM/DD(当年) */
+function resolveTaskSortTime(item) {
+    if (item?.workTime) {
+        const t = new Date(item.workTime).getTime();
+        if (!Number.isNaN(t)) return t;
+    }
+    const md = item?.executeDate;
+    if (typeof md === "string" && /^\d{1,2}\/\d{1,2}$/.test(md)) {
+        const [m, d] = md.split("/").map(Number);
+        const y = new Date().getFullYear();
+        return new Date(y, m - 1, d).getTime();
+    }
+    return 0;
+}
+
 const displayTaskList = computed(() => {
     if (activeTab.value === "completed") {
-        return mapTaskList.value.filter((item) => item.status === "completed");
+        return mapTaskList.value
+            .filter((item) => item.status === "completed")
+            .slice()
+            .sort((a, b) => resolveTaskSortTime(b) - resolveTaskSortTime(a));
     }
     return taskList.value.filter((item) => item.status === "pending");
 });