lxf před 6 hodinami
rodič
revize
f2aae767b7

+ 20 - 16
src/views/old_mini/agri_record/subPages/statusDetail.vue

@@ -152,10 +152,12 @@
                         </photo-provider>
                         <div class="video-play-icon">
                             <div
-                                class="html-ellipsis"
                                 v-html="detailData?.post?.content"
                             ></div>
-                            <!-- <span class="expand-text">展开详细操作指南</span> -->
+                            <!-- <div class="expand-text" @click="toggleGuideExpand">
+                                <el-icon class="expand-icon" :class="{ 'rotate': isGuideExpanded }"><DArrowLeft /></el-icon>
+                                {{isGuideExpanded ? '收起' : '展开详细操作指南'}}
+                            </div> -->
                         </div>
                         <!-- <video src="https://birdseye-img-ali-cdn.sysuimars.com/bbs_post/video/1767872309467.mp4"
                             controls style="width: 100%; max-width: 100%; height: auto; border-radius: 8px"
@@ -271,17 +273,6 @@ const route = useRoute();
 
 const status = ref(null);
 
-// 处方数据(可以从接口获取或从路由参数获取)
-const prescriptionData = ref({
-    id: 280962,
-    title: "秋梢防虫",
-    advice: "当前为秋梢期,建议巡园,重点关注叶片、嫩梢等部位",
-    type: "标准农事",
-    expert: "冼继东",
-    executeTime: "2025.02.18",
-    applyMethod: "内膛喷施",
-});
-
 const typeMap = ref({
     0: "预警农事",
     1: "标准农事",
@@ -311,7 +302,7 @@ const selectExecuteTime = () => {
 
 const handleForward = async () => {
     // 转发处方:复制处方链接到剪贴板
-    const url = `${window.location.origin}/#/prescription_page?id=${prescriptionData.value.id}`;
+    const url = `${window.location.origin}/#/prescription_page?id=${route.query.miniJson ? JSON.parse(route.query.miniJson).id : null}`;
 
     try {
         if (navigator.clipboard && navigator.clipboard.writeText) {
@@ -383,7 +374,7 @@ const isLocked = ref(false);
 onActivated(() => {
     const id = route.query.miniJson ? JSON.parse(route.query.miniJson).id : null;
     if (id) {
-        getDetail(281571);
+        getDetail(id);
     }
 });
 
@@ -742,7 +733,7 @@ const getDetail = async (id) => {
             border-radius: 5px;
         }
         .video-play-icon {
-            padding-top: 12px;
+            // padding-top: 12px;
             font-size: 14px;
                 .html-ellipsis {
                     display: -webkit-box;
@@ -754,7 +745,20 @@ const getDetail = async (id) => {
                     color: #4e5969;
                 }
             .expand-text {
+                padding-top: 4px;
+                text-align: center;
                 color: #2199f8;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                .expand-icon {
+                    margin-right: 4px;
+                    transform: rotate(270deg);
+                    transition: transform 0.3s ease;
+                    &.rotate {
+                        transform: rotate(90deg);
+                    }
+                }
             }
         }
     }

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

@@ -16,7 +16,7 @@
                 <img class="expert-banner-img" src="@/assets/img/home/banner.png" alt="">
                 <div class="expert-desc">
                     <img class="expert-desc-icon" src="@/assets/img/home/expert-text.png" alt="">
-                    <div class="desc-text"><span class="dotted"></span>您有一条长势报告,请查看</div>
+                    <!-- <div class="desc-text"><span class="dotted"></span>您有一条长势报告,请查看</div> -->
                 </div>
             </div>
         </div>

+ 4 - 2
src/views/old_mini/home/subPages/prescriptionPage.vue

@@ -95,7 +95,7 @@
                     </div>
                     <div class="farm-scale-item">
                         <label class="farm-scale-label">专业嫁接换种人员</label>
-                        <el-input v-model="farmScale.pruningWorkerCount" placeholder="请输入人数" class="farm-scale-input">
+                        <el-input v-model="farmScale.graftingWorkerCount" placeholder="请输入人数" class="farm-scale-input">
                             <template #append>人</template>
                         </el-input>
                     </div>
@@ -259,6 +259,7 @@ const farmScale = ref({
     regularWorkerCount: "",
     plantProtectionWorkerCount: "",
     pruningWorkerCount: "",
+    graftingWorkerCount: "",
     tempDispatchWorkerCount: "",
 });
 // 初始化默认选中第一项
@@ -310,6 +311,7 @@ const getBasicFarmFormData = () => {
                 plantProtectionWorkerCount: data.farmScale.plantProtectionWorkerCount || "",
                 pruningWorkerCount: data.farmScale.pruningWorkerCount || "",
                 tempDispatchWorkerCount: data.farmScale.tempDispatchWorkerCount || "",
+                graftingWorkerCount: data.farmScale.graftingWorkerCount || "",
             };
         }
         
@@ -514,6 +516,7 @@ function handleSubmit() {
         regularWorkerCount: Number(farmScale.value.regularWorkerCount) || 0,
         plantProtectionWorkerCount: Number(farmScale.value.plantProtectionWorkerCount) || 0,
         pruningWorkerCount: Number(farmScale.value.pruningWorkerCount) || 0,
+        graftingWorkerCount: Number(farmScale.value.graftingWorkerCount) || 0,
         tempDispatchWorkerCount: Number(farmScale.value.tempDispatchWorkerCount) || 0,
         improvementAreas: improvementAreas.map(code => Number(code)),
     };
@@ -636,7 +639,6 @@ const handlePage = async () => {
             basicForm.value.expertInfo = selectedExpert;
         }
     }
-    console.log('basicForm.value', basicForm.value)
     showPeriodPopup.value = true;
     // // 获取所有需要传递的参数,包括 from 参数
     // const queryParams = {