lxf 4 dias atrás
pai
commit
0141acf8f1

+ 26 - 1
src/views/old_mini/agri_file/index.vue

@@ -58,7 +58,7 @@
                                 </div>
                                 <!-- <div class="tracking-item__issue">{{ item.issue }}</div> -->
                             </div>
-                            <div class="tracking-item__btn" @click.stop="openUploadPopup">
+                            <div class="tracking-item__btn" @click.stop="handleUploadClick(item)">
                                 <el-icon>
                                     <Plus />
                                 </el-icon>
@@ -380,10 +380,35 @@ const handleShare = (item) => {
     });
 };
 
+const needDraw = ref(true);
+
 const openUploadPopup = () => {
     showUploadPopup.value = true;
 };
 
+/** 与 growthTrack 上传一致:需勾画 → add_zone;异常 → pest_interact;否则弹上传 */
+const handleUploadClick = (item) => {
+    const isAbnormal = item?.type === "abnormal";
+    if (needDraw.value) {
+        router.push({
+            path: "/add_zone",
+            query: {
+                type: "farm",
+                targetUrl: isAbnormal ? "/pest_interact" : "/growth_track",
+                ...(isAbnormal ? { isAbnormal: "true" } : {}),
+                ...(item?.id != null ? { trackId: item.id } : {}),
+                ...(item?.type ? { trackType: item.type } : {}),
+            },
+        });
+        return;
+    }
+    if (isAbnormal) {
+        router.push({ path: "/pest_interact" });
+        return;
+    }
+    showUploadPopup.value = true;
+};
+
 const dismissGuide = () => {
     if (!guideVisible.value) return;
     guideVisible.value = false;

+ 8 - 2
src/views/old_mini/work_detail/index.vue

@@ -33,7 +33,7 @@
                 </div>
             </div>
 
-            <div class="work-wrap">
+            <div class="work-wrap" :class="{ 'from-share': isFromShare }">
                 <!-- 农事组信息 -->
                 <div class="group-info group-box" v-if="farmData.interaction_reason">
                     <div class="group-name">
@@ -130,7 +130,7 @@
             </div>
         </div>
 
-        <div class="btn-fixed" >
+        <div class="btn-fixed" :class="{ 'from-share': isFromShare }">
             <div class="primary-btn" @click="goGrowthTrack">巡园要点</div>
         </div>
 
@@ -600,6 +600,9 @@ const areaMap = new AreaMap();
         display: flex;
         align-items: center;
         justify-content: center;
+        &.from-share {
+            bottom: 50px;
+        }
     }
 }
 
@@ -712,6 +715,9 @@ const areaMap = new AreaMap();
     //     // margin-bottom: 168px;
     //     margin-bottom: 88px;
     // }
+    &.from-share {
+        padding-bottom: 82px;
+    }
 }
 
 .box-wrap {