wangsisi 14 часов назад
Родитель
Сommit
495183c65c

+ 18 - 4
src/components/pageComponents/ArchivesFarmTimeLine.vue

@@ -131,10 +131,10 @@ const props = defineProps({
         type: [String, Number],
         default: null,
     },
-    // 是否禁用所有点击事件(用于只读展示)
-    disableClick: {
-        type: Boolean,
-        default: false,
+    // 年份
+    year: {
+        type: [Number, String],
+        default: new Date().getFullYear(),
     },
     // 是否是标准农事
     isStandard: {
@@ -619,6 +619,7 @@ const getFarmWorkPlan = () => {
         farmId: props.farmId,
         regionId: props.regionId,
         problemZoneId: props.problemZoneId,
+        year: props.year,
     }
     if (props.pageType === 'agri_record') {
         params.containerId = props.containerId;
@@ -836,9 +837,22 @@ watch(
     { immediate: true }
 );
 
+watch(
+    () => props.year,
+    (val, oldVal) => {
+        if (!props.farmId) return;
+        if (val !== oldVal) {
+            lastRequestedFarmId.value = null;
+        }
+        isInitialLoad.value = true;
+        updateFarmWorkPlan();
+    },
+);
+
 const showPhenologyName = computed(() => {
     return !props.problemZoneId;
 });
+
 watch(
     () => props.problemZoneId,
     (val, oldVal) => {

+ 2 - 1
src/views/old_mini/agri_record/index.vue

@@ -19,6 +19,7 @@
                         v-model="date"
                         type="year"
                         placeholder="全部日期"
+                        :editable="false"
                         :disabled-date="disabledYearDate"
                     />
                 </div>
@@ -43,7 +44,7 @@
                 <img class="example-img" src="@/assets/img/monitor/example.png" alt="">
             </template>
             <div class="archives-time-line-content">
-                <archives-farm-time-line :farmId="farmIdData" :problemZoneId="currentVariety?.problemZoneTypeId" :regionId="regionData" :containerId="containerData"
+                <archives-farm-time-line :year="date.getFullYear()" :farmId="farmIdData" :problemZoneId="currentVariety?.problemZoneTypeId" :regionId="regionData" :containerId="containerData"
                     pageType="agri_record" :typeId="currentVariety?.typeId" @card-click="handleCardClick"></archives-farm-time-line>
             </div>
         </div>

+ 2 - 1
src/views/old_mini/monitor/index.vue

@@ -16,6 +16,7 @@
                     </div>
                     <el-date-picker
                         style="width: 110px"
+                        :editable="false"
                         v-model="date"
                         type="year"
                         placeholder="全部日期"
@@ -56,7 +57,7 @@
                     <img src="@/assets/img/monitor/report-icon.png" alt="" class="report-icon" />
                 </div> -->
                 <div class="time-line">
-                    <archives-farm-time-line :problemZoneId="currentVariety?.id" :farmId="farmIdData" :regionId="regionData" @card-click="handleCardClick"></archives-farm-time-line>
+                    <archives-farm-time-line :year="date.getFullYear()" :problemZoneId="currentVariety?.id" :farmId="farmIdData" :regionId="regionData" @card-click="handleCardClick"></archives-farm-time-line>
                 </div>
             </div>
         </div>