diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5823b2f..4b84aaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -92,7 +92,9 @@
   "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
   "rain", // 雨量站
   "rainwater_pipeline_quality", // 雨水管网水质
+  "rainwater_pipeline_quality_city", // 雨水管网水质
   "sewage_pipeline_quality", // 污水管网水质
+  "sewage_pipeline_quality_city", // 污水管网水质
   "rainwater_pipeline_quality_area", // 接驳口
   "rainwater_pipeline_water_level", // 雨水管网液位
   "reservoir_water_level", //水库水位
@@ -101,6 +103,7 @@
   "sewageStation", //污水厂
   "gateStation", //闸门
   "pump_water_level", //泵站液位
+  "outlet_water_level_city", //排口流量
 ]);
 // 基本数据
 const arrid = ref([
@@ -279,6 +282,16 @@
     type = "rainwater_pipeline_quality";
     dialogConfig.RefName = "jiancefenxiGWFX";
   }
+  if (type == "outlet_water_level_city") {
+    type = "outlet_water_level";
+  }
+  if (type == "rainwater_pipeline_quality_city") {
+    type = "rainwater_pipeline_quality";
+  }
+  if (type == "sewage_pipeline_quality_city") {
+    type = "sewage_pipeline_quality";
+  }
+
   let params = {
     dataCode: type,
     scene: specificFun(type) || "basis_monitor",

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5823b2f..4b84aaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -92,7 +92,9 @@
   "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
   "rain", // 雨量站
   "rainwater_pipeline_quality", // 雨水管网水质
+  "rainwater_pipeline_quality_city", // 雨水管网水质
   "sewage_pipeline_quality", // 污水管网水质
+  "sewage_pipeline_quality_city", // 污水管网水质
   "rainwater_pipeline_quality_area", // 接驳口
   "rainwater_pipeline_water_level", // 雨水管网液位
   "reservoir_water_level", //水库水位
@@ -101,6 +103,7 @@
   "sewageStation", //污水厂
   "gateStation", //闸门
   "pump_water_level", //泵站液位
+  "outlet_water_level_city", //排口流量
 ]);
 // 基本数据
 const arrid = ref([
@@ -279,6 +282,16 @@
     type = "rainwater_pipeline_quality";
     dialogConfig.RefName = "jiancefenxiGWFX";
   }
+  if (type == "outlet_water_level_city") {
+    type = "outlet_water_level";
+  }
+  if (type == "rainwater_pipeline_quality_city") {
+    type = "rainwater_pipeline_quality";
+  }
+  if (type == "sewage_pipeline_quality_city") {
+    type = "sewage_pipeline_quality";
+  }
+
   let params = {
     dataCode: type,
     scene: specificFun(type) || "basis_monitor",
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index ab2e36e..2003971 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -804,6 +804,11 @@
           AllData.RightShow = true;
         }
       }
+      // 排口水质/流量
+      if (Row.properties.pointType == "outlet_quality" || "outlet_water_level") {
+        // 定位雨水系统二级菜单下右侧排口信息echarts列表
+        bus.emit("SZEchartsScrollTop", Row.properties);
+      }
     }
     // }
   }

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5823b2f..4b84aaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -92,7 +92,9 @@
   "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
   "rain", // 雨量站
   "rainwater_pipeline_quality", // 雨水管网水质
+  "rainwater_pipeline_quality_city", // 雨水管网水质
   "sewage_pipeline_quality", // 污水管网水质
+  "sewage_pipeline_quality_city", // 污水管网水质
   "rainwater_pipeline_quality_area", // 接驳口
   "rainwater_pipeline_water_level", // 雨水管网液位
   "reservoir_water_level", //水库水位
@@ -101,6 +103,7 @@
   "sewageStation", //污水厂
   "gateStation", //闸门
   "pump_water_level", //泵站液位
+  "outlet_water_level_city", //排口流量
 ]);
 // 基本数据
 const arrid = ref([
@@ -279,6 +282,16 @@
     type = "rainwater_pipeline_quality";
     dialogConfig.RefName = "jiancefenxiGWFX";
   }
+  if (type == "outlet_water_level_city") {
+    type = "outlet_water_level";
+  }
+  if (type == "rainwater_pipeline_quality_city") {
+    type = "rainwater_pipeline_quality";
+  }
+  if (type == "sewage_pipeline_quality_city") {
+    type = "sewage_pipeline_quality";
+  }
+
   let params = {
     dataCode: type,
     scene: specificFun(type) || "basis_monitor",
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index ab2e36e..2003971 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -804,6 +804,11 @@
           AllData.RightShow = true;
         }
       }
+      // 排口水质/流量
+      if (Row.properties.pointType == "outlet_quality" || "outlet_water_level") {
+        // 定位雨水系统二级菜单下右侧排口信息echarts列表
+        bus.emit("SZEchartsScrollTop", Row.properties);
+      }
     }
     // }
   }
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
index fea3dc3..4453800 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
@@ -4,311 +4,324 @@
       <div class="leve2Title flex flex-justcontent-spacebetween">
         <div>历史水质</div>
         <div>
-              <el-select
-      v-model="AllData.selectmodel"
-      placeholder="请选择湖泊"
-      style="width: 90px;position: relative;margin-bottom: 5px;"
-      filterable
-      size="small"
-      placement="bottom"
-      @change="selectchange"
-    >
-
-      <el-option v-for="(item) in AllData.filterList" :key="item.lakerId" :label="item.lakerName" :value="item.lakerId">
-      </el-option>
-    </el-select>
+          <el-select
+            v-model="AllData.selectmodel"
+            placeholder="请选择湖泊"
+            style="width: 90px; position: relative; margin-bottom: 5px"
+            filterable
+            size="small"
+            placement="bottom"
+            @change="selectchange"
+          >
+            <el-option
+              v-for="item in AllData.filterList"
+              :key="item.lakerId"
+              :label="item.lakerName"
+              :value="item.lakerId"
+            >
+            </el-option>
+          </el-select>
         </div>
       </div>
       <div id="history">
-      <HistorySZChart :echartData="AllData.szHistoryData" :refresh="AllData.szHistoryrefresh"/>
-
+        <HistorySZChart
+          :echartData="AllData.szHistoryData"
+          :refresh="AllData.szHistoryrefresh"
+        />
       </div>
     </div>
-    <el-tabs v-model="AllData.activeName" class="demo-tabs" @tab-click="handleClick" stretch>
-    <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
-    <el-tab-pane label="排口" name="PK"></el-tab-pane>
-  </el-tabs>
-  <div class="chartsbox" v-if="AllData.activeName=='GQ'">
-        <div class="eachLake" v-for="(item) in AllData.allSZ" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <ShuiZhicharts
+    <el-tabs
+      v-model="AllData.activeName"
+      class="demo-tabs"
+      @tab-click="handleClick"
+      stretch
+    >
+      <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
+      <el-tab-pane label="排口" name="PK"></el-tab-pane>
+    </el-tabs>
+    <div class="chartsbox" v-if="AllData.activeName == 'GQ'" ref="scrollContainer">
+      <div class="eachLake" v-for="item in AllData.allSZ" :key="item.stCode">
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <ShuiZhicharts
               :data="item.chartInfo"
               :refresh="item.chartInfo.refresh"
             ></ShuiZhicharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length == 0">
+        暂无数据
+      </div>
     </div>
-     <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length==0">
-    暂无数据
-  </div>
-  </div>
 
-  <div class="chartsbox" v-if="AllData.activeName=='PK'">
-        <div class="eachLake" v-for="(item) in AllData.allPK" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <Paikoucharts 
-          :refresh="item.chartInfo.refresh"
-          :XAxis="item.chartInfo.XAxis"
-          :YAxis="item.chartInfo.YAxis"
-          :yAxisarr="item.chartInfo.yAxisarr"
-        >
-        </Paikoucharts>
+    <div class="chartsbox" v-if="AllData.activeName == 'PK'" ref="scrollContainer">
+      <div
+        class="eachLake"
+        ref="PKeachLake"
+        v-for="item in AllData.allPK"
+        :key="item.stCode"
+      >
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <Paikoucharts
+              :refresh="item.chartInfo.refresh"
+              :XAxis="item.chartInfo.XAxis"
+              :YAxis="item.chartInfo.YAxis"
+              :yAxisarr="item.chartInfo.yAxisarr"
+            >
+            </Paikoucharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allPK.length == 0">
+        暂无数据
+      </div>
     </div>
-        <div class="flex flex-justcontent-center"   v-if="AllData.allPK.length==0">
-    暂无数据
-
-  </div>
-  </div>
-
-
   </div>
 </template>
 
 <script setup name="YSIndex_right2">
-import { ref, reactive, toRefs, onMounted } from 'vue';
-import { getWaterQualityEchart,riverQualityGetHistory } from '@/api/MonitorAssetsOnMap';
+import { ref, reactive, toRefs, onMounted, nextTick } from "vue";
+import { getWaterQualityEchart, riverQualityGetHistory } from "@/api/MonitorAssetsOnMap";
 import ShuiZhicharts from "./components/ShuiZhicharts.vue";
 import Paikoucharts from "./components/Paikoucharts.vue";
 import HistorySZChart from "./components/HistorySZChart.vue";
+import bus from "@/bus";
 
 const props = defineProps({
   //分区编号
   waterRegionCode: {
     type: [String],
-    default: '',
+    default: "",
   },
-
 });
 const AllData = reactive({
-  selectmodel:'',
-  filterList:[],
-  activeName:'',
-  GQdata:[],
-  PKdata:[],
-  allSZ:[],
-  allPK:[],
-  szHistoryData:[],
-  szHistoryrefresh:[],
-
+  selectmodel: "",
+  filterList: [],
+  activeName: "",
+  GQdata: [],
+  PKdata: [],
+  allSZ: [],
+  allPK: [],
+  szHistoryData: [],
+  szHistoryrefresh: [],
 });
