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

src/components/popup/tipPopup.vue

@@ -89,7 +89,9 @@ const handleBtnClick = () => {
 
 const handleClickOverlay = () => {
     emit("handleClickOverlay");
-    emit("update:show", false);
+    if(props.closeOnClickOverlay){
+        emit("update:show", false);
+    }
 };
 </script>
 

src/views/old_mini/home/patrolPhoto.vue

@@ -185,7 +185,6 @@ const loadNextDateImages = () => {
 
     const params = {
         farmId: farmId.value,
-        // farmId: route.query.farmId,
         date: currentDate,
     };
 

src/views/old_mini/monitor/index.vue

@@ -93,7 +93,7 @@
         :type="showFarmPopupType"
         :text="textPopup"
         :overlay-style="{ 'backdrop-filter': 'blur(4px)' }"
-        :close-on-click-overlay="false"
+        :closeOnClickOverlay="false"
         @confirm="toCreateFarm"
     />
 

src/views/old_mini/plan/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="farm-card-page">
         <custom-header name="农事方案"></custom-header>
-        <Tabs v-model:active="activeTab" class="tabs-wrap" v-if="!route.query.containerId">
+        <!-- <Tabs v-model:active="activeTab" class="tabs-wrap" v-if="!route.query.containerId">
             <Tab title="专家方案">
                 <expert-list :isShowHeader="true"></expert-list>
             </Tab>
@@ -33,6 +33,32 @@
                 class="tabs-list"
             />
             <plan-list :schemeId="active" :containerId="containerId" :isEdit="isEditVal"> </plan-list>
+        </div> -->
+        <div class="farm-card-content" v-if="!route.query.containerId">
+            <tab-list
+                v-if="curRole == 2"
+                type="light"
+                v-model="active"
+                :tabs="tabs"
+                @change="handleTabChange"
+                class="tabs-list"
+            />
+            <plan-list :schemeId="active" :farmId="route.query.farmId" :containerId="containerId" :isEdit="isEditVal"> </plan-list>
+        </div>
+        <div v-else class="system-generated">
+            <div class="tip-box">
+                <el-icon size="18"><CircleCheckFilled /></el-icon>
+                <span>系统已生成多套方案，请选择最佳方案</span>
+            </div>
+            <tab-list
+                v-if="curRole == 2"
+                type="light"
+                v-model="active"
+                :tabs="tabs"
+                @change="handleTabChange"
+                class="tabs-list"
+            />
+            <plan-list :schemeId="active" :containerId="containerId" :isEdit="isEditVal"> </plan-list>
         </div>
     </div>
     <div v-if="route.query.containerId" class="custom-bottom-fixed-btns">