diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 4635d24..d7ac84a 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 项目监测分析 -->
   <div class="publicContainerA">
-    <div class="partTitleHM">项目评估</div>
+    <div class="partTitleHM">项目监测分析</div>
     <div class="ConstrucClass">
       <div class="WaterList">
         <div class="DropdownBox">
@@ -9,16 +10,11 @@
             <span>片区分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="area" style="width: 41%; margin-left: 10px; margin-top: 18px">
+            <el-form-item prop="area" style="width: 100%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.area" placeholder="请选择片区分析" @change="changeArea">
                 <el-option v-for="item in areaList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="pipe" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.pipe" @change="change" placeholder="请选择">
-                <el-option v-for="item in pipeList" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
           </div>
         </div>
 
@@ -28,16 +24,16 @@
             <span>项目分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
+            <el-form-item prop="Xm" style="width: 100%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="queryParams.XmP" placeholder="请选择典型项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
+            <!-- <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.XmA">
                 <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
 
@@ -52,16 +48,16 @@
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmAQ" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmAQ" @change="change" placeholder="请选择">
-                <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
+            <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
+                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </div>
         </div>
         <!-- 设施分析echarts -->
-        <div class="assessment">
-          <AssessmentEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentEcharts>
+        <div class="assessment" v-loading="loadingSS">
+          <AssessmentEcharts :data="chartDataSS" :refresh="chartDataSS.refresh"></AssessmentEcharts>
         </div>
 
         <div class="DropdownBox">
@@ -78,8 +74,8 @@
           </div>
         </div>
         <!-- 积水分析echarts -->
-        <div class="assessment" v-if="jishui">
-          <AssessmentjsEcharts :data="chartData1" :refresh="chartData1.refresh1"></AssessmentjsEcharts>
+        <div class="assessment">
+          <AssessmentjsEcharts :data="chartDataJSD" :refresh="chartDataJSD.refresh"></AssessmentjsEcharts>
         </div>
       </div>
     </div>
@@ -93,32 +89,10 @@
 import ssfx from '@/assets/newImgs/HMScreen/ssfx.png';
 import xmfx from '@/assets/newImgs/HMScreen/xmfx.png';
 import bus from '@/bus';
-
 import WaterAnalysis_icon from '@/assets/newImgs/HMScreen/WaterAnalysis_icon.png';
+import { graphicReport, realtimeDataLatest } from '@/api/dataAnalysis/syntherticData';
 