-
+const scrollContainer = ref(null);
+const PKeachLake = ref(null);
 watch(
   () => props.waterRegionCode,
-  val => {
-    console.log('YSIndex_right2:分区编号变了2', val);
+  (val) => {
+    console.log("YSIndex_right2:分区编号变了2", val);
     // debugger
-    if(val){
+    if (val) {
       getHistoryData();
       getData();
-
     }
-
   },
   { immediate: true, deep: true }
 );
 function selectchange(value) {
-  console.log('value',value);
-  AllData.filterList.map((e)=>{
-    if(e.lakerId==value){
-              AllData.szHistoryData=e
+  console.log("value", value);
+  AllData.filterList.map((e) => {
+    if (e.lakerId == value) {
+      AllData.szHistoryData = e;
 
-      AllData.szHistoryrefresh=Math.random()
+      AllData.szHistoryrefresh = Math.random();
     }
-  })
-
+  });
 }
-function handleClick(e){
-  console.log('e',e.props.name);
-  console.log('AllData.activeName',AllData.activeName);
-  if(e.props.name=='GQ'){
-    chuliDataFunGQ()
-  }else {
-    chuliDataFunPK()
-
+function handleClick(e) {
+  console.log("e", e.props.name);
+  console.log("AllData.activeName", AllData.activeName);
+  if (e.props.name == "GQ") {
+    chuliDataFunGQ();
+  } else {
+    chuliDataFunPK();
   }
 }
-function getHistoryData(){
-  let params={
-    waterRegionCode:props.waterRegionCode,
+function getHistoryData() {
+  let params = {
+    waterRegionCode: props.waterRegionCode,
     // lakerId:5,
+  };
+  riverQualityGetHistory(params).then((res) => {
+    console.log("水质历史数据", res);
+    if (res.code == 200) {
+      AllData.filterList = res.data;
+      if (res.data?.length > 0) {
+        AllData.selectmodel = res.data[0].lakerId;
 
-  }
-  riverQualityGetHistory(params).then(res=>{
-    console.log('水质历史数据',res);
-      if(res.code==200){
-
-      AllData.filterList=res.data
-      if(res.data?.length>0){
-      AllData.selectmodel=res.data[0].lakerId
-
-        AllData.szHistoryData=res.data[0]
-      AllData.szHistoryrefresh=Math.random()
+        AllData.szHistoryData = res.data[0];
+        AllData.szHistoryrefresh = Math.random();
       }
-
-      }
-  })
-}
-function getData(){
-    getWaterQualityEchart(props.waterRegionCode).then(res=>{
-
-      console.log('水质',res);
-    if(res.code==200){
-      AllData.GQdata=res.data.portChannelDataList
-      AllData.PKdata=res.data.outletDataList
-      if(AllData.GQdata.length>0){
-        AllData.activeName='GQ'
-      chuliDataFunGQ()
-      return
-      }else if(AllData.PKdata.length>0) {
-        AllData.activeName='PK'
-      chuliDataFunPK()
-      return
-      }else {
-         AllData.activeName='GQ'
-      chuliDataFunGQ()
-      }
-
-      
     }
-  })
+  });
 }
-function chuliDataFunGQ(){
-         let arr=[]
-       let data=AllData.GQdata
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-            name:'',
-            XAxis:[],
-            nh4n:[],
-            DO:[],
-            codcr:[],
-            cond:[],
-            ph:[],
-            marklineObj:{
-            nh4n:'',
-            DO:'',
-            codcr:'',
-            cond:'',
-            ph:'',
-       },
-            refresh:1
-          }
-        }
-        let at=obj.chartInfo
-       at.XAxis = e.siteEchartDto.times;
-        if(e.targetQuality==1){
-          at.marklineObj.nh4n=0.15
-          at.marklineObj.DO=7.5
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==2){
-           at.marklineObj.nh4n=0.5
-          at.marklineObj.DO=6
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==3){
-           at.marklineObj.nh4n=1
-          at.marklineObj.DO=5
-          at.marklineObj.codcr=20
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==4){
-           at.marklineObj.nh4n=1.5
-          at.marklineObj.DO=3
-          at.marklineObj.codcr=30
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==5){
-           at.marklineObj.nh4n=2
-          at.marklineObj.DO=2
-          at.marklineObj.codcr=40
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }
-        e.siteEchartDto.datas.forEach((j) => {
-          
-        switch (j.dataKey) {
-          case "nh4n":
-            at.nh4n = j.datas;
-            break;
-          case "DO":
-            at.DO = j.datas;
-            break;
-          case "codcr":
-            at.codcr = j.datas;
-            break;
-          case "cond":
-            at.cond = j.datas;
-            break;
-            case "ph":
-            at.ph = j.datas;
-            break;
-        }
-      });
-      if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
+function getData() {
+  getWaterQualityEchart(props.waterRegionCode).then((res) => {
+    console.log("水质", res);
+    if (res.code == 200) {
+      AllData.GQdata = res.data.portChannelDataList;
+      AllData.PKdata = res.data.outletDataList;
+      if (AllData.GQdata.length > 0) {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
+        return;
+      } else if (AllData.PKdata.length > 0) {
+        AllData.activeName = "PK";
+        chuliDataFunPK();
+        return;
+      } else {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
       }
-      
-       obj.chartInfo.refresh =Math.random()
-      
-       })
-      AllData.allSZ=arr
-      console.log('AllData.allSZ',AllData.allSZ);
+    }
+  });
 }
-function chuliDataFunPK(){
-    let arr=[]
-       let data=AllData.PKdata
-       console.log('dataPK',data);
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-              refresh: 1,
-  DataName: '',
-  XAxis: [],
-  typeName: '',
-  YAxis: [0, 1, 6, 3, 4],
-  loading: false,
-  yAxisarr: [
+function chuliDataFunGQ() {
+  let arr = [];
+  let data = AllData.GQdata;
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        name: "",
+        XAxis: [],
+        nh4n: [],
+        DO: [],
+        codcr: [],
+        cond: [],
+        ph: [],
+        marklineObj: {
+          nh4n: "",
+          DO: "",
+          codcr: "",
+          cond: "",
+          ph: "",
+        },
+        refresh: 1,
+      },
+    };
+    let at = obj.chartInfo;
+    at.XAxis = e.siteEchartDto.times;
+    if (e.targetQuality == 1) {
+      at.marklineObj.nh4n = 0.15;
+      at.marklineObj.DO = 7.5;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 2) {
+      at.marklineObj.nh4n = 0.5;
+      at.marklineObj.DO = 6;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 3) {
+      at.marklineObj.nh4n = 1;
+      at.marklineObj.DO = 5;
+      at.marklineObj.codcr = 20;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 4) {
+      at.marklineObj.nh4n = 1.5;
+      at.marklineObj.DO = 3;
+      at.marklineObj.codcr = 30;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 5) {
+      at.marklineObj.nh4n = 2;
+      at.marklineObj.DO = 2;
+      at.marklineObj.codcr = 40;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    }
+    e.siteEchartDto.datas.forEach((j) => {
+      switch (j.dataKey) {
+        case "nh4n":
+          at.nh4n = j.datas;
+          break;
+        case "DO":
+          at.DO = j.datas;
+          break;
+        case "codcr":
+          at.codcr = j.datas;
+          break;
+        case "cond":
+          at.cond = j.datas;
+          break;
+        case "ph":
+          at.ph = j.datas;
+          break;
+      }
+    });
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
 
-  ],
-  marklinearr: [
-
-  ],
-          }
-        }
-        let at=obj.chartInfo
-         e.siteEchartDto.datas.map(item => {
+    obj.chartInfo.refresh = Math.random();
+  });
+  AllData.allSZ = arr;
+  console.log("AllData.allSZ", AllData.allSZ);
+}
+function chuliDataFunPK() {
+  let arr = [];
+  let data = AllData.PKdata;
+  console.log("dataPK", data);
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        refresh: 1,
+        DataName: "",
+        XAxis: [],
+        typeName: "",
+        YAxis: [0, 1, 6, 3, 4],
+        loading: false,
+        yAxisarr: [],
+        marklinearr: [],
+      },
+    };
+    let at = obj.chartInfo;
+    e.siteEchartDto.datas.map((item) => {
       at.marklinearr.push(...item.cordonLineList);
     });
-       at.XAxis = e.siteEchartDto.times;
-        at.yAxisarr = e.siteEchartDto.datas;
-              if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
-      }
-       at.refresh =Math.random()
-
-       })
-       console.log('arrPK',arr);
-          AllData.allPK=arr
+    at.XAxis = e.siteEchartDto.times;
+    at.yAxisarr = e.siteEchartDto.datas;
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
+    at.refresh = Math.random();
+  });
+  console.log("arrPK", arr);
+  AllData.allPK = arr;
 }
+// 通过name去定位到某一个echarts
+const SZEchartsScrollTop = (item) => {
+  AllData.activeName = "PK";
+  chuliDataFunPK();
+  nextTick(() => {
+    //  获取一个单位的echart元素高度
+    let EchartsHeight = PKeachLake.value[0].offsetHeight;
+    // 获取当前站点名称在所有数据中的索引
+    var index = AllData.allPK.findIndex(function (element) {
+      return element.stName == item.name;
+    });
+    scrollContainer.value.scrollTop = index * EchartsHeight;
+  });
+};
 onMounted(() => {
+  bus.on("SZEchartsScrollTop", SZEchartsScrollTop);
+});
+
+onBeforeUnmount(() => {
+  bus.off("SZEchartsScrollTop");
 });
 </script>
 
@@ -316,12 +329,12 @@
 #YSIndex_right2 {
   width: 100%;
   height: 100%;
-  
-  .historySZ{
+
+  .historySZ {
     height: calc((100% - 30px) / 3);
-    
   }
-  #Charts,#history {
+  #Charts,
+  #history {
     width: calc(100% - 10px);
 
     height: calc(100% - 32px);
@@ -331,12 +344,10 @@
     overflow-y: auto;
   }
   .eachLake {
-height: calc((100% - 30px) / 2);
+    height: calc((100% - 30px) / 2);
   }
-  :deep(.el-select .el-input__inner){
+  :deep(.el-select .el-input__inner) {
     color: #fff;
-    
   }
-
 }
 </style>

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5823b2f..4b84aaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -92,7 +92,9 @@
   "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
   "rain", // 雨量站
   "rainwater_pipeline_quality", // 雨水管网水质
+  "rainwater_pipeline_quality_city", // 雨水管网水质
   "sewage_pipeline_quality", // 污水管网水质
+  "sewage_pipeline_quality_city", // 污水管网水质
   "rainwater_pipeline_quality_area", // 接驳口
   "rainwater_pipeline_water_level", // 雨水管网液位
   "reservoir_water_level", //水库水位
@@ -101,6 +103,7 @@
   "sewageStation", //污水厂
   "gateStation", //闸门
   "pump_water_level", //泵站液位
+  "outlet_water_level_city", //排口流量
 ]);
 // 基本数据
 const arrid = ref([
@@ -279,6 +282,16 @@
     type = "rainwater_pipeline_quality";
     dialogConfig.RefName = "jiancefenxiGWFX";
   }
+  if (type == "outlet_water_level_city") {
+    type = "outlet_water_level";
+  }
+  if (type == "rainwater_pipeline_quality_city") {
+    type = "rainwater_pipeline_quality";
+  }
+  if (type == "sewage_pipeline_quality_city") {
+    type = "sewage_pipeline_quality";
+  }
+
   let params = {
     dataCode: type,
     scene: specificFun(type) || "basis_monitor",
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index ab2e36e..2003971 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -804,6 +804,11 @@
           AllData.RightShow = true;
         }
       }
+      // 排口水质/流量
+      if (Row.properties.pointType == "outlet_quality" || "outlet_water_level") {
+        // 定位雨水系统二级菜单下右侧排口信息echarts列表
+        bus.emit("SZEchartsScrollTop", Row.properties);
+      }
     }
     // }
   }
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
index fea3dc3..4453800 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
@@ -4,311 +4,324 @@
       <div class="leve2Title flex flex-justcontent-spacebetween">
         <div>历史水质</div>
         <div>
-              <el-select
-      v-model="AllData.selectmodel"
-      placeholder="请选择湖泊"
-      style="width: 90px;position: relative;margin-bottom: 5px;"
-      filterable
-      size="small"
-      placement="bottom"
-      @change="selectchange"
-    >
-
-      <el-option v-for="(item) in AllData.filterList" :key="item.lakerId" :label="item.lakerName" :value="item.lakerId">
-      </el-option>
-    </el-select>
+          <el-select
+            v-model="AllData.selectmodel"
+            placeholder="请选择湖泊"
+            style="width: 90px; position: relative; margin-bottom: 5px"
+            filterable
+            size="small"
+            placement="bottom"
+            @change="selectchange"
+          >
+            <el-option
+              v-for="item in AllData.filterList"
+              :key="item.lakerId"
+              :label="item.lakerName"
+              :value="item.lakerId"
+            >
+            </el-option>
+          </el-select>
         </div>
       </div>
       <div id="history">
-      <HistorySZChart :echartData="AllData.szHistoryData" :refresh="AllData.szHistoryrefresh"/>
-
+        <HistorySZChart
+          :echartData="AllData.szHistoryData"
+          :refresh="AllData.szHistoryrefresh"
+        />
       </div>
     </div>
-    <el-tabs v-model="AllData.activeName" class="demo-tabs" @tab-click="handleClick" stretch>
-    <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
-    <el-tab-pane label="排口" name="PK"></el-tab-pane>
-  </el-tabs>
-  <div class="chartsbox" v-if="AllData.activeName=='GQ'">
-        <div class="eachLake" v-for="(item) in AllData.allSZ" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <ShuiZhicharts
+    <el-tabs
+      v-model="AllData.activeName"
+      class="demo-tabs"
+      @tab-click="handleClick"
+      stretch
+    >
+      <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
+      <el-tab-pane label="排口" name="PK"></el-tab-pane>
+    </el-tabs>
+    <div class="chartsbox" v-if="AllData.activeName == 'GQ'" ref="scrollContainer">
+      <div class="eachLake" v-for="item in AllData.allSZ" :key="item.stCode">
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <ShuiZhicharts
               :data="item.chartInfo"
               :refresh="item.chartInfo.refresh"
             ></ShuiZhicharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length == 0">
+        暂无数据
+      </div>
     </div>
-     <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length==0">
-    暂无数据
-  </div>
-  </div>
 
-  <div class="chartsbox" v-if="AllData.activeName=='PK'">
-        <div class="eachLake" v-for="(item) in AllData.allPK" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <Paikoucharts 
-          :refresh="item.chartInfo.refresh"
-          :XAxis="item.chartInfo.XAxis"
-          :YAxis="item.chartInfo.YAxis"
-          :yAxisarr="item.chartInfo.yAxisarr"
-        >
-        </Paikoucharts>
+    <div class="chartsbox" v-if="AllData.activeName == 'PK'" ref="scrollContainer">
+      <div
+        class="eachLake"
+        ref="PKeachLake"
+        v-for="item in AllData.allPK"
+        :key="item.stCode"
+      >
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <Paikoucharts
+              :refresh="item.chartInfo.refresh"
+              :XAxis="item.chartInfo.XAxis"
+              :YAxis="item.chartInfo.YAxis"
+              :yAxisarr="item.chartInfo.yAxisarr"
+            >
+            </Paikoucharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allPK.length == 0">
+        暂无数据
+      </div>
     </div>
-        <div class="flex flex-justcontent-center"   v-if="AllData.allPK.length==0">
-    暂无数据
-
-  </div>
-  </div>
-
-
   </div>
 </template>
 
 <script setup name="YSIndex_right2">
-import { ref, reactive, toRefs, onMounted } from 'vue';
-import { getWaterQualityEchart,riverQualityGetHistory } from '@/api/MonitorAssetsOnMap';
+import { ref, reactive, toRefs, onMounted, nextTick } from "vue";
+import { getWaterQualityEchart, riverQualityGetHistory } from "@/api/MonitorAssetsOnMap";
 import ShuiZhicharts from "./components/ShuiZhicharts.vue";
 import Paikoucharts from "./components/Paikoucharts.vue";
 import HistorySZChart from "./components/HistorySZChart.vue";
+import bus from "@/bus";
 
 const props = defineProps({
   //分区编号
   waterRegionCode: {
     type: [String],
-    default: '',
+    default: "",
   },
-
 });
 const AllData = reactive({
-  selectmodel:'',
-  filterList:[],
-  activeName:'',
-  GQdata:[],
-  PKdata:[],
-  allSZ:[],
-  allPK:[],
-  szHistoryData:[],
-  szHistoryrefresh:[],
-
+  selectmodel: "",
+  filterList: [],
+  activeName: "",
+  GQdata: [],
+  PKdata: [],
+  allSZ: [],
+  allPK: [],
+  szHistoryData: [],
+  szHistoryrefresh: [],
 });
