فهرست منبع

feat:天际复合成效页面和农事方案UI 页面修改

wangsisi 2 هفته پیش
والد
کامیت
9b8061e6f5

+ 6 - 1
src/components/recordItem.vue

@@ -3,7 +3,8 @@
         <div class="record-title">
         <div class="record-title">
             <slot name="title"></slot>
             <slot name="title"></slot>
         </div>
         </div>
-        <div class="record-content">
+        <slot name="content" v-if="showContent"></slot>
+        <div class="record-content" v-else>
             <div class="info-item">
             <div class="info-item">
                 推荐时间:
                 推荐时间:
                 <span class="info-val">{{ recordItemData?.farmWorkDetail?.executeDate }}</span>
                 <span class="info-val">{{ recordItemData?.farmWorkDetail?.executeDate }}</span>
@@ -92,6 +93,10 @@ const props = defineProps({
         type: Object,
         type: Object,
         default: () => ({}),
         default: () => ({}),
     },
     },
+    showContent: {
+        type: Boolean,
+        default: false,
+    },
 });
 });
 
 
 console.log('recordItemData', props.recordItemData);
 console.log('recordItemData', props.recordItemData);

+ 15 - 3
src/router/globalRoutes.js

@@ -166,8 +166,8 @@ export default [
     },
     },
     // 专家-我的主页
     // 专家-我的主页
     {
     {
-        path: "/expert_detail",
-        name: "ExpertDetail",
+        path: "/expert_homepage",
+        name: "ExpertHomepage",
         component: () => import("@/views/old_mini/expert_detail/index.vue"),
         component: () => import("@/views/old_mini/expert_detail/index.vue"),
     },
     },
     // 农事详情--农户
     // 农事详情--农户
@@ -188,7 +188,7 @@ export default [
         name: "ServicesIndex",
         name: "ServicesIndex",
         component: () => import("@/views/old_mini/agri_work/servicesIndex.vue"),
         component: () => import("@/views/old_mini/agri_work/servicesIndex.vue"),
     },
     },
-    // 农事复核
+    // 农事成效
     {
     {
         path: "/review_work",
         path: "/review_work",
         name: "ReviewWork",
         name: "ReviewWork",
@@ -242,4 +242,16 @@ export default [
         name: "Plan",
         name: "Plan",
         component: () => import("@/views/old_mini/monitor/subPages/plan.vue"),
         component: () => import("@/views/old_mini/monitor/subPages/plan.vue"),
     },
     },
+    // 农事复核
+    {
+        path: "/review-results",
+        name: "ReviewResults",
+        component: () => import("@/views/old_mini/monitor/subPages/reviewResults.vue"),
+    },
+    // 农事方案
+    {
+        path: "/agricultural_plan",
+        name: "AgriculturalPlan",
+        component: () => import("@/views/old_mini/plan/index.vue"),
+    },
 ];
 ];

+ 105 - 19
src/views/old_mini/agri_services/components/farmDynamics.vue

@@ -30,7 +30,7 @@
             <div class="expert-content" ref="containerRef">
             <div class="expert-content" ref="containerRef">
                 <div v-for="(section, index) in contentData" :key="index" class="content-section">
                 <div v-for="(section, index) in contentData" :key="index" class="content-section">
                     <div class="section-id" :id="section.targetId"></div>
                     <div class="section-id" :id="section.targetId"></div>
-                    <record-item :record-item-data="section" :onlyRecipeName="true" class="recipe-item">
+                    <record-item :record-item-data="section" :onlyRecipeName="true" :showContent="activePlanIndex === 1" class="recipe-item">
                         <template #title>
                         <template #title>
                             <div class="box-title">
                             <div class="box-title">
                                 <div class="title-l">
                                 <div class="title-l">
@@ -43,23 +43,43 @@
                                 </div>
                                 </div>
                             </div>
                             </div>
                         </template>
                         </template>
-                        <template #footer>
-                            <div class="info-item" v-if="activePlanIndex === 1">
-                                农资执行:
-                                <span class="info-val">农资农资组织</span>
+                        <template #content v-if="activePlanIndex === 1">
+                            <!-- 未上传图片时显示 -->
+                            <div class="content-info" v-if="!hasUploadedPhotos(section)">
+                                <div class="info-line">执行时间:<span class="info-val">{{ section.executeDate || '2025年11月11日' }}</span></div>
+                                <div class="info-line">药物处方:<span class="info-val">{{ getPrescriptionInfo(section) }}</span></div>
+                                <div class="reminder-box">
+                                    距离农事执行已<span class="highlight-number">15</span>天,请抓紧时间上传照片!
+                                </div>
+                            </div>
+                            <!-- 已上传图片时显示 -->
+                            <div class="content-info" v-else>
+                                <div class="info-line">药物处方:<span class="info-val">{{ getPrescriptionInfo(section) }}</span></div>
+                                <div class="review-title info-line">复核成效
+                                    <div class="info-val">
+                                        通过精准农业技术的应用,作物产量实现了两位数的增长,病虫害的发生率大幅下降,土壤肥力的提升
+                                    </div>
+                                </div>
+                                <div class="review-image">
+                                    <img src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" alt="">
+                                    <img src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" alt="">
+                                </div>
                             </div>
                             </div>
-                            <div class="action-group">
+                        </template>
+                        <template #footer>
+                            <div class="action-group" v-if="activePlanIndex === 0 || !hasUploadedPhotos(section)">
                                 <div class="action-l">查看详情</div>
                                 <div class="action-l">查看详情</div>
                                 <div class="action-r" v-if="section.orderStatus === 0">
                                 <div class="action-r" v-if="section.orderStatus === 0">
                                     <div class="action-item second-item">拍照识别</div>
                                     <div class="action-item second-item">拍照识别</div>
                                     <div class="action-item primary-item">去确认</div>
                                     <div class="action-item primary-item">去确认</div>
                                 </div>
                                 </div>
                                 <div class="action-r" v-if="activePlanIndex === 0">
                                 <div class="action-r" v-if="activePlanIndex === 0">
+                                    <div class="action-item warning-item" :class="{ 'has-applied': section.hasApplied }" @click="handleApply(section, index)">{{ section.hasApplied ? '已发起需求' : '发起需求' }}</div>
                                     <div class="action-item primary-item">确认完成</div>
                                     <div class="action-item primary-item">确认完成</div>
                                 </div>
                                 </div>
                                 <div class="action-r" v-if="activePlanIndex === 1">
                                 <div class="action-r" v-if="activePlanIndex === 1">
-                                    <div class="action-item warning-item" @click="handleApply">发起需求</div>
-                                    <div class="action-item primary-item">去复核</div>
+                                    <div class="action-item warning-item" :class="{ 'has-applied': section.hasApplied }" @click="handleApply(section, index)">{{ section.hasApplied ? '已发起需求' : '发起需求' }}</div>
+                                    <div class="action-item primary-item">上传照片</div>
                                 </div>
                                 </div>
                             </div>
                             </div>
                         </template>
                         </template>
@@ -83,7 +103,7 @@ import { Popup } from "vant";
 const showApplyPopup = ref(false);
 const showApplyPopup = ref(false);
 
 
 const filterType = ref(["待执行", "已完成"]);
 const filterType = ref(["待执行", "已完成"]);
-const activePlanIndex = ref(0);
+const activePlanIndex = ref(1);
 
 
 const handlePlanClick = (index) => {
 const handlePlanClick = (index) => {
     activePlanIndex.value = index;
     activePlanIndex.value = index;
@@ -117,8 +137,30 @@ const menuData = [
     },
     },
 ];
 ];
 
 
