feat:修改bug

src/components/pageComponents/FarmWorkPlanTimeline.vue

@@ -42,7 +42,9 @@
                                         <span class="farm-work-name">{{ fw.farmWorkName || "农事名称" }}</span>
                                         <span class="tag-standard">标准农事</span>
                                     </div>
-                                    <div class="header-right">托管农事</div>
+                                    <div class="header-right">
+                                        {{ fw.isFollow == 1 ? "已关注" : fw.isFollow == 2 ? "托管农事" : "取消关注" }}
+                                    </div>
                                 </div>
                                 <div class="card-content">
                                     <span>{{ fw.interactionQuestion || "暂无提示" }}</span>
@@ -80,10 +82,7 @@
         </div>
     </div>
     <!-- 互动设置弹窗 -->
-    <interact-popup
-        ref="interactPopupRef"
-        @handleSaveSuccess="getFarmWorkPlan"
-    ></interact-popup>
+    <interact-popup ref="interactPopupRef" @handleSaveSuccess="getFarmWorkPlan"></interact-popup>
 </template>
 
 <script setup>

src/views/old_mini/farm_manage/map/index.js

@@ -211,12 +211,12 @@ class IndexMap {
     }
   }
 
-  initData(taskList, label) {
+  initData(taskList, label,pointType='point') {
     this.gardenPointLayer.source.clear();
     if (taskList.length > 0) {  // 如果任务列表不为空，则添加任务点
       for (let item of taskList) {
         item.mapInfo = label ? item[label] : (item.executeDeadlineDate || item.executeDate)?.replace(/^\d{4}-(\d{2})-(\d{2})$/, '$1.$2') + '  ' + item.farmWorkName
-        this.gardenPointLayer.source.addFeature(newPoint(item, "farmPoint", "myGarden"))
+        this.gardenPointLayer.source.addFeature(newPoint(item, pointType, "myGarden"))
       }
       this.kmap.getView().fit(this.gardenPointLayer.source.getExtent(), { padding: [42, 20, 30, 20] });
       const finalZoom = this.kmap.getView().getZoom();

src/views/old_mini/home/components/AgriculturalDynamics.vue

@@ -146,7 +146,7 @@ const unansweredList = ref([]);
 const getUnansweredFarms = async () => {
     const params = {
         page: 0,
-        limit: 50,
+        limit: 3,
         flowStatus: 5,
     };
     const res = await VE_API.home.listUnansweredFarms(params);

src/views/old_mini/home/subPages/warningDetail.vue

@@ -64,6 +64,7 @@ const showShareSheet = ref(false);
 const shareOptions = ref([{ name: "微信", icon: "wechat", type: "wechat" }]);
 const handleShareSelect = (option) => {
     console.log("option", option);
+
 };
 
 const isLink = ref(true);
@@ -73,7 +74,7 @@ const showImage = ref(false);
 
 onActivated(() => {
     showImage.value = route.query.showImage === "true" ? true : false;
-    isLink.value = localStorage.getItem("curRole") || 0;
+    isLink.value = localStorage.getItem("SET_USER_CUR_ROLE") == 2 ? false : true;
     // isLink.value = true;
     if (route.query.questInfo) {
         const infoObj = JSON.parse(route.query.questInfo);

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

@@ -270,7 +270,7 @@ async function getSimpleList(isLoadMore = false) {
             }
 
             // 更新地图数据
-            indexMap.initData(taskList.value);
+            indexMap.initData(taskList.value,'','farmPoint');
         } else {
             finished.value = true;
             if (taskList.value.length === 0) {

src/views/old_mini/user/index.vue

@@ -130,7 +130,7 @@ const getUserList = async () => {
         data.map((item, index) => {
             item.farmPoint = wktArr[Math.floor(Math.random() * wktArr.length)]
         });
-        indexMap.initData(data, 'name');
+        indexMap.initData(data, 'name','farmPoint');
         // 清空现有的子项
         dataList.value[0].children = [];
         dataList.value[1].children = data || [];