-const jishui = ref(true);
-const chartData2 = ref({
-  xAxis: [
-    '06-12 08:00',
-    '06-12 09:00',
-    '06-12 10:00',
-    '06-12 11:00',
-    '06-12 12:00',
-    '06-12 13:00',
-    '06-12 14:00',
-    '06-12 15:00',
-    '06-12 16:00',
-    '06-12 17:00',
-    '06-12 18:00',
-    '06-12 19:00',
-  ],
-  inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
-  yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
-  refresh: 1,
-});
-const chartData1 = ref({
+const chartDataJSD = ref({
   xAxis: [
     '2024-06-12 08:00',
     '2024-06-13 08:00',
@@ -145,11 +119,6 @@
   { name: '金明片区', value: '3', lonlat: [114.285, 34.809] },
 ]);
 
-const pipeList = ref([
-  { name: '向阳路管网监测点', value: '1' },
-  { name: '汴京路管网监测点', value: '2' },
-]);
-
 const XmList = ref([
   { name: '汴京路管网及道路海绵化改造', value: '1' },
   { name: '市民综合体', value: '3' },
@@ -161,20 +130,66 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', Xm: '1', XmP: '', XmA: '', XmQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
-function jishuiClick() {
-  jishui.value = false;
-}
-const jishuichange = () => {
-  jishui.value = true;
+const dateRain = ref('');
+//海绵设施列表-汴京路
+const hmssList = ref([
+  { value: '0371000044', label: '工农路与汴京路交叉口' },
+  { value: '0371000039', label: '大花园街与汴京路交叉口' },
+  { value: '0371000038', label: '劳动路与汴京路交叉口' },
+  { value: '0371000037', label: '公园路与汴京路交叉口' },
+]);
+const hmssVal = ref('');
+const loadingSS = ref(true);
+const chartDataSS = ref({
+  xAxis: [],
+  inverse: true,
+  yAxis: [], //降雨量
+  yAxis2: [], //流量
+  yAxis3: [], //ss
+  refresh: 1,
+});
+// 海绵设施监测站点切换
+const changeHmss = () => {
+  // hmssVal.value = val;
+  getDataSS();
 };
+// 海绵设施数据渲染
+async function getDataSS() {
+  loadingSS.value = true;
+  // 关联雨量站是皮革厂雨量站，0371000003
+  let params = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: '0371000003',
+  };
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    chartDataSS.value.xAxis = datas.propertyMonitorXList;
+    chartDataSS.value.yAxis = datas.propertyMonitorList[0].ylist;
+  }
 
-const change = val => {
-  jishui.value = false;
-};
+  // 获取监测值
+  let params2 = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: hmssVal.value,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartDataSS.value.yAxis2 = datas.propertyMonitorList[0].ylist;
+  }
+  chartDataSS.value.refresh = Math.random();
+  loadingSS.value = false;
+}
+
+function jishuiClick() {}
+const jishuichange = () => {};
 
 // 片区分析点击
 function changeArea(val) {
@@ -205,6 +220,20 @@
     pitch: 30,
   });
 }
+
+onMounted(() => {
+  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  console.log('33333', hmssVal.value);
+  // 获取降雨日历的日期来加载对应数据
+  bus.on('setRainDate', date => {
+    console.log('降雨日历的日期----', date);
+    dateRain.value = date;
+    changeHmss(); //海绵设施数据加载
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('setRainDate');
+});
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 4635d24..d7ac84a 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 项目监测分析 -->
   <div class="publicContainerA">
-    <div class="partTitleHM">项目评估</div>
+    <div class="partTitleHM">项目监测分析</div>
     <div class="ConstrucClass">
       <div class="WaterList">
         <div class="DropdownBox">
@@ -9,16 +10,11 @@
             <span>片区分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="area" style="width: 41%; margin-left: 10px; margin-top: 18px">
+            <el-form-item prop="area" style="width: 100%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.area" placeholder="请选择片区分析" @change="changeArea">
                 <el-option v-for="item in areaList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="pipe" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.pipe" @change="change" placeholder="请选择">
-                <el-option v-for="item in pipeList" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
           </div>
         </div>
 
@@ -28,16 +24,16 @@
             <span>项目分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
+            <el-form-item prop="Xm" style="width: 100%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="queryParams.XmP" placeholder="请选择典型项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
+            <!-- <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.XmA">
                 <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
 
@@ -52,16 +48,16 @@
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmAQ" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmAQ" @change="change" placeholder="请选择">
-                <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
+            <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
+                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </div>
         </div>
         <!-- 设施分析echarts -->
-        <div class="assessment">
-          <AssessmentEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentEcharts>
+        <div class="assessment" v-loading="loadingSS">
+          <AssessmentEcharts :data="chartDataSS" :refresh="chartDataSS.refresh"></AssessmentEcharts>
         </div>
 
         <div class="DropdownBox">
@@ -78,8 +74,8 @@
           </div>
         </div>
         <!-- 积水分析echarts -->
-        <div class="assessment" v-if="jishui">
-          <AssessmentjsEcharts :data="chartData1" :refresh="chartData1.refresh1"></AssessmentjsEcharts>
+        <div class="assessment">
+          <AssessmentjsEcharts :data="chartDataJSD" :refresh="chartDataJSD.refresh"></AssessmentjsEcharts>
         </div>
       </div>
     </div>
@@ -93,32 +89,10 @@
 import ssfx from '@/assets/newImgs/HMScreen/ssfx.png';
 import xmfx from '@/assets/newImgs/HMScreen/xmfx.png';
 import bus from '@/bus';
-
 import WaterAnalysis_icon from '@/assets/newImgs/HMScreen/WaterAnalysis_icon.png';
+import { graphicReport, realtimeDataLatest } from '@/api/dataAnalysis/syntherticData';
 
-const jishui = ref(true);
-const chartData2 = ref({
-  xAxis: [
-    '06-12 08:00',
-    '06-12 09:00',
-    '06-12 10:00',
-    '06-12 11:00',
-    '06-12 12:00',
-    '06-12 13:00',
-    '06-12 14:00',
-    '06-12 15:00',
-    '06-12 16:00',
-    '06-12 17:00',
-    '06-12 18:00',
-    '06-12 19:00',
-  ],
-  inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
-  yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
-  refresh: 1,
-});
-const chartData1 = ref({
+const chartDataJSD = ref({
   xAxis: [
     '2024-06-12 08:00',
     '2024-06-13 08:00',
@@ -145,11 +119,6 @@
   { name: '金明片区', value: '3', lonlat: [114.285, 34.809] },
 ]);
 
-const pipeList = ref([
-  { name: '向阳路管网监测点', value: '1' },
-  { name: '汴京路管网监测点', value: '2' },
-]);
-
 const XmList = ref([
   { name: '汴京路管网及道路海绵化改造', value: '1' },
   { name: '市民综合体', value: '3' },
@@ -161,20 +130,66 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', Xm: '1', XmP: '', XmA: '', XmQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
-function jishuiClick() {
-  jishui.value = false;
-}
-const jishuichange = () => {
-  jishui.value = true;
+const dateRain = ref('');
+//海绵设施列表-汴京路
+const hmssList = ref([
+  { value: '0371000044', label: '工农路与汴京路交叉口' },
+  { value: '0371000039', label: '大花园街与汴京路交叉口' },
+  { value: '0371000038', label: '劳动路与汴京路交叉口' },
+  { value: '0371000037', label: '公园路与汴京路交叉口' },
+]);
+const hmssVal = ref('');
+const loadingSS = ref(true);
+const chartDataSS = ref({
+  xAxis: [],
+  inverse: true,
+  yAxis: [], //降雨量
+  yAxis2: [], //流量
+  yAxis3: [], //ss
+  refresh: 1,
+});
+// 海绵设施监测站点切换
+const changeHmss = () => {
+  // hmssVal.value = val;
+  getDataSS();
 };
+// 海绵设施数据渲染
+async function getDataSS() {
+  loadingSS.value = true;
+  // 关联雨量站是皮革厂雨量站，0371000003
+  let params = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: '0371000003',
+  };
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    chartDataSS.value.xAxis = datas.propertyMonitorXList;
+    chartDataSS.value.yAxis = datas.propertyMonitorList[0].ylist;
+  }
 
-const change = val => {
-  jishui.value = false;
-};
+  // 获取监测值
+  let params2 = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: hmssVal.value,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartDataSS.value.yAxis2 = datas.propertyMonitorList[0].ylist;
+  }
+  chartDataSS.value.refresh = Math.random();
+  loadingSS.value = false;
+}
+
+function jishuiClick() {}
+const jishuichange = () => {};
 
 // 片区分析点击
 function changeArea(val) {
@@ -205,6 +220,20 @@
     pitch: 30,
   });
 }
+
+onMounted(() => {
+  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  console.log('33333', hmssVal.value);
+  // 获取降雨日历的日期来加载对应数据
+  bus.on('setRainDate', date => {
+    console.log('降雨日历的日期----', date);
+    dateRain.value = date;
+    changeHmss(); //海绵设施数据加载
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('setRainDate');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 13e91cc..813b35a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -138,38 +138,38 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      // {
-      //   layername: 'YSBZ', //雨水泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'combineBengZhan', //合流泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'sewageFactory', //污水处理厂
-      //   show: false,
-      // },
-      // {
-      //   layername: 'ysLine1', //雨水管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'hsLine1', //合流管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'pipeline_info_flow', //管网流向
-      //   show: false,
-      // },
       {
-        layername: 'pipeMonitor', //管网监测点，测试
+        layername: 'YSBZ', //雨水泵站
         show: false,
       },
-      // {
-      //   layername: 'waterCourse', //河道水位计
-      //   show: false,
-      // },
+      {
+        layername: 'combineBengZhan', //合流泵站
+        show: false,
+      },
+      {
+        layername: 'sewageFactory', //污水处理厂
+        show: false,
+      },
+      {
+        layername: 'ysLine1', //雨水管网
+        show: false,
+      },
+      {
+        layername: 'hsLine1', //合流管网
+        show: false,
+      },
+      {
+        layername: 'pipeline_info_flow', //管网流向
+        show: false,
+      },
+      {
+        layername: 'pipeMonitor', //管网监测点
+        show: false,
+      },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
       {
         layername: 'waterLoging', //内涝积水点
         show: false,

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 4635d24..d7ac84a 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 项目监测分析 -->
   <div class="publicContainerA">
-    <div class="partTitleHM">项目评估</div>
+    <div class="partTitleHM">项目监测分析</div>
     <div class="ConstrucClass">
       <div class="WaterList">
         <div class="DropdownBox">
@@ -9,16 +10,11 @@
             <span>片区分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="area" style="width: 41%; margin-left: 10px; margin-top: 18px">
+            <el-form-item prop="area" style="width: 100%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.area" placeholder="请选择片区分析" @change="changeArea">
                 <el-option v-for="item in areaList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="pipe" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.pipe" @change="change" placeholder="请选择">
-                <el-option v-for="item in pipeList" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
           </div>
         </div>
 
@@ -28,16 +24,16 @@
             <span>项目分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
+            <el-form-item prop="Xm" style="width: 100%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="queryParams.XmP" placeholder="请选择典型项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
+            <!-- <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.XmA">
                 <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
 
@@ -52,16 +48,16 @@
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmAQ" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmAQ" @change="change" placeholder="请选择">
-                <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
+            <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
+                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </div>
         </div>
         <!-- 设施分析echarts -->
-        <div class="assessment">
-          <AssessmentEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentEcharts>
+        <div class="assessment" v-loading="loadingSS">
+          <AssessmentEcharts :data="chartDataSS" :refresh="chartDataSS.refresh"></AssessmentEcharts>
         </div>
 
         <div class="DropdownBox">
@@ -78,8 +74,8 @@
           </div>
         </div>
         <!-- 积水分析echarts -->
-        <div class="assessment" v-if="jishui">
-          <AssessmentjsEcharts :data="chartData1" :refresh="chartData1.refresh1"></AssessmentjsEcharts>
+        <div class="assessment">
+          <AssessmentjsEcharts :data="chartDataJSD" :refresh="chartDataJSD.refresh"></AssessmentjsEcharts>
         </div>
       </div>
     </div>
@@ -93,32 +89,10 @@
 import ssfx from '@/assets/newImgs/HMScreen/ssfx.png';
 import xmfx from '@/assets/newImgs/HMScreen/xmfx.png';
 import bus from '@/bus';
-
 import WaterAnalysis_icon from '@/assets/newImgs/HMScreen/WaterAnalysis_icon.png';
+import { graphicReport, realtimeDataLatest } from '@/api/dataAnalysis/syntherticData';
 
-const jishui = ref(true);
-const chartData2 = ref({
-  xAxis: [
-    '06-12 08:00',
-    '06-12 09:00',
-    '06-12 10:00',
-    '06-12 11:00',
-    '06-12 12:00',
-    '06-12 13:00',
-    '06-12 14:00',
-    '06-12 15:00',
-    '06-12 16:00',
-    '06-12 17:00',
-    '06-12 18:00',
-    '06-12 19:00',
-  ],
-  inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
-  yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
-  refresh: 1,
-});
-const chartData1 = ref({
+const chartDataJSD = ref({
   xAxis: [
     '2024-06-12 08:00',
     '2024-06-13 08:00',
@@ -145,11 +119,6 @@
   { name: '金明片区', value: '3', lonlat: [114.285, 34.809] },
 ]);
 
-const pipeList = ref([
-  { name: '向阳路管网监测点', value: '1' },
-  { name: '汴京路管网监测点', value: '2' },
-]);
-
 const XmList = ref([
   { name: '汴京路管网及道路海绵化改造', value: '1' },
   { name: '市民综合体', value: '3' },
@@ -161,20 +130,66 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', Xm: '1', XmP: '', XmA: '', XmQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
-function jishuiClick() {
-  jishui.value = false;
-}
-const jishuichange = () => {
-  jishui.value = true;
+const dateRain = ref('');
+//海绵设施列表-汴京路
+const hmssList = ref([
+  { value: '0371000044', label: '工农路与汴京路交叉口' },
+  { value: '0371000039', label: '大花园街与汴京路交叉口' },
+  { value: '0371000038', label: '劳动路与汴京路交叉口' },
+  { value: '0371000037', label: '公园路与汴京路交叉口' },
+]);
+const hmssVal = ref('');
+const loadingSS = ref(true);
+const chartDataSS = ref({
+  xAxis: [],
+  inverse: true,
+  yAxis: [], //降雨量
+  yAxis2: [], //流量
+  yAxis3: [], //ss
+  refresh: 1,
+});
+// 海绵设施监测站点切换
+const changeHmss = () => {
+  // hmssVal.value = val;
+  getDataSS();
 };
+// 海绵设施数据渲染
+async function getDataSS() {
+  loadingSS.value = true;
+  // 关联雨量站是皮革厂雨量站，0371000003
+  let params = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: '0371000003',
+  };
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    chartDataSS.value.xAxis = datas.propertyMonitorXList;
+    chartDataSS.value.yAxis = datas.propertyMonitorList[0].ylist;
+  }
 
-const change = val => {
-  jishui.value = false;
-};
+  // 获取监测值
+  let params2 = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: hmssVal.value,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartDataSS.value.yAxis2 = datas.propertyMonitorList[0].ylist;
+  }
+  chartDataSS.value.refresh = Math.random();
+  loadingSS.value = false;
+}
+
+function jishuiClick() {}
+const jishuichange = () => {};
 
 // 片区分析点击
 function changeArea(val) {
@@ -205,6 +220,20 @@
     pitch: 30,
   });
 }
+
+onMounted(() => {
+  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  console.log('33333', hmssVal.value);
+  // 获取降雨日历的日期来加载对应数据
+  bus.on('setRainDate', date => {
+    console.log('降雨日历的日期----', date);
+    dateRain.value = date;
+    changeHmss(); //海绵设施数据加载
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('setRainDate');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 13e91cc..813b35a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -138,38 +138,38 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      // {
-      //   layername: 'YSBZ', //雨水泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'combineBengZhan', //合流泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'sewageFactory', //污水处理厂
-      //   show: false,
-      // },
-      // {
-      //   layername: 'ysLine1', //雨水管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'hsLine1', //合流管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'pipeline_info_flow', //管网流向
-      //   show: false,
-      // },
       {
-        layername: 'pipeMonitor', //管网监测点，测试
+        layername: 'YSBZ', //雨水泵站
         show: false,
       },
-      // {
-      //   layername: 'waterCourse', //河道水位计
-      //   show: false,
-      // },
+      {
+        layername: 'combineBengZhan', //合流泵站
+        show: false,
+      },
+      {
+        layername: 'sewageFactory', //污水处理厂
+        show: false,
+      },
+      {
+        layername: 'ysLine1', //雨水管网
+        show: false,
+      },
+      {
+        layername: 'hsLine1', //合流管网
+        show: false,
+      },
+      {
+        layername: 'pipeline_info_flow', //管网流向
+        show: false,
+      },
+      {
+        layername: 'pipeMonitor', //管网监测点
+        show: false,
+      },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
       {
         layername: 'waterLoging', //内涝积水点
         show: false,
diff --git a/src/views/sponeScreen/waterFlood/rainCaldar.vue b/src/views/sponeScreen/waterFlood/rainCaldar.vue
index 5c6cf5b..82b24b4 100644
--- a/src/views/sponeScreen/waterFlood/rainCaldar.vue
+++ b/src/views/sponeScreen/waterFlood/rainCaldar.vue
@@ -73,6 +73,8 @@
 import { rainRainDaylist } from '@/api/newPageline/riverCapacity.js';
 import DEchart from '@/views/sponeScreen/Echarts/DEchart.vue';
 import { getStationList } from '@/api/dataAnalysis/syntherticData';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const rainCode = ref('');
 const rangeTime = ref('');
@@ -125,7 +127,8 @@
     dateIndex.value == 'day' ? 'YYYY-MM-DD' : dateIndex.value == 'month' ? 'YYYY-MM' : dateIndex.value == 'year' ? 'YYYY' : '';
   rangeTime.value = proxy.moment().format(valueFormat);
   currentType.value = '';
-
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
   getBasRainTimeSectionListFn();
 }
 
@@ -179,6 +182,8 @@
   rangeTime.value = curInfo.value?.rainTime;
   AllData.curDate = proxy.moment(rangeTime.value).format('MM-DD');
   AllData.curYear = proxy.moment(rangeTime.value).format('YYYY');
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
 };
 
 onMounted(() => {

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 4635d24..d7ac84a 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 项目监测分析 -->
   <div class="publicContainerA">
-    <div class="partTitleHM">项目评估</div>
+    <div class="partTitleHM">项目监测分析</div>
     <div class="ConstrucClass">
       <div class="WaterList">
         <div class="DropdownBox">
@@ -9,16 +10,11 @@
             <span>片区分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="area" style="width: 41%; margin-left: 10px; margin-top: 18px">
+            <el-form-item prop="area" style="width: 100%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.area" placeholder="请选择片区分析" @change="changeArea">
                 <el-option v-for="item in areaList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="pipe" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.pipe" @change="change" placeholder="请选择">
-                <el-option v-for="item in pipeList" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
           </div>
         </div>
 
@@ -28,16 +24,16 @@
             <span>项目分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
+            <el-form-item prop="Xm" style="width: 100%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="queryParams.XmP" placeholder="请选择典型项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
+            <!-- <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.XmA">
                 <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
 
@@ -52,16 +48,16 @@
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmAQ" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmAQ" @change="change" placeholder="请选择">
-                <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
+            <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
+                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </div>
         </div>
         <!-- 设施分析echarts -->
-        <div class="assessment">
-          <AssessmentEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentEcharts>
+        <div class="assessment" v-loading="loadingSS">
+          <AssessmentEcharts :data="chartDataSS" :refresh="chartDataSS.refresh"></AssessmentEcharts>
         </div>
 
         <div class="DropdownBox">
@@ -78,8 +74,8 @@
           </div>
         </div>
         <!-- 积水分析echarts -->
-        <div class="assessment" v-if="jishui">
-          <AssessmentjsEcharts :data="chartData1" :refresh="chartData1.refresh1"></AssessmentjsEcharts>
+        <div class="assessment">
+          <AssessmentjsEcharts :data="chartDataJSD" :refresh="chartDataJSD.refresh"></AssessmentjsEcharts>
         </div>
       </div>
     </div>
@@ -93,32 +89,10 @@
 import ssfx from '@/assets/newImgs/HMScreen/ssfx.png';
 import xmfx from '@/assets/newImgs/HMScreen/xmfx.png';
 import bus from '@/bus';
-
 import WaterAnalysis_icon from '@/assets/newImgs/HMScreen/WaterAnalysis_icon.png';
+import { graphicReport, realtimeDataLatest } from '@/api/dataAnalysis/syntherticData';
 
-const jishui = ref(true);
-const chartData2 = ref({
-  xAxis: [
-    '06-12 08:00',
-    '06-12 09:00',
-    '06-12 10:00',
-    '06-12 11:00',
-    '06-12 12:00',
-    '06-12 13:00',
-    '06-12 14:00',
-    '06-12 15:00',
-    '06-12 16:00',
-    '06-12 17:00',
-    '06-12 18:00',
-    '06-12 19:00',
-  ],
-  inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
-  yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
-  refresh: 1,
-});
-const chartData1 = ref({
+const chartDataJSD = ref({
   xAxis: [
     '2024-06-12 08:00',
     '2024-06-13 08:00',
@@ -145,11 +119,6 @@
   { name: '金明片区', value: '3', lonlat: [114.285, 34.809] },
 ]);
 
-const pipeList = ref([
-  { name: '向阳路管网监测点', value: '1' },
-  { name: '汴京路管网监测点', value: '2' },
-]);
-
 const XmList = ref([
   { name: '汴京路管网及道路海绵化改造', value: '1' },
   { name: '市民综合体', value: '3' },
@@ -161,20 +130,66 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', Xm: '1', XmP: '', XmA: '', XmQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
-function jishuiClick() {
-  jishui.value = false;
-}
-const jishuichange = () => {
-  jishui.value = true;
+const dateRain = ref('');
+//海绵设施列表-汴京路
+const hmssList = ref([
+  { value: '0371000044', label: '工农路与汴京路交叉口' },
+  { value: '0371000039', label: '大花园街与汴京路交叉口' },
+  { value: '0371000038', label: '劳动路与汴京路交叉口' },
+  { value: '0371000037', label: '公园路与汴京路交叉口' },
+]);
+const hmssVal = ref('');
+const loadingSS = ref(true);
+const chartDataSS = ref({
+  xAxis: [],
+  inverse: true,
+  yAxis: [], //降雨量
+  yAxis2: [], //流量
+  yAxis3: [], //ss
+  refresh: 1,
+});
+// 海绵设施监测站点切换
+const changeHmss = () => {
+  // hmssVal.value = val;
+  getDataSS();
 };
+// 海绵设施数据渲染
+async function getDataSS() {
+  loadingSS.value = true;
+  // 关联雨量站是皮革厂雨量站，0371000003
+  let params = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: '0371000003',
+  };
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    chartDataSS.value.xAxis = datas.propertyMonitorXList;
+    chartDataSS.value.yAxis = datas.propertyMonitorList[0].ylist;
+  }
 
-const change = val => {
-  jishui.value = false;
-};
+  // 获取监测值
+  let params2 = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: hmssVal.value,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartDataSS.value.yAxis2 = datas.propertyMonitorList[0].ylist;
+  }
+  chartDataSS.value.refresh = Math.random();
+  loadingSS.value = false;
+}
+
+function jishuiClick() {}
+const jishuichange = () => {};
 
 // 片区分析点击
 function changeArea(val) {
@@ -205,6 +220,20 @@
     pitch: 30,
   });
 }
+
+onMounted(() => {
+  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  console.log('33333', hmssVal.value);
+  // 获取降雨日历的日期来加载对应数据
+  bus.on('setRainDate', date => {
+    console.log('降雨日历的日期----', date);
+    dateRain.value = date;
+    changeHmss(); //海绵设施数据加载
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('setRainDate');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 13e91cc..813b35a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -138,38 +138,38 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      // {
-      //   layername: 'YSBZ', //雨水泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'combineBengZhan', //合流泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'sewageFactory', //污水处理厂
-      //   show: false,
-      // },
-      // {
-      //   layername: 'ysLine1', //雨水管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'hsLine1', //合流管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'pipeline_info_flow', //管网流向
-      //   show: false,
-      // },
       {
-        layername: 'pipeMonitor', //管网监测点，测试
+        layername: 'YSBZ', //雨水泵站
         show: false,
       },
-      // {
-      //   layername: 'waterCourse', //河道水位计
-      //   show: false,
-      // },
+      {
+        layername: 'combineBengZhan', //合流泵站
+        show: false,
+      },
+      {
+        layername: 'sewageFactory', //污水处理厂
+        show: false,
+      },
+      {
+        layername: 'ysLine1', //雨水管网
+        show: false,
+      },
+      {
+        layername: 'hsLine1', //合流管网
+        show: false,
+      },
+      {
+        layername: 'pipeline_info_flow', //管网流向
+        show: false,
+      },
+      {
+        layername: 'pipeMonitor', //管网监测点
+        show: false,
+      },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
       {
         layername: 'waterLoging', //内涝积水点
         show: false,
diff --git a/src/views/sponeScreen/waterFlood/rainCaldar.vue b/src/views/sponeScreen/waterFlood/rainCaldar.vue
index 5c6cf5b..82b24b4 100644
--- a/src/views/sponeScreen/waterFlood/rainCaldar.vue
+++ b/src/views/sponeScreen/waterFlood/rainCaldar.vue
@@ -73,6 +73,8 @@
 import { rainRainDaylist } from '@/api/newPageline/riverCapacity.js';
 import DEchart from '@/views/sponeScreen/Echarts/DEchart.vue';
 import { getStationList } from '@/api/dataAnalysis/syntherticData';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const rainCode = ref('');
 const rangeTime = ref('');
@@ -125,7 +127,8 @@
     dateIndex.value == 'day' ? 'YYYY-MM-DD' : dateIndex.value == 'month' ? 'YYYY-MM' : dateIndex.value == 'year' ? 'YYYY' : '';
   rangeTime.value = proxy.moment().format(valueFormat);
   currentType.value = '';
-
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
   getBasRainTimeSectionListFn();
 }
 
@@ -179,6 +182,8 @@
   rangeTime.value = curInfo.value?.rainTime;
   AllData.curDate = proxy.moment(rangeTime.value).format('MM-DD');
   AllData.curYear = proxy.moment(rangeTime.value).format('YYYY');
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
 };
 
 onMounted(() => {
diff --git a/src/views/spongePerformance/mainIndex/centerRight.vue b/src/views/spongePerformance/mainIndex/centerRight.vue
index 8cdcb7d..1e91252 100644
--- a/src/views/spongePerformance/mainIndex/centerRight.vue
+++ b/src/views/spongePerformance/mainIndex/centerRight.vue
@@ -18,9 +18,6 @@
   'itemTarget',
 ]);
 
-console.log('realValue', realValue);
-console.log('yData', yData);
-console.log('itemTarget', itemTarget);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 4635d24..d7ac84a 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 项目监测分析 -->
   <div class="publicContainerA">
-    <div class="partTitleHM">项目评估</div>
+    <div class="partTitleHM">项目监测分析</div>
     <div class="ConstrucClass">
       <div class="WaterList">
         <div class="DropdownBox">
@@ -9,16 +10,11 @@
             <span>片区分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="area" style="width: 41%; margin-left: 10px; margin-top: 18px">
+            <el-form-item prop="area" style="width: 100%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.area" placeholder="请选择片区分析" @change="changeArea">
                 <el-option v-for="item in areaList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="pipe" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.pipe" @change="change" placeholder="请选择">
-                <el-option v-for="item in pipeList" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
           </div>
         </div>
 
@@ -28,16 +24,16 @@
             <span>项目分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
+            <el-form-item prop="Xm" style="width: 100%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="queryParams.XmP" placeholder="请选择典型项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
+            <!-- <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.XmA">
                 <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
 
@@ -52,16 +48,16 @@
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmAQ" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmAQ" @change="change" placeholder="请选择">
-                <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
+            <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
+                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </div>
         </div>
         <!-- 设施分析echarts -->
-        <div class="assessment">
-          <AssessmentEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentEcharts>
+        <div class="assessment" v-loading="loadingSS">
+          <AssessmentEcharts :data="chartDataSS" :refresh="chartDataSS.refresh"></AssessmentEcharts>
         </div>
 
         <div class="DropdownBox">
@@ -78,8 +74,8 @@
           </div>
         </div>
         <!-- 积水分析echarts -->
-        <div class="assessment" v-if="jishui">
-          <AssessmentjsEcharts :data="chartData1" :refresh="chartData1.refresh1"></AssessmentjsEcharts>
+        <div class="assessment">
+          <AssessmentjsEcharts :data="chartDataJSD" :refresh="chartDataJSD.refresh"></AssessmentjsEcharts>
         </div>
       </div>
     </div>
@@ -93,32 +89,10 @@
 import ssfx from '@/assets/newImgs/HMScreen/ssfx.png';
 import xmfx from '@/assets/newImgs/HMScreen/xmfx.png';
 import bus from '@/bus';
-
 import WaterAnalysis_icon from '@/assets/newImgs/HMScreen/WaterAnalysis_icon.png';
+import { graphicReport, realtimeDataLatest } from '@/api/dataAnalysis/syntherticData';
 
-const jishui = ref(true);
-const chartData2 = ref({
-  xAxis: [
-    '06-12 08:00',
-    '06-12 09:00',
-    '06-12 10:00',
-    '06-12 11:00',
-    '06-12 12:00',
-    '06-12 13:00',
-    '06-12 14:00',
-    '06-12 15:00',
-    '06-12 16:00',
-    '06-12 17:00',
-    '06-12 18:00',
-    '06-12 19:00',
-  ],
-  inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
-  yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
-  refresh: 1,
-});
-const chartData1 = ref({
+const chartDataJSD = ref({
   xAxis: [
     '2024-06-12 08:00',
     '2024-06-13 08:00',
@@ -145,11 +119,6 @@
   { name: '金明片区', value: '3', lonlat: [114.285, 34.809] },
 ]);
 
-const pipeList = ref([
-  { name: '向阳路管网监测点', value: '1' },
-  { name: '汴京路管网监测点', value: '2' },
-]);
-
 const XmList = ref([
   { name: '汴京路管网及道路海绵化改造', value: '1' },
   { name: '市民综合体', value: '3' },
@@ -161,20 +130,66 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', Xm: '1', XmP: '', XmA: '', XmQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
-function jishuiClick() {
-  jishui.value = false;
-}
-const jishuichange = () => {
-  jishui.value = true;
+const dateRain = ref('');
+//海绵设施列表-汴京路
+const hmssList = ref([
+  { value: '0371000044', label: '工农路与汴京路交叉口' },
+  { value: '0371000039', label: '大花园街与汴京路交叉口' },
+  { value: '0371000038', label: '劳动路与汴京路交叉口' },
+  { value: '0371000037', label: '公园路与汴京路交叉口' },
+]);
+const hmssVal = ref('');
+const loadingSS = ref(true);
+const chartDataSS = ref({
+  xAxis: [],
+  inverse: true,
+  yAxis: [], //降雨量
+  yAxis2: [], //流量
+  yAxis3: [], //ss
+  refresh: 1,
+});
+// 海绵设施监测站点切换
+const changeHmss = () => {
+  // hmssVal.value = val;
+  getDataSS();
 };
+// 海绵设施数据渲染
+async function getDataSS() {
+  loadingSS.value = true;
+  // 关联雨量站是皮革厂雨量站，0371000003
+  let params = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: '0371000003',
+  };
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    chartDataSS.value.xAxis = datas.propertyMonitorXList;
+    chartDataSS.value.yAxis = datas.propertyMonitorList[0].ylist;
+  }
 
-const change = val => {
-  jishui.value = false;
-};
+  // 获取监测值
+  let params2 = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: hmssVal.value,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartDataSS.value.yAxis2 = datas.propertyMonitorList[0].ylist;
+  }
+  chartDataSS.value.refresh = Math.random();
+  loadingSS.value = false;
+}
+
+function jishuiClick() {}
+const jishuichange = () => {};
 
 // 片区分析点击
 function changeArea(val) {
@@ -205,6 +220,20 @@
     pitch: 30,
   });
 }
+
+onMounted(() => {
+  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  console.log('33333', hmssVal.value);
+  // 获取降雨日历的日期来加载对应数据
+  bus.on('setRainDate', date => {
+    console.log('降雨日历的日期----', date);
+    dateRain.value = date;
+    changeHmss(); //海绵设施数据加载
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('setRainDate');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 13e91cc..813b35a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -138,38 +138,38 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      // {
-      //   layername: 'YSBZ', //雨水泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'combineBengZhan', //合流泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'sewageFactory', //污水处理厂
-      //   show: false,
-      // },
-      // {
-      //   layername: 'ysLine1', //雨水管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'hsLine1', //合流管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'pipeline_info_flow', //管网流向
-      //   show: false,
-      // },
       {
-        layername: 'pipeMonitor', //管网监测点，测试
+        layername: 'YSBZ', //雨水泵站
         show: false,
       },
-      // {
-      //   layername: 'waterCourse', //河道水位计
-      //   show: false,
-      // },
+      {
+        layername: 'combineBengZhan', //合流泵站
+        show: false,
+      },
+      {
+        layername: 'sewageFactory', //污水处理厂
+        show: false,
+      },
+      {
+        layername: 'ysLine1', //雨水管网
+        show: false,
+      },
+      {
+        layername: 'hsLine1', //合流管网
+        show: false,
+      },
+      {
+        layername: 'pipeline_info_flow', //管网流向
+        show: false,
+      },
+      {
+        layername: 'pipeMonitor', //管网监测点
+        show: false,
+      },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
       {
         layername: 'waterLoging', //内涝积水点
         show: false,
diff --git a/src/views/sponeScreen/waterFlood/rainCaldar.vue b/src/views/sponeScreen/waterFlood/rainCaldar.vue
index 5c6cf5b..82b24b4 100644
--- a/src/views/sponeScreen/waterFlood/rainCaldar.vue
+++ b/src/views/sponeScreen/waterFlood/rainCaldar.vue
@@ -73,6 +73,8 @@
 import { rainRainDaylist } from '@/api/newPageline/riverCapacity.js';
 import DEchart from '@/views/sponeScreen/Echarts/DEchart.vue';
 import { getStationList } from '@/api/dataAnalysis/syntherticData';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const rainCode = ref('');
 const rangeTime = ref('');
@@ -125,7 +127,8 @@
     dateIndex.value == 'day' ? 'YYYY-MM-DD' : dateIndex.value == 'month' ? 'YYYY-MM' : dateIndex.value == 'year' ? 'YYYY' : '';
   rangeTime.value = proxy.moment().format(valueFormat);
   currentType.value = '';
-
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
   getBasRainTimeSectionListFn();
 }
 
@@ -179,6 +182,8 @@
   rangeTime.value = curInfo.value?.rainTime;
   AllData.curDate = proxy.moment(rangeTime.value).format('MM-DD');
   AllData.curYear = proxy.moment(rangeTime.value).format('YYYY');
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
 };
 
 onMounted(() => {
diff --git a/src/views/spongePerformance/mainIndex/centerRight.vue b/src/views/spongePerformance/mainIndex/centerRight.vue
index 8cdcb7d..1e91252 100644
--- a/src/views/spongePerformance/mainIndex/centerRight.vue
+++ b/src/views/spongePerformance/mainIndex/centerRight.vue
@@ -18,9 +18,6 @@
   'itemTarget',
 ]);
 
-console.log('realValue', realValue);
-console.log('yData', yData);
-console.log('itemTarget', itemTarget);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
diff --git a/src/views/spongePerformance/mainIndex/chart.js b/src/views/spongePerformance/mainIndex/chart.js
index b80dc33..cc35843 100644
--- a/src/views/spongePerformance/mainIndex/chart.js
+++ b/src/views/spongePerformance/mainIndex/chart.js
@@ -12,13 +12,11 @@
   subtext: '项目总数',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });
@@ -37,13 +35,11 @@
   subtext: '优',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 4635d24..d7ac84a 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 项目监测分析 -->
   <div class="publicContainerA">
-    <div class="partTitleHM">项目评估</div>
+    <div class="partTitleHM">项目监测分析</div>
     <div class="ConstrucClass">
       <div class="WaterList">
         <div class="DropdownBox">
@@ -9,16 +10,11 @@
             <span>片区分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="area" style="width: 41%; margin-left: 10px; margin-top: 18px">
+            <el-form-item prop="area" style="width: 100%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.area" placeholder="请选择片区分析" @change="changeArea">
                 <el-option v-for="item in areaList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="pipe" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.pipe" @change="change" placeholder="请选择">
-                <el-option v-for="item in pipeList" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
           </div>
         </div>
 
@@ -28,16 +24,16 @@
             <span>项目分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
+            <el-form-item prop="Xm" style="width: 100%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="queryParams.XmP" placeholder="请选择典型项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
+            <!-- <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.XmA">
                 <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
 
@@ -52,16 +48,16 @@
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmAQ" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmAQ" @change="change" placeholder="请选择">
-                <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
+            <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
+                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </div>
         </div>
         <!-- 设施分析echarts -->
-        <div class="assessment">
-          <AssessmentEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentEcharts>
+        <div class="assessment" v-loading="loadingSS">
+          <AssessmentEcharts :data="chartDataSS" :refresh="chartDataSS.refresh"></AssessmentEcharts>
         </div>
 
         <div class="DropdownBox">
@@ -78,8 +74,8 @@
           </div>
         </div>
         <!-- 积水分析echarts -->
-        <div class="assessment" v-if="jishui">
-          <AssessmentjsEcharts :data="chartData1" :refresh="chartData1.refresh1"></AssessmentjsEcharts>
+        <div class="assessment">
+          <AssessmentjsEcharts :data="chartDataJSD" :refresh="chartDataJSD.refresh"></AssessmentjsEcharts>
         </div>
       </div>
     </div>
@@ -93,32 +89,10 @@
 import ssfx from '@/assets/newImgs/HMScreen/ssfx.png';
 import xmfx from '@/assets/newImgs/HMScreen/xmfx.png';
 import bus from '@/bus';
-
 import WaterAnalysis_icon from '@/assets/newImgs/HMScreen/WaterAnalysis_icon.png';
+import { graphicReport, realtimeDataLatest } from '@/api/dataAnalysis/syntherticData';
 
-const jishui = ref(true);
-const chartData2 = ref({
-  xAxis: [
-    '06-12 08:00',
-    '06-12 09:00',
-    '06-12 10:00',
-    '06-12 11:00',
-    '06-12 12:00',
-    '06-12 13:00',
-    '06-12 14:00',
-    '06-12 15:00',
-    '06-12 16:00',
-    '06-12 17:00',
-    '06-12 18:00',
-    '06-12 19:00',
-  ],
-  inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
-  yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
-  refresh: 1,
-});
-const chartData1 = ref({
+const chartDataJSD = ref({
   xAxis: [
     '2024-06-12 08:00',
     '2024-06-13 08:00',
@@ -145,11 +119,6 @@
   { name: '金明片区', value: '3', lonlat: [114.285, 34.809] },
 ]);
 
-const pipeList = ref([
-  { name: '向阳路管网监测点', value: '1' },
-  { name: '汴京路管网监测点', value: '2' },
-]);
-
 const XmList = ref([
   { name: '汴京路管网及道路海绵化改造', value: '1' },
   { name: '市民综合体', value: '3' },
@@ -161,20 +130,66 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', Xm: '1', XmP: '', XmA: '', XmQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
-function jishuiClick() {
-  jishui.value = false;
-}
-const jishuichange = () => {
-  jishui.value = true;
+const dateRain = ref('');
+//海绵设施列表-汴京路
+const hmssList = ref([
+  { value: '0371000044', label: '工农路与汴京路交叉口' },
+  { value: '0371000039', label: '大花园街与汴京路交叉口' },
+  { value: '0371000038', label: '劳动路与汴京路交叉口' },
+  { value: '0371000037', label: '公园路与汴京路交叉口' },
+]);
+const hmssVal = ref('');
+const loadingSS = ref(true);
+const chartDataSS = ref({
+  xAxis: [],
+  inverse: true,
+  yAxis: [], //降雨量
+  yAxis2: [], //流量
+  yAxis3: [], //ss
+  refresh: 1,
+});
+// 海绵设施监测站点切换
+const changeHmss = () => {
+  // hmssVal.value = val;
+  getDataSS();
 };
+// 海绵设施数据渲染
+async function getDataSS() {
+  loadingSS.value = true;
+  // 关联雨量站是皮革厂雨量站，0371000003
+  let params = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: '0371000003',
+  };
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    chartDataSS.value.xAxis = datas.propertyMonitorXList;
+    chartDataSS.value.yAxis = datas.propertyMonitorList[0].ylist;
+  }
 
-const change = val => {
-  jishui.value = false;
-};
+  // 获取监测值
+  let params2 = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: hmssVal.value,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartDataSS.value.yAxis2 = datas.propertyMonitorList[0].ylist;
+  }
+  chartDataSS.value.refresh = Math.random();
+  loadingSS.value = false;
+}
+
+function jishuiClick() {}
+const jishuichange = () => {};
 
 // 片区分析点击
 function changeArea(val) {
@@ -205,6 +220,20 @@
     pitch: 30,
   });
 }
+
+onMounted(() => {
+  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  console.log('33333', hmssVal.value);
+  // 获取降雨日历的日期来加载对应数据
+  bus.on('setRainDate', date => {
+    console.log('降雨日历的日期----', date);
+    dateRain.value = date;
+    changeHmss(); //海绵设施数据加载
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('setRainDate');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 13e91cc..813b35a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -138,38 +138,38 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      // {
-      //   layername: 'YSBZ', //雨水泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'combineBengZhan', //合流泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'sewageFactory', //污水处理厂
-      //   show: false,
-      // },
-      // {
-      //   layername: 'ysLine1', //雨水管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'hsLine1', //合流管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'pipeline_info_flow', //管网流向
-      //   show: false,
-      // },
       {
-        layername: 'pipeMonitor', //管网监测点，测试
+        layername: 'YSBZ', //雨水泵站
         show: false,
       },
-      // {
-      //   layername: 'waterCourse', //河道水位计
-      //   show: false,
-      // },
+      {
+        layername: 'combineBengZhan', //合流泵站
+        show: false,
+      },
+      {
+        layername: 'sewageFactory', //污水处理厂
+        show: false,
+      },
+      {
+        layername: 'ysLine1', //雨水管网
+        show: false,
+      },
+      {
+        layername: 'hsLine1', //合流管网
+        show: false,
+      },
+      {
+        layername: 'pipeline_info_flow', //管网流向
+        show: false,
+      },
+      {
+        layername: 'pipeMonitor', //管网监测点
+        show: false,
+      },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
       {
         layername: 'waterLoging', //内涝积水点
         show: false,
diff --git a/src/views/sponeScreen/waterFlood/rainCaldar.vue b/src/views/sponeScreen/waterFlood/rainCaldar.vue
index 5c6cf5b..82b24b4 100644
--- a/src/views/sponeScreen/waterFlood/rainCaldar.vue
+++ b/src/views/sponeScreen/waterFlood/rainCaldar.vue
@@ -73,6 +73,8 @@
 import { rainRainDaylist } from '@/api/newPageline/riverCapacity.js';
 import DEchart from '@/views/sponeScreen/Echarts/DEchart.vue';
 import { getStationList } from '@/api/dataAnalysis/syntherticData';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const rainCode = ref('');
 const rangeTime = ref('');
@@ -125,7 +127,8 @@
     dateIndex.value == 'day' ? 'YYYY-MM-DD' : dateIndex.value == 'month' ? 'YYYY-MM' : dateIndex.value == 'year' ? 'YYYY' : '';
   rangeTime.value = proxy.moment().format(valueFormat);
   currentType.value = '';
-
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
   getBasRainTimeSectionListFn();
 }
 
@@ -179,6 +182,8 @@
   rangeTime.value = curInfo.value?.rainTime;
   AllData.curDate = proxy.moment(rangeTime.value).format('MM-DD');
   AllData.curYear = proxy.moment(rangeTime.value).format('YYYY');
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
 };
 
 onMounted(() => {
diff --git a/src/views/spongePerformance/mainIndex/centerRight.vue b/src/views/spongePerformance/mainIndex/centerRight.vue
index 8cdcb7d..1e91252 100644
--- a/src/views/spongePerformance/mainIndex/centerRight.vue
+++ b/src/views/spongePerformance/mainIndex/centerRight.vue
@@ -18,9 +18,6 @@
   'itemTarget',
 ]);
 
-console.log('realValue', realValue);
-console.log('yData', yData);
-console.log('itemTarget', itemTarget);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
diff --git a/src/views/spongePerformance/mainIndex/chart.js b/src/views/spongePerformance/mainIndex/chart.js
index b80dc33..cc35843 100644
--- a/src/views/spongePerformance/mainIndex/chart.js
+++ b/src/views/spongePerformance/mainIndex/chart.js
@@ -12,13 +12,11 @@
   subtext: '项目总数',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });
@@ -37,13 +35,11 @@
   subtext: '优',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });
diff --git a/src/views/spongePerformance/mainIndex/footCenter.vue b/src/views/spongePerformance/mainIndex/footCenter.vue
index 96b8639..9040a8c 100644
--- a/src/views/spongePerformance/mainIndex/footCenter.vue
+++ b/src/views/spongePerformance/mainIndex/footCenter.vue
@@ -6,12 +6,16 @@
 <script setup>
 import { init } from 'echarts';
 import 'echarts-liquidfill/src/liquidFill.js';
+
 const assetEchart = ref(null);
-let { xData } = defineProps(['data']);
-xData?.reduce((n, v) => {
+const props = defineProps({
+  data: {
+    type: Array,
+  },
+});
+props.data.xData.reduce((n, v) => {
   return n + v.itemScore;
 }, 0);
-console.log('xDataxData', xData);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
@@ -20,7 +24,7 @@
   chart.setOption({
     title: [
       {
-        text: xData[0]?.itemContent,
+        text: props.data.xData[0]?.itemContent,
         x: '10%',
         y: '79%',
         textStyle: {
@@ -32,7 +36,7 @@
         },
       },
       {
-        text: xData[1]?.itemContent,
+        text: props.data.xData[1]?.itemContent,
         x: '61%',
         y: '79%',
         textStyle: {
@@ -71,21 +75,19 @@
             globalCoord: true,
           },
         ],
-        data: [xData[0]?.realScore], // data个数代表波浪数
+        data: [props.data.xData[0]?.realScore], // data个数代表波浪数
         backgroundStyle: {
           borderWidth: 1,
           color: '#1e5187',
           opacity: '0.3',
         },
         label: {
-          normal: {
-            textStyle: {
-              fontSize: 14,
-              color: '#0f406a',
-            },
-            formatter: function (param) {
-              return xData[0]?.standardFlag == 1 ? '已完成' : '未完成' + '\n' + '总数' + (xData[0]?.itemScore || 0);
-            },
+          textStyle: {
+            fontSize: 14,
+            color: '#0f406a',
+          },
+          formatter: function (param) {
+            return props.data.xData[0]?.standardFlag == 1 ? '已完成' : '未完成' + '\n' + '总数' + (props.data.xData[0]?.itemScore || 0);
           },
         },
         outline: {
@@ -124,22 +126,20 @@
             globalCoord: false,
           },
         ],
-        data: [xData[1]?.standardFlag == 1 ? 1 : 0], // data个数代表波浪数
-        //   data: [xData[1]?.realValue/xData[1]?.itemScore], // data个数代表波浪数
+        data: [props.data.xData[1]?.standardFlag == 1 ? 1 : 0], // data个数代表波浪数
+        //   data: [props.data[1]?.realValue/props.data[1]?.itemScore], // data个数代表波浪数
         backgroundStyle: {
           borderWidth: 1,
           color: '#1e5187',
           opacity: '0.3',
         },
         label: {
-          normal: {
-            textStyle: {
-              fontSize: 14,
-              color: '#fff',
-            },
-            formatter: function (param) {
-              return (param.value * 100 || 0) + '%' + '\n' + '总数' + (xData[1]?.itemScore || 0);
-            },
+          textStyle: {
+            fontSize: 14,
+            color: '#fff',
+          },
+          formatter: function (param) {
+            return (param.value * 100 || 0) + '%' + '\n' + '总数' + (props.data.xData[1]?.itemScore || 0);
           },
         },
         outline: {

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 4635d24..d7ac84a 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 项目监测分析 -->
   <div class="publicContainerA">
-    <div class="partTitleHM">项目评估</div>
+    <div class="partTitleHM">项目监测分析</div>
     <div class="ConstrucClass">
       <div class="WaterList">
         <div class="DropdownBox">
@@ -9,16 +10,11 @@
             <span>片区分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="area" style="width: 41%; margin-left: 10px; margin-top: 18px">
+            <el-form-item prop="area" style="width: 100%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.area" placeholder="请选择片区分析" @change="changeArea">
                 <el-option v-for="item in areaList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="pipe" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.pipe" @change="change" placeholder="请选择">
-                <el-option v-for="item in pipeList" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
           </div>
         </div>
 
@@ -28,16 +24,16 @@
             <span>项目分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
+            <el-form-item prop="Xm" style="width: 100%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="queryParams.XmP" placeholder="请选择典型项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
+            <!-- <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.XmA">
                 <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
 
@@ -52,16 +48,16 @@
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmAQ" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmAQ" @change="change" placeholder="请选择">
-                <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
+            <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
+                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </div>
         </div>
         <!-- 设施分析echarts -->
-        <div class="assessment">
-          <AssessmentEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentEcharts>
+        <div class="assessment" v-loading="loadingSS">
+          <AssessmentEcharts :data="chartDataSS" :refresh="chartDataSS.refresh"></AssessmentEcharts>
         </div>
 
         <div class="DropdownBox">
@@ -78,8 +74,8 @@
           </div>
         </div>
         <!-- 积水分析echarts -->
-        <div class="assessment" v-if="jishui">
-          <AssessmentjsEcharts :data="chartData1" :refresh="chartData1.refresh1"></AssessmentjsEcharts>
+        <div class="assessment">
+          <AssessmentjsEcharts :data="chartDataJSD" :refresh="chartDataJSD.refresh"></AssessmentjsEcharts>
         </div>
       </div>
     </div>
@@ -93,32 +89,10 @@
 import ssfx from '@/assets/newImgs/HMScreen/ssfx.png';
 import xmfx from '@/assets/newImgs/HMScreen/xmfx.png';
 import bus from '@/bus';
-
 import WaterAnalysis_icon from '@/assets/newImgs/HMScreen/WaterAnalysis_icon.png';
+import { graphicReport, realtimeDataLatest } from '@/api/dataAnalysis/syntherticData';
 
-const jishui = ref(true);
-const chartData2 = ref({
-  xAxis: [
-    '06-12 08:00',
-    '06-12 09:00',
-    '06-12 10:00',
-    '06-12 11:00',
-    '06-12 12:00',
-    '06-12 13:00',
-    '06-12 14:00',
-    '06-12 15:00',
-    '06-12 16:00',
-    '06-12 17:00',
-    '06-12 18:00',
-    '06-12 19:00',
-  ],
-  inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
-  yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
-  refresh: 1,
-});
-const chartData1 = ref({
+const chartDataJSD = ref({
   xAxis: [
     '2024-06-12 08:00',
     '2024-06-13 08:00',
@@ -145,11 +119,6 @@
   { name: '金明片区', value: '3', lonlat: [114.285, 34.809] },
 ]);
 
-const pipeList = ref([
-  { name: '向阳路管网监测点', value: '1' },
-  { name: '汴京路管网监测点', value: '2' },
-]);
-
 const XmList = ref([
   { name: '汴京路管网及道路海绵化改造', value: '1' },
   { name: '市民综合体', value: '3' },
@@ -161,20 +130,66 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', Xm: '1', XmP: '', XmA: '', XmQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
-function jishuiClick() {
-  jishui.value = false;
-}
-const jishuichange = () => {
-  jishui.value = true;
+const dateRain = ref('');
+//海绵设施列表-汴京路
+const hmssList = ref([
+  { value: '0371000044', label: '工农路与汴京路交叉口' },
+  { value: '0371000039', label: '大花园街与汴京路交叉口' },
+  { value: '0371000038', label: '劳动路与汴京路交叉口' },
+  { value: '0371000037', label: '公园路与汴京路交叉口' },
+]);
+const hmssVal = ref('');
+const loadingSS = ref(true);
+const chartDataSS = ref({
+  xAxis: [],
+  inverse: true,
+  yAxis: [], //降雨量
+  yAxis2: [], //流量
+  yAxis3: [], //ss
+  refresh: 1,
+});
+// 海绵设施监测站点切换
+const changeHmss = () => {
+  // hmssVal.value = val;
+  getDataSS();
 };
+// 海绵设施数据渲染
+async function getDataSS() {
+  loadingSS.value = true;
+  // 关联雨量站是皮革厂雨量站，0371000003
+  let params = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: '0371000003',
+  };
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    chartDataSS.value.xAxis = datas.propertyMonitorXList;
+    chartDataSS.value.yAxis = datas.propertyMonitorList[0].ylist;
+  }
 
-const change = val => {
-  jishui.value = false;
-};
+  // 获取监测值
+  let params2 = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: hmssVal.value,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartDataSS.value.yAxis2 = datas.propertyMonitorList[0].ylist;
+  }
+  chartDataSS.value.refresh = Math.random();
+  loadingSS.value = false;
+}
+
+function jishuiClick() {}
+const jishuichange = () => {};
 
 // 片区分析点击
 function changeArea(val) {
@@ -205,6 +220,20 @@
     pitch: 30,
   });
 }
+
+onMounted(() => {
+  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  console.log('33333', hmssVal.value);
+  // 获取降雨日历的日期来加载对应数据
+  bus.on('setRainDate', date => {
+    console.log('降雨日历的日期----', date);
+    dateRain.value = date;
+    changeHmss(); //海绵设施数据加载
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('setRainDate');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 13e91cc..813b35a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -138,38 +138,38 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      // {
-      //   layername: 'YSBZ', //雨水泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'combineBengZhan', //合流泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'sewageFactory', //污水处理厂
-      //   show: false,
-      // },
-      // {
-      //   layername: 'ysLine1', //雨水管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'hsLine1', //合流管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'pipeline_info_flow', //管网流向
-      //   show: false,
-      // },
       {
-        layername: 'pipeMonitor', //管网监测点，测试
+        layername: 'YSBZ', //雨水泵站
         show: false,
       },
-      // {
-      //   layername: 'waterCourse', //河道水位计
-      //   show: false,
-      // },
+      {
+        layername: 'combineBengZhan', //合流泵站
+        show: false,
+      },
+      {
+        layername: 'sewageFactory', //污水处理厂
+        show: false,
+      },
+      {
+        layername: 'ysLine1', //雨水管网
+        show: false,
+      },
+      {
+        layername: 'hsLine1', //合流管网
+        show: false,
+      },
+      {
+        layername: 'pipeline_info_flow', //管网流向
+        show: false,
+      },
+      {
+        layername: 'pipeMonitor', //管网监测点
+        show: false,
+      },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
       {
         layername: 'waterLoging', //内涝积水点
         show: false,
diff --git a/src/views/sponeScreen/waterFlood/rainCaldar.vue b/src/views/sponeScreen/waterFlood/rainCaldar.vue
index 5c6cf5b..82b24b4 100644
--- a/src/views/sponeScreen/waterFlood/rainCaldar.vue
+++ b/src/views/sponeScreen/waterFlood/rainCaldar.vue
@@ -73,6 +73,8 @@
 import { rainRainDaylist } from '@/api/newPageline/riverCapacity.js';
 import DEchart from '@/views/sponeScreen/Echarts/DEchart.vue';
 import { getStationList } from '@/api/dataAnalysis/syntherticData';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const rainCode = ref('');
 const rangeTime = ref('');
@@ -125,7 +127,8 @@
     dateIndex.value == 'day' ? 'YYYY-MM-DD' : dateIndex.value == 'month' ? 'YYYY-MM' : dateIndex.value == 'year' ? 'YYYY' : '';
   rangeTime.value = proxy.moment().format(valueFormat);
   currentType.value = '';
-
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
   getBasRainTimeSectionListFn();
 }
 
@@ -179,6 +182,8 @@
   rangeTime.value = curInfo.value?.rainTime;
   AllData.curDate = proxy.moment(rangeTime.value).format('MM-DD');
   AllData.curYear = proxy.moment(rangeTime.value).format('YYYY');
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
 };
 
 onMounted(() => {
diff --git a/src/views/spongePerformance/mainIndex/centerRight.vue b/src/views/spongePerformance/mainIndex/centerRight.vue
index 8cdcb7d..1e91252 100644
--- a/src/views/spongePerformance/mainIndex/centerRight.vue
+++ b/src/views/spongePerformance/mainIndex/centerRight.vue
@@ -18,9 +18,6 @@
   'itemTarget',
 ]);
 
-console.log('realValue', realValue);
-console.log('yData', yData);
-console.log('itemTarget', itemTarget);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
diff --git a/src/views/spongePerformance/mainIndex/chart.js b/src/views/spongePerformance/mainIndex/chart.js
index b80dc33..cc35843 100644
--- a/src/views/spongePerformance/mainIndex/chart.js
+++ b/src/views/spongePerformance/mainIndex/chart.js
@@ -12,13 +12,11 @@
   subtext: '项目总数',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });
@@ -37,13 +35,11 @@
   subtext: '优',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });
diff --git a/src/views/spongePerformance/mainIndex/footCenter.vue b/src/views/spongePerformance/mainIndex/footCenter.vue
index 96b8639..9040a8c 100644
--- a/src/views/spongePerformance/mainIndex/footCenter.vue
+++ b/src/views/spongePerformance/mainIndex/footCenter.vue
@@ -6,12 +6,16 @@
 <script setup>
 import { init } from 'echarts';
 import 'echarts-liquidfill/src/liquidFill.js';
+
 const assetEchart = ref(null);
-let { xData } = defineProps(['data']);
-xData?.reduce((n, v) => {
+const props = defineProps({
+  data: {
+    type: Array,
+  },
+});
+props.data.xData.reduce((n, v) => {
   return n + v.itemScore;
 }, 0);
-console.log('xDataxData', xData);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
@@ -20,7 +24,7 @@
   chart.setOption({
     title: [
       {
-        text: xData[0]?.itemContent,
+        text: props.data.xData[0]?.itemContent,
         x: '10%',
         y: '79%',
         textStyle: {
@@ -32,7 +36,7 @@
         },
       },
       {
-        text: xData[1]?.itemContent,
+        text: props.data.xData[1]?.itemContent,
         x: '61%',
         y: '79%',
         textStyle: {
@@ -71,21 +75,19 @@
             globalCoord: true,
           },
         ],
-        data: [xData[0]?.realScore], // data个数代表波浪数
+        data: [props.data.xData[0]?.realScore], // data个数代表波浪数
         backgroundStyle: {
           borderWidth: 1,
           color: '#1e5187',
           opacity: '0.3',
         },
         label: {
-          normal: {
-            textStyle: {
-              fontSize: 14,
-              color: '#0f406a',
-            },
-            formatter: function (param) {
-              return xData[0]?.standardFlag == 1 ? '已完成' : '未完成' + '\n' + '总数' + (xData[0]?.itemScore || 0);
-            },
+          textStyle: {
+            fontSize: 14,
+            color: '#0f406a',
+          },
+          formatter: function (param) {
+            return props.data.xData[0]?.standardFlag == 1 ? '已完成' : '未完成' + '\n' + '总数' + (props.data.xData[0]?.itemScore || 0);
           },
         },
         outline: {
@@ -124,22 +126,20 @@
             globalCoord: false,
           },
         ],
-        data: [xData[1]?.standardFlag == 1 ? 1 : 0], // data个数代表波浪数
-        //   data: [xData[1]?.realValue/xData[1]?.itemScore], // data个数代表波浪数
+        data: [props.data.xData[1]?.standardFlag == 1 ? 1 : 0], // data个数代表波浪数
+        //   data: [props.data[1]?.realValue/props.data[1]?.itemScore], // data个数代表波浪数
         backgroundStyle: {
           borderWidth: 1,
           color: '#1e5187',
           opacity: '0.3',
         },
         label: {
-          normal: {
-            textStyle: {
-              fontSize: 14,
-              color: '#fff',
-            },
-            formatter: function (param) {
-              return (param.value * 100 || 0) + '%' + '\n' + '总数' + (xData[1]?.itemScore || 0);
-            },
+          textStyle: {
+            fontSize: 14,
+            color: '#fff',
+          },
+          formatter: function (param) {
+            return (param.value * 100 || 0) + '%' + '\n' + '总数' + (props.data.xData[1]?.itemScore || 0);
           },
         },
         outline: {
diff --git a/src/views/spongePerformance/mainIndex/footLeft.vue b/src/views/spongePerformance/mainIndex/footLeft.vue
index 45e817f..4adfb3a 100644
--- a/src/views/spongePerformance/mainIndex/footLeft.vue
+++ b/src/views/spongePerformance/mainIndex/footLeft.vue
@@ -111,12 +111,10 @@
         data: yData,
         barWidth: '30px',
         itemStyle: {
-          normal: {
-            color: function (params) {
-              return data.colorList[params.dataIndex];
-            },
-            barBorderRadius: [0, 0, 0, 0],
+          color: function (params) {
+            return data.colorList[params.dataIndex];
           },
+          barBorderRadius: [0, 0, 0, 0],
         },
       },
     ],

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 4635d24..d7ac84a 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 项目监测分析 -->
   <div class="publicContainerA">
-    <div class="partTitleHM">项目评估</div>
+    <div class="partTitleHM">项目监测分析</div>
     <div class="ConstrucClass">
       <div class="WaterList">
         <div class="DropdownBox">
@@ -9,16 +10,11 @@
             <span>片区分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="area" style="width: 41%; margin-left: 10px; margin-top: 18px">
+            <el-form-item prop="area" style="width: 100%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.area" placeholder="请选择片区分析" @change="changeArea">
                 <el-option v-for="item in areaList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="pipe" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.pipe" @change="change" placeholder="请选择">
-                <el-option v-for="item in pipeList" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
           </div>
         </div>
 
@@ -28,16 +24,16 @@
             <span>项目分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
+            <el-form-item prop="Xm" style="width: 100%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="queryParams.XmP" placeholder="请选择典型项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
+            <!-- <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.XmA">
                 <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
 
@@ -52,16 +48,16 @@
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmAQ" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmAQ" @change="change" placeholder="请选择">
-                <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
+            <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
+                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </div>
         </div>
         <!-- 设施分析echarts -->
-        <div class="assessment">
-          <AssessmentEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentEcharts>
+        <div class="assessment" v-loading="loadingSS">
+          <AssessmentEcharts :data="chartDataSS" :refresh="chartDataSS.refresh"></AssessmentEcharts>
         </div>
 
         <div class="DropdownBox">
@@ -78,8 +74,8 @@
           </div>
         </div>
         <!-- 积水分析echarts -->
-        <div class="assessment" v-if="jishui">
-          <AssessmentjsEcharts :data="chartData1" :refresh="chartData1.refresh1"></AssessmentjsEcharts>
+        <div class="assessment">
+          <AssessmentjsEcharts :data="chartDataJSD" :refresh="chartDataJSD.refresh"></AssessmentjsEcharts>
         </div>
       </div>
     </div>
@@ -93,32 +89,10 @@
 import ssfx from '@/assets/newImgs/HMScreen/ssfx.png';
 import xmfx from '@/assets/newImgs/HMScreen/xmfx.png';
 import bus from '@/bus';
-
 import WaterAnalysis_icon from '@/assets/newImgs/HMScreen/WaterAnalysis_icon.png';
+import { graphicReport, realtimeDataLatest } from '@/api/dataAnalysis/syntherticData';
 
-const jishui = ref(true);
-const chartData2 = ref({
-  xAxis: [
-    '06-12 08:00',
-    '06-12 09:00',
-    '06-12 10:00',
-    '06-12 11:00',
-    '06-12 12:00',
-    '06-12 13:00',
-    '06-12 14:00',
-    '06-12 15:00',
-    '06-12 16:00',
-    '06-12 17:00',
-    '06-12 18:00',
-    '06-12 19:00',
-  ],
-  inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
-  yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
-  refresh: 1,
-});
-const chartData1 = ref({
+const chartDataJSD = ref({
   xAxis: [
     '2024-06-12 08:00',
     '2024-06-13 08:00',
@@ -145,11 +119,6 @@
   { name: '金明片区', value: '3', lonlat: [114.285, 34.809] },
 ]);
 
-const pipeList = ref([
-  { name: '向阳路管网监测点', value: '1' },
-  { name: '汴京路管网监测点', value: '2' },
-]);
-
 const XmList = ref([
   { name: '汴京路管网及道路海绵化改造', value: '1' },
   { name: '市民综合体', value: '3' },
@@ -161,20 +130,66 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', Xm: '1', XmP: '', XmA: '', XmQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
-function jishuiClick() {
-  jishui.value = false;
-}
-const jishuichange = () => {
-  jishui.value = true;
+const dateRain = ref('');
+//海绵设施列表-汴京路
+const hmssList = ref([
+  { value: '0371000044', label: '工农路与汴京路交叉口' },
+  { value: '0371000039', label: '大花园街与汴京路交叉口' },
+  { value: '0371000038', label: '劳动路与汴京路交叉口' },
+  { value: '0371000037', label: '公园路与汴京路交叉口' },
+]);
+const hmssVal = ref('');
+const loadingSS = ref(true);
+const chartDataSS = ref({
+  xAxis: [],
+  inverse: true,
+  yAxis: [], //降雨量
+  yAxis2: [], //流量
+  yAxis3: [], //ss
+  refresh: 1,
+});
+// 海绵设施监测站点切换
+const changeHmss = () => {
+  // hmssVal.value = val;
+  getDataSS();
 };
+// 海绵设施数据渲染
+async function getDataSS() {
+  loadingSS.value = true;
+  // 关联雨量站是皮革厂雨量站，0371000003
+  let params = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: '0371000003',
+  };
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    chartDataSS.value.xAxis = datas.propertyMonitorXList;
+    chartDataSS.value.yAxis = datas.propertyMonitorList[0].ylist;
+  }
 
-const change = val => {
-  jishui.value = false;
-};
+  // 获取监测值
+  let params2 = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: hmssVal.value,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartDataSS.value.yAxis2 = datas.propertyMonitorList[0].ylist;
+  }
+  chartDataSS.value.refresh = Math.random();
+  loadingSS.value = false;
+}
+
+function jishuiClick() {}
+const jishuichange = () => {};
 
 // 片区分析点击
 function changeArea(val) {
@@ -205,6 +220,20 @@
     pitch: 30,
   });
 }
+
+onMounted(() => {
+  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  console.log('33333', hmssVal.value);
+  // 获取降雨日历的日期来加载对应数据
+  bus.on('setRainDate', date => {
+    console.log('降雨日历的日期----', date);
+    dateRain.value = date;
+    changeHmss(); //海绵设施数据加载
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('setRainDate');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 13e91cc..813b35a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -138,38 +138,38 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      // {
-      //   layername: 'YSBZ', //雨水泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'combineBengZhan', //合流泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'sewageFactory', //污水处理厂
-      //   show: false,
-      // },
-      // {
-      //   layername: 'ysLine1', //雨水管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'hsLine1', //合流管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'pipeline_info_flow', //管网流向
-      //   show: false,
-      // },
       {
-        layername: 'pipeMonitor', //管网监测点，测试
+        layername: 'YSBZ', //雨水泵站
         show: false,
       },
-      // {
-      //   layername: 'waterCourse', //河道水位计
-      //   show: false,
-      // },
+      {
+        layername: 'combineBengZhan', //合流泵站
+        show: false,
+      },
+      {
+        layername: 'sewageFactory', //污水处理厂
+        show: false,
+      },
+      {
+        layername: 'ysLine1', //雨水管网
+        show: false,
+      },
+      {
+        layername: 'hsLine1', //合流管网
+        show: false,
+      },
+      {
+        layername: 'pipeline_info_flow', //管网流向
+        show: false,
+      },
+      {
+        layername: 'pipeMonitor', //管网监测点
+        show: false,
+      },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
       {
         layername: 'waterLoging', //内涝积水点
         show: false,
diff --git a/src/views/sponeScreen/waterFlood/rainCaldar.vue b/src/views/sponeScreen/waterFlood/rainCaldar.vue
index 5c6cf5b..82b24b4 100644
--- a/src/views/sponeScreen/waterFlood/rainCaldar.vue
+++ b/src/views/sponeScreen/waterFlood/rainCaldar.vue
@@ -73,6 +73,8 @@
 import { rainRainDaylist } from '@/api/newPageline/riverCapacity.js';
 import DEchart from '@/views/sponeScreen/Echarts/DEchart.vue';
 import { getStationList } from '@/api/dataAnalysis/syntherticData';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const rainCode = ref('');
 const rangeTime = ref('');
@@ -125,7 +127,8 @@
     dateIndex.value == 'day' ? 'YYYY-MM-DD' : dateIndex.value == 'month' ? 'YYYY-MM' : dateIndex.value == 'year' ? 'YYYY' : '';
   rangeTime.value = proxy.moment().format(valueFormat);
   currentType.value = '';
-
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
   getBasRainTimeSectionListFn();
 }
 
@@ -179,6 +182,8 @@
   rangeTime.value = curInfo.value?.rainTime;
   AllData.curDate = proxy.moment(rangeTime.value).format('MM-DD');
   AllData.curYear = proxy.moment(rangeTime.value).format('YYYY');
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
 };
 
 onMounted(() => {
diff --git a/src/views/spongePerformance/mainIndex/centerRight.vue b/src/views/spongePerformance/mainIndex/centerRight.vue
index 8cdcb7d..1e91252 100644
--- a/src/views/spongePerformance/mainIndex/centerRight.vue
+++ b/src/views/spongePerformance/mainIndex/centerRight.vue
@@ -18,9 +18,6 @@
   'itemTarget',
 ]);
 
-console.log('realValue', realValue);
-console.log('yData', yData);
-console.log('itemTarget', itemTarget);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
diff --git a/src/views/spongePerformance/mainIndex/chart.js b/src/views/spongePerformance/mainIndex/chart.js
index b80dc33..cc35843 100644
--- a/src/views/spongePerformance/mainIndex/chart.js
+++ b/src/views/spongePerformance/mainIndex/chart.js
@@ -12,13 +12,11 @@
   subtext: '项目总数',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });
@@ -37,13 +35,11 @@
   subtext: '优',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });
diff --git a/src/views/spongePerformance/mainIndex/footCenter.vue b/src/views/spongePerformance/mainIndex/footCenter.vue
index 96b8639..9040a8c 100644
--- a/src/views/spongePerformance/mainIndex/footCenter.vue
+++ b/src/views/spongePerformance/mainIndex/footCenter.vue
@@ -6,12 +6,16 @@
 <script setup>
 import { init } from 'echarts';
 import 'echarts-liquidfill/src/liquidFill.js';
+
 const assetEchart = ref(null);
-let { xData } = defineProps(['data']);
-xData?.reduce((n, v) => {
+const props = defineProps({
+  data: {
+    type: Array,
+  },
+});
+props.data.xData.reduce((n, v) => {
   return n + v.itemScore;
 }, 0);
-console.log('xDataxData', xData);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
@@ -20,7 +24,7 @@
   chart.setOption({
     title: [
       {
-        text: xData[0]?.itemContent,
+        text: props.data.xData[0]?.itemContent,
         x: '10%',
         y: '79%',
         textStyle: {
@@ -32,7 +36,7 @@
         },
       },
       {
-        text: xData[1]?.itemContent,
+        text: props.data.xData[1]?.itemContent,
         x: '61%',
         y: '79%',
         textStyle: {
@@ -71,21 +75,19 @@
             globalCoord: true,
           },
         ],
-        data: [xData[0]?.realScore], // data个数代表波浪数
+        data: [props.data.xData[0]?.realScore], // data个数代表波浪数
         backgroundStyle: {
           borderWidth: 1,
           color: '#1e5187',
           opacity: '0.3',
         },
         label: {
-          normal: {
-            textStyle: {
-              fontSize: 14,
-              color: '#0f406a',
-            },
-            formatter: function (param) {
-              return xData[0]?.standardFlag == 1 ? '已完成' : '未完成' + '\n' + '总数' + (xData[0]?.itemScore || 0);
-            },
+          textStyle: {
+            fontSize: 14,
+            color: '#0f406a',
+          },
+          formatter: function (param) {
+            return props.data.xData[0]?.standardFlag == 1 ? '已完成' : '未完成' + '\n' + '总数' + (props.data.xData[0]?.itemScore || 0);
           },
         },
         outline: {
@@ -124,22 +126,20 @@
             globalCoord: false,
           },
         ],
-        data: [xData[1]?.standardFlag == 1 ? 1 : 0], // data个数代表波浪数
-        //   data: [xData[1]?.realValue/xData[1]?.itemScore], // data个数代表波浪数
+        data: [props.data.xData[1]?.standardFlag == 1 ? 1 : 0], // data个数代表波浪数
+        //   data: [props.data[1]?.realValue/props.data[1]?.itemScore], // data个数代表波浪数
         backgroundStyle: {
           borderWidth: 1,
           color: '#1e5187',
           opacity: '0.3',
         },
         label: {
-          normal: {
-            textStyle: {
-              fontSize: 14,
-              color: '#fff',
-            },
-            formatter: function (param) {
-              return (param.value * 100 || 0) + '%' + '\n' + '总数' + (xData[1]?.itemScore || 0);
-            },
+          textStyle: {
+            fontSize: 14,
+            color: '#fff',
+          },
+          formatter: function (param) {
+            return (param.value * 100 || 0) + '%' + '\n' + '总数' + (props.data.xData[1]?.itemScore || 0);
           },
         },
         outline: {
diff --git a/src/views/spongePerformance/mainIndex/footLeft.vue b/src/views/spongePerformance/mainIndex/footLeft.vue
index 45e817f..4adfb3a 100644
--- a/src/views/spongePerformance/mainIndex/footLeft.vue
+++ b/src/views/spongePerformance/mainIndex/footLeft.vue
@@ -111,12 +111,10 @@
         data: yData,
         barWidth: '30px',
         itemStyle: {
-          normal: {
-            color: function (params) {
-              return data.colorList[params.dataIndex];
-            },
-            barBorderRadius: [0, 0, 0, 0],
+          color: function (params) {
+            return data.colorList[params.dataIndex];
           },
+          barBorderRadius: [0, 0, 0, 0],
         },
       },
     ],
diff --git a/src/views/spongePerformance/mainIndex/footRight.vue b/src/views/spongePerformance/mainIndex/footRight.vue
index b29209d..e176153 100644
--- a/src/views/spongePerformance/mainIndex/footRight.vue
+++ b/src/views/spongePerformance/mainIndex/footRight.vue
@@ -7,7 +7,12 @@
 import { init } from 'echarts';
 import 'echarts-liquidfill/src/liquidFill.js';
 const assetEchart = ref(null);
-let { xData, yData } = defineProps(['data']);
+const props = defineProps({
+  data: {
+    type: Array,
+  },
+});
+console.log('满意度---', props.data);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
@@ -66,7 +71,7 @@
             color: '#fff',
           },
         },
-        data: xData,
+        data: props.data.xData,
       },
     ],
     yAxis: [
@@ -143,8 +148,7 @@
             },
           },
         },
-
-        data: yData,
+        data: props.data.yData,
       },
     ],
   });

diff --git a/src/views/project/compensation/homeEcharts/index.vue b/src/views/project/compensation/homeEcharts/index.vue
index 3ac2a2f..c7eb11b 100644
--- a/src/views/project/compensation/homeEcharts/index.vue
+++ b/src/views/project/compensation/homeEcharts/index.vue
@@ -1,88 +1,80 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
-import { init } from "echarts";
-import {
-  reactive,
-  toRefs,
-  Ref,
-  ref,
-  onMounted,
-  watchEffect,
-  defineProps,
-} from "vue";
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+<script setup>
+import { init } from 'echarts';
+
+const assetEchart = ref(null);
 let {
-  data: { type, xData, center, padding, itemStyle,x ,y},
-} = defineProps(["data"]);
-console.log("xData", xData)
-const all=xData.reduce((n,v)=>{ 
-  return n + v.value
-},0)
+  data: { type, xData, center, padding, itemStyle, x, y },
+} = defineProps(['data']);
+console.log('xData', xData);
+const all = xData.reduce((n, v) => {
+  return n + v.value;
+}, 0);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
-  window.addEventListener("resize", () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
     chart.resize();
   });
   chart.setOption({
     title: {
-        text: all+'(个)',
-        subtext: '总数',
-        x,
-        y,
-        textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
-        subtextStyle: {
-            fontSize: 20,
-            fontWeight: 'normal',
-            align: 'center',
-            color: '#fff',
-        },
+      text: all + '(个)',
+      subtext: '总数',
+      x,
+      y,
+      textStyle: {
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
+      subtextStyle: {
+        fontSize: 20,
+        fontWeight: 'normal',
+        align: 'center',
+        color: '#fff',
+      },
     },
     tooltip: {
-        // formatter: `{a} {c} <br/> {b}({d}%)`,
-        formatter:(params)=>{ 
-          return params.name+': '+params.value +'(个)' +'<br/>'+'占比:'+(params.value/all*100).toFixed(2)+'%';
+      // formatter: `{a} {c} <br/> {b}({d}%)`,
+      formatter: params => {
+        return params.name + ': ' + params.value + '(个)' + '<br/>' + '占比:' + ((params.value / all) * 100).toFixed(2) + '%';
+      },
+      padding: [10, 10],
+      axisPointer: {
+        type: 'shadow',
+        shadowStyle: {
+          color: '#fff',
         },
-          padding: [10, 10],
-          axisPointer: {
-            type: "shadow",
-            shadowStyle: {
-              color: "#fff",
-            },
-          },
+      },
     },
     legend: {
-      icon: "circle",
-      align: "left",
-      orient: "vertical",
-      x: "right",
-      y: "center",
+      icon: 'circle',
+      align: 'left',
+      orient: 'vertical',
+      x: 'right',
+      y: 'center',
       padding,
       textStyle: {
-            fontSize: 16,
-            fontWeight: 'normal',
-            color: '#fff',
-        },
+        fontSize: 16,
+        fontWeight: 'normal',
+        color: '#fff',
+      },
       formatter: function (name) {
         let total = 0;
         let tarValue;
-        let arr=name
+        let arr = name;
         for (let i = 0; i < xData.length; i++) {
           total += xData[i].value;
           // if (name.length > 20) {
-            // name =name.slice(20, name.length) + "...";
-            // xData[i].name=arr.slice(20, arr.length) + "...";
+          // name =name.slice(20, name.length) + "...";
+          // xData[i].name=arr.slice(20, arr.length) + "...";
           // }
           if (xData[i].name == name) {
             tarValue = xData[i].value;
           }
         }
-        return `${name}  ${tarValue}(个)` ;
+        return `${name}  ${tarValue}(个)`;
       },
     },
 
@@ -101,11 +93,11 @@
           show: false,
         },
         type,
-      //  name: xData[0].name,
-        radius: ["40%", "70%"],
+        //  name: xData[0].name,
+        radius: ['40%', '70%'],
         center,
         data: xData,
-        itemStyle
+        itemStyle,
       },
     ],
   });
@@ -118,7 +110,7 @@
       return el.currentStyle;
     }
   }
-  const hi = getStyle(container, "height").height;
+  const hi = getStyle(container, 'height').height;
   charts.style.height = hi;
 }
 watchEffect(() => {});
diff --git a/src/views/project/compensation/homeEcharts/project.vue b/src/views/project/compensation/homeEcharts/project.vue
index 1c1be57..a643962 100644
--- a/src/views/project/compensation/homeEcharts/project.vue
+++ b/src/views/project/compensation/homeEcharts/project.vue
@@ -1,154 +1,146 @@
 <template>
-    <div ref="assetEchart" class="asset_echart"></div>
-  </template>
-  <script lang="ts" setup>
-  import { init } from "echarts";
-  import  * as echarts from 'echarts'
-  import {
-    reactive,
-    toRefs,
-    Ref,
-    ref,
-    onMounted,
-    watchEffect,
-    defineProps,
-  } from "vue";
-  const assetEchart: Ref<HTMLElement | null | any> = ref(null);
-  let {
-    data: { type, xData,yData, center, padding, itemStyle,x ,y},
-  } = defineProps(["data"]);
-  console.log("x11Data", xData)
-  let arrayist=[]
-  xData.forEach((i,x)=>{ 
-    arrayist.push(x)
-  })
+  <div ref="assetEchart" class="asset_echart"></div>
+</template>
+<script setup>
+import { init } from 'echarts';
+import * as echarts from 'echarts';
+
+const assetEchart = ref(null);
+let { data } = defineProps(['data']);
+console.log('x11Data', data.xData);
+let arrayist = [];
+data.xData.map(item => {
+  arrayist.push(item);
+});
 // var salvProName =["安徽省","河南省","浙江省","湖北省","贵州省","江西省","江苏省","四川省","云南省","湖南省"];
 // var salvProValue =[239,181,154,144,135,117,74,72,67,55];
-var salvProMax =[];//背景按最大值
-for (let i = 0; i < yData.length; i++) {
-    salvProMax.push(yData[0])
+var salvProMax = []; //背景按最大值
+for (let i = 0; i < data.yData.length; i++) {
+  salvProMax.push(data.yData[i]);
 }
-  const initM = () => {
-    const chart = init(assetEchart.value as HTMLElement);
-    window.addEventListener("resize", () => {
-      chart.resize();
-    });
-    chart.setOption( {
+const initM = () => {
+  const chart = init(assetEchart.value);
+  window.addEventListener('resize', () => {
+    chart.resize();
+  });
+  chart.setOption({
     grid: {
-        left: '2%',
-        right: '2%',
-        bottom: '2%',
-        top: '9%',
-        containLabel: true
+      left: '2%',
+      right: '2%',
+      bottom: '2%',
+      top: '9%',
+      containLabel: true,
     },
     tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'none'
-        },
-        formatter: function(params) {
-            return params[0].name  + ' : ' + params[0].value
-        }
+      trigger: 'axis',
+      axisPointer: {
+        type: 'none',
+      },
+      formatter: function (params) {
+        return params[0].name + ' : ' + params[0].value;
+      },
     },
     xAxis: {
-        show: false,
-        type: 'value'
+      show: false,
+      type: 'value',
     },
-    yAxis: [{
+    yAxis: [
+      {
         type: 'category',
         inverse: true,
         axisLabel: {
-            show: true,
-            textStyle: {
-                color: '#fff'
-            },
+          show: true,
+          textStyle: {
+            color: '#fff',
+          },
         },
         splitLine: {
-            show: false
+          show: false,
         },
         axisTick: {
-            show: false
+          show: false,
         },
         axisLine: {
-            show: false
+          show: false,
         },
-        data: xData
-    }, {
+        data: data.xData,
+      },
+      {
         type: 'category',
         inverse: true,
         axisTick: 'none',
         axisLine: 'none',
         show: true,
         axisLabel: {
-            textStyle: {
-                color: '#ffffff',
-                fontSize: '12'
-            },
+          textStyle: {
+            color: '#ffffff',
+            fontSize: '12',
+          },
         },
-        data:yData
-    }],
-    series: [{
-            name: '值',
-            type: 'bar',
-            zlevel: 1,
-            itemStyle: {
-                normal: {
-                    barBorderRadius: 30,
-                    color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
-                        offset: 0,
-                        color: 'rgb(57,89,255,1)'
-                    }, {
-                        offset: 1,
-                        color: 'rgb(46,200,207,1)'
-                    }]),
-                },
+        data: data.yData,
+      },
+    ],
+    series: [
+      {
+        name: '值',
+        type: 'bar',
+        zlevel: 1,
+        itemStyle: {
+          barBorderRadius: 30,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: 'rgb(57,89,255,1)',
             },
-            barWidth: 20,
-            data: yData
-        },
-        {
-            name: '背景',
-            type: 'bar',
-            barWidth: 20,
-            barGap: '-100%',
-            data: salvProMax,
-            itemStyle: {
-                normal: {
-                    color: 'rgba(24,31,68,1)',
-                    barBorderRadius: 30,
-                }
+            {
+              offset: 1,
+              color: 'rgb(46,200,207,1)',
             },
+          ]),
         },
-    ]
-});
-  };
-  function chartSize(container, charts) {
-    function getStyle(el, name) {
-      if (window.getComputedStyle) {
-        return window.getComputedStyle(el, null);
-      } else {
-        return el.currentStyle;
-      }
-    }
-    const hi = getStyle(container, "height").height;
-    charts.style.height = hi;
-  }
-  watchEffect(() => {});
-  onMounted(() => {
-    initM();
+        barWidth: 20,
+        data: data.yData,
+      },
+      {
+        name: '背景',
+        type: 'bar',
+        barWidth: 20,
+        barGap: '-100%',
+        data: salvProMax,
+        itemStyle: {
+          color: 'rgba(24,31,68,1)',
+          barBorderRadius: 30,
+        },
+      },
+    ],
   });
-  </script>
-  
-  <style lang="scss" scoped>
-  .asset_echart {
-    width: 498px;
-    height: 250px;
-    margin: 10px 14px 0 16px;
-  
-    &_echart {
-      width: 100%;
-      height: 100%;
+};
+function chartSize(container, charts) {
+  function getStyle(el, name) {
+    if (window.getComputedStyle) {
+      return window.getComputedStyle(el, null);
+    } else {
+      return el.currentStyle;
     }
   }
-  </style>
-  
\ No newline at end of file
+  const hi = getStyle(container, 'height').height;
+  charts.style.height = hi;
+}
+watchEffect(() => {});
+onMounted(() => {
+  initM();
+});
+</script>
+
+<style lang="scss" scoped>
+.asset_echart {
+  width: 498px;
+  height: 250px;
+  margin: 10px 14px 0 16px;
+
+  &_echart {
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/project/compensation/homeEcharts/queryChat.vue b/src/views/project/compensation/homeEcharts/queryChat.vue
index be96f1c..e4f3822 100644
--- a/src/views/project/compensation/homeEcharts/queryChat.vue
+++ b/src/views/project/compensation/homeEcharts/queryChat.vue
@@ -3,16 +3,12 @@
     <div ref="assetEchart" class="asset_echart"></div>
   </div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, defineEmits, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 let {
-  data: {
-    xData,
-    legend,
-    yData: { paymentMoney },
-  },
+  data: { xData, legend, yData },
 } = defineProps(['data']);
 let options = reactive({
   title: {
@@ -68,14 +64,6 @@
         formatter: '{value}',
       },
     },
-    // {
-    //   type: 'value',
-    //   name: legend[2],
-    //   interval: 5,
-    //   axisLabel: {
-    //     formatter: '{value}'
-    //   }
-    // }
   ],
   series: [
     {
@@ -87,34 +75,11 @@
           return value;
         },
       },
-      data: paymentMoney,
+      data: yData.paymentMoney,
       itemStyle: {
         color: '#0f69ff',
       },
     },
-    // {
-    //   name:  legend[1],
-    //   type: 'line',
-    //   yAxisIndex: 1,
-    //   tooltip: {
-    //     valueFormatter: function (value) {
-    //       return value;
-    //     }
-    //   },
-    //   data: contractMoney,
-
-    //   smooth:true,
-    //   itemStyle: {
-    //     normal: {
-    //       color:'#ffa773', //折线点的颜色
-    //       borderColor: '#fff', //拐点边框颜色
-    //       borderWidth: 5, //拐点边框大小
-    //     },
-    //   },
-    //   lineStyle: {
-    //     color:'#ffa773', //折线的颜色
-    //   },
-    // }
   ],
 });
 function chartSize(container, charts) {
@@ -129,7 +94,7 @@
   charts.style.height = hi;
 }
 onMounted(() => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   chart.setOption(options);
   window.addEventListener('resize', () => {
     chart.resize();
diff --git a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
index dbc8168..36d9c33 100644
--- a/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentEcharts.vue
@@ -39,11 +39,12 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '流量(m³/h)', 'ss(mg/L)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
         },
+        dataZoom: [{ type: 'inside', startValue: props.data.xAxis[props.data.xAxis - 48] }],
         xAxis: [
           {
             type: 'category',
@@ -77,6 +78,7 @@
               color: '#fff',
               show: true,
             },
+            min: 1,
             nameTextStyle: {
               color: '#fff',
             },
@@ -89,7 +91,7 @@
           },
           {
             name: props.data.yAxisName2 || '',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
             type: 'value',
             nameTextStyle: {
@@ -112,7 +114,7 @@
           {
             name: '降雨量(mm)',
             type: 'bar',
-            barWidth: barWidth,
+            // barWidth: barWidth,
             barGap: '10%', // Make series be overlap
             barCateGoryGap: '10%',
             itemStyle: {
@@ -132,19 +134,11 @@
           },
           {
             // smooth: true, //变为曲线 默认false折线
-            name: '流量(m³/h)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
-            yAxisIndex: 0,
-            color: '#FFF21C',
-          },
-          {
-            // smooth: true, //变为曲线 默认false折线
-            name: 'ss(mg/L)',
-            type: 'line',
-            data: props.data.yAxis3,
             yAxisIndex: 1,
-            color: 'orange',
+            color: '#FFF21C',
           },
         ],
       };
diff --git a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
index 46b0837..59e7389 100644
--- a/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
+++ b/src/views/sponeScreen/Echarts/AssessmentjsEcharts.vue
@@ -39,7 +39,7 @@
           bottom: 30,
         },
         legend: {
-          data: ['降雨量(mm)', '水深(cm)'],
+          data: ['降雨量(mm)', '水深(m)'],
           textStyle: {
             color: '#fff',
           },
@@ -89,17 +89,12 @@
             },
           },
           {
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'value',
-            inverse: true,
+            inverse: false,
             nameLocation: 'start', // 坐标轴名称显示位置
-            nameTextStyle: {
-              color: '#fff',
-            },
-            axisLabel: {
-              show: true,
-              color: '#fff',
-            },
+            nameTextStyle: { color: '#fff' },
+            axisLabel: { show: true, color: '#fff' },
             splitLine: {
               lineStyle: {
                 color: '#D1DEEE',
@@ -118,14 +113,8 @@
             barCateGoryGap: '10%',
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 0.7, [
-                {
-                  offset: 0,
-                  color: 'rgba(24, 255, 255, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(188, 255, 255, 1)',
-                },
+                { offset: 0, color: 'rgba(24, 255, 255, 1)' },
+                { offset: 1, color: 'rgba(188, 255, 255, 1)' },
               ]),
             },
             yAxisIndex: 0,
@@ -133,7 +122,7 @@
           },
           {
             smooth: true, //变为曲线 默认false折线
-            name: '水深(cm)',
+            name: '水深(m)',
             type: 'line',
             data: props.data.yAxis2,
             yAxisIndex: 1,
diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
index 3826e9d..c3a36c4 100644
--- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
+++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue
@@ -13,11 +13,11 @@
 import { useDicts } from '@/hooks';
 import { buildstatusCount } from '@/api/sponeScreen/gcpjApi.js';
 import { nextTick } from 'vue';
+
 const { proxy } = getCurrentInstance();
 const myChart = shallowRef(null);
 const totalData = ref(0);
 const { build_status } = useDicts(proxy);
-console.log(build_status, 333);
 const dataList = ref([]);
 async function getProjectStatisticsM() {
   let { data, code } = await buildstatusCount();
@@ -36,24 +36,20 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            color: colorWrap[i],
-            borderWidth: 5,
-            borderColor: colorWrap[i],
-            shadowBlur: 50,
-            shadowColor: 'rgba(7, 132, 250, 0.8)',
-          },
+          color: colorWrap[i],
+          borderWidth: 5,
+          borderColor: colorWrap[i],
+          shadowBlur: 50,
+          shadowColor: 'rgba(7, 132, 250, 0.8)',
         },
       },
       {
         value: 5,
         name: '',
         itemStyle: {
-          normal: {
-            color: 'transparent',
-            borderWidth: 5,
-            borderColor: 'transparent',
-          },
+          color: 'transparent',
+          borderWidth: 5,
+          borderColor: 'transparent',
         },
         tooltip: {
           show: false,
@@ -66,10 +62,8 @@
         value: dataList.value[i].value,
         name: dataList.value[i].name,
         itemStyle: {
-          normal: {
-            borderWidth: 20,
-            borderColor: colorPie[i],
-          },
+          borderWidth: 20,
+          borderColor: colorPie[i],
         },
       });
     }
@@ -168,14 +162,12 @@
       {
         name: '',
         type: 'pie',
-        clockWise: false, //顺时加载
-        hoverAnimation: false, //鼠标移入变大
+        clockwise: false, //顺时加载
+        // hoverAnimation: false, //鼠标移入变大
         center: ['30%', '50%'],
         radius: ['80%', '81%'],
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: baseDataWrap,
       },
@@ -186,11 +178,9 @@
         selectedMode: 'single',
         radius: ['55%', '58%'],
         center: ['30%', '50%'],
-        hoverAnimation: false,
+        // hoverAnimation: false,
         label: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         tooltip: {
           show: false,
diff --git a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
index 45b1804..8db6ef8 100644
--- a/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
+++ b/src/views/sponeScreen/Echarts/RainwaterTakeAdvantage.vue
@@ -1,15 +1,15 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
+
+const assetEchart = ref(null);
 
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/Echarts/SewageEcharts.vue b/src/views/sponeScreen/Echarts/SewageEcharts.vue
index a489cab..2f3c144 100644
--- a/src/views/sponeScreen/Echarts/SewageEcharts.vue
+++ b/src/views/sponeScreen/Echarts/SewageEcharts.vue
@@ -1,15 +1,14 @@
 <template>
   <div ref="assetEchart" class="asset_echart"></div>
 </template>
-<script lang="ts" setup>
+<script setup>
 import { init } from 'echarts';
 import * as echarts from 'echarts';
-import { reactive, toRefs, Ref, ref, onMounted, watchEffect } from 'vue';
-const assetEchart: Ref<HTMLElement | null | any> = ref(null);
 
+const assetEchart = ref(null);
 const emit = defineEmits(['click-call-back']);
 const initM = () => {
-  const chart = init(assetEchart.value as HTMLElement);
+  const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
     chart.resize();
   });
diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue
index b34cc61..29aef8d 100644
--- a/src/views/sponeScreen/HaiMianScreen/index.vue
+++ b/src/views/sponeScreen/HaiMianScreen/index.vue
@@ -177,7 +177,7 @@
   { name: '排水防涝', id: 4 },
   { name: '长效运维', id: 5 },
 ]);
-const menuIndex = ref(4);
+const menuIndex = ref(2);
 const showPanel = ref(false);
 const showLegend = ref(false);
 const showPipe = ref(false);
diff --git a/src/views/sponeScreen/chengguanweiScreen/index.vue b/src/views/sponeScreen/chengguanweiScreen/index.vue
index 9de5fca..0ed29d7 100644
--- a/src/views/sponeScreen/chengguanweiScreen/index.vue
+++ b/src/views/sponeScreen/chengguanweiScreen/index.vue
@@ -29,7 +29,7 @@
 
 onMounted(() => {
   setScreenType(); //兼容城管委15楼大屏3800*866和1920*1080
-  window.loginLoading.close();
+  if (window.loginLoading) window.loginLoading.close();
 });
 </script>
 
diff --git a/src/views/sponeScreen/gisMF/cesiumMapLegend.js b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
index 7c3f9b5..3f65c2d 100644
--- a/src/views/sponeScreen/gisMF/cesiumMapLegend.js
+++ b/src/views/sponeScreen/gisMF/cesiumMapLegend.js
@@ -44,7 +44,7 @@
     let rainStation = results[2];
     let stationDataList = results[3];
     let waterFactoryDatalist = results[4];
-    console.log('waterFactoryDatalist--', waterFactoryDatalist);
+    // console.log('waterFactoryDatalist--', waterFactoryDatalist);
     //雨水泵站
     let YSBZDataList = resRainwater.data.filter(data => data.pumpType == 'rain_water'); //雨水泵站
     let WSBZDataList = resRainwater.data.filter(data => data.pumpType == 'sewage_water'); //污水泵站
diff --git a/src/views/sponeScreen/projectHM/ProjectDisplay.vue b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
index e7ee849..3e2354b 100644
--- a/src/views/sponeScreen/projectHM/ProjectDisplay.vue
+++ b/src/views/sponeScreen/projectHM/ProjectDisplay.vue
@@ -65,7 +65,6 @@
 };
 let layerList = ['HMJZYSQ', 'HMXDLGC', 'HMXGYLD', 'HMXSX', 'GWPCYXF', 'GWJBZ', 'GIS'];
 async function projectInfoNewM(p) {
-  console.log('ppppp---', p);
   let { data, code } = await projectInfoNew(p);
   if (code == 200) {
     //newfiberMap.removeByIds(['projectBoundaryLayers', 'haimianFacility']);
@@ -236,7 +235,6 @@
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
     ProjectClick(properties);
-    console.log('feature--', '海绵项目点击事件', properties);
   });
   newfiberMapbox.map.on('mouseenter', ['polygonGeojson', 'lineGeojson', 'pointGeojson'], e => {
     let selectPoint = {},
@@ -249,7 +247,6 @@
       ])
       .filter(i => !!i.layer.id)[0];
     let properties = feature.properties;
-    console.log('feature--', '海绵项目点击事件', properties);
     let geometryToFrature = {
       type: 'Feature',
       geometry: Terraformer.WKT.parse(properties.geometry),
diff --git a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
index 4635d24..d7ac84a 100644
--- a/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
+++ b/src/views/sponeScreen/projectHM/ProjectEvaluation.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- 项目监测分析 -->
   <div class="publicContainerA">
-    <div class="partTitleHM">项目评估</div>
+    <div class="partTitleHM">项目监测分析</div>
     <div class="ConstrucClass">
       <div class="WaterList">
         <div class="DropdownBox">
@@ -9,16 +10,11 @@
             <span>片区分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="area" style="width: 41%; margin-left: 10px; margin-top: 18px">
+            <el-form-item prop="area" style="width: 100%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.area" placeholder="请选择片区分析" @change="changeArea">
                 <el-option v-for="item in areaList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="pipe" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.pipe" @change="change" placeholder="请选择">
-                <el-option v-for="item in pipeList" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
           </div>
         </div>
 
@@ -28,16 +24,16 @@
             <span>项目分析</span>
           </div>
           <div class="Selectionbox">
-            <el-form-item prop="Xm" style="width: 41%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmP" placeholder="请选择项目分析" @change="changeProject">
+            <el-form-item prop="Xm" style="width: 100%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="queryParams.XmP" placeholder="请选择典型项目分析" @change="changeProject">
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
+            <!-- <el-form-item prop="XmA" style="width: 50%; margin-left: 10px; margin-top: 18px">
               <el-select v-model="queryParams.XmA">
                 <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
 
@@ -52,16 +48,16 @@
                 <el-option v-for="item in XmList" :key="item.value" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item prop="XmAQ" style="width: 50%; margin-left: 10px; margin-top: 18px">
-              <el-select v-model="queryParams.XmAQ" @change="change" placeholder="请选择">
-                <el-option v-for="item in XmListA" :key="item.value" :label="item.name" :value="item.value" />
+            <el-form-item prop="hmssVal" style="width: 50%; margin-left: 10px; margin-top: 18px">
+              <el-select v-model="hmssVal" @change="changeHmss" placeholder="请选择监测点">
+                <el-option v-for="item in hmssList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </div>
         </div>
         <!-- 设施分析echarts -->
-        <div class="assessment">
-          <AssessmentEcharts :data="chartData2" :refresh="chartData2.refresh"></AssessmentEcharts>
+        <div class="assessment" v-loading="loadingSS">
+          <AssessmentEcharts :data="chartDataSS" :refresh="chartDataSS.refresh"></AssessmentEcharts>
         </div>
 
         <div class="DropdownBox">
@@ -78,8 +74,8 @@
           </div>
         </div>
         <!-- 积水分析echarts -->
-        <div class="assessment" v-if="jishui">
-          <AssessmentjsEcharts :data="chartData1" :refresh="chartData1.refresh1"></AssessmentjsEcharts>
+        <div class="assessment">
+          <AssessmentjsEcharts :data="chartDataJSD" :refresh="chartDataJSD.refresh"></AssessmentjsEcharts>
         </div>
       </div>
     </div>
@@ -93,32 +89,10 @@
 import ssfx from '@/assets/newImgs/HMScreen/ssfx.png';
 import xmfx from '@/assets/newImgs/HMScreen/xmfx.png';
 import bus from '@/bus';
-
 import WaterAnalysis_icon from '@/assets/newImgs/HMScreen/WaterAnalysis_icon.png';
+import { graphicReport, realtimeDataLatest } from '@/api/dataAnalysis/syntherticData';
 
-const jishui = ref(true);
-const chartData2 = ref({
-  xAxis: [
-    '06-12 08:00',
-    '06-12 09:00',
-    '06-12 10:00',
-    '06-12 11:00',
-    '06-12 12:00',
-    '06-12 13:00',
-    '06-12 14:00',
-    '06-12 15:00',
-    '06-12 16:00',
-    '06-12 17:00',
-    '06-12 18:00',
-    '06-12 19:00',
-  ],
-  inverse: true,
-  yAxis: [1, 2, 2.3, 2, 1.1, 2.5, 1.9, 2.5, 2.8, 1.1, 2.1, 3], //降雨量
-  yAxis2: [0.1, 0.2, 0.3, 0.2, 0.1, 0.4, 0.3, 0.03, 0.6, 0.1, 0.2, 0.5], //流量
-  yAxis3: [50, 55, 80, 50, 46, 65, 70, 50, 78, 52, 69, 90], //ss
-  refresh: 1,
-});
-const chartData1 = ref({
+const chartDataJSD = ref({
   xAxis: [
     '2024-06-12 08:00',
     '2024-06-13 08:00',
@@ -145,11 +119,6 @@
   { name: '金明片区', value: '3', lonlat: [114.285, 34.809] },
 ]);
 
-const pipeList = ref([
-  { name: '向阳路管网监测点', value: '1' },
-  { name: '汴京路管网监测点', value: '2' },
-]);
-
 const XmList = ref([
   { name: '汴京路管网及道路海绵化改造', value: '1' },
   { name: '市民综合体', value: '3' },
@@ -161,20 +130,66 @@
 ]);
 
 const AllData = reactive({
-  queryParams: { BODName: '1', area: '', pipe: '', Xm: '1', XmP: '', XmA: '', XmQ: '1', XmAQ: '1' },
+  queryParams: { BODName: '1', area: '', Xm: '1', XmP: '', XmA: '', XmQ: '1' },
 });
 const { queryParams } = toRefs(AllData);
 
-function jishuiClick() {
-  jishui.value = false;
-}
-const jishuichange = () => {
-  jishui.value = true;
+const dateRain = ref('');
+//海绵设施列表-汴京路
+const hmssList = ref([
+  { value: '0371000044', label: '工农路与汴京路交叉口' },
+  { value: '0371000039', label: '大花园街与汴京路交叉口' },
+  { value: '0371000038', label: '劳动路与汴京路交叉口' },
+  { value: '0371000037', label: '公园路与汴京路交叉口' },
+]);
+const hmssVal = ref('');
+const loadingSS = ref(true);
+const chartDataSS = ref({
+  xAxis: [],
+  inverse: true,
+  yAxis: [], //降雨量
+  yAxis2: [], //流量
+  yAxis3: [], //ss
+  refresh: 1,
+});
+// 海绵设施监测站点切换
+const changeHmss = () => {
+  // hmssVal.value = val;
+  getDataSS();
 };
+// 海绵设施数据渲染
+async function getDataSS() {
+  loadingSS.value = true;
+  // 关联雨量站是皮革厂雨量站，0371000003
+  let params = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: '0371000003',
+  };
+  let res = await graphicReport(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    chartDataSS.value.xAxis = datas.propertyMonitorXList;
+    chartDataSS.value.yAxis = datas.propertyMonitorList[0].ylist;
+  }
 
-const change = val => {
-  jishui.value = false;
-};
+  // 获取监测值
+  let params2 = {
+    startTime: dateRain.value,
+    endTime: dateRain.value,
+    stCode: hmssVal.value,
+  };
+  let res2 = await graphicReport(params2);
+  if (res2 && res2.code == 200) {
+    let datas = res2.data;
+    chartDataSS.value.yAxis2 = datas.propertyMonitorList[0].ylist;
+  }
+  chartDataSS.value.refresh = Math.random();
+  loadingSS.value = false;
+}
+
+function jishuiClick() {}
+const jishuichange = () => {};
 
 // 片区分析点击
 function changeArea(val) {
@@ -205,6 +220,20 @@
     pitch: 30,
   });
 }
+
+onMounted(() => {
+  hmssVal.value = hmssList.value[0].value; //默认第一个监测点
+  console.log('33333', hmssVal.value);
+  // 获取降雨日历的日期来加载对应数据
+  bus.on('setRainDate', date => {
+    console.log('降雨日历的日期----', date);
+    dateRain.value = date;
+    changeHmss(); //海绵设施数据加载
+  });
+});
+onBeforeUnmount(() => {
+  bus.off('setRainDate');
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sponeScreen/waterFlood/index.vue b/src/views/sponeScreen/waterFlood/index.vue
index 13e91cc..813b35a 100644
--- a/src/views/sponeScreen/waterFlood/index.vue
+++ b/src/views/sponeScreen/waterFlood/index.vue
@@ -138,38 +138,38 @@
       pitch: 30,
     });
     bus.emit('setIniteLayer', [
-      // {
-      //   layername: 'YSBZ', //雨水泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'combineBengZhan', //合流泵站
-      //   show: false,
-      // },
-      // {
-      //   layername: 'sewageFactory', //污水处理厂
-      //   show: false,
-      // },
-      // {
-      //   layername: 'ysLine1', //雨水管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'hsLine1', //合流管网
-      //   show: false,
-      // },
-      // {
-      //   layername: 'pipeline_info_flow', //管网流向
-      //   show: false,
-      // },
       {
-        layername: 'pipeMonitor', //管网监测点，测试
+        layername: 'YSBZ', //雨水泵站
         show: false,
       },
-      // {
-      //   layername: 'waterCourse', //河道水位计
-      //   show: false,
-      // },
+      {
+        layername: 'combineBengZhan', //合流泵站
+        show: false,
+      },
+      {
+        layername: 'sewageFactory', //污水处理厂
+        show: false,
+      },
+      {
+        layername: 'ysLine1', //雨水管网
+        show: false,
+      },
+      {
+        layername: 'hsLine1', //合流管网
+        show: false,
+      },
+      {
+        layername: 'pipeline_info_flow', //管网流向
+        show: false,
+      },
+      {
+        layername: 'pipeMonitor', //管网监测点
+        show: false,
+      },
+      {
+        layername: 'waterCourse', //河道水位计
+        show: false,
+      },
       {
         layername: 'waterLoging', //内涝积水点
         show: false,
diff --git a/src/views/sponeScreen/waterFlood/rainCaldar.vue b/src/views/sponeScreen/waterFlood/rainCaldar.vue
index 5c6cf5b..82b24b4 100644
--- a/src/views/sponeScreen/waterFlood/rainCaldar.vue
+++ b/src/views/sponeScreen/waterFlood/rainCaldar.vue
@@ -73,6 +73,8 @@
 import { rainRainDaylist } from '@/api/newPageline/riverCapacity.js';
 import DEchart from '@/views/sponeScreen/Echarts/DEchart.vue';
 import { getStationList } from '@/api/dataAnalysis/syntherticData';
+import bus from '@/bus';
+
 const { proxy } = getCurrentInstance();
 const rainCode = ref('');
 const rangeTime = ref('');
@@ -125,7 +127,8 @@
     dateIndex.value == 'day' ? 'YYYY-MM-DD' : dateIndex.value == 'month' ? 'YYYY-MM' : dateIndex.value == 'year' ? 'YYYY' : '';
   rangeTime.value = proxy.moment().format(valueFormat);
   currentType.value = '';
-
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
   getBasRainTimeSectionListFn();
 }
 
@@ -179,6 +182,8 @@
   rangeTime.value = curInfo.value?.rainTime;
   AllData.curDate = proxy.moment(rangeTime.value).format('MM-DD');
   AllData.curYear = proxy.moment(rangeTime.value).format('YYYY');
+  // 传递给项目监测分析
+  bus.emit('setRainDate', rangeTime.value);
 };
 
 onMounted(() => {
diff --git a/src/views/spongePerformance/mainIndex/centerRight.vue b/src/views/spongePerformance/mainIndex/centerRight.vue
index 8cdcb7d..1e91252 100644
--- a/src/views/spongePerformance/mainIndex/centerRight.vue
+++ b/src/views/spongePerformance/mainIndex/centerRight.vue
@@ -18,9 +18,6 @@
   'itemTarget',
 ]);
 
-console.log('realValue', realValue);
-console.log('yData', yData);
-console.log('itemTarget', itemTarget);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
diff --git a/src/views/spongePerformance/mainIndex/chart.js b/src/views/spongePerformance/mainIndex/chart.js
index b80dc33..cc35843 100644
--- a/src/views/spongePerformance/mainIndex/chart.js
+++ b/src/views/spongePerformance/mainIndex/chart.js
@@ -12,13 +12,11 @@
   subtext: '项目总数',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });
@@ -37,13 +35,11 @@
   subtext: '优',
   padding: [10, 0, 0, 0],
   itemStyle: {
-    normal: {
-      borderWidth: 9,
-      borderColor: '#fff',
-      color: function (colors) {
-        var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
-        return colorList[colors.dataIndex];
-      },
+    borderWidth: 9,
+    borderColor: '#fff',
+    color: function (colors) {
+      var colorList = ['#86D882 ', '#159AFF', '#F8AA45 ', '#FF6969', '#5470c6'];
+      return colorList[colors.dataIndex];
     },
   },
 });
diff --git a/src/views/spongePerformance/mainIndex/footCenter.vue b/src/views/spongePerformance/mainIndex/footCenter.vue
index 96b8639..9040a8c 100644
--- a/src/views/spongePerformance/mainIndex/footCenter.vue
+++ b/src/views/spongePerformance/mainIndex/footCenter.vue
@@ -6,12 +6,16 @@
 <script setup>
 import { init } from 'echarts';
 import 'echarts-liquidfill/src/liquidFill.js';
+
 const assetEchart = ref(null);
-let { xData } = defineProps(['data']);
-xData?.reduce((n, v) => {
+const props = defineProps({
+  data: {
+    type: Array,
+  },
+});
+props.data.xData.reduce((n, v) => {
   return n + v.itemScore;
 }, 0);
-console.log('xDataxData', xData);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
@@ -20,7 +24,7 @@
   chart.setOption({
     title: [
       {
-        text: xData[0]?.itemContent,
+        text: props.data.xData[0]?.itemContent,
         x: '10%',
         y: '79%',
         textStyle: {
@@ -32,7 +36,7 @@
         },
       },
       {
-        text: xData[1]?.itemContent,
+        text: props.data.xData[1]?.itemContent,
         x: '61%',
         y: '79%',
         textStyle: {
@@ -71,21 +75,19 @@
             globalCoord: true,
           },
         ],
-        data: [xData[0]?.realScore], // data个数代表波浪数
+        data: [props.data.xData[0]?.realScore], // data个数代表波浪数
         backgroundStyle: {
           borderWidth: 1,
           color: '#1e5187',
           opacity: '0.3',
         },
         label: {
-          normal: {
-            textStyle: {
-              fontSize: 14,
-              color: '#0f406a',
-            },
-            formatter: function (param) {
-              return xData[0]?.standardFlag == 1 ? '已完成' : '未完成' + '\n' + '总数' + (xData[0]?.itemScore || 0);
-            },
+          textStyle: {
+            fontSize: 14,
+            color: '#0f406a',
+          },
+          formatter: function (param) {
+            return props.data.xData[0]?.standardFlag == 1 ? '已完成' : '未完成' + '\n' + '总数' + (props.data.xData[0]?.itemScore || 0);
           },
         },
         outline: {
@@ -124,22 +126,20 @@
             globalCoord: false,
           },
         ],
-        data: [xData[1]?.standardFlag == 1 ? 1 : 0], // data个数代表波浪数
-        //   data: [xData[1]?.realValue/xData[1]?.itemScore], // data个数代表波浪数
+        data: [props.data.xData[1]?.standardFlag == 1 ? 1 : 0], // data个数代表波浪数
+        //   data: [props.data[1]?.realValue/props.data[1]?.itemScore], // data个数代表波浪数
         backgroundStyle: {
           borderWidth: 1,
           color: '#1e5187',
           opacity: '0.3',
         },
         label: {
-          normal: {
-            textStyle: {
-              fontSize: 14,
-              color: '#fff',
-            },
-            formatter: function (param) {
-              return (param.value * 100 || 0) + '%' + '\n' + '总数' + (xData[1]?.itemScore || 0);
-            },
+          textStyle: {
+            fontSize: 14,
+            color: '#fff',
+          },
+          formatter: function (param) {
+            return (param.value * 100 || 0) + '%' + '\n' + '总数' + (props.data.xData[1]?.itemScore || 0);
           },
         },
         outline: {
diff --git a/src/views/spongePerformance/mainIndex/footLeft.vue b/src/views/spongePerformance/mainIndex/footLeft.vue
index 45e817f..4adfb3a 100644
--- a/src/views/spongePerformance/mainIndex/footLeft.vue
+++ b/src/views/spongePerformance/mainIndex/footLeft.vue
@@ -111,12 +111,10 @@
         data: yData,
         barWidth: '30px',
         itemStyle: {
-          normal: {
-            color: function (params) {
-              return data.colorList[params.dataIndex];
-            },
-            barBorderRadius: [0, 0, 0, 0],
+          color: function (params) {
+            return data.colorList[params.dataIndex];
           },
+          barBorderRadius: [0, 0, 0, 0],
         },
       },
     ],
diff --git a/src/views/spongePerformance/mainIndex/footRight.vue b/src/views/spongePerformance/mainIndex/footRight.vue
index b29209d..e176153 100644
--- a/src/views/spongePerformance/mainIndex/footRight.vue
+++ b/src/views/spongePerformance/mainIndex/footRight.vue
@@ -7,7 +7,12 @@
 import { init } from 'echarts';
 import 'echarts-liquidfill/src/liquidFill.js';
 const assetEchart = ref(null);
-let { xData, yData } = defineProps(['data']);
+const props = defineProps({
+  data: {
+    type: Array,
+  },
+});
+console.log('满意度---', props.data);
 const initM = () => {
   const chart = init(assetEchart.value);
   window.addEventListener('resize', () => {
@@ -66,7 +71,7 @@
             color: '#fff',
           },
         },
-        data: xData,
+        data: props.data.xData,
       },
     ],
     yAxis: [
@@ -143,8 +148,7 @@
             },
           },
         },
-
-        data: yData,
+        data: props.data.yData,
       },
     ],
   });
diff --git a/src/views/spongePerformance/mainIndex/index.vue b/src/views/spongePerformance/mainIndex/index.vue
index d4cea26..bc4a577 100644
--- a/src/views/spongePerformance/mainIndex/index.vue
+++ b/src/views/spongePerformance/mainIndex/index.vue
@@ -302,7 +302,6 @@
 ]);
 
 function TopClick(v) {
-  // console.log(v.year, 'v.year');
   if (v.year == 2024) {
     proxy.$modal.msgWarning('请添加2024年数据');
     return;
@@ -321,7 +320,6 @@
   let { data } = await three_year_statics(p);
   if (data.length > 0) {
     data.map((i, index) => {
-      console.log(i.datetime.slice(0, 7), '时间');
       topList.value.push({
         year: i.year,
         name: i.year + '年度绩效考核得分',
@@ -348,11 +346,11 @@
   } = await performanceEvaluateItem(p);
   centerList.value = typeStaticsList;
   tableData.value = ziJinStaticsList;
-  console.log('tableDatatableDatatableData', tableData);
   tableData1.value = otherStaticsList;
   qzmyd.value = qunZongStaticsList;
   footRightTopRef.value.yData = [qunZongStaticsList.lastYearSatisfyPercent, qunZongStaticsList.satisfyPercent];
-  footCenterRef.value.xData = liFaStaticsList;
+  footCenterRef.value.xData = liFaStaticsList; //立法及长效机制
+  console.log('------', footRightTopRef.value);
   liFaStaticsListAll.value = liFaStaticsList.reduce((p, v) => {
     return (p += v.itemScore);
   }, 0);
@@ -395,7 +393,6 @@
   });
   // 内涝防治相关指标
   threeLeftDate.value.map((i, k) => {
-    console.log(i, 'iiiii');
     i.xData = [i.itemContent];
     i.yData = [i.realValue || 0];
     i.yData2 = [i.itemTarget || 0];
@@ -408,7 +405,6 @@
       i.tittle = '内涝防治';
     }
   });
-  console.log(threeLeftDate.value, 'threeLeftDate.value');
   // 雨水收集与利用
   threeLeftDate1.value.map((i, k) => {
     i.xData = [i.itemContent];
@@ -441,7 +437,6 @@
       i.isBorder = 1;
     }
   });
-  console.log('threeLeftDate2', threeLeftDate2);
   isChart1.value = true;
   loading.value = false;
 }