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

src/App.vue

@@ -22,7 +22,7 @@
 
 
     <Tabbar class="tabbar" route fixed v-show="showTab" active-color="#2199F8" inactive-color="#898989">
-        <!-- 托管农户：首页、作物档案、农事记录 -->
+        <!-- 托管农户：首页、农情档案、农事记录 -->
         <!-- <template v-if="userType == 2"> -->
             <tabbar-item replace to="/growth_report">
                 <span>长势报告</span>
@@ -37,7 +37,7 @@
                 </template>
             </tabbar-item>
             <tabbar-item replace to="/monitor">
-                <span>作物档案</span>
+                <span>农情档案</span>
                 <template #icon="props">
                     <img
                         :src="

src/router/globalRoutes.js

@@ -356,7 +356,7 @@ export default [
         name: "FarmDetails",
         component: () => import("@/views/old_mini/user/farmDetails.vue"),
     },
-    // 作物档案
+    // 农情档案
     {
         path: "/crop_record",
         name: "CropRecord",

src/views/old_mini/interaction/index.vue

@@ -56,7 +56,8 @@
                         <div class="field-value">
                             <el-date-picker :editable="false" style="width: 100%" v-model="region.phenologyStartDate"
                                 class="date-picker" type="date" placeholder="选择时间" format="YYYY-MM-DD"
-                                value-format="YYYY-MM-DD" />
+                                value-format="YYYY-MM-DD"
+                                :disabled-date="disabledFutureDate" />
                         </div>
                     </div>
                 </div>
@@ -201,6 +202,13 @@ const getPhenologyLabel = (farm, phenologyId) => {
     return found?.startDateLabel || "选择时间";
 };
 
+// 禁用今天之后的日期：只能选择今天及之前
+const disabledFutureDate = (time) => {
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    return time.getTime() > today.getTime();
+};
+
 const showTipPopup = ref(false);
 
 // 勾选区域引导弹窗相关

src/views/old_mini/interactionList/index.vue

@@ -549,7 +549,7 @@ const showExample = (item, index, options = {}) => {
 const loadData = async () => {
     loading.value = true;
     try {
-        const { data } = await VE_API.home.listTriggeredByFarm({ farmId: miniData.value.farmId, regionId: miniData.value.regionId, interactionTypeId: miniData.value.interactionTypeId })
+        const { data } = await VE_API.home.listTriggeredByFarm({ farmId: miniData.value.farmId, interactionTypeId: miniData.value.interactionTypeId })
         listData.value = data.map(item => {
             // question 按 || 切割成数组，用于循环渲染
             const questionStr = item.question != null ? String(item.question) : '';

src/views/old_mini/monitor/index.vue

@@ -9,7 +9,7 @@
         <!-- 作物档案 -->
         <div class="archives-time-line">
             <div class="archives-time-line-header">
-                <div class="line-title" @click="handlePage">作物档案</div>
+                <div class="line-title" @click="handlePage">农情档案</div>
                 <div class="header-right">
                     <div class="add-variety-btn" v-if="varietyTabs.length > 0" @click="handleAddVariety">
                         <span>分区管理</span>

src/views/old_mini/monitor/subPages/agriculturalDetail.vue

@@ -34,7 +34,7 @@
 
 <script setup>
 import { useRoute } from "vue-router";
-import { ref, onMounted, computed } from "vue";
+import { ref, onActivated, computed } from "vue";
 import customHeader from "@/components/customHeader.vue";
 import { showImagePreview } from 'vant';
 
@@ -56,7 +56,7 @@ const handlePhotoClick = (index) => {
     });
 };
 
-onMounted(() => {
+onActivated(() => {
     getFarmImagePage();
 });
 

src/views/old_mini/user/farmDetails.vue

@@ -32,8 +32,8 @@
                 </template> -->
             </farm-info-card>
             <tabs v-model:active="activeTab" class="custom-tabs" scrollspy sticky offset-top="40" background="#F2F3F5">
-                <tab title="作物档案" class="tab-item">
-                    <common-box title="作物档案">
+                <tab title="农情档案" class="tab-item">
+                    <common-box title="农情档案">
                         <template #right>
                             <span @click="handleDetail('crop_record')">查看详情</span>
                         </template>

src/views/old_mini/user/subPages/cropRecord.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="crop-record-page">
-        <custom-header name="作物档案"></custom-header>
+        <custom-header name="农情档案"></custom-header>
         <div class="farm-work-timeline">
             <div class="farm-work-item" v-for="(item, index) in farmWorkData" :key="index">
                 <div class="timeline-left">

src/views/old_mini/work_detail/index.vue

@@ -8,11 +8,11 @@
                 <div class="status-l">
                     <div class="status-title">{{ handleTagType(detail?.flowStatus) }}</div>
                     <div class="status-sub" v-if="triggerDateText && (detail?.flowStatus == -1 || detail?.flowStatus == -2)">
-                        执行时间已经过去 {{ daysDiff }} 天了
+                        执行时间已经过去 {{ Math.abs(daysDiff) }} 天了
                     </div>
                     <div class="status-sub" v-if="detail?.flowStatus === 3">
                         <template v-if="daysDiff > 0">
-                            距离执行时间还差 {{ daysDiff }} 天
+                            距离执行时间还差 {{ Math.abs(daysDiff) }} 天
                         </template>
                         <template v-else-if="daysDiff === 0">
                             执行时间为今天
@@ -70,7 +70,7 @@
                                     {{ detail.remark || "--" }}
                                 </div>
                             </div>
-                            <div class="form-item">
+                            <div class="form-item" v-if="hasAnyAvailableExecutionMethod(prescription)">
                                 <div class="item-name">药肥处方</div>
                             </div>
                         </div>
@@ -282,7 +282,7 @@ const daysDiff = computed(() => {
     const diffTime = executeDate.getTime() - today.getTime();
     const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24));
 
-    return detail.value?.flowStatus === 3 ? diffDays : Math.abs(diffDays);
+    return diffDays;
 });
 
 // 执行方式 Tab 配置
@@ -335,7 +335,7 @@ const stageList = computed(() => {
     const d = detail.value;
     if (!d) return [];
 
-    if (Array.isArray(d.pesticideList) && d.pesticideList.length) {
+    // if (Array.isArray(d.pesticideList) && d.pesticideList.length) {
         return [
             {
                 ...d,
@@ -347,9 +347,9 @@ const stageList = computed(() => {
                 ),
             },
         ];
-    }
+    // }
 
-    return [];
+    // return [];
 });
 
 

vue.config.js

@@ -44,8 +44,8 @@ module.exports = {
             }
         },
         //这里的ip和端口是前端项目的;下面为需要跨域访问后端项目
-        host:"127.0.0.1",
-        port: '8081',
+        host:"0.0.0.0",
+        port: '3000',
         https: false,
         open: false // 配置自动启动浏览器
     },