diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 40824b5..6924ac2 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -23,7 +23,7 @@
   // 数据id
   location: {
     type: Array,
-    default: () => [114.45370037156442, 30.525710664701975],
+    // default: () => [114.45370037156442, 30.525710664701975],
   },
 });
 const { proxy } = getCurrentInstance();
@@ -49,11 +49,14 @@
 //根据中心点查找poi
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
+
   let poiData = await axios({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
-      location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`,
+      location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
+        AllData.poiCircle[0].toFixed(6)
+      )}`,
       radius: 1000,
       query: "公交站$商场$著名景点$学校",
     },

diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 40824b5..6924ac2 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -23,7 +23,7 @@
   // 数据id
   location: {
     type: Array,
-    default: () => [114.45370037156442, 30.525710664701975],
+    // default: () => [114.45370037156442, 30.525710664701975],
   },
 });
 const { proxy } = getCurrentInstance();
@@ -49,11 +49,14 @@
 //根据中心点查找poi
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
+
   let poiData = await axios({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
-      location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`,
+      location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
+        AllData.poiCircle[0].toFixed(6)
+      )}`,
       radius: 1000,
       query: "公交站$商场$著名景点$学校",
     },
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 4824528..2552dac 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -92,13 +92,13 @@
 ]);
 const rightMenuArr = ref([
   {
-    label: '水安全',
+    label: '排涝调度',
     value: '4',
     posSum: '24.2',
     link: '/FloodControlAndDrainage',
   },
   {
-    label: '水政务',
+    label: '舆情分析',
     value: '5',
     posSum: '16.9',
     link: '/PublicOpinionAnalysis',

diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 40824b5..6924ac2 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -23,7 +23,7 @@
   // 数据id
   location: {
     type: Array,
-    default: () => [114.45370037156442, 30.525710664701975],
+    // default: () => [114.45370037156442, 30.525710664701975],
   },
 });
 const { proxy } = getCurrentInstance();
@@ -49,11 +49,14 @@
 //根据中心点查找poi
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
+
   let poiData = await axios({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
-      location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`,
+      location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
+        AllData.poiCircle[0].toFixed(6)
+      )}`,
       radius: 1000,
       query: "公交站$商场$著名景点$学校",
     },
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 4824528..2552dac 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -92,13 +92,13 @@
 ]);
 const rightMenuArr = ref([
   {
-    label: '水安全',
+    label: '排涝调度',
     value: '4',
     posSum: '24.2',
     link: '/FloodControlAndDrainage',
   },
   {
-    label: '水政务',
+    label: '舆情分析',
     value: '5',
     posSum: '16.9',
     link: '/PublicOpinionAnalysis',
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 8e98190..919a6e1 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -491,9 +491,7 @@
   Getproperties.value.dataId = item.dataId || "";
   Getproperties.value.stType = item.stType;
 
-  Getproperties.value.geometry =
-    item.geometry ||
-    item.geometrys 
+  Getproperties.value.geometry = item.geometry || item.geometrys||'';
     // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情

diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 40824b5..6924ac2 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -23,7 +23,7 @@
   // 数据id
   location: {
     type: Array,
-    default: () => [114.45370037156442, 30.525710664701975],
+    // default: () => [114.45370037156442, 30.525710664701975],
   },
 });
 const { proxy } = getCurrentInstance();
@@ -49,11 +49,14 @@
 //根据中心点查找poi
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
+
   let poiData = await axios({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
-      location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`,
+      location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
+        AllData.poiCircle[0].toFixed(6)
+      )}`,
       radius: 1000,
       query: "公交站$商场$著名景点$学校",
     },
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 4824528..2552dac 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -92,13 +92,13 @@
 ]);
 const rightMenuArr = ref([
   {
-    label: '水安全',
+    label: '排涝调度',
     value: '4',
     posSum: '24.2',
     link: '/FloodControlAndDrainage',
   },
   {
-    label: '水政务',
+    label: '舆情分析',
     value: '5',
     posSum: '16.9',
     link: '/PublicOpinionAnalysis',
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 8e98190..919a6e1 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -491,9 +491,7 @@
   Getproperties.value.dataId = item.dataId || "";
   Getproperties.value.stType = item.stType;
 
-  Getproperties.value.geometry =
-    item.geometry ||
-    item.geometrys 
+  Getproperties.value.geometry = item.geometry || item.geometrys||'';
     // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
index 33934d7..1fb2b7e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
@@ -136,8 +136,15 @@
        gw.map((e)=>{
         let wellDepth=e.wellDepth||2;
         let sum=Number((e.warnFactorValue/wellDepth*100).toFixed(2))
+        console.log('sum',sum);
         if(isFinite(sum)){
+          if(sum>100){
+e.percentum=100
+
+          }else {
 e.percentum=sum
+
+          }
         }else {
 e.percentum=100
 

diff --git a/src/components/Map/streetSpace.vue b/src/components/Map/streetSpace.vue
index 40824b5..6924ac2 100644
--- a/src/components/Map/streetSpace.vue
+++ b/src/components/Map/streetSpace.vue
@@ -23,7 +23,7 @@
   // 数据id
   location: {
     type: Array,
-    default: () => [114.45370037156442, 30.525710664701975],
+    // default: () => [114.45370037156442, 30.525710664701975],
   },
 });
 const { proxy } = getCurrentInstance();
@@ -49,11 +49,14 @@
 //根据中心点查找poi
 const searchPoiByLonlat = async () => {
   AllData.poiImages = [];
+
   let poiData = await axios({
     url: `/bdApi/baiduservice/placeSearch`,
     method: "GET",
     params: {
-      location: `${AllData.poiCircle[1]},${AllData.poiCircle[0]}`,
+      location: `${parseFloat(AllData.poiCircle[1].toFixed(6))},${parseFloat(
+        AllData.poiCircle[0].toFixed(6)
+      )}`,
       radius: 1000,
       query: "公交站$商场$著名景点$学校",
     },
diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 4824528..2552dac 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -92,13 +92,13 @@
 ]);
 const rightMenuArr = ref([
   {
-    label: '水安全',
+    label: '排涝调度',
     value: '4',
     posSum: '24.2',
     link: '/FloodControlAndDrainage',
   },
   {
-    label: '水政务',
+    label: '舆情分析',
     value: '5',
     posSum: '16.9',
     link: '/PublicOpinionAnalysis',
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 8e98190..919a6e1 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -491,9 +491,7 @@
   Getproperties.value.dataId = item.dataId || "";
   Getproperties.value.stType = item.stType;
 
-  Getproperties.value.geometry =
-    item.geometry ||
-    item.geometrys 
+  Getproperties.value.geometry = item.geometry || item.geometrys||'';
     // Terraformer.WKT.convert(turf.point(item.lonLat.split(",").map(Number)).geometry);
 
   Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情  查询水系分区详情
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
index 33934d7..1fb2b7e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/MonitoringAlarm.vue
@@ -136,8 +136,15 @@
        gw.map((e)=>{
         let wellDepth=e.wellDepth||2;
         let sum=Number((e.warnFactorValue/wellDepth*100).toFixed(2))
+        console.log('sum',sum);
         if(isFinite(sum)){
+          if(sum>100){
+e.percentum=100
+
+          }else {
 e.percentum=sum
+
+          }
         }else {
 e.percentum=100
 
diff --git a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
index 0bfd2ac..dd65a8b 100644
--- a/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
+++ b/src/views/pictureOnMap/page/MonitoringAnalysis/components/MonBarChartsLeft2.vue
@@ -237,16 +237,17 @@
           },
           itemStyle: {
             borderRadius: [10, 0, 0, 10],
-            color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
-              {
-                offset: 0,
-                color: "RGBA(0, 0, 0, 0.6)",
-              },
-              {
-                offset: 1,
-                color: "RGBA(0, 0, 0, 1)",
-              },
-            ]),
+            color: "#1e7dff",
+            // new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
+            //   {
+            //     offset: 0,
+            //     color: "RGBA(0, 0, 0, 0.6)",
+            //   },
+            //   {
+            //     offset: 1,
+            //     color: "RGBA(0, 0, 0, 1)",
+            //   },
+            // ]),
           },
           data: props.echartData.data1,
         },
@@ -260,20 +261,21 @@
           label: {
             show: true,
             formatter: "{c} h",
-            color: "black",
+            color: "white",
           },
           itemStyle: {
             borderRadius: [0, 10, 10, 0],
-            color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
-              {
-                offset: 0,
-                color: "rgba(255, 255, 255, 1)",
-              },
-              {
-                offset: 1,
-                color: "rgba(255, 255, 255, 0.6)",
-              },
-            ]),
+            color: "#23ffed",
+            //  new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
+            //   {
+            //     offset: 0,
+            //     color: "rgba(255, 255, 255, 1)",
+            //   },
+            //   {
+            //     offset: 1,
+            //     color: "rgba(255, 255, 255, 0.6)",
+            //   },
+            // ]),
           },
           data: props.echartData.data2,
         },