diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png
index e56a338..379444d 100644
--- a/src/assets/newImgs/HMScreen/bottom_img .png
+++ b/src/assets/newImgs/HMScreen/bottom_img .png
Binary files differ

diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png
index e56a338..379444d 100644
--- a/src/assets/newImgs/HMScreen/bottom_img .png
+++ b/src/assets/newImgs/HMScreen/bottom_img .png
Binary files differ
diff --git a/src/views/sponeScreen/Echarts/RainfallEcharts.vue b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
index 2dd8995..c47f997 100644
--- a/src/views/sponeScreen/Echarts/RainfallEcharts.vue
+++ b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
@@ -58,7 +58,7 @@
             var relVal = '' + params[0].name;
             for (var i = 0, l = params.length; i < l; i++) {
               if (params[i].seriesName) {
-                let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '天';
+                let unit = params[i].seriesName == '年降雨量' ? 'mm' : '天';
                 relVal += '<br/>' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit;
               }
             }
@@ -68,9 +68,10 @@
         grid: {
           top: 50,
           bottom: 30,
+          right: 20,
         },
         legend: {
-          data: ['K线性拟合', '月降雨天数'],
+          data: ['年降雨量'],
           textStyle: {
             color: '#fff',
           },
@@ -118,29 +119,6 @@
             },
             alignTicks: true,
           },
-
-          {
-            name: '天数',
-            type: 'value',
-            nameTextStyle: {
-              color: '#fff',
-            },
-            min: 0,
-            max: 20,
-            interval: 5,
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
-            splitLine: {
-              lineStyle: {
-                color: '#D1DEEE',
-                type: 'dashed',
-                color: '#53D8FB',
-              },
-            },
-            alignTicks: true,
-          },
         ],
         dataZoom: [
           {
@@ -172,7 +150,7 @@
         ],
         series: [
           {
-            name: 'K线性拟合',
+            name: '年降雨量',
             type: 'bar',
             barWidth: barWidth,
             barGap: '10%', // Make series be overlap
@@ -191,14 +169,6 @@
             },
             data: props.data.yAxis,
           },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: '月降雨天数',
-            type: 'line',
-            data: props.data.yAxis2,
-            yAxisIndex: 1,
-            color: '#FFF21C',
-          },
         ],
       };
       option && chartDom.setOption(option, true);

diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png
index e56a338..379444d 100644
--- a/src/assets/newImgs/HMScreen/bottom_img .png
+++ b/src/assets/newImgs/HMScreen/bottom_img .png
Binary files differ
diff --git a/src/views/sponeScreen/Echarts/RainfallEcharts.vue b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
index 2dd8995..c47f997 100644
--- a/src/views/sponeScreen/Echarts/RainfallEcharts.vue
+++ b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
@@ -58,7 +58,7 @@
             var relVal = '' + params[0].name;
             for (var i = 0, l = params.length; i < l; i++) {
               if (params[i].seriesName) {
-                let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '天';
+                let unit = params[i].seriesName == '年降雨量' ? 'mm' : '天';
                 relVal += '<br/>' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit;
               }
             }
@@ -68,9 +68,10 @@
         grid: {
           top: 50,
           bottom: 30,
+          right: 20,
         },
         legend: {
-          data: ['K线性拟合', '月降雨天数'],
+          data: ['年降雨量'],
           textStyle: {
             color: '#fff',
           },
@@ -118,29 +119,6 @@
             },
             alignTicks: true,
           },
-
-          {
-            name: '天数',
-            type: 'value',
-            nameTextStyle: {
-              color: '#fff',
-            },
-            min: 0,
-            max: 20,
-            interval: 5,
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
-            splitLine: {
-              lineStyle: {
-                color: '#D1DEEE',
-                type: 'dashed',
-                color: '#53D8FB',
-              },
-            },
-            alignTicks: true,
-          },
         ],
         dataZoom: [
           {
@@ -172,7 +150,7 @@
         ],
         series: [
           {
-            name: 'K线性拟合',
+            name: '年降雨量',
             type: 'bar',
             barWidth: barWidth,
             barGap: '10%', // Make series be overlap
@@ -191,14 +169,6 @@
             },
             data: props.data.yAxis,
           },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: '月降雨天数',
-            type: 'line',
-            data: props.data.yAxis2,
-            yAxisIndex: 1,
-            color: '#FFF21C',
-          },
         ],
       };
       option && chartDom.setOption(option, true);
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index eec97fa..93c2fe1 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -2,7 +2,7 @@
   <!-- 海绵综合一张图首页 -->
   <div class="hmMainPage">
     <!-- 地图 -->
