diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 89c5709..152fba2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -96,7 +96,7 @@
       },
       legend: {
         data: [
-          "地下水渗入",
+          { name: "地下水渗入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -273,7 +273,7 @@
         },
         {
           name: "地下水渗入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },

diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 89c5709..152fba2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -96,7 +96,7 @@
       },
       legend: {
         data: [
-          "地下水渗入",
+          { name: "地下水渗入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -273,7 +273,7 @@
         },
         {
           name: "地下水渗入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index b44423c..107b703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -54,6 +54,7 @@
 );
 function init() {
   let colorarr = ['#99FF55', '#b14de5', '#FFC155', '#409eff', '#ff7f50', '#ff69b4', '#87ceeb', '#4682b4', '#98fb98'];
+  let integerArr=['开机台数']
   let rightnumber = props.yAxisarr.length * '2.5' + '%';
   let newarr = [];
   let marklinedata = [];
@@ -157,6 +158,7 @@
       let obj = {
         name: item.dataName + item.unit,
         type: 'value',
+        minInterval:integerArr.some(i=>i==item.dataName)?1:'',
         axisLabel: {
           show: true,
           color: colorarr[index],

diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 89c5709..152fba2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -96,7 +96,7 @@
       },
       legend: {
         data: [
-          "地下水渗入",
+          { name: "地下水渗入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -273,7 +273,7 @@
         },
         {
           name: "地下水渗入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index b44423c..107b703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -54,6 +54,7 @@
 );
 function init() {
   let colorarr = ['#99FF55', '#b14de5', '#FFC155', '#409eff', '#ff7f50', '#ff69b4', '#87ceeb', '#4682b4', '#98fb98'];
+  let integerArr=['开机台数']
   let rightnumber = props.yAxisarr.length * '2.5' + '%';
   let newarr = [];
   let marklinedata = [];
@@ -157,6 +158,7 @@
       let obj = {
         name: item.dataName + item.unit,
         type: 'value',
+        minInterval:integerArr.some(i=>i==item.dataName)?1:'',
         axisLabel: {
           show: true,
           color: colorarr[index],
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index b724caf..2c9fcf7 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -97,7 +97,12 @@
         },
       },
       legend: {
-        data: ["水质异常", AllData.yAxis_Name, AllData.yAxis2_Name, AllData.yAxis3_Name],
+        data: [
+          { name: "水质异常", icon: "rect" },
+          AllData.yAxis_Name,
+          AllData.yAxis2_Name,
+          AllData.yAxis3_Name,
+        ],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -246,7 +251,7 @@
 
         {
           name: "水质异常",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },

diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 89c5709..152fba2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -96,7 +96,7 @@
       },
       legend: {
         data: [
-          "地下水渗入",
+          { name: "地下水渗入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -273,7 +273,7 @@
         },
         {
           name: "地下水渗入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index b44423c..107b703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -54,6 +54,7 @@
 );
 function init() {
   let colorarr = ['#99FF55', '#b14de5', '#FFC155', '#409eff', '#ff7f50', '#ff69b4', '#87ceeb', '#4682b4', '#98fb98'];
+  let integerArr=['开机台数']
   let rightnumber = props.yAxisarr.length * '2.5' + '%';
   let newarr = [];
   let marklinedata = [];
@@ -157,6 +158,7 @@
       let obj = {
         name: item.dataName + item.unit,
         type: 'value',
+        minInterval:integerArr.some(i=>i==item.dataName)?1:'',
         axisLabel: {
           show: true,
           color: colorarr[index],
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index b724caf..2c9fcf7 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -97,7 +97,12 @@
         },
       },
       legend: {
-        data: ["水质异常", AllData.yAxis_Name, AllData.yAxis2_Name, AllData.yAxis3_Name],
+        data: [
+          { name: "水质异常", icon: "rect" },
+          AllData.yAxis_Name,
+          AllData.yAxis2_Name,
+          AllData.yAxis3_Name,
+        ],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -246,7 +251,7 @@
 
         {
           name: "水质异常",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index 92bc253..155310f 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -97,7 +97,7 @@
       },
       legend: {
         data: [
-          "污水注入",
+          { name: "污水注入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -271,19 +271,10 @@
               { offset: 1, color: "#19D6FF" },
             ]), // 数据点颜色
           },
-          markArea: {
-            label: {
-              color: "#fb6061",
-            },
-            itemStyle: {
-              color: "#fb606150",
-            },
-            data: AllData.FenXianTimer,
-          },
         },
         {
           name: "污水注入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },

diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 89c5709..152fba2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -96,7 +96,7 @@
       },
       legend: {
         data: [
-          "地下水渗入",
+          { name: "地下水渗入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -273,7 +273,7 @@
         },
         {
           name: "地下水渗入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index b44423c..107b703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -54,6 +54,7 @@
 );
 function init() {
   let colorarr = ['#99FF55', '#b14de5', '#FFC155', '#409eff', '#ff7f50', '#ff69b4', '#87ceeb', '#4682b4', '#98fb98'];
+  let integerArr=['开机台数']
   let rightnumber = props.yAxisarr.length * '2.5' + '%';
   let newarr = [];
   let marklinedata = [];
@@ -157,6 +158,7 @@
       let obj = {
         name: item.dataName + item.unit,
         type: 'value',
+        minInterval:integerArr.some(i=>i==item.dataName)?1:'',
         axisLabel: {
           show: true,
           color: colorarr[index],
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index b724caf..2c9fcf7 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -97,7 +97,12 @@
         },
       },
       legend: {
-        data: ["水质异常", AllData.yAxis_Name, AllData.yAxis2_Name, AllData.yAxis3_Name],
+        data: [
+          { name: "水质异常", icon: "rect" },
+          AllData.yAxis_Name,
+          AllData.yAxis2_Name,
+          AllData.yAxis3_Name,
+        ],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -246,7 +251,7 @@
 
         {
           name: "水质异常",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index 92bc253..155310f 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -97,7 +97,7 @@
       },
       legend: {
         data: [
-          "污水注入",
+          { name: "污水注入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -271,19 +271,10 @@
               { offset: 1, color: "#19D6FF" },
             ]), // 数据点颜色
           },
-          markArea: {
-            label: {
-              color: "#fb6061",
-            },
-            itemStyle: {
-              color: "#fb606150",
-            },
-            data: AllData.FenXianTimer,
-          },
         },
         {
           name: "污水注入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
index 0ca517c..9551420 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
@@ -89,6 +89,10 @@
     width: 100%;
   height: 100%;
   padding: 0 10px;
+
+  .popUpTable {
+    height: calc(100% - 50px)
+  }
   // color: #ccefff;
 }
 </style>

diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 89c5709..152fba2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -96,7 +96,7 @@
       },
       legend: {
         data: [
-          "地下水渗入",
+          { name: "地下水渗入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -273,7 +273,7 @@
         },
         {
           name: "地下水渗入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index b44423c..107b703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -54,6 +54,7 @@
 );
 function init() {
   let colorarr = ['#99FF55', '#b14de5', '#FFC155', '#409eff', '#ff7f50', '#ff69b4', '#87ceeb', '#4682b4', '#98fb98'];
+  let integerArr=['开机台数']
   let rightnumber = props.yAxisarr.length * '2.5' + '%';
   let newarr = [];
   let marklinedata = [];
@@ -157,6 +158,7 @@
       let obj = {
         name: item.dataName + item.unit,
         type: 'value',
+        minInterval:integerArr.some(i=>i==item.dataName)?1:'',
         axisLabel: {
           show: true,
           color: colorarr[index],
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index b724caf..2c9fcf7 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -97,7 +97,12 @@
         },
       },
       legend: {
-        data: ["水质异常", AllData.yAxis_Name, AllData.yAxis2_Name, AllData.yAxis3_Name],
+        data: [
+          { name: "水质异常", icon: "rect" },
+          AllData.yAxis_Name,
+          AllData.yAxis2_Name,
+          AllData.yAxis3_Name,
+        ],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -246,7 +251,7 @@
 
         {
           name: "水质异常",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index 92bc253..155310f 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -97,7 +97,7 @@
       },
       legend: {
         data: [
-          "污水注入",
+          { name: "污水注入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -271,19 +271,10 @@
               { offset: 1, color: "#19D6FF" },
             ]), // 数据点颜色
           },
-          markArea: {
-            label: {
-              color: "#fb6061",
-            },
-            itemStyle: {
-              color: "#fb606150",
-            },
-            data: AllData.FenXianTimer,
-          },
         },
         {
           name: "污水注入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
index 0ca517c..9551420 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
@@ -89,6 +89,10 @@
     width: 100%;
   height: 100%;
   padding: 0 10px;
+
+  .popUpTable {
+    height: calc(100% - 50px)
+  }
   // color: #ccefff;
 }
 </style>
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
index 7967d8b..ad98e8e 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
@@ -94,7 +94,12 @@
         },
       },
       legend: {
-        data: ["淤堵风险", AllData.yAxis_Name, AllData.yAxis2_Name, AllData.yAxis3_Name],
+        data: [
+          { name: "淤堵风险", icon: "rect" },
+          AllData.yAxis_Name,
+          AllData.yAxis2_Name,
+          AllData.yAxis3_Name,
+        ],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -240,7 +245,7 @@
         },
         {
           name: "淤堵风险",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },

diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 89c5709..152fba2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -96,7 +96,7 @@
       },
       legend: {
         data: [
-          "地下水渗入",
+          { name: "地下水渗入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -273,7 +273,7 @@
         },
         {
           name: "地下水渗入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index b44423c..107b703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -54,6 +54,7 @@
 );
 function init() {
   let colorarr = ['#99FF55', '#b14de5', '#FFC155', '#409eff', '#ff7f50', '#ff69b4', '#87ceeb', '#4682b4', '#98fb98'];
+  let integerArr=['开机台数']
   let rightnumber = props.yAxisarr.length * '2.5' + '%';
   let newarr = [];
   let marklinedata = [];
@@ -157,6 +158,7 @@
       let obj = {
         name: item.dataName + item.unit,
         type: 'value',
+        minInterval:integerArr.some(i=>i==item.dataName)?1:'',
         axisLabel: {
           show: true,
           color: colorarr[index],
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index b724caf..2c9fcf7 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -97,7 +97,12 @@
         },
       },
       legend: {
-        data: ["水质异常", AllData.yAxis_Name, AllData.yAxis2_Name, AllData.yAxis3_Name],
+        data: [
+          { name: "水质异常", icon: "rect" },
+          AllData.yAxis_Name,
+          AllData.yAxis2_Name,
+          AllData.yAxis3_Name,
+        ],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -246,7 +251,7 @@
 
         {
           name: "水质异常",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index 92bc253..155310f 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -97,7 +97,7 @@
       },
       legend: {
         data: [
-          "污水注入",
+          { name: "污水注入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -271,19 +271,10 @@
               { offset: 1, color: "#19D6FF" },
             ]), // 数据点颜色
           },
-          markArea: {
-            label: {
-              color: "#fb6061",
-            },
-            itemStyle: {
-              color: "#fb606150",
-            },
-            data: AllData.FenXianTimer,
-          },
         },
         {
           name: "污水注入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
index 0ca517c..9551420 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
@@ -89,6 +89,10 @@
     width: 100%;
   height: 100%;
   padding: 0 10px;
+
+  .popUpTable {
+    height: calc(100% - 50px)
+  }
   // color: #ccefff;
 }
 </style>
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
index 7967d8b..ad98e8e 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
@@ -94,7 +94,12 @@
         },
       },
       legend: {
-        data: ["淤堵风险", AllData.yAxis_Name, AllData.yAxis2_Name, AllData.yAxis3_Name],
+        data: [
+          { name: "淤堵风险", icon: "rect" },
+          AllData.yAxis_Name,
+          AllData.yAxis2_Name,
+          AllData.yAxis3_Name,
+        ],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -240,7 +245,7 @@
         },
         {
           name: "淤堵风险",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
index 59cfd4f..72f3d10 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
@@ -107,7 +107,7 @@
         },
       },
       legend: {
-        data: ["溢流", AllData.yAxis_Name, AllData.yAxis3_Name],
+        data: [{ name: "溢流", icon: "rect" }, AllData.yAxis_Name, AllData.yAxis3_Name],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -230,7 +230,7 @@
         },
         {
           name: "溢流",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },

diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
index 89c5709..152fba2 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue
@@ -96,7 +96,7 @@
       },
       legend: {
         data: [
-          "地下水渗入",
+          { name: "地下水渗入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -273,7 +273,7 @@
         },
         {
           name: "地下水渗入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index b44423c..107b703 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -54,6 +54,7 @@
 );
 function init() {
   let colorarr = ['#99FF55', '#b14de5', '#FFC155', '#409eff', '#ff7f50', '#ff69b4', '#87ceeb', '#4682b4', '#98fb98'];
+  let integerArr=['开机台数']
   let rightnumber = props.yAxisarr.length * '2.5' + '%';
   let newarr = [];
   let marklinedata = [];
@@ -157,6 +158,7 @@
       let obj = {
         name: item.dataName + item.unit,
         type: 'value',
+        minInterval:integerArr.some(i=>i==item.dataName)?1:'',
         axisLabel: {
           show: true,
           color: colorarr[index],
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
index b724caf..2c9fcf7 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue
@@ -97,7 +97,12 @@
         },
       },
       legend: {
-        data: ["水质异常", AllData.yAxis_Name, AllData.yAxis2_Name, AllData.yAxis3_Name],
+        data: [
+          { name: "水质异常", icon: "rect" },
+          AllData.yAxis_Name,
+          AllData.yAxis2_Name,
+          AllData.yAxis3_Name,
+        ],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -246,7 +251,7 @@
 
         {
           name: "水质异常",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
index 92bc253..155310f 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue
@@ -97,7 +97,7 @@
       },
       legend: {
         data: [
-          "污水注入",
+          { name: "污水注入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -271,19 +271,10 @@
               { offset: 1, color: "#19D6FF" },
             ]), // 数据点颜色
           },
-          markArea: {
-            label: {
-              color: "#fb6061",
-            },
-            itemStyle: {
-              color: "#fb606150",
-            },
-            data: AllData.FenXianTimer,
-          },
         },
         {
           name: "污水注入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
index 0ca517c..9551420 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wuzicangku.vue
@@ -89,6 +89,10 @@
     width: 100%;
   height: 100%;
   padding: 0 10px;
+
+  .popUpTable {
+    height: calc(100% - 50px)
+  }
   // color: #ccefff;
 }
 </style>
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
index 7967d8b..ad98e8e 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue
@@ -94,7 +94,12 @@
         },
       },
       legend: {
-        data: ["淤堵风险", AllData.yAxis_Name, AllData.yAxis2_Name, AllData.yAxis3_Name],
+        data: [
+          { name: "淤堵风险", icon: "rect" },
+          AllData.yAxis_Name,
+          AllData.yAxis2_Name,
+          AllData.yAxis3_Name,
+        ],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -240,7 +245,7 @@
         },
         {
           name: "淤堵风险",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
index 59cfd4f..72f3d10 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue
@@ -107,7 +107,7 @@
         },
       },
       legend: {
-        data: ["溢流", AllData.yAxis_Name, AllData.yAxis3_Name],
+        data: [{ name: "溢流", icon: "rect" }, AllData.yAxis_Name, AllData.yAxis3_Name],
         textStyle: {
           color: "#FFFFFF",
           fontSize: 12,
@@ -230,7 +230,7 @@
         },
         {
           name: "溢流",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
index cb0a8eb..04462b6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue
@@ -98,7 +98,7 @@
       },
       legend: {
         data: [
-          "雨水注入",
+          { name: "雨水注入", icon: "rect" },
           AllData.yAxis_Name,
           AllData.yAxis2_Name,
           AllData.yAxis3_Name,
@@ -275,7 +275,7 @@
         },
         {
           name: "雨水注入",
-          type: "bar",
+          type: "line",
           itemStyle: {
             color: "#fb606150",
           },