-
+const scrollContainer = ref(null);
+const PKeachLake = ref(null);
 watch(
   () => props.waterRegionCode,
-  val => {
-    console.log('YSIndex_right2:分区编号变了2', val);
+  (val) => {
+    console.log("YSIndex_right2:分区编号变了2", val);
     // debugger
-    if(val){
+    if (val) {
       getHistoryData();
       getData();
-
     }
-
   },
   { immediate: true, deep: true }
 );
 function selectchange(value) {
-  console.log('value',value);
-  AllData.filterList.map((e)=>{
-    if(e.lakerId==value){
-              AllData.szHistoryData=e
+  console.log("value", value);
+  AllData.filterList.map((e) => {
+    if (e.lakerId == value) {
+      AllData.szHistoryData = e;
 
-      AllData.szHistoryrefresh=Math.random()
+      AllData.szHistoryrefresh = Math.random();
     }
-  })
-
+  });
 }
-function handleClick(e){
-  console.log('e',e.props.name);
-  console.log('AllData.activeName',AllData.activeName);
-  if(e.props.name=='GQ'){
-    chuliDataFunGQ()
-  }else {
-    chuliDataFunPK()
-
+function handleClick(e) {
+  console.log("e", e.props.name);
+  console.log("AllData.activeName", AllData.activeName);
+  if (e.props.name == "GQ") {
+    chuliDataFunGQ();
+  } else {
+    chuliDataFunPK();
   }
 }
-function getHistoryData(){
-  let params={
-    waterRegionCode:props.waterRegionCode,
+function getHistoryData() {
+  let params = {
+    waterRegionCode: props.waterRegionCode,
     // lakerId:5,
+  };
+  riverQualityGetHistory(params).then((res) => {
+    console.log("水质历史数据", res);
+    if (res.code == 200) {
+      AllData.filterList = res.data;
+      if (res.data?.length > 0) {
+        AllData.selectmodel = res.data[0].lakerId;
 
-  }
-  riverQualityGetHistory(params).then(res=>{
-    console.log('水质历史数据',res);
-      if(res.code==200){
-
-      AllData.filterList=res.data
-      if(res.data?.length>0){
-      AllData.selectmodel=res.data[0].lakerId
-
-        AllData.szHistoryData=res.data[0]
-      AllData.szHistoryrefresh=Math.random()
+        AllData.szHistoryData = res.data[0];
+        AllData.szHistoryrefresh = Math.random();
       }
-
-      }
-  })
-}
-function getData(){
-    getWaterQualityEchart(props.waterRegionCode).then(res=>{
-
-      console.log('水质',res);
-    if(res.code==200){
-      AllData.GQdata=res.data.portChannelDataList
-      AllData.PKdata=res.data.outletDataList
-      if(AllData.GQdata.length>0){
-        AllData.activeName='GQ'
-      chuliDataFunGQ()
-      return
-      }else if(AllData.PKdata.length>0) {
-        AllData.activeName='PK'
-      chuliDataFunPK()
-      return
-      }else {
-         AllData.activeName='GQ'
-      chuliDataFunGQ()
-      }
-
-      
     }
-  })
+  });
 }
-function chuliDataFunGQ(){
-         let arr=[]
-       let data=AllData.GQdata
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-            name:'',
-            XAxis:[],
-            nh4n:[],
-            DO:[],
-            codcr:[],
-            cond:[],
-            ph:[],
-            marklineObj:{
-            nh4n:'',
-            DO:'',
-            codcr:'',
-            cond:'',
-            ph:'',
-       },
-            refresh:1
-          }
-        }
-        let at=obj.chartInfo
-       at.XAxis = e.siteEchartDto.times;
-        if(e.targetQuality==1){
-          at.marklineObj.nh4n=0.15
-          at.marklineObj.DO=7.5
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==2){
-           at.marklineObj.nh4n=0.5
-          at.marklineObj.DO=6
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==3){
-           at.marklineObj.nh4n=1
-          at.marklineObj.DO=5
-          at.marklineObj.codcr=20
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==4){
-           at.marklineObj.nh4n=1.5
-          at.marklineObj.DO=3
-          at.marklineObj.codcr=30
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==5){
-           at.marklineObj.nh4n=2
-          at.marklineObj.DO=2
-          at.marklineObj.codcr=40
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }
-        e.siteEchartDto.datas.forEach((j) => {
-          
-        switch (j.dataKey) {
-          case "nh4n":
-            at.nh4n = j.datas;
-            break;
-          case "DO":
-            at.DO = j.datas;
-            break;
-          case "codcr":
-            at.codcr = j.datas;
-            break;
-          case "cond":
-            at.cond = j.datas;
-            break;
-            case "ph":
-            at.ph = j.datas;
-            break;
-        }
-      });
-      if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
+function getData() {
+  getWaterQualityEchart(props.waterRegionCode).then((res) => {
+    console.log("水质", res);
+    if (res.code == 200) {
+      AllData.GQdata = res.data.portChannelDataList;
+      AllData.PKdata = res.data.outletDataList;
+      if (AllData.GQdata.length > 0) {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
+        return;
+      } else if (AllData.PKdata.length > 0) {
+        AllData.activeName = "PK";
+        chuliDataFunPK();
+        return;
+      } else {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
       }
-      
-       obj.chartInfo.refresh =Math.random()
-      
-       })
-      AllData.allSZ=arr
-      console.log('AllData.allSZ',AllData.allSZ);
+    }
+  });
 }
-function chuliDataFunPK(){
-    let arr=[]
-       let data=AllData.PKdata
-       console.log('dataPK',data);
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-              refresh: 1,
-  DataName: '',
-  XAxis: [],
-  typeName: '',
-  YAxis: [0, 1, 6, 3, 4],
-  loading: false,
-  yAxisarr: [
+function chuliDataFunGQ() {
+  let arr = [];
+  let data = AllData.GQdata;
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        name: "",
+        XAxis: [],
+        nh4n: [],
+        DO: [],
+        codcr: [],
+        cond: [],
+        ph: [],
+        marklineObj: {
+          nh4n: "",
+          DO: "",
+          codcr: "",
+          cond: "",
+          ph: "",
+        },
+        refresh: 1,
+      },
+    };
+    let at = obj.chartInfo;
+    at.XAxis = e.siteEchartDto.times;
+    if (e.targetQuality == 1) {
+      at.marklineObj.nh4n = 0.15;
+      at.marklineObj.DO = 7.5;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 2) {
+      at.marklineObj.nh4n = 0.5;
+      at.marklineObj.DO = 6;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 3) {
+      at.marklineObj.nh4n = 1;
+      at.marklineObj.DO = 5;
+      at.marklineObj.codcr = 20;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 4) {
+      at.marklineObj.nh4n = 1.5;
+      at.marklineObj.DO = 3;
+      at.marklineObj.codcr = 30;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 5) {
+      at.marklineObj.nh4n = 2;
+      at.marklineObj.DO = 2;
+      at.marklineObj.codcr = 40;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    }
+    e.siteEchartDto.datas.forEach((j) => {
+      switch (j.dataKey) {
+        case "nh4n":
+          at.nh4n = j.datas;
+          break;
+        case "DO":
+          at.DO = j.datas;
+          break;
+        case "codcr":
+          at.codcr = j.datas;
+          break;
+        case "cond":
+          at.cond = j.datas;
+          break;
+        case "ph":
+          at.ph = j.datas;
+          break;
+      }
+    });
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
 
-  ],
-  marklinearr: [
-
-  ],
-          }
-        }
-        let at=obj.chartInfo
-         e.siteEchartDto.datas.map(item => {
+    obj.chartInfo.refresh = Math.random();
+  });
+  AllData.allSZ = arr;
+  console.log("AllData.allSZ", AllData.allSZ);
+}
+function chuliDataFunPK() {
+  let arr = [];
+  let data = AllData.PKdata;
+  console.log("dataPK", data);
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        refresh: 1,
+        DataName: "",
+        XAxis: [],
+        typeName: "",
+        YAxis: [0, 1, 6, 3, 4],
+        loading: false,
+        yAxisarr: [],
+        marklinearr: [],
+      },
+    };
+    let at = obj.chartInfo;
+    e.siteEchartDto.datas.map((item) => {
       at.marklinearr.push(...item.cordonLineList);
     });
-       at.XAxis = e.siteEchartDto.times;
-        at.yAxisarr = e.siteEchartDto.datas;
-              if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
-      }
-       at.refresh =Math.random()
-
-       })
-       console.log('arrPK',arr);
-          AllData.allPK=arr
+    at.XAxis = e.siteEchartDto.times;
+    at.yAxisarr = e.siteEchartDto.datas;
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
+    at.refresh = Math.random();
+  });
+  console.log("arrPK", arr);
+  AllData.allPK = arr;
 }
+// 通过name去定位到某一个echarts
+const SZEchartsScrollTop = (item) => {
+  AllData.activeName = "PK";
+  chuliDataFunPK();
+  nextTick(() => {
+    //  获取一个单位的echart元素高度
+    let EchartsHeight = PKeachLake.value[0].offsetHeight;
+    // 获取当前站点名称在所有数据中的索引
+    var index = AllData.allPK.findIndex(function (element) {
+      return element.stName == item.name;
+    });
+    scrollContainer.value.scrollTop = index * EchartsHeight;
+  });
+};
 onMounted(() => {
+  bus.on("SZEchartsScrollTop", SZEchartsScrollTop);
+});
+
+onBeforeUnmount(() => {
+  bus.off("SZEchartsScrollTop");
 });
 </script>
 
@@ -316,12 +329,12 @@
 #YSIndex_right2 {
   width: 100%;
   height: 100%;
-  
-  .historySZ{
+
+  .historySZ {
     height: calc((100% - 30px) / 3);
-    
   }
-  #Charts,#history {
+  #Charts,
+  #history {
     width: calc(100% - 10px);
 
     height: calc(100% - 32px);
@@ -331,12 +344,10 @@
     overflow-y: auto;
   }
   .eachLake {
-height: calc((100% - 30px) / 2);
+    height: calc((100% - 30px) / 2);
   }