-    <GisMapMF v-if="menuIndex != 3"></GisMapMF>
+    <!-- <GisMapMF v-if="menuIndex != 3"></GisMapMF> -->
 
     <!-- 图例 -->
     <Legend :showLegend="showLegend" :class="['animate__animated', showPanel ? 'animate__fadeOutDown' : '']"></Legend>
@@ -61,7 +61,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -156,7 +156,7 @@
     right: 30px;
   }
   .right520 {
-    right: 520px;
+    right: 480px;
   }
   .controlHM {
     position: absolute;

diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png
index e56a338..379444d 100644
--- a/src/assets/newImgs/HMScreen/bottom_img .png
+++ b/src/assets/newImgs/HMScreen/bottom_img .png
Binary files differ
diff --git a/src/views/sponeScreen/Echarts/RainfallEcharts.vue b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
index 2dd8995..c47f997 100644
--- a/src/views/sponeScreen/Echarts/RainfallEcharts.vue
+++ b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
@@ -58,7 +58,7 @@
             var relVal = '' + params[0].name;
             for (var i = 0, l = params.length; i < l; i++) {
               if (params[i].seriesName) {
-                let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '天';
+                let unit = params[i].seriesName == '年降雨量' ? 'mm' : '天';
                 relVal += '<br/>' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit;
               }
             }
@@ -68,9 +68,10 @@
         grid: {
           top: 50,
           bottom: 30,
+          right: 20,
         },
         legend: {
-          data: ['K线性拟合', '月降雨天数'],
+          data: ['年降雨量'],
           textStyle: {
             color: '#fff',
           },
@@ -118,29 +119,6 @@
             },
             alignTicks: true,
           },
-
-          {
-            name: '天数',
-            type: 'value',
-            nameTextStyle: {
-              color: '#fff',
-            },
-            min: 0,
-            max: 20,
-            interval: 5,
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
-            splitLine: {
-              lineStyle: {
-                color: '#D1DEEE',
-                type: 'dashed',
-                color: '#53D8FB',
-              },
-            },
-            alignTicks: true,
-          },
         ],
         dataZoom: [
           {
@@ -172,7 +150,7 @@
         ],
         series: [
           {
-            name: 'K线性拟合',
+            name: '年降雨量',
             type: 'bar',
             barWidth: barWidth,
             barGap: '10%', // Make series be overlap
@@ -191,14 +169,6 @@
             },
             data: props.data.yAxis,
           },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: '月降雨天数',
-            type: 'line',
-            data: props.data.yAxis2,
-            yAxisIndex: 1,
-            color: '#FFF21C',
-          },
         ],
       };
       option && chartDom.setOption(option, true);
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index eec97fa..93c2fe1 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -2,7 +2,7 @@
   <!-- 海绵综合一张图首页 -->
   <div class="hmMainPage">
     <!-- 地图 -->
-    <GisMapMF v-if="menuIndex != 3"></GisMapMF>
+    <!-- <GisMapMF v-if="menuIndex != 3"></GisMapMF> -->
 
     <!-- 图例 -->
     <Legend :showLegend="showLegend" :class="['animate__animated', showPanel ? 'animate__fadeOutDown' : '']"></Legend>