-const handleApply = () => {
+const handleApply = (section, index) => {
+    // 更新当前项的发起需求状态
     showApplyPopup.value = true;
     showApplyPopup.value = true;
+    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;
+    const hasExecuteEvidence = section.executeEvidence && section.executeEvidence.length > 0;
+    return hasConfirmPictures || hasExecuteEvidence;
 };
 };
 
 
 const contentData = ref([
 const contentData = ref([
@@ -127,6 +169,7 @@ const contentData = ref([
         title: "巡园农事",
         title: "巡园农事",
         parentTitle: "秋梢期",
         parentTitle: "秋梢期",
         isExpanded: false, // 添加展开状态
         isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,虫害风险控制优异,未发现虫害风险",
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,虫害风险控制优异,未发现虫害风险",
         expert: 91356,
         expert: 91356,
         orderStatus: 3,
         orderStatus: 3,
@@ -216,6 +259,7 @@ const contentData = ref([
         title: "梢期防虫",
         title: "梢期防虫",
         parentTitle: "秋梢期",
         parentTitle: "秋梢期",
         isExpanded: false, // 添加展开状态
         isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
         consequenceText: "如果不做本次农事,会导致您的产量、质量下降30%,管理得分降低10分",
         consequenceText: "如果不做本次农事,会导致您的产量、质量下降30%,管理得分降低10分",
         id: "274654",
         id: "274654",
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,土壤肥力增加",
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,土壤肥力增加",
@@ -388,6 +432,7 @@ const contentData = ref([
         targetId: "part3",
         targetId: "part3",
         title: "梢期营养",
         title: "梢期营养",
         isExpanded: false, // 添加展开状态
         isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
         consequenceText: "如果不做本次农事,会导致您的产量、质量下降5%,管理得分降低2分",
         consequenceText: "如果不做本次农事,会导致您的产量、质量下降5%,管理得分降低2分",
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,转色速度非常稳定,转色率超过80%",
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,转色速度非常稳定,转色率超过80%",
         farmName: "荔枝博览园",
         farmName: "荔枝博览园",
@@ -629,6 +674,7 @@ const contentData = ref([
         title: "巡园农事",
         title: "巡园农事",
         parentTitle: "开花期",
         parentTitle: "开花期",
         isExpanded: false, // 添加展开状态
         isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
         consequenceText: "如果不做本次农事,会导致您的产量、质量下降20%,管理得分降低8分",
         consequenceText: "如果不做本次农事,会导致您的产量、质量下降20%,管理得分降低8分",
         id: "274672",
         id: "274672",
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,病虫害基数得到大幅下降,未发现病虫害风险",
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,病虫害基数得到大幅下降,未发现病虫害风险",
@@ -917,6 +963,7 @@ const contentData = ref([
         title: "摇花吹花",
         title: "摇花吹花",
         parentTitle: "开花期",
         parentTitle: "开花期",
         isExpanded: false, // 添加展开状态
         isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
         consequenceText: "如果不做本次农事,会导致您的产量、质量下降15%,管理得分降低5分",
         consequenceText: "如果不做本次农事,会导致您的产量、质量下降15%,管理得分降低5分",
         id: "274671",
         id: "274671",
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,膨果速度非常稳定,膨果率超过80%",
         reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,膨果速度非常稳定,膨果率超过80%",
@@ -1288,27 +1335,61 @@ const contentData = ref([
                 .title-r {
                 .title-r {
                     display: flex;
                     display: flex;
                     align-items: center;
                     align-items: center;
-                    color: #ff8a2a;
+                    color: #393939;
                     font-size: 12px;
                     font-size: 12px;
                     .r-dot {
                     .r-dot {
                         width: 6px;
                         width: 6px;
                         height: 6px;
                         height: 6px;
                         border-radius: 50%;
                         border-radius: 50%;
-                        background: #ff8a2a;
+                        background: #393939;
                         margin-right: 5px;
                         margin-right: 5px;
                     }
                     }
                 }
                 }
             }
             }
+            .content-info {
+                padding-top: 8px;
+                .info-line {
+                    font-size: 12px;
+                    color: #BBBBBB;
+                    margin-bottom: 8px;
+                    line-height: 1.4;
+                    .info-val{
+                        color: #666666;
+                    }
+                }
+                .review-title {
+                    .info-val{
+                        margin-top: 5px;
+                    }
+                }
+                .review-image{
+                    display: flex;
+                    align-items: center;
+                    gap: 8px;
+                    img{
+                        flex: 1;
+                        height: 82px;
+                        object-fit: cover;
+                        border-radius: 4px;
+                    }
+                }
+                .reminder-box {
+                    background: linear-gradient(90deg, #d9ebfc, transparent);
+                    border-radius: 4px;
+                    padding: 6px 8px;
+                    font-size: 12px;
+                    color: #2E2E2E;
+                    line-height: 1.4;
+                    margin-top: 8px;
+                    .highlight-number {
+                        color: #2199f8;
+                        font-weight: 500;
+                    }
+                }
+            }
             .action-r{
             .action-r{
                 color: #1D2129;
                 color: #1D2129;
             }
             }
-            .info-item{
-                font-size: 12px;
-                color: #BBBBBB;
-                .info-val{
-                    color: #666666;
-                }
-            }
             .action-group {
             .action-group {
                 display: flex;
                 display: flex;
                 align-items: center;
                 align-items: center;
@@ -1341,6 +1422,11 @@ const contentData = ref([
                         &.warning-item {
                         &.warning-item {
                             background: rgba(255, 131, 29, 0.1);
                             background: rgba(255, 131, 29, 0.1);
                             color: #ff831d;
                             color: #ff831d;
+                            &.has-applied {
+                                background: transparent;
+                                color: #AFAFAF;
+                                pointer-events: none;
+                            }
                         }
                         }
                         &.cancel-item {
                         &.cancel-item {
                             color: #676767;
                             color: #676767;

+ 1 - 1
src/views/old_mini/home/components/problemReminder.vue

@@ -45,7 +45,7 @@ import detailDialog from "@/components/detailDialog.vue"
 import { useRouter } from "vue-router";
 import { useRouter } from "vue-router";
 const router = useRouter();
 const router = useRouter();
 
 
-const show = ref(true);
+const show = ref(false);
 const noShow = ref(false);
 const noShow = ref(false);
 const noClick = () => {
 const noClick = () => {
     show.value = false;
     show.value = false;

+ 1 - 1
src/views/old_mini/home/subPages/expertList.vue

@@ -154,7 +154,7 @@ onMounted(() => {
 function toPage(containerId) {
 function toPage(containerId) {
     // userId=${id}&name=${name}
     // userId=${id}&name=${name}
     if (isToSelect) {
     if (isToSelect) {
-        router.replace(`/plan?containerId=${containerId}`)
+        router.replace(`/expert_homepage?containerId=${containerId}`)
     } else {
     } else {
         router.push(`/chat_frame?userId=91754&name=咨询专家`)
         router.push(`/chat_frame?userId=91754&name=咨询专家`)
     }
     }

+ 55 - 28
src/views/old_mini/modify_work/reviewWork.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
     <div class="work-wrap">
     <div class="work-wrap">
-        <custom-header name="农事成效"></custom-header>
+        <custom-header name="农事成效" bgColor="#f2f3f5"></custom-header>
         <div class="work-content recheck-title">
         <div class="work-content recheck-title">
             <div class="tabs-content-item">
             <div class="tabs-content-item">
                 <div class="common-card-title">
                 <div class="common-card-title">
@@ -76,37 +76,57 @@
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
-
+            <!-- 农事成效 -->
             <div class="tabs-content-item">
             <div class="tabs-content-item">
                 <div class="common-card-title">
                 <div class="common-card-title">
                     <img class="icon" src="@/assets/img/home/label-icon.png" alt="" />
                     <img class="icon" src="@/assets/img/home/label-icon.png" alt="" />
-                    <span>投入成本</span>
+                    <span>复核成效</span>
                 </div>
                 </div>
-                <div class="info-box cost-wrap">
-                    <div class="subject-box cost-box">
-                        <div class="subject-item cost-item cost-l">
-                            <div class="cost-title">农资投入(元)</div>
-                            <div class="cost-text subject-tag PangMenZhengDao-FONT">
-                                {{
-                                    workItem?.cost?.pesticideFertilizerCost
-                                        ? workItem.cost?.pesticideFertilizerCost
-                                        : "35元"
-                                }}
-                            </div>
+                <div class="info-box bottom-box">
+                    <div class="result-box">
+                        <div class="result-text">
+                            通过精准农业技术的应用,作物产量实现了两位数的增长,病虫害的发生率大幅下降,土壤肥力的提升
                         </div>
                         </div>
-                        <div class="subject-item cost-item">
-                            <div class="cost-title">农服投入(元)</div>
-                            <div class="cost-text subject-tag PangMenZhengDao-FONT">
-                                {{
-                                    workItem?.cost?.farmWorkServiceCost ? workItem.cost?.farmWorkServiceCost : "1125元"
-                                }}
+                    </div>
+                    <div class="recheck-box">
+                        <div class="recheck-ablum">
+                            <div>农事前</div>
+                            <img class="img-box" src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" alt="">
+                            <div>农事后</div>
+                            <img class="img-box" src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" alt="">
+                            <!-- <div class="img-list over-img-box">
+                                <album-carousel7d
+                                    :key="1"
+                                    :farmId="workItem.farmId"
+                                    :farmWork="{
+                                        beforeExecuteDate: workItem.beforeExecuteDate,
+                                        executeDate: workItem.executeDate,
+                                    }"
+                                ></album-carousel7d>
+                            </div> -->
+                            <!-- <div class="img-list over-img-box" v-if="workItem.reviewImage.length">
+                                <album-carousel
+                                    :key="2"
+                                    :farmId="workItem.farmId"
+                                    :lock="false"
+                                    :images="handleConversion(workItem.reviewImage)"
+                                ></album-carousel>
                             </div>
                             </div>
+                            <div class="img-list over-img-box" v-if="workItem.reviewImage2.length">
+                                <album-carousel
+                                    :key="2"
+                                    :farmId="workItem.farmId"
+                                    :lock="false"
+                                    :images="handleConversion(workItem.reviewImage2)"
+                                ></album-carousel>
+                            </div> -->
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>
 
 
-            <div class="tabs-content-item">
+            <!-- 农事成效 -->
+            <!-- <div class="tabs-content-item">
                 <div class="common-card-title">
                 <div class="common-card-title">
                     <img class="icon" src="@/assets/img/home/label-icon.png" alt="" />
                     <img class="icon" src="@/assets/img/home/label-icon.png" alt="" />
                     <span>复核成效</span>
                     <span>复核成效</span>
@@ -118,7 +138,7 @@
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="recheck-box" v-if="workItem?.farmId">
                     <div class="recheck-box" v-if="workItem?.farmId">
-                        <div class="recheck-ablum">
+                        <div class="recheck-ablum"> -->
                             <!-- <div class="img-list over-img-box">
                             <!-- <div class="img-list over-img-box">
                                 <album-carousel7d
                                 <album-carousel7d
                                     :key="1"
                                     :key="1"
@@ -129,7 +149,7 @@
                                     }"
                                     }"
                                 ></album-carousel7d>
                                 ></album-carousel7d>
                             </div> -->
                             </div> -->
-                            <div class="img-list" v-if="!workItem.reviewImage.length && workItem.activeStatus === 0">
+                            <!-- <div class="img-list" v-if="!workItem.reviewImage.length && workItem.activeStatus === 0">
                                 <div
                                 <div
                                     class="recheck-text-wrap no-events"
                                     class="recheck-text-wrap no-events"
                                     :class="{
                                     :class="{
@@ -274,10 +294,10 @@
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-            </div>
+            </div> -->
 
 
             <!-- 按钮 -->
             <!-- 按钮 -->
-            <div class="up-btn-group" v-show="isPlan">
+            <!-- <div class="up-btn-group" v-show="isPlan">
                 <template v-if="curRole === '2'">
                 <template v-if="curRole === '2'">
                     <div
                     <div
                         class="up-btn"
                         class="up-btn"
@@ -304,10 +324,10 @@
                         联系专家
                         联系专家
                     </div>
                     </div>
                 </template>
                 </template>
-            </div>
+            </div> -->
         </div>
         </div>
         <!-- 上传图片弹窗 -->
         <!-- 上传图片弹窗 -->
-        <upload-popup :executionData="workItem"></upload-popup>
+        <!-- <upload-popup :executionData="workItem"></upload-popup> -->
     </div>
     </div>
 </template>
 </template>
 
 
@@ -361,7 +381,7 @@ const workItem = ref({
     uniqueId: 1,
     uniqueId: 1,
     isPlan: false,
     isPlan: false,
     curRole: "",
     curRole: "",
-    farmId: 766,
+    farmId: 90264,
     libId: 1,
     libId: 1,
     uniqueId: null,
     uniqueId: null,
 });
 });
@@ -704,6 +724,13 @@ function toUpload() {
             .recheck-box,
             .recheck-box,
             .recheck-ablum {
             .recheck-ablum {
                 width: 100%;
                 width: 100%;
+                .img-box{
+                    width: 100%;
+                    height: 255px;
+                    object-fit: cover;
+                    border-radius: 8px;
+                    margin: 12px 0;
+                }
             }
             }
             .evaluate {
             .evaluate {
                 background: #fff;
                 background: #fff;

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

@@ -118,7 +118,7 @@ const functionCards = ref([
     {
     {
         title: "农事方案",
         title: "农事方案",
         status: "2 待执行",
         status: "2 待执行",
-        route: "/agricultural-scheme",
+        route: "/agricultural_plan",
     },
     },
     {
     {
         title: "复核成效",
         title: "复核成效",

+ 19 - 5
src/views/old_mini/monitor/subPages/plan.vue

@@ -20,6 +20,7 @@
                         :key="rowIndex"
                         :key="rowIndex"
                         class="cycle-row"
                         class="cycle-row"
                         :class="{ 'odd-index': rowIndex % 2 === 1 }"
                         :class="{ 'odd-index': rowIndex % 2 === 1 }"
+                        @click="handleRowClick(rowIndex)"
                     >
                     >
                         <div
                         <div
                             v-for="(item, itemIndex) in row.items"
                             v-for="(item, itemIndex) in row.items"
@@ -70,6 +71,9 @@
 <script setup>
 <script setup>
 import { reactive, ref } from "vue";
 import { reactive, ref } from "vue";
 import customHeader from "@/components/customHeader.vue";
 import customHeader from "@/components/customHeader.vue";
+import { useRouter } from "vue-router";
+
+const router = useRouter();
 
 
 // 状态列表数据
 // 状态列表数据
 const statusList = reactive([
 const statusList = reactive([
@@ -157,9 +161,9 @@ const timelineRows = reactive([
     {
     {
         items: [
         items: [
         { type: "term", status: "active" },
         { type: "term", status: "active" },
-            { type: "task", status: "complete", icon: { type: "warning", text: "✓" } },
+            { type: "task", status: "warning", icon: { type: "warning", text: "✓" } },
             { type: "term", status: "active" },
             { type: "term", status: "active" },
-            { type: "task", status: "warning", icon: { type: "complete", text: "!" } },
+            { type: "task", status: "complete", icon: { type: "complete", text: "!" } },
             { type: "term", status: "active" },
             { type: "term", status: "active" },
             { type: "task", status: "complete", icon: { type: "complete", text: "✓" } },
             { type: "task", status: "complete", icon: { type: "complete", text: "✓" } },
         ],
         ],
@@ -176,6 +180,16 @@ const addNewTask = () => {
     console.log("新增农事");
     console.log("新增农事");
     // 这里可以添加新增农事的逻辑
     // 这里可以添加新增农事的逻辑
 };
 };
+
+const handleRowClick = (rowIndex) => {
+    console.log(rowIndex);
+    router.push({
+        path: "/services_agri",
+        // query: {
+        //     rowIndex: rowIndex,
+        // },
+    });
+};
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
@@ -276,7 +290,7 @@ const addNewTask = () => {
                         left: 20px;
                         left: 20px;
                         right: 10px;
                         right: 10px;
                         height: 1px;
                         height: 1px;
-                        background: #e3e3e3;
+                        background: #9e9d9d;
                         transform: translateY(-50%);
                         transform: translateY(-50%);
                         z-index: 1;
                         z-index: 1;
                     }
                     }
@@ -395,7 +409,7 @@ const addNewTask = () => {
                         transform: translateY(-50%);
                         transform: translateY(-50%);
                         width: 30px;
                         width: 30px;
                         height: 76px;
                         height: 76px;
-                        border: 1px solid #e3e3e3;
+                        border: 1px solid #9e9d9d;
                         border-left: none;
                         border-left: none;
                         background: transparent;
                         background: transparent;
 
 
@@ -409,7 +423,7 @@ const addNewTask = () => {
                             border-bottom-left-radius: 5px;
                             border-bottom-left-radius: 5px;
                             left: 0;
                             left: 0;
                             border-right: none;
                             border-right: none;
-                            border-left: 1px solid #e3e3e3;
+                            border-left: 1px solid #9e9d9d;
                         }
                         }
                     }
                     }
                 }
                 }

+ 1324 - 0
src/views/old_mini/monitor/subPages/reviewResults.vue

@@ -0,0 +1,1324 @@
+<template>
+    <custom-header name="复核成效"></custom-header>
+    <div class="farm-dynamics">
+        <div class="task-content">
+            <div class="expert-content" ref="containerRef">
+                <div v-for="(section, index) in contentData" :key="index" class="content-section">
+                    <div class="section-id" :id="section.targetId"></div>
+                    <record-item :record-item-data="section" :onlyRecipeName="true" :showContent="true" class="recipe-item" @click="handleClick(section, index)">
+                        <template #title>
+                            <div class="box-title">
+                                <div class="title-l">
+                                    {{ section.title }}
+                                    <span class="parent-text">{{ section.parentTitle || "秋梢期" }}</span>
+                                </div>
+                                <div class="title-r">
+                                    <span class="r-dot"></span>
+                                    2区
+                                </div>
+                            </div>
+                        </template>
+                        <template #content>
+                            <!-- 未上传图片时显示 -->
+                            <div class="content-info" v-if="index === 0 || index === 2">
+                                <div class="info-line">执行时间:<span class="info-val">{{ section.executeDate || '2025年11月11日' }}</span></div>
+                                <div class="info-line">药物处方:<span class="info-val">{{ getPrescriptionInfo(section) }}</span></div>
+                                <div class="reminder-box">
+                                    距离农事执行已<span class="highlight-number">15</span>天,请抓紧时间上传照片!
+                                </div>
+                            </div>
+                            <!-- 已上传图片时显示 -->
+                            <div class="content-info" v-else>
+                                <div class="info-line">药物处方:<span class="info-val">{{ getPrescriptionInfo(section) }}</span></div>
+                                <div class="review-title info-line">复核成效
+                                    <div class="info-val">
+                                        通过精准农业技术的应用,作物产量实现了两位数的增长,病虫害的发生率大幅下降,土壤肥力的提升
+                                    </div>
+                                </div>
+                                <div class="review-image">
+                                    <img src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" alt="">
+                                    <img src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" alt="">
+                                </div>
+                            </div>
+                        </template>
+                        <template #footer>
+                            <div class="action-group" v-if="index === 0 || index === 2">
+                                <div class="action-l">查看详情</div>
+                                <div class="action-r">
+                                    <div class="action-item warning-item" :class="{ 'has-applied': section.hasApplied }" @click="handleApply(section, index)">{{ section.hasApplied ? '已发起需求' : '发起需求' }}</div>
+                                    <div class="action-item primary-item">上传照片</div>
+                                </div>
+                            </div>
+                        </template>
+                    </record-item>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 需求发送成功弹窗 -->
+    <popup v-model:show="showApplyPopup" round class="apply-popup">
+        <img class="check-icon" src="@/assets/img/home/right.png" alt="">
+        <div class="apply-text">需求发送成功</div>
+        <div class="apply-btn" @click="showApplyPopup = false">我知道了</div>
+    </popup>
+</template>
+<script setup>
+import { ref } from "vue";
+import recordItem from "@/components/recordItem.vue";
+import { Popup } from "vant";
+import customHeader from "@/components/customHeader.vue";
+import { useRouter } from "vue-router";
+
+const showApplyPopup = ref(false);
+const containerRef = ref(null);
+const router = useRouter();
+
+const handleApply = (section, index) => {
+    // 更新当前项的发起需求状态
+    showApplyPopup.value = true;
+    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;
+    const hasExecuteEvidence = section.executeEvidence && section.executeEvidence.length > 0;
+    return hasConfirmPictures || hasExecuteEvidence;
+};
+
+const handleClick = (section, index) => {
+    router.push({
+        path: "/review_work",
+        query: {
+            id: section.id,
+        },
+    });
+};
+
+const contentData = ref([
+    {
+        targetId: "part1",
+        title: "巡园农事",
+        parentTitle: "秋梢期",
+        isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,虫害风险控制优异,未发现虫害风险",
+        expert: 91356,
+        orderStatus: 3,
+        activeStatus: 0,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        farmWorkId: "699343457474318336",
+        farmWorkLibId: "699343457474318336",
+        farmWorkLibName: "梢期防虫",
+        farmWorkName: "梢期防虫",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        icon: 4,
+        beforeExecuteDate: "2025-08-01",
+        executeDate: "2025-08-15",
+        code: "BZ-BC-04-SQFC-20",
+        expertPrescription: "",
+        condition: "单树嫩叶率大于20.0%",
+        defaultFarmWork: 0,
+        farmWorkType: 3,
+        farmWorkTypeName: "病虫",
+        usageMode: "叶面施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        serviceRegion: "广州市从化区荔枝博览园",
+        prescriptionList: [
+            {
+                name: "营养",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "尿素",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 15000.0,
+                        muUsage2: 15000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1001",
+                        pesticideFertilizerId: "1",
+                        pesticideFertilizerName: "尿素",
+                        brand: "山东联盟",
+                        typeName: "营养",
+                        price: 132,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "15-15-15复合肥",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 45000.0,
+                        muUsage2: 45000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1002",
+                        pesticideFertilizerId: "2",
+                        pesticideFertilizerName: "15-15-15复合肥",
+                        brand: "金正大",
+                        typeName: "营养",
+                        price: 220,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+    },
+    {
+        targetId: "part2",
+        title: "梢期防虫",
+        parentTitle: "秋梢期",
+        isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
+        consequenceText: "如果不做本次农事,会导致您的产量、质量下降30%,管理得分降低10分",
+        id: "274654",
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,土壤肥力增加",
+        farmName: "荔枝博览园",
+        farmPoint: "POINT(113.61702297075017 23.584863449735067)",
+        orderId: "745923632567422976",
+        area: 2.719998598098755,
+        expert: 91356,
+        orderStatus: 4,
+        activeStatus: 0,
+        farmId: 766,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        agriculturalId: 24,
+        farmWorkId: "699343457444958208",
+        farmWorkLibId: "699343457444958208",
+        farmWorkLibName: "梢期营养",
+        farmWorkName: "梢期营养",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        expertUserIcon: "",
+        expertUserName: "韦帮稳",
+        icon: 4,
+        indexChart: [],
+        indexName: "",
+        beforeExecuteDate: "2025-05-26",
+        checkDate: null,
+        executeDate: "2025-08-01",
+        indexJson: "",
+        code: "BZ-YY-04-SQYY-20",
+        expertPrescription: "",
+        condition: "园区叶芽率大于20.0%",
+        solarName: "",
+        reCheck: null,
+        executeBlueZones: [
+            {
+                id: "ws0y1m6x7cjz",
+                level: null,
+            },
+            {
+                id: "ws0y1md9v3ht",
+                level: null,
+            },
+            {
+                id: "ws0y1mdspbk7",
+                level: null,
+            },
+            {
+                id: "ws0y1mdvvdsz",
+                level: null,
+            },
+            {
+                id: "ws0y1me545tg",
+                level: null,
+            },
+        ],
+        menu: 1,
+        isEdit: 0,
+        isMaster: null,
+        num: null,
+        purpose: "",
+        selfExec: null,
+        defaultFarmWork: 0,
+        farmWorkType: 2,
+        farmWorkTypeName: "营养",
+        type: 1,
+        execute: 4,
+        updateDate0: "2025-08-20",
+        updateDate1: null,
+        updateDate2: null,
+        updateDate3: null,
+        updateDate4: null,
+        updateDate5: null,
+        usageMode: "根部施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        weatherWarningMsg: "",
+        executeEvidence: [],
+        userEvaluation: null,
+        reviewDate: null,
+        reviewDate2: null,
+        reviewImage: [],
+        reviewImage2: [],
+        serviceRegion: "广州市从化区荔枝博览园",
+        users: [
+            {
+                id: null,
+                orderId: null,
+                serviceType: null,
+                userType: null,
+                userId: 81881,
+                joinStatus: null,
+                icon: "https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png",
+                userName: "飞鸟种植助手",
+                area: "",
+                point: "",
+                farmName: "",
+                selected: null,
+            },
+        ],
+        cost: null,
+        prescriptionList: [
+            {
+                name: "营养",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "尿素",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 15000.0,
+                        muUsage2: 15000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1001",
+                        pesticideFertilizerId: "1",
+                        pesticideFertilizerName: "尿素",
+                        brand: "山东联盟",
+                        typeName: "营养",
+                        price: 132,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "15-15-15复合肥",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 45000.0,
+                        muUsage2: 45000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1002",
+                        pesticideFertilizerId: "2",
+                        pesticideFertilizerName: "15-15-15复合肥",
+                        brand: "金正大",
+                        typeName: "营养",
+                        price: 220,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+        conditionList: [
+            {
+                index: "1-2-001-02-02-02-01-0008",
+                name: "园区叶芽率",
+                type: 1,
+                value: "0.2",
+            },
+        ],
+    },
+    {
+        targetId: "part3",
+        title: "梢期营养",
+        isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
+        consequenceText: "如果不做本次农事,会导致您的产量、质量下降5%,管理得分降低2分",
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,转色速度非常稳定,转色率超过80%",
+        farmName: "荔枝博览园",
+        farmPoint: "POINT(113.61702297075017 23.584863449735067)",
+        orderId: "745923697054846976",
+        area: 2.719998598098755,
+        expert: 91356,
+        orderStatus: 2,
+        activeStatus: 0,
+        farmId: 766,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        agriculturalId: 24,
+        farmWorkId: "699343457482706947",
+        farmWorkLibId: "699343457482706947",
+        farmWorkLibName: "转色营养",
+        farmWorkName: "转色营养",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        expertUserIcon: "",
+        expertUserName: "韦帮稳",
+        icon: 0,
+        indexChart: [],
+        indexName: "",
+        beforeExecuteDate: "2025-05-26",
+        checkDate: null,
+        executeDate: "2025-05-26",
+        indexJson: "",
+        code: "BZ-YY-06-ZSYY-100",
+        expertPrescription: "",
+        condition: "园区转色率大于20.0%",
+        solarName: "",
+        reCheck: null,
+        executeBlueZones: [
+            {
+                id: "ws0y1m6x7cjz",
+                level: null,
+            },
+            {
+                id: "ws0y1md9v3ht",
+                level: null,
+            },
+            {
+                id: "ws0y1mdspbk7",
+                level: null,
+            },
+            {
+                id: "ws0y1mdvvdsz",
+                level: null,
+            },
+            {
+                id: "ws0y1me545tg",
+                level: null,
+            },
+        ],
+        menu: 1,
+        isEdit: 0,
+        isMaster: null,
+        num: null,
+        purpose: "",
+        selfExec: null,
+        defaultFarmWork: 0,
+        farmWorkType: 2,
+        farmWorkTypeName: "营养",
+        type: 1,
+        execute: 4,
+        updateDate0: "2025-08-20",
+        updateDate1: null,
+        updateDate2: null,
+        updateDate3: null,
+        updateDate4: null,
+        updateDate5: null,
+        usageMode: "根部施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        weatherWarningMsg: "",
+        executeEvidence: [],
+        userEvaluation: null,
+        reviewDate: null,
+        reviewDate2: null,
+        reviewImage: [],
+        reviewImage2: [],
+        serviceRegion: "广州市从化区荔枝博览园",
+        users: [
+            {
+                id: null,
+                orderId: null,
+                serviceType: null,
+                userType: null,
+                userId: 81881,
+                joinStatus: null,
+                icon: "https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png",
+                userName: "飞鸟种植助手",
+                area: "",
+                point: "",
+                farmName: "",
+                selected: null,
+            },
+        ],
+        cost: null,
+        prescriptionList: [
+            {
+                name: "营养",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "矿源黄腐酸钾",
+                        defaultRatio: 2000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 4.0,
+                        muUsage2: 4.0,
+                        ratio: 2000,
+                        ratio2: 200,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1166",
+                        pesticideFertilizerId: "166",
+                        pesticideFertilizerName: "矿源黄腐酸钾",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 15000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "有机质水溶肥",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1167",
+                        pesticideFertilizerId: "167",
+                        pesticideFertilizerName: "有机质水溶肥",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 10000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "磷酸二氢钾",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1168",
+                        pesticideFertilizerId: "168",
+                        pesticideFertilizerName: "磷酸二氢钾",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 12000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "高钾复合肥",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1169",
+                        pesticideFertilizerId: "169",
+                        pesticideFertilizerName: "高钾复合肥",
+                        brand: "未知",
+                        typeName: "营养",
+                        price: 245,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "红牛硫酸钾",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1170",
+                        pesticideFertilizerId: "170",
+                        pesticideFertilizerName: "红牛硫酸钾",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 230,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+        conditionList: [
+            {
+                index: "1-2-016-02-02-02-01-0008",
+                name: "园区转色率",
+                type: 1,
+                value: "0.2",
+            },
+        ],
+    },
+    {
+        targetId: "part4",
+        title: "巡园农事",
+        parentTitle: "开花期",
+        isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
+        consequenceText: "如果不做本次农事,会导致您的产量、质量下降20%,管理得分降低8分",
+        id: "274672",
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,病虫害基数得到大幅下降,未发现病虫害风险",
+        farmName: "荔枝博览园",
+        farmPoint: "POINT(113.61702297075017 23.584863449735067)",
+        orderId: "745923690209742848",
+        area: 2.719998598098755,
+        expert: 91356,
+        orderStatus: 3,
+        activeStatus: 0,
+        farmId: 766,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        agriculturalId: 24,
+        farmWorkId: "699343457478512646",
+        farmWorkLibId: "699343457478512646",
+        farmWorkLibName: "果期防治II",
+        farmWorkName: "果期防治II",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        expertUserIcon: "",
+        expertUserName: "韦帮稳",
+        icon: 1,
+        indexChart: [],
+        indexName: "",
+        beforeExecuteDate: "2025-05-06",
+        checkDate: null,
+        executeDate: "2025-05-12",
+        indexJson: "",
+        code: "BZ-BC-06-GQFZ2-100",
+        expertPrescription: "",
+        condition: "园区膨果率大于20.0%",
+        solarName: "",
+        reCheck: null,
+        executeBlueZones: [
+            {
+                id: "ws0y1m6x7cjz",
+                level: null,
+            },
+            {
+                id: "ws0y1md9v3ht",
+                level: null,
+            },
+            {
+                id: "ws0y1mdspbk7",
+                level: null,
+            },
+            {
+                id: "ws0y1mdvvdsz",
+                level: null,
+            },
+            {
+                id: "ws0y1me545tg",
+                level: null,
+            },
+        ],
+        menu: 1,
+        isEdit: 0,
+        isMaster: null,
+        num: null,
+        purpose: "",
+        selfExec: null,
+        defaultFarmWork: 0,
+        farmWorkType: 3,
+        farmWorkTypeName: "病虫",
+        type: 1,
+        execute: 4,
+        updateDate0: "2025-08-20",
+        updateDate1: null,
+        updateDate2: null,
+        updateDate3: null,
+        updateDate4: null,
+        updateDate5: null,
+        usageMode: "叶面施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        weatherWarningMsg: "",
+        executeEvidence: [],
+        userEvaluation: null,
+        reviewDate: null,
+        reviewDate2: null,
+        reviewImage: [],
+        reviewImage2: [],
+        serviceRegion: "广州市从化区荔枝博览园",
+        users: [
+            {
+                id: null,
+                orderId: null,
+                serviceType: null,
+                userType: null,
+                userId: 81881,
+                joinStatus: null,
+                icon: "https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png",
+                userName: "飞鸟种植助手",
+                area: "",
+                point: "",
+                farmName: "",
+                selected: null,
+            },
+        ],
+        cost: null,
+        prescriptionList: [
+            {
+                name: "病虫",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "威远.绿凯",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 150.0,
+                        muUsage2: 150.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1147",
+                        pesticideFertilizerId: "147",
+                        pesticideFertilizerName: "威远.绿凯",
+                        brand: "利民控股绿凯",
+                        typeName: "病虫",
+                        price: 90,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "微量元素益元液",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 300.0,
+                        muUsage2: 300.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1174",
+                        pesticideFertilizerId: "174",
+                        pesticideFertilizerName: "微量元素益元液",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 60,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "中量元素益元液",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 300.0,
+                        muUsage2: 300.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1175",
+                        pesticideFertilizerId: "175",
+                        pesticideFertilizerName: "中量元素益元液",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 30,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "济南中科翠剑",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 150.0,
+                        muUsage2: 150.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1149",
+                        pesticideFertilizerId: "149",
+                        pesticideFertilizerName: "吡唑醚菌酯",
+                        brand: "济南中科翠剑",
+                        typeName: "病虫",
+                        price: 60,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "佳果天成",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 300.0,
+                        muUsage2: 300.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1171",
+                        pesticideFertilizerId: "171",
+                        pesticideFertilizerName: "佳果天成",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 120,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "高效氟氯氰菊酯",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 150.0,
+                        muUsage2: 150.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1155",
+                        pesticideFertilizerId: "155",
+                        pesticideFertilizerName: "高效氟氯氰菊酯",
+                        brand: "广东立威.立功",
+                        typeName: "病虫",
+                        price: 50,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "联苯噻虫嗪",
+                        defaultRatio: 150000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 150.0,
+                        muUsage2: 150.0,
+                        ratio: 150000,
+                        ratio2: 15000,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1156",
+                        pesticideFertilizerId: "156",
+                        pesticideFertilizerName: "联苯噻虫嗪",
+                        brand: "青岛金正飞灵",
+                        typeName: "病虫",
+                        price: 60,
+                        unit: "ml",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+        conditionList: [
+            {
+                index: "1-2-014-02-02-02-01-0008",
+                name: "园区膨果率",
+                type: 1,
+                value: "0.2",
+            },
+        ],
+    },
+    {
+        id: "part5",
+        title: "摇花吹花",
+        parentTitle: "开花期",
+        isExpanded: false, // 添加展开状态
+        hasApplied: false, // 是否已发起需求
+        consequenceText: "如果不做本次农事,会导致您的产量、质量下降15%,管理得分降低5分",
+        id: "274671",
+        reCheckText: "本次农事复核成效优异,作物产量潜力实现大幅增长,树体营养较充足,膨果速度非常稳定,膨果率超过80%",
+        farmName: "荔枝博览园",
+        farmPoint: "POINT(113.61702297075017 23.584863449735067)",
+        orderId: "745923686854299648",
+        area: 2.719998598098755,
+        expert: 91356,
+        orderStatus: 1,
+        activeStatus: 0,
+        farmId: 766,
+        regionId: 2,
+        speciesId: "1",
+        speciesName: "荔枝",
+        agriculturalId: 24,
+        farmWorkId: "699343457482706944",
+        farmWorkLibId: "699343457482706944",
+        farmWorkLibName: "膨果营养",
+        farmWorkName: "膨果营养",
+        expertIcon:
+            "https://birdseye-img.sysuimars.com/birdseye-look-vue/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250411150343.png",
+        expertName: "韦帮稳",
+        expertUserIcon: "",
+        expertUserName: "韦帮稳",
+        icon: 2,
+        indexChart: [],
+        indexName: "",
+        beforeExecuteDate: "2025-05-01",
+        checkDate: null,
+        executeDate: "2025-05-06",
+        indexJson: "",
+        code: "BZ-YY-06-PGYY-100",
+        expertPrescription: "",
+        condition: "园区膨果率大于10.0%",
+        solarName: "",
+        reCheck: null,
+        executeBlueZones: [
+            {
+                id: "ws0y1m6x7cjz",
+                level: null,
+            },
+            {
+                id: "ws0y1md9v3ht",
+                level: null,
+            },
+            {
+                id: "ws0y1mdspbk7",
+                level: null,
+            },
+            {
+                id: "ws0y1mdvvdsz",
+                level: null,
+            },
+            {
+                id: "ws0y1me545tg",
+                level: null,
+            },
+        ],
+        menu: 1,
+        isEdit: 0,
+        isMaster: null,
+        num: null,
+        purpose: "",
+        selfExec: null,
+        defaultFarmWork: 0,
+        farmWorkType: 2,
+        farmWorkTypeName: "营养",
+        type: 1,
+        execute: 4,
+        updateDate0: "2025-08-20",
+        updateDate1: null,
+        updateDate2: null,
+        updateDate3: null,
+        updateDate4: null,
+        updateDate5: null,
+        usageMode: "根部施",
+        serviceMain: "广州泽秾丰农资有限公司",
+        updateDate6: null,
+        confirmPicture: [],
+        executeMain: "广州泽秾丰农资有限公司",
+        storeShortName: "泽秾丰",
+        weatherWarningMsg: "",
+        executeEvidence: [],
+        userEvaluation: null,
+        reviewDate: null,
+        reviewDate2: null,
+        reviewImage: [],
+        reviewImage2: [],
+        serviceRegion: "广州市从化区荔枝博览园",
+        users: [
+            {
+                id: null,
+                orderId: null,
+                serviceType: null,
+                userType: null,
+                userId: 81881,
+                joinStatus: null,
+                icon: "https://birdseye-img.sysuimars.com/birdseye-look-mini/Group%201321316260.png",
+                userName: "飞鸟种植助手",
+                area: "",
+                point: "",
+                farmName: "",
+                selected: null,
+            },
+        ],
+        cost: null,
+        prescriptionList: [
+            {
+                name: "营养",
+                pesticideFertilizerList: [
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "硝酸铵钙",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 15000.0,
+                        muUsage2: 15000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1162",
+                        pesticideFertilizerId: "162",
+                        pesticideFertilizerName: "硝酸铵钙",
+                        brand: "未知",
+                        typeName: "营养",
+                        price: 2000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "氯化钾",
+                        defaultRatio: 0,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 15000.0,
+                        muUsage2: 15000.0,
+                        ratio: 0,
+                        ratio2: 0,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1163",
+                        pesticideFertilizerId: "163",
+                        pesticideFertilizerName: "氯化钾",
+                        brand: "未知",
+                        typeName: "营养",
+                        price: 4500,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "高氮水溶肥",
+                        defaultRatio: 5000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 10.0,
+                        muUsage2: 10.0,
+                        ratio: 5000,
+                        ratio2: 500,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1165",
+                        pesticideFertilizerId: "165",
+                        pesticideFertilizerName: "高氮水溶肥",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 8500,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                    {
+                        defaultDroneRatio: null,
+                        defaultName: "矿源黄腐酸钾",
+                        defaultRatio: 2000,
+                        id: null,
+                        muPrice: null,
+                        muUsage: 4.0,
+                        muUsage2: 4.0,
+                        ratio: 2000,
+                        ratio2: 200,
+                        remark: "",
+                        usageMode: "",
+                        usageModeList: ["叶面施、根部施"],
+                        orderId: null,
+                        pesticideFertilizerCode: "1166",
+                        pesticideFertilizerId: "166",
+                        pesticideFertilizerName: "矿源黄腐酸钾",
+                        brand: "广州大炎",
+                        typeName: "营养",
+                        price: 15000,
+                        unit: "g",
+                        executeStyle: null,
+                    },
+                ],
+            },
+        ],
+        conditionList: [
+            {
+                index: "1-2-014-02-02-02-01-0008",
+                name: "园区膨果率",
+                type: 1,
+                value: "0.1",
+            },
+        ],
+    },
+]);
+</script>
+<style lang="scss" scoped>
+.farm-dynamics {
+    width: 100%;
+    height: 100vh;
+    background: #f5f7fb;
+    .task-content {
+        display: flex;
+        padding-top: 10px;
+        height: calc(100% - 40px);
+        .expert-content {
+            width: 100%;
+            height: 100%;
+            overflow: auto;
+            padding-bottom: 10px;
+            box-sizing: border-box;
+            .content-section {
+                position: relative;
+                .section-id {
+                    position: absolute;
+                    top: 0;
+                    width: 100%;
+                    height: 1px;
+                }
+            }
+            .box-title {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                padding-bottom: 8px;
+                .title-l {
+                    font-size: 16px;
+                    font-weight: 600;
+                    color: #000;
+                    .parent-text {
+                        margin-left: 5px;
+                        font-size: 12px;
+                        font-weight: normal;
+                        padding: 4px 6px;
+                        border-radius: 14px;
+                        background: rgba(119, 119, 119, 0.1);
+                    }
+                }
+                .title-btn {
+                    width: 24px;
+                    height: 24px;
+                    border-radius: 50%;
+                    background: #2199f8;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                }
+                .title-r {
+                    display: flex;
+                    align-items: center;
+                    color: #393939;
+                    font-size: 12px;
+                    .r-dot {
+                        width: 6px;
+                        height: 6px;
+                        border-radius: 50%;
+                        background: #393939;
+                        margin-right: 5px;
+                    }
+                }
+            }
+            .content-info {
+                padding-top: 8px;
+                .info-line {
+                    font-size: 12px;
+                    color: #BBBBBB;
+                    margin-bottom: 8px;
+                    line-height: 1.4;
+                    .info-val{
+                        color: #666666;
+                    }
+                }
+                .review-title {
+                    .info-val{
+                        margin-top: 5px;
+                    }
+                }
+                .review-image{
+                    display: flex;
+                    align-items: center;
+                    gap: 8px;
+                    img{
+                        flex: 1;
+                        height: 82px;
+                        object-fit: cover;
+                        border-radius: 4px;
+                    }
+                }
+                .reminder-box {
+                    background: linear-gradient(90deg, #d9ebfc, transparent);
+                    border-radius: 4px;
+                    padding: 6px 8px;
+                    font-size: 12px;
+                    color: #2E2E2E;
+                    line-height: 1.4;
+                    margin-top: 8px;
+                    .highlight-number {
+                        color: #2199f8;
+                        font-weight: 500;
+                    }
+                }
+            }
+            .action-r{
+                color: #1D2129;
+            }
+            .action-group {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                padding-top: 8px;
+                margin-top: 8px;
+                border-top: 1px solid #f5f5f5;
+                .action-l {
+                    font-size: 12px;
+                }
+            }
+            .action-group {
+                .action-r {
+                    display: flex;
+                    align-items: center;
+                    .action-item {
+                        padding: 0 11px;
+                        height: 30px;
+                        line-height: 30px;
+                        border-radius: 20px;
+                        font-size: 12px;
+                        &.second-item {
+                            border: 1px solid #2199f8;
+                            color: #2199f8;
+                        }
+                        &.primary-item {
+                            background: #2199f8;
+                            color: #fff;
+                        }
+                        &.warning-item {
+                            background: rgba(255, 131, 29, 0.1);
+                            color: #ff831d;
+                            &.has-applied {
+                                background: transparent;
+                                color: #AFAFAF;
+                                pointer-events: none;
+                            }
+                        }
+                        &.cancel-item {
+                            color: #676767;
+                            border: 1px solid rgba(103, 103, 103, 0.2);
+                        }
+                    }
+                    .action-item + .action-item {
+                        margin-left: 5px;
+                    }
+                }
+                .apply-action {
+                    justify-content: flex-end;
+                    .default-item {
+                        border: 1px solid rgba(0, 0, 0, 0.4);
+                        color: rgba(0, 0, 0, 0.4);
+                    }
+                }
+            }
+        }
+    }
+}
+.apply-popup {
+    width: 75%;
+    padding: 28px 28px 20px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    .check-icon{
+        width: 68px;
+        height: 68px;
+        margin-bottom: 12px;
+    }
+    .apply-text{
+        font-size: 24px;
+        font-weight: 500;
+        margin-bottom: 32px;
+        text-align: center;
+    }
+    .apply-btn{
+        width: 100%;
+        box-sizing: border-box;
+        padding: 8px;
+        border-radius: 25px;
+        font-size: 16px;
+        background: #2199F8;
+        color: #fff;
+        text-align: center;
+    }
+}
+</style>

+ 9 - 8
src/views/old_mini/plan/components/myPrescription.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
     <div class="prescription-page">
     <div class="prescription-page">
-        <div class="filter-wrap">
+        <!-- <div class="filter-wrap">
             <div class="farm-list">
             <div class="farm-list">
                 <el-select
                 <el-select
                     @change="changeFarm"
                     @change="changeFarm"
@@ -29,7 +29,7 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="plan-add" @click="newPlan">新增方案</div>
             <div class="plan-add" @click="newPlan">新增方案</div>
-        </div>
+        </div> -->
         <div class="expert-prescription" :class="{'isSubPage': isSubPage}">
         <div class="expert-prescription" :class="{'isSubPage': isSubPage}">
             <div class="plan-menu">
             <div class="plan-menu">
                 <el-anchor :container="containerRef" direction="vertical" type="default" @click="handleClick">
                 <el-anchor :container="containerRef" direction="vertical" type="default" @click="handleClick">
@@ -57,14 +57,14 @@
                                         {{ sub.farmWorkDetail?.name }}
                                         {{ sub.farmWorkDetail?.name }}
                                         <span class="parent-text">{{ section.name }}</span>
                                         <span class="parent-text">{{ section.name }}</span>
                                     </div>
                                     </div>
-                                    <div class="title-r">
+                                    <!-- <div class="title-r">
                                         <div class="btn-item del-btn" @click="deletePlan">
                                         <div class="btn-item del-btn" @click="deletePlan">
                                             <el-icon color="#fff" size="14"><Delete /></el-icon>
                                             <el-icon color="#fff" size="14"><Delete /></el-icon>
                                         </div>
                                         </div>
                                         <div class="btn-item edit-btn">
                                         <div class="btn-item edit-btn">
                                             <el-icon color="#fff" size="14"><Edit /></el-icon>
                                             <el-icon color="#fff" size="14"><Edit /></el-icon>
                                         </div>
                                         </div>
-                                    </div>
+                                    </div> -->
                                 </div>
                                 </div>
                             </template>
                             </template>
                         </record-item>
                         </record-item>
@@ -74,7 +74,7 @@
         </div>
         </div>
 
 
         <!-- 底部 -->
         <!-- 底部 -->
-        <div class="fixed-bottom">
+        <!-- <div class="fixed-bottom">
             <div class="bottom-l">
             <div class="bottom-l">
                 <div class="l-btn">
                 <div class="l-btn">
                     <el-icon color="#666666" class="btn-icon" size="16"><Download /></el-icon>
                     <el-icon color="#666666" class="btn-icon" size="16"><Download /></el-icon>
@@ -82,7 +82,7 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="bottom-r" @click="addWork">新增农事</div>
             <div class="bottom-r" @click="addWork">新增农事</div>
-        </div>
+        </div> -->
     </div>
     </div>
     <add-group ref="addGroupRef" @updateGroupList="getPlan" />
     <add-group ref="addGroupRef" @updateGroupList="getPlan" />
     <action-sheet :style="{ bottom: tabBarHeight + 'px' }" v-model:show="showAction" title="选择农事类型(可多选)">
     <action-sheet :style="{ bottom: tabBarHeight + 'px' }" v-model:show="showAction" title="选择农事类型(可多选)">
@@ -316,7 +316,8 @@ function changeFarm(v) {
         width: 100%;
         width: 100%;
         height: calc(100vh - 52px - 48px);
         height: calc(100vh - 52px - 48px);
         &.isSubPage {
         &.isSubPage {
-            height: calc(100vh - 52px - 48px - 50px);
+            height: calc(100vh - 52px - 48px);
+            padding-top: 10px;
         }
         }
         .plan-menu {
         .plan-menu {
             width: 100px;
             width: 100px;
@@ -505,7 +506,7 @@ function changeFarm(v) {
         .bottom-r {
         .bottom-r {
             height: 32px;
             height: 32px;
             line-height: 32px;
             line-height: 32px;
-            background: #2199F8;
+            background: linear-gradient(180deg, #70bffe, #2199f8);
             border-radius: 20px;
             border-radius: 20px;
             color: #fff;
             color: #fff;
             padding: 0 12px;
             padding: 0 12px;

+ 9 - 28
src/views/old_mini/plan/index.vue

@@ -1,10 +1,11 @@
 <template>
 <template>
-    <div class="plan-page" :style="{ height: `calc(100vh - ${tabBarHeight}px)` }">
+    <div class="plan-page">
+        <custom-header name="农事方案"></custom-header>
         <div class="plan-title">
         <div class="plan-title">
             <div class="tabs">
             <div class="tabs">
                 <div class="tab" :class="{ active: activeTab === 'left' }" @click="setActiveTab('left')">专家处方</div>
                 <div class="tab" :class="{ active: activeTab === 'left' }" @click="setActiveTab('left')">专家处方</div>
                 <div class="tab" :class="{ active: activeTab === 'right' }" @click="setActiveTab('right')">
                 <div class="tab" :class="{ active: activeTab === 'right' }" @click="setActiveTab('right')">
-                    我的
+                    我的方
                     <span class="badge-dot">2</span>
                     <span class="badge-dot">2</span>
                 </div>
                 </div>
                 <div class="slider" :style="sliderStyle"></div>
                 <div class="slider" :style="sliderStyle"></div>
@@ -28,26 +29,6 @@
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="filter-r" @click="toPage">更多专家<el-icon><ArrowRightBold /></el-icon></div>
                 <div class="filter-r" @click="toPage">更多专家<el-icon><ArrowRightBold /></el-icon></div>
-                <!-- <div class="filter-item">
-                    <el-select v-model="expertVal" placeholder="推荐专家" style="width: 86px">
-                        <el-option
-                            v-for="item in expertOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </div>
-                <div class="filter-item">
-                    <el-select v-model="filterVal" placeholder="筛选" style="width: 68px">
-                        <el-option
-                            v-for="item in filterOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </div> -->
             </div>
             </div>
             <div class="expert-prescription">
             <div class="expert-prescription">
                 <div class="plan-menu">
                 <div class="plan-menu">
@@ -76,9 +57,9 @@
                                             {{ sub.farmWorkDetail?.name }}
                                             {{ sub.farmWorkDetail?.name }}
                                             <span class="parent-text">{{ section.name }}</span>
                                             <span class="parent-text">{{ section.name }}</span>
                                         </div>
                                         </div>
-                                        <div class="title-btn" v-if="sub.selected == 0" @click="addToMyPlan">
+                                        <!-- <div class="title-btn" v-if="sub.selected == 0" @click="addToMyPlan">
                                             <el-icon color="#fff" size="14"><Plus /></el-icon>
                                             <el-icon color="#fff" size="14"><Plus /></el-icon>
-                                        </div>
+                                        </div> -->
                                     </div>
                                     </div>
                                 </template>
                                 </template>
                             </record-item>
                             </record-item>
@@ -103,8 +84,7 @@
         </div>
         </div>
         <div class="plan-content my-recipe" v-if="activeTab === 'right'">
         <div class="plan-content my-recipe" v-if="activeTab === 'right'">
             <my-prescription :isSubPage="true"></my-prescription>
             <my-prescription :isSubPage="true"></my-prescription>
-            <!-- 底部 -->
-            <div class="fixed-bottom">
+            <!-- <div class="fixed-bottom">
                 <div class="bottom-l">
                 <div class="bottom-l">
                     <div class="l-btn">
                     <div class="l-btn">
                         <img class="btn-icon calculator-icon" src="@/assets/img/home/calculator.png" alt="" />
                         <img class="btn-icon calculator-icon" src="@/assets/img/home/calculator.png" alt="" />
@@ -112,7 +92,7 @@
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="bottom-r">新增农事</div>
                 <div class="bottom-r">新增农事</div>
-            </div>
+            </div> -->
         </div>
         </div>
     </div>
     </div>
     <add-group ref="addGroupRef" />
     <add-group ref="addGroupRef" />
@@ -123,6 +103,7 @@ import { computed, onMounted, ref } from "vue";
 import recordItem from "@/components/recordItem.vue";
 import recordItem from "@/components/recordItem.vue";
 import addGroup from "./components/addGroup.vue";
 import addGroup from "./components/addGroup.vue";
 import myPrescription from "./components/myPrescription.vue";
 import myPrescription from "./components/myPrescription.vue";
+import customHeader from "@/components/customHeader.vue";
 import { useStore } from "vuex";
 import { useStore } from "vuex";
 import { useRouter, useRoute } from "vue-router";
 import { useRouter, useRoute } from "vue-router";
 const store = useStore();
 const store = useStore();
@@ -277,7 +258,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .plan-page {
 .plan-page {
     position: relative;
     position: relative;
-    height: calc(100vh - 50px);
+    height: 100vh;
     .plan-title {
     .plan-title {
         width: 158px;
         width: 158px;
         margin: 0 auto;
         margin: 0 auto;