-  :deep(.el-select .el-input__inner){
+  :deep(.el-select .el-input__inner) {
     color: #fff;
-    
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
index c48ca1e..7185eb7 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
@@ -8,8 +8,8 @@
 const id = guid();
 const myChart = shallowRef("");
 import * as echarts from "echarts";
-import { nowSize } from '@/utils/util.js';
-import moment from 'moment';
+import { nowSize } from "@/utils/util.js";
+import moment from "moment";
 
 const props = defineProps({
   //刷新标志
@@ -45,7 +45,7 @@
 watch(
   () => props.refresh,
   (value) => {
-    console.log("???????");
+    // console.log("???????");
     //先销毁实例
     myChart.value && myChart.value.dispose();
     init();
@@ -80,7 +80,6 @@
       axisLabel: {
         show: true,
         color: "#409eff",
-
       },
       axisLine: {
         lineStyle: {
@@ -134,7 +133,7 @@
     // },
   ];
 
-  console.log("获取的Y轴的数据", props.yAxisarr);
+  // console.log("获取的Y轴的数据", props.yAxisarr);
 
   // 处理多个y轴遍历展示
   if (props.yAxisarr) {
@@ -152,7 +151,7 @@
           },
           name: p.lineName,
           yAxis: Number(p.lineValue),
-          
+
           label: {
             formatter: `${p.lineValue}-${p.lineName}`,
             color: p.lineColor,
@@ -166,7 +165,7 @@
       marklinedata.push(arr);
     });
 
-    console.log("marklinedata", marklinedata);
+    // console.log("marklinedata", marklinedata);
     props.yAxisarr.map((item, index) => {
       let obj = {
         name: item.dataName,
@@ -174,7 +173,7 @@
         axisLabel: {
           show: true,
           color: colorarr[index],
-                        formatter: function (value) {
+          formatter: function (value) {
             return value.toFixed(2); // 保留两位小数
           },
         },
@@ -249,8 +248,8 @@
     },
     tooltip: {
       trigger: "axis",
-      backgroundColor: '#004284',
-      borderColor: '#0B9BFF',
+      backgroundColor: "#004284",
+      borderColor: "#0B9BFF",
       borderRadius: 6, // 设置圆角大小
       feature: {
         mark: { show: true },
@@ -259,24 +258,23 @@
         restore: { show: true },
         saveAsImage: { show: true },
       },
-             formatter: function (params) {
-            let res = params[0].name + '<br/>';
-            params.forEach(function (item) {
-                // 对每个数据项的数值进行格式化，保留两位小数
-                 let text=   `<div class="flex flex-justcontent-spacebetween">
+      formatter: function (params) {
+        let res = params[0].name + "<br/>";
+        params.forEach(function (item) {
+          // 对每个数据项的数值进行格式化，保留两位小数
+          let text = `<div class="flex flex-justcontent-spacebetween">
                 <span>${item.marker}${item.seriesName}</span>
-                <span>${(item.value == null ? '-' : Number(item.value).toFixed(2))}</span>
-              </div>`
-                res +=text ;
-            });
-            return res;
-        },
-              textStyle: {
+                <span>${item.value == null ? "-" : Number(item.value).toFixed(2)}</span>
+              </div>`;
+          res += text;
+        });
+        return res;
+      },
+      textStyle: {
         // 字体颜色
-        color: 'white',
+        color: "white",
         // 字体大小
         fontSize: nowSize(14, 1920),
-
       },
       axisPointer: {
         type: "cross",
@@ -298,13 +296,13 @@
         type: "category",
         data: props.XAxis,
         axisLabel: {
-        color: 'rgba(255,255,255,1)',
-        fontSize: nowSize(12, 1920),
-        fontFamily: 'AlibabaPuHuiTi',
-        formatter: function (value) {
-          return moment(value).format('HH:MM');
+          color: "rgba(255,255,255,1)",
+          fontSize: nowSize(12, 1920),
+          fontFamily: "AlibabaPuHuiTi",
+          formatter: function (value) {
+            return moment(value).format("HH:MM");
+          },
         },
-      },
         axisPointer: {
           type: "shadow",
         },

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5823b2f..4b84aaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -92,7 +92,9 @@
   "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
   "rain", // 雨量站
   "rainwater_pipeline_quality", // 雨水管网水质
+  "rainwater_pipeline_quality_city", // 雨水管网水质
   "sewage_pipeline_quality", // 污水管网水质
+  "sewage_pipeline_quality_city", // 污水管网水质
   "rainwater_pipeline_quality_area", // 接驳口
   "rainwater_pipeline_water_level", // 雨水管网液位
   "reservoir_water_level", //水库水位
@@ -101,6 +103,7 @@
   "sewageStation", //污水厂
   "gateStation", //闸门
   "pump_water_level", //泵站液位
+  "outlet_water_level_city", //排口流量
 ]);
 // 基本数据
 const arrid = ref([
@@ -279,6 +282,16 @@
     type = "rainwater_pipeline_quality";
     dialogConfig.RefName = "jiancefenxiGWFX";
   }
+  if (type == "outlet_water_level_city") {
+    type = "outlet_water_level";
+  }
+  if (type == "rainwater_pipeline_quality_city") {
+    type = "rainwater_pipeline_quality";
+  }
+  if (type == "sewage_pipeline_quality_city") {
+    type = "sewage_pipeline_quality";
+  }
+
   let params = {
     dataCode: type,
     scene: specificFun(type) || "basis_monitor",
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index ab2e36e..2003971 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -804,6 +804,11 @@
           AllData.RightShow = true;
         }
       }
+      // 排口水质/流量
+      if (Row.properties.pointType == "outlet_quality" || "outlet_water_level") {
+        // 定位雨水系统二级菜单下右侧排口信息echarts列表
+        bus.emit("SZEchartsScrollTop", Row.properties);
+      }
     }
     // }
   }
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
index fea3dc3..4453800 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
@@ -4,311 +4,324 @@
       <div class="leve2Title flex flex-justcontent-spacebetween">
         <div>历史水质</div>
         <div>
-              <el-select
-      v-model="AllData.selectmodel"
-      placeholder="请选择湖泊"
-      style="width: 90px;position: relative;margin-bottom: 5px;"
-      filterable
-      size="small"
-      placement="bottom"
-      @change="selectchange"
-    >
-
-      <el-option v-for="(item) in AllData.filterList" :key="item.lakerId" :label="item.lakerName" :value="item.lakerId">
-      </el-option>
-    </el-select>
+          <el-select
+            v-model="AllData.selectmodel"
+            placeholder="请选择湖泊"
+            style="width: 90px; position: relative; margin-bottom: 5px"
+            filterable
+            size="small"
+            placement="bottom"
+            @change="selectchange"
+          >
+            <el-option
+              v-for="item in AllData.filterList"
+              :key="item.lakerId"
+              :label="item.lakerName"
+              :value="item.lakerId"
+            >
+            </el-option>
+          </el-select>
         </div>
       </div>
       <div id="history">
-      <HistorySZChart :echartData="AllData.szHistoryData" :refresh="AllData.szHistoryrefresh"/>
-
+        <HistorySZChart
+          :echartData="AllData.szHistoryData"
+          :refresh="AllData.szHistoryrefresh"
+        />
       </div>
     </div>
-    <el-tabs v-model="AllData.activeName" class="demo-tabs" @tab-click="handleClick" stretch>
-    <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
-    <el-tab-pane label="排口" name="PK"></el-tab-pane>
-  </el-tabs>
-  <div class="chartsbox" v-if="AllData.activeName=='GQ'">
-        <div class="eachLake" v-for="(item) in AllData.allSZ" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <ShuiZhicharts
+    <el-tabs
+      v-model="AllData.activeName"
+      class="demo-tabs"
+      @tab-click="handleClick"
+      stretch
+    >
+      <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
+      <el-tab-pane label="排口" name="PK"></el-tab-pane>
+    </el-tabs>
+    <div class="chartsbox" v-if="AllData.activeName == 'GQ'" ref="scrollContainer">
+      <div class="eachLake" v-for="item in AllData.allSZ" :key="item.stCode">
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <ShuiZhicharts
               :data="item.chartInfo"
               :refresh="item.chartInfo.refresh"
             ></ShuiZhicharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length == 0">
+        暂无数据
+      </div>
     </div>
-     <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length==0">
-    暂无数据
-  </div>
-  </div>
 
-  <div class="chartsbox" v-if="AllData.activeName=='PK'">
-        <div class="eachLake" v-for="(item) in AllData.allPK" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <Paikoucharts 
-          :refresh="item.chartInfo.refresh"
-          :XAxis="item.chartInfo.XAxis"
-          :YAxis="item.chartInfo.YAxis"
-          :yAxisarr="item.chartInfo.yAxisarr"
-        >
-        </Paikoucharts>
+    <div class="chartsbox" v-if="AllData.activeName == 'PK'" ref="scrollContainer">
+      <div
+        class="eachLake"
+        ref="PKeachLake"
+        v-for="item in AllData.allPK"
+        :key="item.stCode"
+      >
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <Paikoucharts
+              :refresh="item.chartInfo.refresh"
+              :XAxis="item.chartInfo.XAxis"
+              :YAxis="item.chartInfo.YAxis"
+              :yAxisarr="item.chartInfo.yAxisarr"
+            >
+            </Paikoucharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allPK.length == 0">
+        暂无数据
+      </div>
     </div>
-        <div class="flex flex-justcontent-center"   v-if="AllData.allPK.length==0">
-    暂无数据
-
-  </div>
-  </div>
-
-
   </div>
 </template>
 
 <script setup name="YSIndex_right2">
-import { ref, reactive, toRefs, onMounted } from 'vue';
-import { getWaterQualityEchart,riverQualityGetHistory } from '@/api/MonitorAssetsOnMap';
+import { ref, reactive, toRefs, onMounted, nextTick } from "vue";
+import { getWaterQualityEchart, riverQualityGetHistory } from "@/api/MonitorAssetsOnMap";
 import ShuiZhicharts from "./components/ShuiZhicharts.vue";
 import Paikoucharts from "./components/Paikoucharts.vue";
 import HistorySZChart from "./components/HistorySZChart.vue";
+import bus from "@/bus";
 
 const props = defineProps({
   //分区编号
   waterRegionCode: {
     type: [String],
-    default: '',
+    default: "",
   },
-
 });
 const AllData = reactive({
-  selectmodel:'',
-  filterList:[],
-  activeName:'',
-  GQdata:[],
-  PKdata:[],
-  allSZ:[],
-  allPK:[],
-  szHistoryData:[],
-  szHistoryrefresh:[],
-
+  selectmodel: "",
+  filterList: [],
+  activeName: "",
+  GQdata: [],
+  PKdata: [],
+  allSZ: [],
+  allPK: [],
+  szHistoryData: [],
+  szHistoryrefresh: [],
 });
-
+const scrollContainer = ref(null);
+const PKeachLake = ref(null);
 watch(
   () => props.waterRegionCode,
-  val => {
-    console.log('YSIndex_right2:分区编号变了2', val);
+  (val) => {
+    console.log("YSIndex_right2:分区编号变了2", val);
     // debugger
-    if(val){
+    if (val) {
       getHistoryData();
       getData();
-
     }
-
   },
   { immediate: true, deep: true }
 );
 function selectchange(value) {
-  console.log('value',value);
-  AllData.filterList.map((e)=>{
-    if(e.lakerId==value){
-              AllData.szHistoryData=e
+  console.log("value", value);
+  AllData.filterList.map((e) => {
+    if (e.lakerId == value) {
+      AllData.szHistoryData = e;
 
-      AllData.szHistoryrefresh=Math.random()
+      AllData.szHistoryrefresh = Math.random();
     }
-  })
-
+  });
 }
-function handleClick(e){
-  console.log('e',e.props.name);
-  console.log('AllData.activeName',AllData.activeName);
-  if(e.props.name=='GQ'){
-    chuliDataFunGQ()
-  }else {
-    chuliDataFunPK()
-
+function handleClick(e) {
+  console.log("e", e.props.name);
+  console.log("AllData.activeName", AllData.activeName);
+  if (e.props.name == "GQ") {
+    chuliDataFunGQ();
+  } else {
+    chuliDataFunPK();
   }
 }
-function getHistoryData(){
-  let params={
-    waterRegionCode:props.waterRegionCode,
+function getHistoryData() {
+  let params = {
+    waterRegionCode: props.waterRegionCode,
     // lakerId:5,
+  };
+  riverQualityGetHistory(params).then((res) => {
+    console.log("水质历史数据", res);
+    if (res.code == 200) {
+      AllData.filterList = res.data;
+      if (res.data?.length > 0) {
+        AllData.selectmodel = res.data[0].lakerId;
 
-  }
-  riverQualityGetHistory(params).then(res=>{
-    console.log('水质历史数据',res);
-      if(res.code==200){
-
-      AllData.filterList=res.data
-      if(res.data?.length>0){
-      AllData.selectmodel=res.data[0].lakerId
-
-        AllData.szHistoryData=res.data[0]
-      AllData.szHistoryrefresh=Math.random()
+        AllData.szHistoryData = res.data[0];
+        AllData.szHistoryrefresh = Math.random();
       }
-
-      }
-  })
-}
-function getData(){
-    getWaterQualityEchart(props.waterRegionCode).then(res=>{
-
-      console.log('水质',res);
-    if(res.code==200){
-      AllData.GQdata=res.data.portChannelDataList
-      AllData.PKdata=res.data.outletDataList
-      if(AllData.GQdata.length>0){
-        AllData.activeName='GQ'
-      chuliDataFunGQ()
-      return
-      }else if(AllData.PKdata.length>0) {
-        AllData.activeName='PK'
-      chuliDataFunPK()
-      return
-      }else {
-         AllData.activeName='GQ'
-      chuliDataFunGQ()
-      }
-
-      
     }
-  })
+  });
 }
-function chuliDataFunGQ(){
-         let arr=[]
-       let data=AllData.GQdata
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-            name:'',
-            XAxis:[],
-            nh4n:[],
-            DO:[],
-            codcr:[],
-            cond:[],
-            ph:[],
-            marklineObj:{
-            nh4n:'',
-            DO:'',
-            codcr:'',
-            cond:'',
-            ph:'',
-       },
-            refresh:1
-          }
-        }
-        let at=obj.chartInfo
-       at.XAxis = e.siteEchartDto.times;
-        if(e.targetQuality==1){
-          at.marklineObj.nh4n=0.15
-          at.marklineObj.DO=7.5
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==2){
-           at.marklineObj.nh4n=0.5
-          at.marklineObj.DO=6
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==3){
-           at.marklineObj.nh4n=1
-          at.marklineObj.DO=5
-          at.marklineObj.codcr=20
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==4){
-           at.marklineObj.nh4n=1.5
-          at.marklineObj.DO=3
-          at.marklineObj.codcr=30
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==5){
-           at.marklineObj.nh4n=2
-          at.marklineObj.DO=2
-          at.marklineObj.codcr=40
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }
-        e.siteEchartDto.datas.forEach((j) => {
-          
-        switch (j.dataKey) {
-          case "nh4n":
-            at.nh4n = j.datas;
-            break;
-          case "DO":
-            at.DO = j.datas;
-            break;
-          case "codcr":
-            at.codcr = j.datas;
-            break;
-          case "cond":
-            at.cond = j.datas;
-            break;
-            case "ph":
-            at.ph = j.datas;
-            break;
-        }
-      });
-      if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
+function getData() {
+  getWaterQualityEchart(props.waterRegionCode).then((res) => {
+    console.log("水质", res);
+    if (res.code == 200) {
+      AllData.GQdata = res.data.portChannelDataList;
+      AllData.PKdata = res.data.outletDataList;
+      if (AllData.GQdata.length > 0) {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
+        return;
+      } else if (AllData.PKdata.length > 0) {
+        AllData.activeName = "PK";
+        chuliDataFunPK();
+        return;
+      } else {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
       }
-      
-       obj.chartInfo.refresh =Math.random()
-      
-       })
-      AllData.allSZ=arr
-      console.log('AllData.allSZ',AllData.allSZ);
+    }
+  });
 }
-function chuliDataFunPK(){
-    let arr=[]
-       let data=AllData.PKdata
-       console.log('dataPK',data);
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-              refresh: 1,
-  DataName: '',
-  XAxis: [],
-  typeName: '',
-  YAxis: [0, 1, 6, 3, 4],
-  loading: false,
-  yAxisarr: [
+function chuliDataFunGQ() {
+  let arr = [];
+  let data = AllData.GQdata;
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        name: "",
+        XAxis: [],
+        nh4n: [],
+        DO: [],
+        codcr: [],
+        cond: [],
+        ph: [],
+        marklineObj: {
+          nh4n: "",
+          DO: "",
+          codcr: "",
+          cond: "",
+          ph: "",
+        },
+        refresh: 1,
+      },
+    };
+    let at = obj.chartInfo;
+    at.XAxis = e.siteEchartDto.times;
+    if (e.targetQuality == 1) {
+      at.marklineObj.nh4n = 0.15;
+      at.marklineObj.DO = 7.5;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 2) {
+      at.marklineObj.nh4n = 0.5;
+      at.marklineObj.DO = 6;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 3) {
+      at.marklineObj.nh4n = 1;
+      at.marklineObj.DO = 5;
+      at.marklineObj.codcr = 20;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 4) {
+      at.marklineObj.nh4n = 1.5;
+      at.marklineObj.DO = 3;
+      at.marklineObj.codcr = 30;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 5) {
+      at.marklineObj.nh4n = 2;
+      at.marklineObj.DO = 2;
+      at.marklineObj.codcr = 40;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    }
+    e.siteEchartDto.datas.forEach((j) => {
+      switch (j.dataKey) {
+        case "nh4n":
+          at.nh4n = j.datas;
+          break;
+        case "DO":
+          at.DO = j.datas;
+          break;
+        case "codcr":
+          at.codcr = j.datas;
+          break;
+        case "cond":
+          at.cond = j.datas;
+          break;
+        case "ph":
+          at.ph = j.datas;
+          break;
+      }
+    });
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
 
-  ],
-  marklinearr: [
-
-  ],
-          }
-        }
-        let at=obj.chartInfo
-         e.siteEchartDto.datas.map(item => {
+    obj.chartInfo.refresh = Math.random();
+  });
+  AllData.allSZ = arr;
+  console.log("AllData.allSZ", AllData.allSZ);
+}
+function chuliDataFunPK() {
+  let arr = [];
+  let data = AllData.PKdata;
+  console.log("dataPK", data);
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        refresh: 1,
+        DataName: "",
+        XAxis: [],
+        typeName: "",
+        YAxis: [0, 1, 6, 3, 4],
+        loading: false,
+        yAxisarr: [],
+        marklinearr: [],
+      },
+    };
+    let at = obj.chartInfo;
+    e.siteEchartDto.datas.map((item) => {
       at.marklinearr.push(...item.cordonLineList);
     });
-       at.XAxis = e.siteEchartDto.times;
-        at.yAxisarr = e.siteEchartDto.datas;
-              if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
-      }
-       at.refresh =Math.random()
-
-       })
-       console.log('arrPK',arr);
-          AllData.allPK=arr
+    at.XAxis = e.siteEchartDto.times;
+    at.yAxisarr = e.siteEchartDto.datas;
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
+    at.refresh = Math.random();
+  });
+  console.log("arrPK", arr);
+  AllData.allPK = arr;
 }
+// 通过name去定位到某一个echarts
+const SZEchartsScrollTop = (item) => {
+  AllData.activeName = "PK";
+  chuliDataFunPK();
+  nextTick(() => {
+    //  获取一个单位的echart元素高度
+    let EchartsHeight = PKeachLake.value[0].offsetHeight;
+    // 获取当前站点名称在所有数据中的索引
+    var index = AllData.allPK.findIndex(function (element) {
+      return element.stName == item.name;
+    });
+    scrollContainer.value.scrollTop = index * EchartsHeight;
+  });
+};
 onMounted(() => {
+  bus.on("SZEchartsScrollTop", SZEchartsScrollTop);
+});
+
+onBeforeUnmount(() => {
+  bus.off("SZEchartsScrollTop");
 });
 </script>
 
@@ -316,12 +329,12 @@
 #YSIndex_right2 {
   width: 100%;
   height: 100%;
-  
-  .historySZ{
+
+  .historySZ {
     height: calc((100% - 30px) / 3);
-    
   }
-  #Charts,#history {
+  #Charts,
+  #history {
     width: calc(100% - 10px);
 
     height: calc(100% - 32px);
@@ -331,12 +344,10 @@
     overflow-y: auto;
   }
   .eachLake {
-height: calc((100% - 30px) / 2);
+    height: calc((100% - 30px) / 2);
   }
-  :deep(.el-select .el-input__inner){
+  :deep(.el-select .el-input__inner) {
     color: #fff;
-    
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
index c48ca1e..7185eb7 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
@@ -8,8 +8,8 @@
 const id = guid();
 const myChart = shallowRef("");
 import * as echarts from "echarts";
-import { nowSize } from '@/utils/util.js';
-import moment from 'moment';
+import { nowSize } from "@/utils/util.js";
+import moment from "moment";
 
 const props = defineProps({
   //刷新标志
@@ -45,7 +45,7 @@
 watch(
   () => props.refresh,
   (value) => {
-    console.log("???????");
+    // console.log("???????");
     //先销毁实例
     myChart.value && myChart.value.dispose();
     init();
@@ -80,7 +80,6 @@
       axisLabel: {
         show: true,
         color: "#409eff",
-
       },
       axisLine: {
         lineStyle: {
@@ -134,7 +133,7 @@
     // },
   ];
 
-  console.log("获取的Y轴的数据", props.yAxisarr);
+  // console.log("获取的Y轴的数据", props.yAxisarr);
 
   // 处理多个y轴遍历展示
   if (props.yAxisarr) {
@@ -152,7 +151,7 @@
           },
           name: p.lineName,
           yAxis: Number(p.lineValue),
-          
+
           label: {
             formatter: `${p.lineValue}-${p.lineName}`,
             color: p.lineColor,
@@ -166,7 +165,7 @@
       marklinedata.push(arr);
     });
 
-    console.log("marklinedata", marklinedata);
+    // console.log("marklinedata", marklinedata);
     props.yAxisarr.map((item, index) => {
       let obj = {
         name: item.dataName,
@@ -174,7 +173,7 @@
         axisLabel: {
           show: true,
           color: colorarr[index],
-                        formatter: function (value) {
+          formatter: function (value) {
             return value.toFixed(2); // 保留两位小数
           },
         },
@@ -249,8 +248,8 @@
     },
     tooltip: {
       trigger: "axis",
-      backgroundColor: '#004284',
-      borderColor: '#0B9BFF',
+      backgroundColor: "#004284",
+      borderColor: "#0B9BFF",
       borderRadius: 6, // 设置圆角大小
       feature: {
         mark: { show: true },
@@ -259,24 +258,23 @@
         restore: { show: true },
         saveAsImage: { show: true },
       },
-             formatter: function (params) {
-            let res = params[0].name + '<br/>';
-            params.forEach(function (item) {
-                // 对每个数据项的数值进行格式化，保留两位小数
-                 let text=   `<div class="flex flex-justcontent-spacebetween">
+      formatter: function (params) {
+        let res = params[0].name + "<br/>";
+        params.forEach(function (item) {
+          // 对每个数据项的数值进行格式化，保留两位小数
+          let text = `<div class="flex flex-justcontent-spacebetween">
                 <span>${item.marker}${item.seriesName}</span>
-                <span>${(item.value == null ? '-' : Number(item.value).toFixed(2))}</span>
-              </div>`
-                res +=text ;
-            });
-            return res;
-        },
-              textStyle: {
+                <span>${item.value == null ? "-" : Number(item.value).toFixed(2)}</span>
+              </div>`;
+          res += text;
+        });
+        return res;
+      },
+      textStyle: {
         // 字体颜色
-        color: 'white',
+        color: "white",
         // 字体大小
         fontSize: nowSize(14, 1920),
-
       },
       axisPointer: {
         type: "cross",
@@ -298,13 +296,13 @@
         type: "category",
         data: props.XAxis,
         axisLabel: {
-        color: 'rgba(255,255,255,1)',
-        fontSize: nowSize(12, 1920),
-        fontFamily: 'AlibabaPuHuiTi',
-        formatter: function (value) {
-          return moment(value).format('HH:MM');
+          color: "rgba(255,255,255,1)",
+          fontSize: nowSize(12, 1920),
+          fontFamily: "AlibabaPuHuiTi",
+          formatter: function (value) {
+            return moment(value).format("HH:MM");
+          },
         },
-      },
         axisPointer: {
           type: "shadow",
         },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 4adccc8..497c620 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -60,7 +60,7 @@
 watch(
   () => props.refresh,
   (value) => {
-    console.log("???????");
+    // console.log("???????");
     //先销毁实例
     myChart.value && myChart.value.dispose();
     init();

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5823b2f..4b84aaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -92,7 +92,9 @@
   "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
   "rain", // 雨量站
   "rainwater_pipeline_quality", // 雨水管网水质
+  "rainwater_pipeline_quality_city", // 雨水管网水质
   "sewage_pipeline_quality", // 污水管网水质
+  "sewage_pipeline_quality_city", // 污水管网水质
   "rainwater_pipeline_quality_area", // 接驳口
   "rainwater_pipeline_water_level", // 雨水管网液位
   "reservoir_water_level", //水库水位
@@ -101,6 +103,7 @@
   "sewageStation", //污水厂
   "gateStation", //闸门
   "pump_water_level", //泵站液位
+  "outlet_water_level_city", //排口流量
 ]);
 // 基本数据
 const arrid = ref([
@@ -279,6 +282,16 @@
     type = "rainwater_pipeline_quality";
     dialogConfig.RefName = "jiancefenxiGWFX";
   }
+  if (type == "outlet_water_level_city") {
+    type = "outlet_water_level";
+  }
+  if (type == "rainwater_pipeline_quality_city") {
+    type = "rainwater_pipeline_quality";
+  }
+  if (type == "sewage_pipeline_quality_city") {
+    type = "sewage_pipeline_quality";
+  }
+
   let params = {
     dataCode: type,
     scene: specificFun(type) || "basis_monitor",
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index ab2e36e..2003971 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -804,6 +804,11 @@
           AllData.RightShow = true;
         }
       }
+      // 排口水质/流量
+      if (Row.properties.pointType == "outlet_quality" || "outlet_water_level") {
+        // 定位雨水系统二级菜单下右侧排口信息echarts列表
+        bus.emit("SZEchartsScrollTop", Row.properties);
+      }
     }
     // }
   }
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
index fea3dc3..4453800 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
@@ -4,311 +4,324 @@
       <div class="leve2Title flex flex-justcontent-spacebetween">
         <div>历史水质</div>
         <div>
-              <el-select
-      v-model="AllData.selectmodel"
-      placeholder="请选择湖泊"
-      style="width: 90px;position: relative;margin-bottom: 5px;"
-      filterable
-      size="small"
-      placement="bottom"
-      @change="selectchange"
-    >
-
-      <el-option v-for="(item) in AllData.filterList" :key="item.lakerId" :label="item.lakerName" :value="item.lakerId">
-      </el-option>
-    </el-select>
+          <el-select
+            v-model="AllData.selectmodel"
+            placeholder="请选择湖泊"
+            style="width: 90px; position: relative; margin-bottom: 5px"
+            filterable
+            size="small"
+            placement="bottom"
+            @change="selectchange"
+          >
+            <el-option
+              v-for="item in AllData.filterList"
+              :key="item.lakerId"
+              :label="item.lakerName"
+              :value="item.lakerId"
+            >
+            </el-option>
+          </el-select>
         </div>
       </div>
       <div id="history">
-      <HistorySZChart :echartData="AllData.szHistoryData" :refresh="AllData.szHistoryrefresh"/>
-
+        <HistorySZChart
+          :echartData="AllData.szHistoryData"
+          :refresh="AllData.szHistoryrefresh"
+        />
       </div>
     </div>
-    <el-tabs v-model="AllData.activeName" class="demo-tabs" @tab-click="handleClick" stretch>
-    <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
-    <el-tab-pane label="排口" name="PK"></el-tab-pane>
-  </el-tabs>
-  <div class="chartsbox" v-if="AllData.activeName=='GQ'">
-        <div class="eachLake" v-for="(item) in AllData.allSZ" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <ShuiZhicharts
+    <el-tabs
+      v-model="AllData.activeName"
+      class="demo-tabs"
+      @tab-click="handleClick"
+      stretch
+    >
+      <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
+      <el-tab-pane label="排口" name="PK"></el-tab-pane>
+    </el-tabs>
+    <div class="chartsbox" v-if="AllData.activeName == 'GQ'" ref="scrollContainer">
+      <div class="eachLake" v-for="item in AllData.allSZ" :key="item.stCode">
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <ShuiZhicharts
               :data="item.chartInfo"
               :refresh="item.chartInfo.refresh"
             ></ShuiZhicharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length == 0">
+        暂无数据
+      </div>
     </div>
-     <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length==0">
-    暂无数据
-  </div>
-  </div>
 
-  <div class="chartsbox" v-if="AllData.activeName=='PK'">
-        <div class="eachLake" v-for="(item) in AllData.allPK" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <Paikoucharts 
-          :refresh="item.chartInfo.refresh"
-          :XAxis="item.chartInfo.XAxis"
-          :YAxis="item.chartInfo.YAxis"
-          :yAxisarr="item.chartInfo.yAxisarr"
-        >
-        </Paikoucharts>
+    <div class="chartsbox" v-if="AllData.activeName == 'PK'" ref="scrollContainer">
+      <div
+        class="eachLake"
+        ref="PKeachLake"
+        v-for="item in AllData.allPK"
+        :key="item.stCode"
+      >
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <Paikoucharts
+              :refresh="item.chartInfo.refresh"
+              :XAxis="item.chartInfo.XAxis"
+              :YAxis="item.chartInfo.YAxis"
+              :yAxisarr="item.chartInfo.yAxisarr"
+            >
+            </Paikoucharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allPK.length == 0">
+        暂无数据
+      </div>
     </div>
-        <div class="flex flex-justcontent-center"   v-if="AllData.allPK.length==0">
-    暂无数据
-
-  </div>
-  </div>
-
-
   </div>
 </template>
 
 <script setup name="YSIndex_right2">
-import { ref, reactive, toRefs, onMounted } from 'vue';
-import { getWaterQualityEchart,riverQualityGetHistory } from '@/api/MonitorAssetsOnMap';
+import { ref, reactive, toRefs, onMounted, nextTick } from "vue";
+import { getWaterQualityEchart, riverQualityGetHistory } from "@/api/MonitorAssetsOnMap";
 import ShuiZhicharts from "./components/ShuiZhicharts.vue";
 import Paikoucharts from "./components/Paikoucharts.vue";
 import HistorySZChart from "./components/HistorySZChart.vue";
+import bus from "@/bus";
 
 const props = defineProps({
   //分区编号
   waterRegionCode: {
     type: [String],
-    default: '',
+    default: "",
   },
-
 });
 const AllData = reactive({
-  selectmodel:'',
-  filterList:[],
-  activeName:'',
-  GQdata:[],
-  PKdata:[],
-  allSZ:[],
-  allPK:[],
-  szHistoryData:[],
-  szHistoryrefresh:[],
-
+  selectmodel: "",
+  filterList: [],
+  activeName: "",
+  GQdata: [],
+  PKdata: [],
+  allSZ: [],
+  allPK: [],
+  szHistoryData: [],
+  szHistoryrefresh: [],
 });
-
+const scrollContainer = ref(null);
+const PKeachLake = ref(null);
 watch(
   () => props.waterRegionCode,
-  val => {
-    console.log('YSIndex_right2:分区编号变了2', val);
+  (val) => {
+    console.log("YSIndex_right2:分区编号变了2", val);
     // debugger
-    if(val){
+    if (val) {
       getHistoryData();
       getData();
-
     }
-
   },
   { immediate: true, deep: true }
 );
 function selectchange(value) {
-  console.log('value',value);
-  AllData.filterList.map((e)=>{
-    if(e.lakerId==value){
-              AllData.szHistoryData=e
+  console.log("value", value);
+  AllData.filterList.map((e) => {
+    if (e.lakerId == value) {
+      AllData.szHistoryData = e;
 
-      AllData.szHistoryrefresh=Math.random()
+      AllData.szHistoryrefresh = Math.random();
     }
-  })
-
+  });
 }
-function handleClick(e){
-  console.log('e',e.props.name);
-  console.log('AllData.activeName',AllData.activeName);
-  if(e.props.name=='GQ'){
-    chuliDataFunGQ()
-  }else {
-    chuliDataFunPK()
-
+function handleClick(e) {
+  console.log("e", e.props.name);
+  console.log("AllData.activeName", AllData.activeName);
+  if (e.props.name == "GQ") {
+    chuliDataFunGQ();
+  } else {
+    chuliDataFunPK();
   }
 }
-function getHistoryData(){
-  let params={
-    waterRegionCode:props.waterRegionCode,
+function getHistoryData() {
+  let params = {
+    waterRegionCode: props.waterRegionCode,
     // lakerId:5,
+  };
+  riverQualityGetHistory(params).then((res) => {
+    console.log("水质历史数据", res);
+    if (res.code == 200) {
+      AllData.filterList = res.data;
+      if (res.data?.length > 0) {
+        AllData.selectmodel = res.data[0].lakerId;
 
-  }
-  riverQualityGetHistory(params).then(res=>{
-    console.log('水质历史数据',res);
-      if(res.code==200){
-
-      AllData.filterList=res.data
-      if(res.data?.length>0){
-      AllData.selectmodel=res.data[0].lakerId
-
-        AllData.szHistoryData=res.data[0]
-      AllData.szHistoryrefresh=Math.random()
+        AllData.szHistoryData = res.data[0];
+        AllData.szHistoryrefresh = Math.random();
       }
-
-      }
-  })
-}
-function getData(){
-    getWaterQualityEchart(props.waterRegionCode).then(res=>{
-
-      console.log('水质',res);
-    if(res.code==200){
-      AllData.GQdata=res.data.portChannelDataList
-      AllData.PKdata=res.data.outletDataList
-      if(AllData.GQdata.length>0){
-        AllData.activeName='GQ'
-      chuliDataFunGQ()
-      return
-      }else if(AllData.PKdata.length>0) {
-        AllData.activeName='PK'
-      chuliDataFunPK()
-      return
-      }else {
-         AllData.activeName='GQ'
-      chuliDataFunGQ()
-      }
-
-      
     }
-  })
+  });
 }
-function chuliDataFunGQ(){
-         let arr=[]
-       let data=AllData.GQdata
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-            name:'',
-            XAxis:[],
-            nh4n:[],
-            DO:[],
-            codcr:[],
-            cond:[],
-            ph:[],
-            marklineObj:{
-            nh4n:'',
-            DO:'',
-            codcr:'',
-            cond:'',
-            ph:'',
-       },
-            refresh:1
-          }
-        }
-        let at=obj.chartInfo
-       at.XAxis = e.siteEchartDto.times;
-        if(e.targetQuality==1){
-          at.marklineObj.nh4n=0.15
-          at.marklineObj.DO=7.5
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==2){
-           at.marklineObj.nh4n=0.5
-          at.marklineObj.DO=6
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==3){
-           at.marklineObj.nh4n=1
-          at.marklineObj.DO=5
-          at.marklineObj.codcr=20
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==4){
-           at.marklineObj.nh4n=1.5
-          at.marklineObj.DO=3
-          at.marklineObj.codcr=30
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==5){
-           at.marklineObj.nh4n=2
-          at.marklineObj.DO=2
-          at.marklineObj.codcr=40
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }
-        e.siteEchartDto.datas.forEach((j) => {
-          
-        switch (j.dataKey) {
-          case "nh4n":
-            at.nh4n = j.datas;
-            break;
-          case "DO":
-            at.DO = j.datas;
-            break;
-          case "codcr":
-            at.codcr = j.datas;
-            break;
-          case "cond":
-            at.cond = j.datas;
-            break;
-            case "ph":
-            at.ph = j.datas;
-            break;
-        }
-      });
-      if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
+function getData() {
+  getWaterQualityEchart(props.waterRegionCode).then((res) => {
+    console.log("水质", res);
+    if (res.code == 200) {
+      AllData.GQdata = res.data.portChannelDataList;
+      AllData.PKdata = res.data.outletDataList;
+      if (AllData.GQdata.length > 0) {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
+        return;
+      } else if (AllData.PKdata.length > 0) {
+        AllData.activeName = "PK";
+        chuliDataFunPK();
+        return;
+      } else {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
       }
-      
-       obj.chartInfo.refresh =Math.random()
-      
-       })
-      AllData.allSZ=arr
-      console.log('AllData.allSZ',AllData.allSZ);
+    }
+  });
 }
-function chuliDataFunPK(){
-    let arr=[]
-       let data=AllData.PKdata
-       console.log('dataPK',data);
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-              refresh: 1,
-  DataName: '',
-  XAxis: [],
-  typeName: '',
-  YAxis: [0, 1, 6, 3, 4],
-  loading: false,
-  yAxisarr: [
+function chuliDataFunGQ() {
+  let arr = [];
+  let data = AllData.GQdata;
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        name: "",
+        XAxis: [],
+        nh4n: [],
+        DO: [],
+        codcr: [],
+        cond: [],
+        ph: [],
+        marklineObj: {
+          nh4n: "",
+          DO: "",
+          codcr: "",
+          cond: "",
+          ph: "",
+        },
+        refresh: 1,
+      },
+    };
+    let at = obj.chartInfo;
+    at.XAxis = e.siteEchartDto.times;
+    if (e.targetQuality == 1) {
+      at.marklineObj.nh4n = 0.15;
+      at.marklineObj.DO = 7.5;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 2) {
+      at.marklineObj.nh4n = 0.5;
+      at.marklineObj.DO = 6;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 3) {
+      at.marklineObj.nh4n = 1;
+      at.marklineObj.DO = 5;
+      at.marklineObj.codcr = 20;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 4) {
+      at.marklineObj.nh4n = 1.5;
+      at.marklineObj.DO = 3;
+      at.marklineObj.codcr = 30;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 5) {
+      at.marklineObj.nh4n = 2;
+      at.marklineObj.DO = 2;
+      at.marklineObj.codcr = 40;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    }
+    e.siteEchartDto.datas.forEach((j) => {
+      switch (j.dataKey) {
+        case "nh4n":
+          at.nh4n = j.datas;
+          break;
+        case "DO":
+          at.DO = j.datas;
+          break;
+        case "codcr":
+          at.codcr = j.datas;
+          break;
+        case "cond":
+          at.cond = j.datas;
+          break;
+        case "ph":
+          at.ph = j.datas;
+          break;
+      }
+    });
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
 
-  ],
-  marklinearr: [
-
-  ],
-          }
-        }
-        let at=obj.chartInfo
-         e.siteEchartDto.datas.map(item => {
+    obj.chartInfo.refresh = Math.random();
+  });
+  AllData.allSZ = arr;
+  console.log("AllData.allSZ", AllData.allSZ);
+}
+function chuliDataFunPK() {
+  let arr = [];
+  let data = AllData.PKdata;
+  console.log("dataPK", data);
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        refresh: 1,
+        DataName: "",
+        XAxis: [],
+        typeName: "",
+        YAxis: [0, 1, 6, 3, 4],
+        loading: false,
+        yAxisarr: [],
+        marklinearr: [],
+      },
+    };
+    let at = obj.chartInfo;
+    e.siteEchartDto.datas.map((item) => {
       at.marklinearr.push(...item.cordonLineList);
     });
-       at.XAxis = e.siteEchartDto.times;
-        at.yAxisarr = e.siteEchartDto.datas;
-              if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
-      }
-       at.refresh =Math.random()
-
-       })
-       console.log('arrPK',arr);
-          AllData.allPK=arr
+    at.XAxis = e.siteEchartDto.times;
+    at.yAxisarr = e.siteEchartDto.datas;
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
+    at.refresh = Math.random();
+  });
+  console.log("arrPK", arr);
+  AllData.allPK = arr;
 }
+// 通过name去定位到某一个echarts
+const SZEchartsScrollTop = (item) => {
+  AllData.activeName = "PK";
+  chuliDataFunPK();
+  nextTick(() => {
+    //  获取一个单位的echart元素高度
+    let EchartsHeight = PKeachLake.value[0].offsetHeight;
+    // 获取当前站点名称在所有数据中的索引
+    var index = AllData.allPK.findIndex(function (element) {
+      return element.stName == item.name;
+    });
+    scrollContainer.value.scrollTop = index * EchartsHeight;
+  });
+};
 onMounted(() => {
+  bus.on("SZEchartsScrollTop", SZEchartsScrollTop);
+});
+
+onBeforeUnmount(() => {
+  bus.off("SZEchartsScrollTop");
 });
 </script>
 
@@ -316,12 +329,12 @@
 #YSIndex_right2 {
   width: 100%;
   height: 100%;
-  
-  .historySZ{
+
+  .historySZ {
     height: calc((100% - 30px) / 3);
-    
   }
-  #Charts,#history {
+  #Charts,
+  #history {
     width: calc(100% - 10px);
 
     height: calc(100% - 32px);
@@ -331,12 +344,10 @@
     overflow-y: auto;
   }
   .eachLake {
-height: calc((100% - 30px) / 2);
+    height: calc((100% - 30px) / 2);
   }
-  :deep(.el-select .el-input__inner){
+  :deep(.el-select .el-input__inner) {
     color: #fff;
-    
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
index c48ca1e..7185eb7 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
@@ -8,8 +8,8 @@
 const id = guid();
 const myChart = shallowRef("");
 import * as echarts from "echarts";
-import { nowSize } from '@/utils/util.js';
-import moment from 'moment';
+import { nowSize } from "@/utils/util.js";
+import moment from "moment";
 
 const props = defineProps({
   //刷新标志
@@ -45,7 +45,7 @@
 watch(
   () => props.refresh,
   (value) => {
-    console.log("???????");
+    // console.log("???????");
     //先销毁实例
     myChart.value && myChart.value.dispose();
     init();
@@ -80,7 +80,6 @@
       axisLabel: {
         show: true,
         color: "#409eff",
-
       },
       axisLine: {
         lineStyle: {
@@ -134,7 +133,7 @@
     // },
   ];
 
-  console.log("获取的Y轴的数据", props.yAxisarr);
+  // console.log("获取的Y轴的数据", props.yAxisarr);
 
   // 处理多个y轴遍历展示
   if (props.yAxisarr) {
@@ -152,7 +151,7 @@
           },
           name: p.lineName,
           yAxis: Number(p.lineValue),
-          
+
           label: {
             formatter: `${p.lineValue}-${p.lineName}`,
             color: p.lineColor,
@@ -166,7 +165,7 @@
       marklinedata.push(arr);
     });
 
-    console.log("marklinedata", marklinedata);
+    // console.log("marklinedata", marklinedata);
     props.yAxisarr.map((item, index) => {
       let obj = {
         name: item.dataName,
@@ -174,7 +173,7 @@
         axisLabel: {
           show: true,
           color: colorarr[index],
-                        formatter: function (value) {
+          formatter: function (value) {
             return value.toFixed(2); // 保留两位小数
           },
         },
@@ -249,8 +248,8 @@
     },
     tooltip: {
       trigger: "axis",
-      backgroundColor: '#004284',
-      borderColor: '#0B9BFF',
+      backgroundColor: "#004284",
+      borderColor: "#0B9BFF",
       borderRadius: 6, // 设置圆角大小
       feature: {
         mark: { show: true },
@@ -259,24 +258,23 @@
         restore: { show: true },
         saveAsImage: { show: true },
       },
-             formatter: function (params) {
-            let res = params[0].name + '<br/>';
-            params.forEach(function (item) {
-                // 对每个数据项的数值进行格式化，保留两位小数
-                 let text=   `<div class="flex flex-justcontent-spacebetween">
+      formatter: function (params) {
+        let res = params[0].name + "<br/>";
+        params.forEach(function (item) {
+          // 对每个数据项的数值进行格式化，保留两位小数
+          let text = `<div class="flex flex-justcontent-spacebetween">
                 <span>${item.marker}${item.seriesName}</span>
-                <span>${(item.value == null ? '-' : Number(item.value).toFixed(2))}</span>
-              </div>`
-                res +=text ;
-            });
-            return res;
-        },
-              textStyle: {
+                <span>${item.value == null ? "-" : Number(item.value).toFixed(2)}</span>
+              </div>`;
+          res += text;
+        });
+        return res;
+      },
+      textStyle: {
         // 字体颜色
-        color: 'white',
+        color: "white",
         // 字体大小
         fontSize: nowSize(14, 1920),
-
       },
       axisPointer: {
         type: "cross",
@@ -298,13 +296,13 @@
         type: "category",
         data: props.XAxis,
         axisLabel: {
-        color: 'rgba(255,255,255,1)',
-        fontSize: nowSize(12, 1920),
-        fontFamily: 'AlibabaPuHuiTi',
-        formatter: function (value) {
-          return moment(value).format('HH:MM');
+          color: "rgba(255,255,255,1)",
+          fontSize: nowSize(12, 1920),
+          fontFamily: "AlibabaPuHuiTi",
+          formatter: function (value) {
+            return moment(value).format("HH:MM");
+          },
         },
-      },
         axisPointer: {
           type: "shadow",
         },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 4adccc8..497c620 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -60,7 +60,7 @@
 watch(
   () => props.refresh,
   (value) => {
-    console.log("???????");
+    // console.log("???????");
     //先销毁实例
     myChart.value && myChart.value.dispose();
     init();
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index 5fcff38..a61fcdc 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -43,7 +43,7 @@
 watch(
   () => props.refresh,
   (value) => {
-    console.log("???????");
+    // console.log("???????");
     //先销毁实例
     myChart.value && myChart.value.dispose();
     init();
@@ -131,7 +131,7 @@
     // },
   ];
 
-  console.log("获取的Y轴的数据", props.yAxisarr);
+  // console.log("获取的Y轴的数据", props.yAxisarr);
 
   // 处理多个y轴遍历展示
   if (props.yAxisarr) {
@@ -162,7 +162,7 @@
       marklinedata.push(arr);
     });
 
-    console.log("marklinedata", marklinedata);
+    // console.log("marklinedata", marklinedata);
     props.yAxisarr.map((item, index) => {
       let obj = {
         name: item.dataName + item.unit,

diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5823b2f..4b84aaf 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -92,7 +92,9 @@
   "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之）
   "rain", // 雨量站
   "rainwater_pipeline_quality", // 雨水管网水质
+  "rainwater_pipeline_quality_city", // 雨水管网水质
   "sewage_pipeline_quality", // 污水管网水质
+  "sewage_pipeline_quality_city", // 污水管网水质
   "rainwater_pipeline_quality_area", // 接驳口
   "rainwater_pipeline_water_level", // 雨水管网液位
   "reservoir_water_level", //水库水位
@@ -101,6 +103,7 @@
   "sewageStation", //污水厂
   "gateStation", //闸门
   "pump_water_level", //泵站液位
+  "outlet_water_level_city", //排口流量
 ]);
 // 基本数据
 const arrid = ref([
@@ -279,6 +282,16 @@
     type = "rainwater_pipeline_quality";
     dialogConfig.RefName = "jiancefenxiGWFX";
   }
+  if (type == "outlet_water_level_city") {
+    type = "outlet_water_level";
+  }
+  if (type == "rainwater_pipeline_quality_city") {
+    type = "rainwater_pipeline_quality";
+  }
+  if (type == "sewage_pipeline_quality_city") {
+    type = "sewage_pipeline_quality";
+  }
+
   let params = {
     dataCode: type,
     scene: specificFun(type) || "basis_monitor",
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index ab2e36e..2003971 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -804,6 +804,11 @@
           AllData.RightShow = true;
         }
       }
+      // 排口水质/流量
+      if (Row.properties.pointType == "outlet_quality" || "outlet_water_level") {
+        // 定位雨水系统二级菜单下右侧排口信息echarts列表
+        bus.emit("SZEchartsScrollTop", Row.properties);
+      }
     }
     // }
   }
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
index fea3dc3..4453800 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex_right2.vue
@@ -4,311 +4,324 @@
       <div class="leve2Title flex flex-justcontent-spacebetween">
         <div>历史水质</div>
         <div>
-              <el-select
-      v-model="AllData.selectmodel"
-      placeholder="请选择湖泊"
-      style="width: 90px;position: relative;margin-bottom: 5px;"
-      filterable
-      size="small"
-      placement="bottom"
-      @change="selectchange"
-    >
-
-      <el-option v-for="(item) in AllData.filterList" :key="item.lakerId" :label="item.lakerName" :value="item.lakerId">
-      </el-option>
-    </el-select>
+          <el-select
+            v-model="AllData.selectmodel"
+            placeholder="请选择湖泊"
+            style="width: 90px; position: relative; margin-bottom: 5px"
+            filterable
+            size="small"
+            placement="bottom"
+            @change="selectchange"
+          >
+            <el-option
+              v-for="item in AllData.filterList"
+              :key="item.lakerId"
+              :label="item.lakerName"
+              :value="item.lakerId"
+            >
+            </el-option>
+          </el-select>
         </div>
       </div>
       <div id="history">
-      <HistorySZChart :echartData="AllData.szHistoryData" :refresh="AllData.szHistoryrefresh"/>
-
+        <HistorySZChart
+          :echartData="AllData.szHistoryData"
+          :refresh="AllData.szHistoryrefresh"
+        />
       </div>
     </div>
-    <el-tabs v-model="AllData.activeName" class="demo-tabs" @tab-click="handleClick" stretch>
-    <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
-    <el-tab-pane label="排口" name="PK"></el-tab-pane>
-  </el-tabs>
-  <div class="chartsbox" v-if="AllData.activeName=='GQ'">
-        <div class="eachLake" v-for="(item) in AllData.allSZ" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <ShuiZhicharts
+    <el-tabs
+      v-model="AllData.activeName"
+      class="demo-tabs"
+      @tab-click="handleClick"
+      stretch
+    >
+      <el-tab-pane label="港渠" name="GQ"></el-tab-pane>
+      <el-tab-pane label="排口" name="PK"></el-tab-pane>
+    </el-tabs>
+    <div class="chartsbox" v-if="AllData.activeName == 'GQ'" ref="scrollContainer">
+      <div class="eachLake" v-for="item in AllData.allSZ" :key="item.stCode">
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <ShuiZhicharts
               :data="item.chartInfo"
               :refresh="item.chartInfo.refresh"
             ></ShuiZhicharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length == 0">
+        暂无数据
+      </div>
     </div>
-     <div class="flex flex-justcontent-center" v-if="AllData.allSZ.length==0">
-    暂无数据
-  </div>
-  </div>
 
-  <div class="chartsbox" v-if="AllData.activeName=='PK'">
-        <div class="eachLake" v-for="(item) in AllData.allPK" :key="item.stCode" >
-      <div class="h100">
-        <div class="leve2Title">{{item.stName}}</div>
-        <div id="Charts">
-                      <Paikoucharts 
-          :refresh="item.chartInfo.refresh"
-          :XAxis="item.chartInfo.XAxis"
-          :YAxis="item.chartInfo.YAxis"
-          :yAxisarr="item.chartInfo.yAxisarr"
-        >
-        </Paikoucharts>
+    <div class="chartsbox" v-if="AllData.activeName == 'PK'" ref="scrollContainer">
+      <div
+        class="eachLake"
+        ref="PKeachLake"
+        v-for="item in AllData.allPK"
+        :key="item.stCode"
+      >
+        <div class="h100">
+          <div class="leve2Title">{{ item.stName }}</div>
+          <div id="Charts">
+            <Paikoucharts
+              :refresh="item.chartInfo.refresh"
+              :XAxis="item.chartInfo.XAxis"
+              :YAxis="item.chartInfo.YAxis"
+              :yAxisarr="item.chartInfo.yAxisarr"
+            >
+            </Paikoucharts>
+          </div>
         </div>
       </div>
-      
+      <div class="flex flex-justcontent-center" v-if="AllData.allPK.length == 0">
+        暂无数据
+      </div>
     </div>
-        <div class="flex flex-justcontent-center"   v-if="AllData.allPK.length==0">
-    暂无数据
-
-  </div>
-  </div>
-
-
   </div>
 </template>
 
 <script setup name="YSIndex_right2">
-import { ref, reactive, toRefs, onMounted } from 'vue';
-import { getWaterQualityEchart,riverQualityGetHistory } from '@/api/MonitorAssetsOnMap';
+import { ref, reactive, toRefs, onMounted, nextTick } from "vue";
+import { getWaterQualityEchart, riverQualityGetHistory } from "@/api/MonitorAssetsOnMap";
 import ShuiZhicharts from "./components/ShuiZhicharts.vue";
 import Paikoucharts from "./components/Paikoucharts.vue";
 import HistorySZChart from "./components/HistorySZChart.vue";
+import bus from "@/bus";
 
 const props = defineProps({
   //分区编号
   waterRegionCode: {
     type: [String],
-    default: '',
+    default: "",
   },
-
 });
 const AllData = reactive({
-  selectmodel:'',
-  filterList:[],
-  activeName:'',
-  GQdata:[],
-  PKdata:[],
-  allSZ:[],
-  allPK:[],
-  szHistoryData:[],
-  szHistoryrefresh:[],
-
+  selectmodel: "",
+  filterList: [],
+  activeName: "",
+  GQdata: [],
+  PKdata: [],
+  allSZ: [],
+  allPK: [],
+  szHistoryData: [],
+  szHistoryrefresh: [],
 });
-
+const scrollContainer = ref(null);
+const PKeachLake = ref(null);
 watch(
   () => props.waterRegionCode,
-  val => {
-    console.log('YSIndex_right2:分区编号变了2', val);
+  (val) => {
+    console.log("YSIndex_right2:分区编号变了2", val);
     // debugger
-    if(val){
+    if (val) {
       getHistoryData();
       getData();
-
     }
-
   },
   { immediate: true, deep: true }
 );
 function selectchange(value) {
-  console.log('value',value);
-  AllData.filterList.map((e)=>{
-    if(e.lakerId==value){
-              AllData.szHistoryData=e
+  console.log("value", value);
+  AllData.filterList.map((e) => {
+    if (e.lakerId == value) {
+      AllData.szHistoryData = e;
 
-      AllData.szHistoryrefresh=Math.random()
+      AllData.szHistoryrefresh = Math.random();
     }
-  })
-
+  });
 }
-function handleClick(e){
-  console.log('e',e.props.name);
-  console.log('AllData.activeName',AllData.activeName);
-  if(e.props.name=='GQ'){
-    chuliDataFunGQ()
-  }else {
-    chuliDataFunPK()
-
+function handleClick(e) {
+  console.log("e", e.props.name);
+  console.log("AllData.activeName", AllData.activeName);
+  if (e.props.name == "GQ") {
+    chuliDataFunGQ();
+  } else {
+    chuliDataFunPK();
   }
 }
-function getHistoryData(){
-  let params={
-    waterRegionCode:props.waterRegionCode,
+function getHistoryData() {
+  let params = {
+    waterRegionCode: props.waterRegionCode,
     // lakerId:5,
+  };
+  riverQualityGetHistory(params).then((res) => {
+    console.log("水质历史数据", res);
+    if (res.code == 200) {
+      AllData.filterList = res.data;
+      if (res.data?.length > 0) {
+        AllData.selectmodel = res.data[0].lakerId;
 
-  }
-  riverQualityGetHistory(params).then(res=>{
-    console.log('水质历史数据',res);
-      if(res.code==200){
-
-      AllData.filterList=res.data
-      if(res.data?.length>0){
-      AllData.selectmodel=res.data[0].lakerId
-
-        AllData.szHistoryData=res.data[0]
-      AllData.szHistoryrefresh=Math.random()
+        AllData.szHistoryData = res.data[0];
+        AllData.szHistoryrefresh = Math.random();
       }
-
-      }
-  })
-}
-function getData(){
-    getWaterQualityEchart(props.waterRegionCode).then(res=>{
-
-      console.log('水质',res);
-    if(res.code==200){
-      AllData.GQdata=res.data.portChannelDataList
-      AllData.PKdata=res.data.outletDataList
-      if(AllData.GQdata.length>0){
-        AllData.activeName='GQ'
-      chuliDataFunGQ()
-      return
-      }else if(AllData.PKdata.length>0) {
-        AllData.activeName='PK'
-      chuliDataFunPK()
-      return
-      }else {
-         AllData.activeName='GQ'
-      chuliDataFunGQ()
-      }
-
-      
     }
-  })
+  });
 }
-function chuliDataFunGQ(){
-         let arr=[]
-       let data=AllData.GQdata
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-            name:'',
-            XAxis:[],
-            nh4n:[],
-            DO:[],
-            codcr:[],
-            cond:[],
-            ph:[],
-            marklineObj:{
-            nh4n:'',
-            DO:'',
-            codcr:'',
-            cond:'',
-            ph:'',
-       },
-            refresh:1
-          }
-        }
-        let at=obj.chartInfo
-       at.XAxis = e.siteEchartDto.times;
-        if(e.targetQuality==1){
-          at.marklineObj.nh4n=0.15
-          at.marklineObj.DO=7.5
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==2){
-           at.marklineObj.nh4n=0.5
-          at.marklineObj.DO=6
-          at.marklineObj.codcr=15
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==3){
-           at.marklineObj.nh4n=1
-          at.marklineObj.DO=5
-          at.marklineObj.codcr=20
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==4){
-           at.marklineObj.nh4n=1.5
-          at.marklineObj.DO=3
-          at.marklineObj.codcr=30
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }else if(e.targetQuality==5){
-           at.marklineObj.nh4n=2
-          at.marklineObj.DO=2
-          at.marklineObj.codcr=40
-          at.marklineObj.cond=''
-          at.marklineObj.ph=''
-        }
-        e.siteEchartDto.datas.forEach((j) => {
-          
-        switch (j.dataKey) {
-          case "nh4n":
-            at.nh4n = j.datas;
-            break;
-          case "DO":
-            at.DO = j.datas;
-            break;
-          case "codcr":
-            at.codcr = j.datas;
-            break;
-          case "cond":
-            at.cond = j.datas;
-            break;
-            case "ph":
-            at.ph = j.datas;
-            break;
-        }
-      });
-      if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
+function getData() {
+  getWaterQualityEchart(props.waterRegionCode).then((res) => {
+    console.log("水质", res);
+    if (res.code == 200) {
+      AllData.GQdata = res.data.portChannelDataList;
+      AllData.PKdata = res.data.outletDataList;
+      if (AllData.GQdata.length > 0) {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
+        return;
+      } else if (AllData.PKdata.length > 0) {
+        AllData.activeName = "PK";
+        chuliDataFunPK();
+        return;
+      } else {
+        AllData.activeName = "GQ";
+        chuliDataFunGQ();
       }
-      
-       obj.chartInfo.refresh =Math.random()
-      
-       })
-      AllData.allSZ=arr
-      console.log('AllData.allSZ',AllData.allSZ);
+    }
+  });
 }
-function chuliDataFunPK(){
-    let arr=[]
-       let data=AllData.PKdata
-       console.log('dataPK',data);
-       data.forEach((e)=>{
-        let obj={
-          stName:e.stName,
-          stCode:e.stCode,
-          targetQuality:e.targetQuality,
-          chartInfo:{
-              refresh: 1,
-  DataName: '',
-  XAxis: [],
-  typeName: '',
-  YAxis: [0, 1, 6, 3, 4],
-  loading: false,
-  yAxisarr: [
+function chuliDataFunGQ() {
+  let arr = [];
+  let data = AllData.GQdata;
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        name: "",
+        XAxis: [],
+        nh4n: [],
+        DO: [],
+        codcr: [],
+        cond: [],
+        ph: [],
+        marklineObj: {
+          nh4n: "",
+          DO: "",
+          codcr: "",
+          cond: "",
+          ph: "",
+        },
+        refresh: 1,
+      },
+    };
+    let at = obj.chartInfo;
+    at.XAxis = e.siteEchartDto.times;
+    if (e.targetQuality == 1) {
+      at.marklineObj.nh4n = 0.15;
+      at.marklineObj.DO = 7.5;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 2) {
+      at.marklineObj.nh4n = 0.5;
+      at.marklineObj.DO = 6;
+      at.marklineObj.codcr = 15;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 3) {
+      at.marklineObj.nh4n = 1;
+      at.marklineObj.DO = 5;
+      at.marklineObj.codcr = 20;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 4) {
+      at.marklineObj.nh4n = 1.5;
+      at.marklineObj.DO = 3;
+      at.marklineObj.codcr = 30;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    } else if (e.targetQuality == 5) {
+      at.marklineObj.nh4n = 2;
+      at.marklineObj.DO = 2;
+      at.marklineObj.codcr = 40;
+      at.marklineObj.cond = "";
+      at.marklineObj.ph = "";
+    }
+    e.siteEchartDto.datas.forEach((j) => {
+      switch (j.dataKey) {
+        case "nh4n":
+          at.nh4n = j.datas;
+          break;
+        case "DO":
+          at.DO = j.datas;
+          break;
+        case "codcr":
+          at.codcr = j.datas;
+          break;
+        case "cond":
+          at.cond = j.datas;
+          break;
+        case "ph":
+          at.ph = j.datas;
+          break;
+      }
+    });
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
 
-  ],
-  marklinearr: [
-
-  ],
-          }
-        }
-        let at=obj.chartInfo
-         e.siteEchartDto.datas.map(item => {
+    obj.chartInfo.refresh = Math.random();
+  });
+  AllData.allSZ = arr;
+  console.log("AllData.allSZ", AllData.allSZ);
+}
+function chuliDataFunPK() {
+  let arr = [];
+  let data = AllData.PKdata;
+  console.log("dataPK", data);
+  data.forEach((e) => {
+    let obj = {
+      stName: e.stName,
+      stCode: e.stCode,
+      targetQuality: e.targetQuality,
+      chartInfo: {
+        refresh: 1,
+        DataName: "",
+        XAxis: [],
+        typeName: "",
+        YAxis: [0, 1, 6, 3, 4],
+        loading: false,
+        yAxisarr: [],
+        marklinearr: [],
+      },
+    };
+    let at = obj.chartInfo;
+    e.siteEchartDto.datas.map((item) => {
       at.marklinearr.push(...item.cordonLineList);
     });
-       at.XAxis = e.siteEchartDto.times;
-        at.yAxisarr = e.siteEchartDto.datas;
-              if(e.siteEchartDto?.times?.length>0){
-        arr.push(obj)
-      }
-       at.refresh =Math.random()
-
-       })
-       console.log('arrPK',arr);
-          AllData.allPK=arr
+    at.XAxis = e.siteEchartDto.times;
+    at.yAxisarr = e.siteEchartDto.datas;
+    if (e.siteEchartDto?.times?.length > 0) {
+      arr.push(obj);
+    }
+    at.refresh = Math.random();
+  });
+  console.log("arrPK", arr);
+  AllData.allPK = arr;
 }
+// 通过name去定位到某一个echarts
+const SZEchartsScrollTop = (item) => {
+  AllData.activeName = "PK";
+  chuliDataFunPK();
+  nextTick(() => {
+    //  获取一个单位的echart元素高度
+    let EchartsHeight = PKeachLake.value[0].offsetHeight;
+    // 获取当前站点名称在所有数据中的索引
+    var index = AllData.allPK.findIndex(function (element) {
+      return element.stName == item.name;
+    });
+    scrollContainer.value.scrollTop = index * EchartsHeight;
+  });
+};
 onMounted(() => {
+  bus.on("SZEchartsScrollTop", SZEchartsScrollTop);
+});
+
+onBeforeUnmount(() => {
+  bus.off("SZEchartsScrollTop");
 });
 </script>
 
@@ -316,12 +329,12 @@
 #YSIndex_right2 {
   width: 100%;
   height: 100%;
-  
-  .historySZ{
+
+  .historySZ {
     height: calc((100% - 30px) / 3);
-    
   }
-  #Charts,#history {
+  #Charts,
+  #history {
     width: calc(100% - 10px);
 
     height: calc(100% - 32px);
@@ -331,12 +344,10 @@
     overflow-y: auto;
   }
   .eachLake {
-height: calc((100% - 30px) / 2);
+    height: calc((100% - 30px) / 2);
   }
-  :deep(.el-select .el-input__inner){
+  :deep(.el-select .el-input__inner) {
     color: #fff;
-    
   }
-
 }
 </style>
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
index c48ca1e..7185eb7 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue
@@ -8,8 +8,8 @@
 const id = guid();
 const myChart = shallowRef("");
 import * as echarts from "echarts";
-import { nowSize } from '@/utils/util.js';
-import moment from 'moment';
+import { nowSize } from "@/utils/util.js";
+import moment from "moment";
 
 const props = defineProps({
   //刷新标志
@@ -45,7 +45,7 @@
 watch(
   () => props.refresh,
   (value) => {
-    console.log("???????");
+    // console.log("???????");
     //先销毁实例
     myChart.value && myChart.value.dispose();
     init();
@@ -80,7 +80,6 @@
       axisLabel: {
         show: true,
         color: "#409eff",
-
       },
       axisLine: {
         lineStyle: {
@@ -134,7 +133,7 @@
     // },
   ];
 
-  console.log("获取的Y轴的数据", props.yAxisarr);
+  // console.log("获取的Y轴的数据", props.yAxisarr);
 
   // 处理多个y轴遍历展示
   if (props.yAxisarr) {
@@ -152,7 +151,7 @@
           },
           name: p.lineName,
           yAxis: Number(p.lineValue),
-          
+
           label: {
             formatter: `${p.lineValue}-${p.lineName}`,
             color: p.lineColor,
@@ -166,7 +165,7 @@
       marklinedata.push(arr);
     });
 
-    console.log("marklinedata", marklinedata);
+    // console.log("marklinedata", marklinedata);
     props.yAxisarr.map((item, index) => {
       let obj = {
         name: item.dataName,
@@ -174,7 +173,7 @@
         axisLabel: {
           show: true,
           color: colorarr[index],
-                        formatter: function (value) {
+          formatter: function (value) {
             return value.toFixed(2); // 保留两位小数
           },
         },
@@ -249,8 +248,8 @@
     },
     tooltip: {
       trigger: "axis",
-      backgroundColor: '#004284',
-      borderColor: '#0B9BFF',
+      backgroundColor: "#004284",
+      borderColor: "#0B9BFF",
       borderRadius: 6, // 设置圆角大小
       feature: {
         mark: { show: true },
@@ -259,24 +258,23 @@
         restore: { show: true },
         saveAsImage: { show: true },
       },
-             formatter: function (params) {
-            let res = params[0].name + '<br/>';
-            params.forEach(function (item) {
-                // 对每个数据项的数值进行格式化，保留两位小数
-                 let text=   `<div class="flex flex-justcontent-spacebetween">
+      formatter: function (params) {
+        let res = params[0].name + "<br/>";
+        params.forEach(function (item) {
+          // 对每个数据项的数值进行格式化，保留两位小数
+          let text = `<div class="flex flex-justcontent-spacebetween">
                 <span>${item.marker}${item.seriesName}</span>
-                <span>${(item.value == null ? '-' : Number(item.value).toFixed(2))}</span>
-              </div>`
-                res +=text ;
-            });
-            return res;
-        },
-              textStyle: {
+                <span>${item.value == null ? "-" : Number(item.value).toFixed(2)}</span>
+              </div>`;
+          res += text;
+        });
+        return res;
+      },
+      textStyle: {
         // 字体颜色
-        color: 'white',
+        color: "white",
         // 字体大小
         fontSize: nowSize(14, 1920),
-
       },
       axisPointer: {
         type: "cross",
@@ -298,13 +296,13 @@
         type: "category",
         data: props.XAxis,
         axisLabel: {
-        color: 'rgba(255,255,255,1)',
-        fontSize: nowSize(12, 1920),
-        fontFamily: 'AlibabaPuHuiTi',
-        formatter: function (value) {
-          return moment(value).format('HH:MM');
+          color: "rgba(255,255,255,1)",
+          fontSize: nowSize(12, 1920),
+          fontFamily: "AlibabaPuHuiTi",
+          formatter: function (value) {
+            return moment(value).format("HH:MM");
+          },
         },
-      },
         axisPointer: {
           type: "shadow",
         },
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
index 4adccc8..497c620 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue
@@ -60,7 +60,7 @@
 watch(
   () => props.refresh,
   (value) => {
-    console.log("???????");
+    // console.log("???????");
     //先销毁实例
     myChart.value && myChart.value.dispose();
     init();
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
index 5fcff38..a61fcdc 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue
@@ -43,7 +43,7 @@
 watch(
   () => props.refresh,
   (value) => {
-    console.log("???????");
+    // console.log("???????");
     //先销毁实例
     myChart.value && myChart.value.dispose();
     init();
@@ -131,7 +131,7 @@
     // },
   ];
 
-  console.log("获取的Y轴的数据", props.yAxisarr);
+  // console.log("获取的Y轴的数据", props.yAxisarr);
 
   // 处理多个y轴遍历展示
   if (props.yAxisarr) {
@@ -162,7 +162,7 @@
       marklinedata.push(arr);
     });
 
-    console.log("marklinedata", marklinedata);
+    // console.log("marklinedata", marklinedata);
     props.yAxisarr.map((item, index) => {
       let obj = {
         name: item.dataName + item.unit,
diff --git a/vite.config.js b/vite.config.js
index 4ddbb34..6093014 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,6 +7,7 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.135:9100';
+// let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.124:9100';
 // let ipLink = 'http://192.168.20.43:9100'; // 刘总
 /*  */