@@ -61,7 +61,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -156,7 +156,7 @@
     right: 30px;
   }
   .right520 {
-    right: 520px;
+    right: 480px;
   }
   .controlHM {
     position: absolute;
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 61a80fb..4c9e367 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -32,29 +32,28 @@
 import RainfallLegend from '@/views/sponeScreen/Echarts/RainfallLegend.vue'; //年内降雨量
 
 const chartData2 = ref({
-  xAxis: [1985, 1900, 1995, 2000, 2005, 2010, 2015, 2020],
-  yAxis: [700, 600, 750, 800, 750, 740, 780, 900],
-  yAxis2: [7, 9, 10, 9, 11, 10, 12, 15],
+  xAxis: [1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020, 2021],
+  yAxis: [650, 800, 502, 630, 820, 800, 510, 805, 1203],
+  // yAxis2: [7, 9, 10, 9, 11, 10, 12, 15],
   refresh: 1,
 });
 const chartData3 = ref({
   XName: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  data1: [67, 97, 51, 338, 32, 11, 1, 51, 338, 32, 11, 1],
-
+  data1: [1, 46, 45, 42, 100, 11, 420, 278, 318, 35, 30, 1],
   data: [
     {
       coords: [
-        ['1', 67],
-        ['2', 97],
-        ['3', 51],
-        ['4', 338],
-        ['5', 32],
+        ['1', 1],
+        ['2', 46],
+        ['3', 45],
+        ['4', 42],
+        ['5', 100],
         ['6', 11],
-        ['7', 1],
-        ['8', 51],
-        ['9', 338],
-        ['10', 32],
-        ['11', 11],
+        ['7', 420],
+        ['8', 278],
+        ['9', 318],
+        ['10', 35],
+        ['11', 30],
         ['12', 1],
       ],
     },

diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png
index e56a338..379444d 100644
--- a/src/assets/newImgs/HMScreen/bottom_img .png
+++ b/src/assets/newImgs/HMScreen/bottom_img .png
Binary files differ
diff --git a/src/views/sponeScreen/Echarts/RainfallEcharts.vue b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
index 2dd8995..c47f997 100644
--- a/src/views/sponeScreen/Echarts/RainfallEcharts.vue
+++ b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
@@ -58,7 +58,7 @@
             var relVal = '' + params[0].name;
             for (var i = 0, l = params.length; i < l; i++) {
               if (params[i].seriesName) {
-                let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '天';
+                let unit = params[i].seriesName == '年降雨量' ? 'mm' : '天';
                 relVal += '<br/>' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit;
               }
             }
@@ -68,9 +68,10 @@
         grid: {
           top: 50,
           bottom: 30,
+          right: 20,
         },
         legend: {
-          data: ['K线性拟合', '月降雨天数'],
+          data: ['年降雨量'],
           textStyle: {
             color: '#fff',
           },
@@ -118,29 +119,6 @@
             },
             alignTicks: true,
           },
-
-          {
-            name: '天数',
-            type: 'value',
-            nameTextStyle: {
-              color: '#fff',
-            },
-            min: 0,
-            max: 20,
-            interval: 5,
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
-            splitLine: {
-              lineStyle: {
-                color: '#D1DEEE',
-                type: 'dashed',
-                color: '#53D8FB',
-              },
-            },
-            alignTicks: true,
-          },
         ],
         dataZoom: [
           {
@@ -172,7 +150,7 @@
         ],
         series: [
           {
-            name: 'K线性拟合',
+            name: '年降雨量',
             type: 'bar',
             barWidth: barWidth,
             barGap: '10%', // Make series be overlap
@@ -191,14 +169,6 @@
             },
             data: props.data.yAxis,
           },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: '月降雨天数',
-            type: 'line',
-            data: props.data.yAxis2,
-            yAxisIndex: 1,
-            color: '#FFF21C',
-          },
         ],
       };
       option && chartDom.setOption(option, true);
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index eec97fa..93c2fe1 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -2,7 +2,7 @@
   <!-- 海绵综合一张图首页 -->
   <div class="hmMainPage">
     <!-- 地图 -->
-    <GisMapMF v-if="menuIndex != 3"></GisMapMF>
+    <!-- <GisMapMF v-if="menuIndex != 3"></GisMapMF> -->
 
     <!-- 图例 -->
     <Legend :showLegend="showLegend" :class="['animate__animated', showPanel ? 'animate__fadeOutDown' : '']"></Legend>
