Prechádzať zdrojové kódy

feat:修改显示bug

wangsisi 2 dní pred
rodič
commit
7157c96960

+ 0 - 13
src/views/old_mini/agri_services/components/farmDynamics.vue

@@ -101,19 +101,6 @@ const handleApply = (section, index) => {
     // section.hasApplied = true;
 };
 
-const getPrescriptionInfo = (section) => {
-    // 从section的prescriptionList中获取药物信息
-    if (section.prescriptionList && section.prescriptionList.length > 0) {
-        const firstPrescription = section.prescriptionList[0];
-        if (firstPrescription.pesticideFertilizerList && firstPrescription.pesticideFertilizerList.length > 0) {
-            const firstDrug = firstPrescription.pesticideFertilizerList[0];
-            const ratio = firstDrug.ratio || firstDrug.defaultRatio || 1000;
-            return `${ratio}倍${firstDrug.brand}${firstDrug.pesticideFertilizerName}`;
-        }
-    }
-    return "1000倍国光乙烯利"; // 默认值
-};
-
 const hasUploadedPhotos = (section) => {
     // 检查是否上传了图片,通过confirmPicture和executeEvidence字段判断
     const hasConfirmPictures = section.confirmPicture && section.confirmPicture.length > 0;

+ 4 - 1
src/views/old_mini/home/index.vue

@@ -114,7 +114,10 @@ const monitorCards = ref({
 
 // 卡片点击事件
 const handleCardClick = (card) => {
-    // showFarmPopup.value = true;
+    if(!isGarden.value){
+        showFarmPopup.value = true;
+        return;
+    }
     if (card.route === "/pest") {
         if(curRole == 2){
             ElMessage.warning("该功能正在升级中,敬请期待");

+ 11 - 7
src/views/old_mini/modify_work/reviewWork.vue

@@ -84,12 +84,14 @@
                 </div>
                 <div class="info-box bottom-box">
                     <div class="result-box">
-                        <div class="result-text">
-                            通过精准农业技术的应用,作物产量实现了两位数的增长,病虫害的发生率大幅下降,土壤肥力的提升
+                        <div class="result-text" v-if="workItem.reviewImage && workItem.reviewImage.length">
+                            促进分蘖芽萌发、加快分蘖生长,同时补充氮素等关键养分,增强植株长势,为形成足够穗数、提高群体产量打基础。
+                            <!-- 通过精准农业技术的应用,作物产量实现了两位数的增长,病虫害的发生率大幅下降,土壤肥力的提升 -->
+                        </div>
+                        <div class="result-text time-text" v-else>
+                            请抓紧时间上传照片!系统为您生成农事成效分析!
+                            <!-- 距离农事执行已 15 天,请抓紧时间上传照片!系统为您生成农事成效分析! -->
                         </div>
-                        <!-- <div class="result-text time-text">
-                            距离农事执行已 15 天,请抓紧时间上传照片!系统为您生成农事成效分析!
-                        </div> -->
                     </div>
                     <div class="recheck-box">
                         <div class="recheck-ablum">
@@ -142,7 +144,7 @@
                                                 class="recheck-desc"
                                                 v-show="curRole === '2' && diffInDays(workItem.reviewDate) != 0"
                                             >
-                                            (已逾期{{ diffInDays(workItem.reviewDate, "add") }}天)
+                                            <!-- (已逾期{{ diffInDays(workItem.reviewDate, "add") }}天) -->
                                             </div>
                                         </template>
                                         <template v-else>
@@ -554,6 +556,9 @@ const handleUpload = ({ imgArr }) => {
                     padding-bottom: 5px;
                 }
             }
+            .recheck-box{
+                margin-top: 12px;
+            }
             .recheck-box,
             .recheck-ablum {
                 width: 100%;
@@ -636,7 +641,6 @@ const handleUpload = ({ imgArr }) => {
                 font-size: 12px;
                 color: #666666;
                 line-height: 18px;
-                padding-bottom: 12px;
             }
             .time-text {
                 color: #ff953d;