Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5

src/components/taskItem.vue

@@ -41,7 +41,8 @@
             </div> -->
 
             <div class="farm-text" v-if="status === 0">
-                <span class="text-title">农场现状：</span>现状现状现状选咋混给农场现状现状现状现状选咋混给选咋混给选咋混给选咋混<span class="text-more">点击查看照片</span>
+                <span class="text-title">农场现状：</span>水稻移栽后返青成活（新根萌发、心叶展开），进入分蘖始期
+                <!-- <span class="text-more">点击查看照片</span> -->
             </div>
             <div class="img-text-wrap">
                 <div class="left-wrap">
@@ -74,7 +75,7 @@
                 <div class="desc-info two-text" v-if="!expiredDay">
                     <div class="desc-info-item">
                         <div>复核成效</div>
-                        <span class="value">通过精准农业技术的应用，作物产量实现了两位数的增长，病虫害的发生率大幅下降，土壤肥力的提升</span>
+                        <span class="value">促进分蘖芽萌发、加快分蘖生长，同时补充氮素等关键养分，增强植株长势，为形成足够穗数、提高群体产量打基础。</span>
                     </div>
                 </div>
                 <div class="review-image" v-if="!expiredDay">

src/views/old_mini/modify_work/completedWork.vue

@@ -129,13 +129,13 @@
                 <div class="box-wrap farm-info">
                     <div class="info-title">
                         <div class="card-title">农场现状</div>
-                        <div class="info-more">
+                        <!-- <div class="info-more">
                             点击查看更多
                             <el-icon><ArrowRight /></el-icon>
-                        </div>
+                        </div> -->
                     </div>
                     <div class="info-content">
-                        当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标
+                        水稻移栽后返青成活（新根萌发、心叶展开），进入分蘖始期
                     </div>
                 </div>
                 <div class="box-wrap farm-photo" v-if="triggerImg.length">

src/views/old_mini/modify_work/index.vue

@@ -9,13 +9,13 @@
                 <div class="box-wrap farm-info">
                     <div class="info-title">
                         <div class="card-title">农场现状</div>
-                        <div class="info-more">
+                        <!-- <div class="info-more">
                             点击查看更多
                             <el-icon><ArrowRight /></el-icon>
-                        </div>
+                        </div> -->
                     </div>
                     <div class="info-content">
-                        当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标：当前农场指标
+                        水稻移栽后返青成活（新根萌发、心叶展开），进入分蘖始期
                     </div>
                 </div>
                 <div class="box-wrap farm-photo" v-if="triggerImg.length">

src/views/old_mini/modify_work/reviewWork.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="work-wrap">
         <custom-header name="农事成效"></custom-header>
-        <div class="work-content recheck-title">
+        <div class="work-content recheck-title" v-loading="loading">
             <div class="tabs-content-item">
                 <div class="common-card-title">
                     <img class="icon" src="@/assets/img/home/label-icon.png" alt="" />
@@ -261,7 +261,7 @@
 <script setup>
 import { Tab, Tabs } from "vant";
 import customHeader from "@/components/customHeader.vue";
-import { onMounted, ref, onDeactivated, onActivated } from "vue";
+import { onMounted, ref, onDeactivated, onActivated, onUnmounted } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import upload from "@/components/upload";
 import AlbumCarousel from "@/components/album_compoents/albumCarousel";
@@ -273,6 +273,7 @@ const workItem = ref({});
 const curRole = ref("");
 // 农事规划页面-显示上传农事凭证按钮
 const isPlan = ref(false);
+const loading = ref(false);
 
 const diffInDays = (date, type = "minus") => {
     const targetDate = new Date(date);
@@ -297,9 +298,12 @@ onActivated(() => {
 
 const getDetail = () => {
     if (!paramsPage.value.id) return;
+    loading.value = true;
     VE_API.z_farm_work_record.getDetail({ id: paramsPage.value.id }).then(({ data }) => {
         workItem.value = data[0];
         getTriggerImg(workItem.value.id);
+    }).finally(() => {
+        loading.value = false;
     });
 };
 
@@ -325,8 +329,23 @@ const handleSubmit = () => {
     });
 };
 
-onDeactivated(() => {
+// 清理数据的函数
+const clearData = () => {
     workItem.value = {};
+    triggerImg.value = [];
+    imageArr.value = [];
+    paramsPage.value = {};
+    isPlan.value = false;
+    curRole.value = "";
+    loading.value = false;
+};
+
+onDeactivated(() => {
+    clearData();
+});
+
+onUnmounted(() => {
+    clearData();
 });
 
 // //联系专家

src/views/old_mini/task_condition/components/reviewPopup.vue

@@ -29,7 +29,7 @@
                         <div class="info-item flex-wrap">
                             <div class="info-label">复核成效</div>
                             <div class="info-value">
-                                通过精准农业技术的应用，作物产量实现增长，病虫害的发生率大幅下降
+                                促进分蘖芽萌发、加快分蘖生长，同时补充氮素等关键养分，增强植株长势，为形成足够穗数、提高群体产量打基础。
                             </div>
                         </div>
                     </div>