@@ -61,7 +61,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -156,7 +156,7 @@
     right: 30px;
   }
   .right520 {
-    right: 520px;
+    right: 480px;
   }
   .controlHM {
     position: absolute;
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 61a80fb..4c9e367 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -32,29 +32,28 @@
 import RainfallLegend from '@/views/sponeScreen/Echarts/RainfallLegend.vue'; //年内降雨量
 
 const chartData2 = ref({
-  xAxis: [1985, 1900, 1995, 2000, 2005, 2010, 2015, 2020],
-  yAxis: [700, 600, 750, 800, 750, 740, 780, 900],
-  yAxis2: [7, 9, 10, 9, 11, 10, 12, 15],
+  xAxis: [1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020, 2021],
+  yAxis: [650, 800, 502, 630, 820, 800, 510, 805, 1203],
+  // yAxis2: [7, 9, 10, 9, 11, 10, 12, 15],
   refresh: 1,
 });
 const chartData3 = ref({
   XName: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  data1: [67, 97, 51, 338, 32, 11, 1, 51, 338, 32, 11, 1],
-
+  data1: [1, 46, 45, 42, 100, 11, 420, 278, 318, 35, 30, 1],
   data: [
     {
       coords: [
-        ['1', 67],
-        ['2', 97],
-        ['3', 51],
-        ['4', 338],
-        ['5', 32],
+        ['1', 1],
+        ['2', 46],
+        ['3', 45],
+        ['4', 42],
+        ['5', 100],
         ['6', 11],
-        ['7', 1],
-        ['8', 51],
-        ['9', 338],
-        ['10', 32],
-        ['11', 11],
+        ['7', 420],
+        ['8', 278],
+        ['9', 318],
+        ['10', 35],
+        ['11', 30],
         ['12', 1],
       ],
     },
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 0c67b6d..2b8ca1e 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -9,7 +9,7 @@
           <p>物资详情</p>
           <p>负责人</p>
         </div>
-        <Vue3SeamlessScroll :list="dataList" :singleHeight="54" :singleWaitTime="2000" :hover="true" class="scroll">
+        <Vue3SeamlessScroll :list="dataList" :singleHeight="50" :singleWaitTime="2000" :hover="true" class="scroll">
           <div class="scrollCont flex" v-for="item in dataList" :key="item.id">
             <p class="ellipsis" :title="item.address">{{ item.address }}</p>
             <p class="ellipsis" :title="item.materialDetails">{{ item.materialDetails }}</p>

diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png
index e56a338..379444d 100644
--- a/src/assets/newImgs/HMScreen/bottom_img .png
+++ b/src/assets/newImgs/HMScreen/bottom_img .png
Binary files differ
diff --git a/src/views/sponeScreen/Echarts/RainfallEcharts.vue b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
index 2dd8995..c47f997 100644
--- a/src/views/sponeScreen/Echarts/RainfallEcharts.vue
+++ b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
@@ -58,7 +58,7 @@
             var relVal = '' + params[0].name;
             for (var i = 0, l = params.length; i < l; i++) {
               if (params[i].seriesName) {
-                let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '天';
+                let unit = params[i].seriesName == '年降雨量' ? 'mm' : '天';
                 relVal += '<br/>' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit;
               }
             }
@@ -68,9 +68,10 @@
         grid: {
           top: 50,
           bottom: 30,
+          right: 20,
         },
         legend: {
-          data: ['K线性拟合', '月降雨天数'],
+          data: ['年降雨量'],
           textStyle: {
             color: '#fff',
           },
@@ -118,29 +119,6 @@
             },
             alignTicks: true,
           },
-
-          {
-            name: '天数',
-            type: 'value',
-            nameTextStyle: {
-              color: '#fff',
-            },
-            min: 0,
-            max: 20,
-            interval: 5,
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
-            splitLine: {
-              lineStyle: {
-                color: '#D1DEEE',
-                type: 'dashed',
-                color: '#53D8FB',
-              },
-            },
-            alignTicks: true,
-          },
         ],
         dataZoom: [
           {
@@ -172,7 +150,7 @@
         ],
         series: [
           {
-            name: 'K线性拟合',
+            name: '年降雨量',
             type: 'bar',
             barWidth: barWidth,
             barGap: '10%', // Make series be overlap
@@ -191,14 +169,6 @@
             },
             data: props.data.yAxis,
           },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: '月降雨天数',
-            type: 'line',
-            data: props.data.yAxis2,
-            yAxisIndex: 1,
-            color: '#FFF21C',
-          },
         ],
       };
       option && chartDom.setOption(option, true);
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index eec97fa..93c2fe1 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -2,7 +2,7 @@
   <!-- 海绵综合一张图首页 -->
   <div class="hmMainPage">
     <!-- 地图 -->
