Kaynağa Gözat

feat:修改农事规划显示

wangsisi 6 gün önce
ebeveyn
işleme
e5d71ffd3d

+ 8 - 2
src/components/pageComponents/ArchivesFarmTimeLine.vue

@@ -42,8 +42,9 @@
                                             </div>
                                             <div class="info-right">{{ fw.interaction_issue }}</div>
                                         </div>
-                                        <div class="title-text van-ellipsis">{{ fw.work_time }} ({{ fw.crop_type_name
-                                            }})</div>
+                                        <div class="text-display" v-if="fw.zone.length">
+                                            <div class="title-text van-ellipsis" v-for="(zone,index) in fw.zone" :key="index">{{ zone }}</div>
+                                        </div>
                                     </div>
                                     <div class="status-right" :style="statusColorObj[fw.work_status]"
                                         v-if="fw.work_status !== 3 && fw.work_status !== 5">{{
@@ -730,6 +731,11 @@ onBeforeRouteLeave(() => {
                                 }
                             }
 
+                            .text-display {
+                                display: flex;
+                                gap: 5px;
+                            }
+
                             .title-text {
                                 margin-top: 5px;
                                 width: fit-content;

+ 2 - 2
src/components/pageComponents/PhenologyTrackTimelineItem.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from "vue";
+import { onActivated, ref } from "vue";
 import { useI18n } from "@/i18n";
 
 const { t } = useI18n();
@@ -56,7 +56,7 @@ const getFarmImages = async () => {
     }
 };
 
-onMounted(() => {
+onActivated(() => {
     getFarmImages();
 })
 </script>

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

@@ -12,7 +12,7 @@
             </div>
             <div class="record-header" v-else>
                 <span>{{ t('agriRecord.phenologyWorkName') }}</span>
-                <div class="question">{{ t('recordDetails.phenologyQuestion') }}</div>
+                <div class="question">{{ workDetail.interaction_issue }}</div>
             </div>
             <div class="record-body">
                 <div class="card-wrap" v-if="recordType === 'growth'">
@@ -85,7 +85,7 @@
                         <span class="item-label">{{ t('recordDetails.farmAnalysisLabel') }}</span>
                         <text-ellipsis class="item-value" :expand-text="expandCollapse.expand"
                             :collapse-text="expandCollapse.collapse" rows="3"
-                            :content="t('recordDetails.phenologyAnalysis')" />
+                            :content="workDetail.crop_condition_analysis" />
                     </div>
                     <div class="card-item">
                         <span class="item-label">{{ t('recordDetails.patrolLabel') }}</span>
@@ -97,7 +97,7 @@
                         <span class="item-label">{{ t('recordDetails.phenotypeLabel') }}</span>
                         <text-ellipsis class="item-value" :expand-text="expandCollapse.expand"
                             :collapse-text="expandCollapse.collapse" rows="3"
-                            :content="t('recordDetails.phenologyPhenotype')" />
+                            :content="workDetail.phenotypic_characteristics" />
                     </div>
                 </div>
                 <!-- <div class="tabs-list" v-if="!showMap">