lxf před 1 dnem
rodič
revize
9e4b55df9e

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

@@ -20,7 +20,7 @@
                             <div class="latest-card__date">{{ report.dateText }}</div>
                         </div>
                     </div>
-                    <span class="risk-badge">{{ report.riskLevel || "—" }}</span>
+                    <span class="risk-badge">{{ report.riskLevelText || "—" }}</span>
                 </div>
 
                 <div class="latest-card__subject">{{ report.riskName || "—" }}</div>
@@ -62,7 +62,7 @@
             <div v-if="!latestReports.length" class="report-empty">暂无最新报告</div>
 
             <!-- 报告生成中:暂写死 -->
-            <div class="generating-card">
+            <!-- <div class="generating-card">
                 <div class="generating-card__spinner"></div>
                 <div class="generating-card__text">
                     <div class="generating-card__title">报告生成中</div>
@@ -70,7 +70,7 @@
                         东区2号 · 已上传 <span class="generating-card__desc-count">3</span> 张巡园照片
                     </div>
                 </div>
-            </div>
+            </div> -->
         </div>
 
         <!-- 历史报告 -->
@@ -116,7 +116,7 @@
                                         <el-icon><WarningFilled /></el-icon>
                                         <span>{{ resolveTypeLabel(item.type) }}</span>
                                     </div>
-                                    <span class="risk-badge">{{ item.riskLevel || "—" }}</span>
+                                    <span class="risk-badge">{{ item.riskLevelText || "—" }}</span>
                                 </div>
                                 <div class="history-card__title van-ellipsis">
                                     {{ item.title || "—" }}
@@ -254,6 +254,7 @@ const mapReportItem = (item, index) => {
         phenoName: item.phenophase_name || "",
         riskName: item.risk_name || "",
         riskLevel: item.risk_level || "",
+        riskLevelText: item.risk_level_text || "",
         riskLevelNum: item.risk_level_num || "",
     };
 };
@@ -408,6 +409,9 @@ onActivated(resetAndLoad);
     }
 
     // ---------- 最新报告卡片 ----------
+    .latest-card + .latest-card {
+        margin-top: 12px;
+    }
     .latest-card {
         padding: 12px;
         border-radius: 12px;

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

@@ -123,7 +123,7 @@
                                     <span class="title-bar"></span>
                                     {{ $t("agriRecordDetail.executionArea") }}
                                 </div>
-                                <span class="code">{{ displayAreaCode || "编码" }}</span>
+                                <span class="code">{{ displayAreaCode }}</span>
                             </div>
                             <div class="map-container" ref="mapContainer"></div>
                         </div>
@@ -708,9 +708,9 @@ const displayNotes = computed(
 /** 执行区域标题旁:分区名称(data.zone.zone_name) */
 const displayAreaCode = computed(() => {
     if (isFwTaskMode.value) {
-        return taskDetail.value?.zone?.zone_name || "编码";
+        return taskDetail.value?.zone?.zone_name || "";
     }
-    return farmZones.value[0]?.zone_name || farmData.value?.zone_name || "编码";
+    return farmZones.value[0]?.zone_name || farmData.value?.zone_name || "";
 });
 
 /** 农资表格:接口未返回 materials,写死 */

+ 4 - 3
src/views/old_mini/work_execute/index.vue

@@ -456,24 +456,25 @@ const refreshMapMarkers = () => {
     indexMap.initData(getMapMarkerList(), "farmName", "wkt", false);
 };
 
-/** 每个分区一个点位,点位上方显示该分区最新一条农事名称,右上角显示农事数量 */
+/** 每个分区一个点位:名称取最新农事,角标为本周待执行数量 */
 const getMapMarkerList = () => {
     const zoneMap = new Map();
     for (const item of taskList.value) {
         if (item.latitude == null || item.longitude == null) continue;
         const key = item.zoneId ?? "default";
+        const isPending = item.status === "pending";
         if (!zoneMap.has(key)) {
             zoneMap.set(key, {
                 zoneId: item.zoneId,
                 lat: item.latitude,
                 lng: item.longitude,
                 latest: item,
-                count: 1,
+                count: isPending ? 1 : 0,
             });
             continue;
         }
         const cur = zoneMap.get(key);
-        cur.count += 1;
+        if (isPending) cur.count += 1;
         if ((item.executeDateFull || "") > (cur.latest.executeDateFull || "")) {
             cur.latest = item;
         }