-    <GisMapMF v-if="menuIndex != 3"></GisMapMF>
+    <!-- <GisMapMF v-if="menuIndex != 3"></GisMapMF> -->
 
     <!-- 图例 -->
     <Legend :showLegend="showLegend" :class="['animate__animated', showPanel ? 'animate__fadeOutDown' : '']"></Legend>
@@ -61,7 +61,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -156,7 +156,7 @@
     right: 30px;
   }
   .right520 {
-    right: 520px;
+    right: 480px;
   }
   .controlHM {
     position: absolute;
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 61a80fb..4c9e367 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -32,29 +32,28 @@
 import RainfallLegend from '@/views/sponeScreen/Echarts/RainfallLegend.vue'; //年内降雨量
 
 const chartData2 = ref({
-  xAxis: [1985, 1900, 1995, 2000, 2005, 2010, 2015, 2020],
-  yAxis: [700, 600, 750, 800, 750, 740, 780, 900],
-  yAxis2: [7, 9, 10, 9, 11, 10, 12, 15],
+  xAxis: [1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020, 2021],
+  yAxis: [650, 800, 502, 630, 820, 800, 510, 805, 1203],
+  // yAxis2: [7, 9, 10, 9, 11, 10, 12, 15],
   refresh: 1,
 });
 const chartData3 = ref({
   XName: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  data1: [67, 97, 51, 338, 32, 11, 1, 51, 338, 32, 11, 1],
-
+  data1: [1, 46, 45, 42, 100, 11, 420, 278, 318, 35, 30, 1],
   data: [
     {
       coords: [
-        ['1', 67],
-        ['2', 97],
-        ['3', 51],
-        ['4', 338],
-        ['5', 32],
+        ['1', 1],
+        ['2', 46],
+        ['3', 45],
+        ['4', 42],
+        ['5', 100],
         ['6', 11],
-        ['7', 1],
-        ['8', 51],
-        ['9', 338],
-        ['10', 32],
-        ['11', 11],
+        ['7', 420],
+        ['8', 278],
+        ['9', 318],
+        ['10', 35],
+        ['11', 30],
         ['12', 1],
       ],
     },
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 0c67b6d..2b8ca1e 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -9,7 +9,7 @@
           <p>物资详情</p>
           <p>负责人</p>
         </div>
-        <Vue3SeamlessScroll :list="dataList" :singleHeight="54" :singleWaitTime="2000" :hover="true" class="scroll">
+        <Vue3SeamlessScroll :list="dataList" :singleHeight="50" :singleWaitTime="2000" :hover="true" class="scroll">
           <div class="scrollCont flex" v-for="item in dataList" :key="item.id">
             <p class="ellipsis" :title="item.address">{{ item.address }}</p>
             <p class="ellipsis" :title="item.materialDetails">{{ item.materialDetails }}</p>
diff --git a/src/views/sponeScreen/waterFlood/futureRain.vue b/src/views/sponeScreen/waterFlood/futureRain.vue
index 402cd94..f784562 100644
--- a/src/views/sponeScreen/waterFlood/futureRain.vue
+++ b/src/views/sponeScreen/waterFlood/futureRain.vue
@@ -7,6 +7,20 @@
       <el-button type="warning" @click="startImitate" v-if="ifStart" :disabled="isdisabled">开始</el-button>
       <el-button type="warning" @click="stopImitate" v-else :disabled="isdisabled">暂停</el-button>
     </div>
+    <div class="centerCont flex">
+      <p class="title"></p>
+      <div class="flex flex-justcontent-spacebetween" style="width: 100%; margin-right: 50px">
+        <p>00:00</p>
+        <p>06:00</p>
+        <p>12:00</p>
+        <p>24:00</p>
+      </div>
+      <el-button type="warning" style="visibility: hidden"></el-button>
+    </div>
+    <!-- 颜色块 -->
+    <div class="flex">
+      
+    </div>
   </div>
 </template>
 
@@ -16,21 +30,71 @@
 const processVal = ref(0);
 const ifStart = ref(true);
 const isdisabled = ref(false);
+const timer = ref(null);
 
 // 开始
-function startImitate() {}
-// 暂停
-function stopImitate() {}
+function startImitate() {
+  ifStart.value = false;
+  startTimer(); // 定时器开启
+}
+// 开启定时器
+function startTimer() {
+  if (processVal.value == 100) processVal.value = 0;
+  timer.value = setInterval(() => {
+    console.log('timer------');
+    processVal.value += 5;
+    if (processVal.value > 100) {
+      processVal.value = 100;
+      stopImitate();
+      return;
+    }
+  }, 1000);
+}
+
+// 暂停模拟
+function stopImitate() {
+  ifStart.value = true;
+  stopTimer();
+}
+// 定时器清除
+function stopTimer() {
+  if (timer.value) {
+    clearInterval(timer.value);
+  }
+}
 
 onMounted(() => {});
+onBeforeMount(() => {
+  stopTimer();
+});
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .rainFuturePage {
   width: 100%;
   padding: 20px;
   .centerCont {
     justify-content: space-around;
+    .title {
+      font-family: Source Han Sans CN;
+      font-weight: bold;
+      font-size: 20px;
+      color: #3afff8;
+      width: 130px;
+    }
+    .el-progress {
+      width: 100%;
+      margin-right: 20px;
+      .el-progress-bar__outer {
+        background: rgba(0, 59, 109, 0.8);
+      }
+      .el-progress-bar__innerText {
+        color: #3afff8;
+      }
+    }
+    .el-progress.is-success .el-progress-bar__inner {
+      background: #3afff8;
+    }
   }
 }
 </style>

diff --git a/src/assets/newImgs/HMScreen/bottom_img .png b/src/assets/newImgs/HMScreen/bottom_img .png
index e56a338..379444d 100644
--- a/src/assets/newImgs/HMScreen/bottom_img .png
+++ b/src/assets/newImgs/HMScreen/bottom_img .png
Binary files differ
diff --git a/src/views/sponeScreen/Echarts/RainfallEcharts.vue b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
index 2dd8995..c47f997 100644
--- a/src/views/sponeScreen/Echarts/RainfallEcharts.vue
+++ b/src/views/sponeScreen/Echarts/RainfallEcharts.vue
@@ -58,7 +58,7 @@
             var relVal = '' + params[0].name;
             for (var i = 0, l = params.length; i < l; i++) {
               if (params[i].seriesName) {
-                let unit = params[i].seriesName == 'K线性拟合' ? 'mm' : '天';
+                let unit = params[i].seriesName == '年降雨量' ? 'mm' : '天';
                 relVal += '<br/>' + params[i].marker + params[i].seriesName + ' ' + params[i].value + unit;
               }
             }
@@ -68,9 +68,10 @@
         grid: {
           top: 50,
           bottom: 30,
+          right: 20,
         },
         legend: {
-          data: ['K线性拟合', '月降雨天数'],
+          data: ['年降雨量'],
           textStyle: {
             color: '#fff',
           },
@@ -118,29 +119,6 @@
             },
             alignTicks: true,
           },
-
-          {
-            name: '天数',
-            type: 'value',
-            nameTextStyle: {
-              color: '#fff',
-            },
-            min: 0,
-            max: 20,
-            interval: 5,
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
-            splitLine: {
-              lineStyle: {
-                color: '#D1DEEE',
-                type: 'dashed',
-                color: '#53D8FB',
-              },
-            },
-            alignTicks: true,
-          },
         ],
         dataZoom: [
           {
@@ -172,7 +150,7 @@
         ],
         series: [
           {
-            name: 'K线性拟合',
+            name: '年降雨量',
             type: 'bar',
             barWidth: barWidth,
             barGap: '10%', // Make series be overlap
@@ -191,14 +169,6 @@
             },
             data: props.data.yAxis,
           },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: '月降雨天数',
-            type: 'line',
-            data: props.data.yAxis2,
-            yAxisIndex: 1,
-            color: '#FFF21C',
-          },
         ],
       };
       option && chartDom.setOption(option, true);
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index eec97fa..93c2fe1 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -2,7 +2,7 @@
   <!-- 海绵综合一张图首页 -->
   <div class="hmMainPage">
     <!-- 地图 -->
