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

src/components/weatherInfo.vue

@@ -306,6 +306,8 @@ const currentDateText = computed(() => {
 </style>
 <style lang="scss">
 .select-garden-popper {
+    max-height: calc(100vh - 200px);
+    overflow-y: auto;
     &.el-dropdown__popper {
         .el-dropdown__list {
             max-width: 160px;

src/router/globalRoutes.js

@@ -193,6 +193,7 @@ export default [
     {
         path: "/review_work",
         name: "ReviewWork",
+        meta: { keepAlive: true },
         component: () => import("@/views/old_mini/modify_work/reviewWork.vue"),
     },
     // 分享好友页面

src/views/old_mini/monitor/index.vue

@@ -117,7 +117,7 @@ const functionCards = ref([
     {
         title: "农场报告",
         status: "最新",
-        route: "/farm-report",
+        route: "/farm_report",
         className: "blue",
     },
     {

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

@@ -1190,7 +1190,7 @@ const contentData = ref([
             width: 100%;
             height: 100%;
             overflow: auto;
-            padding-bottom: 10px;
+            padding: 0 10px 10px;
             box-sizing: border-box;
             .content-section {
                 position: relative;