-    <GisMapMF v-if="menuIndex != 3"></GisMapMF>
+    <!-- <GisMapMF v-if="menuIndex != 3"></GisMapMF> -->
 
     <!-- 图例 -->
     <Legend :showLegend="showLegend" :class="['animate__animated', showPanel ? 'animate__fadeOutDown' : '']"></Legend>
@@ -61,7 +61,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(1);
+const menuIndex = ref(4);
 const showPanel = ref(false);
 const showLegend = ref(false);
 
@@ -156,7 +156,7 @@
     right: 30px;
   }
   .right520 {
-    right: 520px;
+    right: 480px;
   }
   .controlHM {
     position: absolute;
diff --git a/src/views/sponeScreen/cityGK/rainfall.vue b/src/views/sponeScreen/cityGK/rainfall.vue
index 61a80fb..4c9e367 100644
--- a/src/views/sponeScreen/cityGK/rainfall.vue
+++ b/src/views/sponeScreen/cityGK/rainfall.vue
@@ -32,29 +32,28 @@
 import RainfallLegend from '@/views/sponeScreen/Echarts/RainfallLegend.vue'; //年内降雨量
 
 const chartData2 = ref({
-  xAxis: [1985, 1900, 1995, 2000, 2005, 2010, 2015, 2020],
-  yAxis: [700, 600, 750, 800, 750, 740, 780, 900],
-  yAxis2: [7, 9, 10, 9, 11, 10, 12, 15],
+  xAxis: [1985, 1990, 1995, 2000, 2005, 2010, 2015, 2020, 2021],
+  yAxis: [650, 800, 502, 630, 820, 800, 510, 805, 1203],
+  // yAxis2: [7, 9, 10, 9, 11, 10, 12, 15],
   refresh: 1,
 });
 const chartData3 = ref({
   XName: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-  data1: [67, 97, 51, 338, 32, 11, 1, 51, 338, 32, 11, 1],
-
+  data1: [1, 46, 45, 42, 100, 11, 420, 278, 318, 35, 30, 1],
   data: [
     {
       coords: [
-        ['1', 67],
-        ['2', 97],
-        ['3', 51],
-        ['4', 338],
-        ['5', 32],
+        ['1', 1],
+        ['2', 46],
+        ['3', 45],
+        ['4', 42],
+        ['5', 100],
         ['6', 11],
-        ['7', 1],
-        ['8', 51],
-        ['9', 338],
-        ['10', 32],
-        ['11', 11],
+        ['7', 420],
+        ['8', 278],
+        ['9', 318],
+        ['10', 35],
+        ['11', 30],
         ['12', 1],
       ],
     },
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 0c67b6d..2b8ca1e 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -9,7 +9,7 @@
           <p>物资详情</p>
           <p>负责人</p>
         </div>
-        <Vue3SeamlessScroll :list="dataList" :singleHeight="54" :singleWaitTime="2000" :hover="true" class="scroll">
+        <Vue3SeamlessScroll :list="dataList" :singleHeight="50" :singleWaitTime="2000" :hover="true" class="scroll">
           <div class="scrollCont flex" v-for="item in dataList" :key="item.id">
             <p class="ellipsis" :title="item.address">{{ item.address }}</p>
             <p class="ellipsis" :title="item.materialDetails">{{ item.materialDetails }}</p>
diff --git a/src/views/sponeScreen/waterFlood/futureRain.vue b/src/views/sponeScreen/waterFlood/futureRain.vue
index 402cd94..f784562 100644
--- a/src/views/sponeScreen/waterFlood/futureRain.vue
+++ b/src/views/sponeScreen/waterFlood/futureRain.vue
@@ -7,6 +7,20 @@
       <el-button type="warning" @click="startImitate" v-if="ifStart" :disabled="isdisabled">开始</el-button>
       <el-button type="warning" @click="stopImitate" v-else :disabled="isdisabled">暂停</el-button>
     </div>
+    <div class="centerCont flex">
+      <p class="title"></p>
+      <div class="flex flex-justcontent-spacebetween" style="width: 100%; margin-right: 50px">
+        <p>00:00</p>
+        <p>06:00</p>
+        <p>12:00</p>
+        <p>24:00</p>
+      </div>
+      <el-button type="warning" style="visibility: hidden"></el-button>
+    </div>
+    <!-- 颜色块 -->
+    <div class="flex">
+      
+    </div>
   </div>
 </template>
 
@@ -16,21 +30,71 @@
 const processVal = ref(0);
 const ifStart = ref(true);
 const isdisabled = ref(false);
+const timer = ref(null);
 
 // 开始
-function startImitate() {}
-// 暂停
-function stopImitate() {}
+function startImitate() {
+  ifStart.value = false;
+  startTimer(); // 定时器开启
+}
+// 开启定时器
+function startTimer() {
+  if (processVal.value == 100) processVal.value = 0;
+  timer.value = setInterval(() => {
+    console.log('timer------');
+    processVal.value += 5;
+    if (processVal.value > 100) {
+      processVal.value = 100;
+      stopImitate();
+      return;
+    }
+  }, 1000);
+}
+
+// 暂停模拟
+function stopImitate() {
+  ifStart.value = true;
+  stopTimer();
+}
+// 定时器清除
+function stopTimer() {
+  if (timer.value) {
+    clearInterval(timer.value);
+  }
+}
 
 onMounted(() => {});
+onBeforeMount(() => {
+  stopTimer();
+});
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .rainFuturePage {
   width: 100%;
   padding: 20px;
   .centerCont {
     justify-content: space-around;
+    .title {
+      font-family: Source Han Sans CN;
+      font-weight: bold;
+      font-size: 20px;
+      color: #3afff8;
+      width: 130px;
+    }
+    .el-progress {
+      width: 100%;
+      margin-right: 20px;
+      .el-progress-bar__outer {
+        background: rgba(0, 59, 109, 0.8);
+      }
+      .el-progress-bar__innerText {
+        color: #3afff8;
+      }
+    }
+    .el-progress.is-success .el-progress-bar__inner {
+      background: #3afff8;
+    }
   }
 }
 </style>
diff --git a/src/views/sponeScreen/waterFlood/rainReport.vue b/src/views/sponeScreen/waterFlood/rainReport.vue
index dab01b7..93c382e 100644
--- a/src/views/sponeScreen/waterFlood/rainReport.vue
+++ b/src/views/sponeScreen/waterFlood/rainReport.vue
@@ -11,7 +11,7 @@
           <p>累计降雨量</p>
           <p>操作</p>
         </div>
-        <Vue3SeamlessScroll :list="dataList" :singleHeight="53" :singleWaitTime="1500" :hover="true" class="scroll">
+        <Vue3SeamlessScroll :list="dataList" :singleHeight="50" :singleWaitTime="1500" :hover="true" class="scroll">
           <div class="scrollCont flex" v-for="item in dataList" :key="item.id">
             <p class="ellipsis">{{ item.start }}</p>
             <p class="ellipsis">{{ item.end }}</p>