diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 9e999e6..3a6a7ad 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -136,4 +136,12 @@
     method: 'get',
     params,
   });
+}
+
+export function siteWaterYieldAnalysisByDate(params) {
+  return request({
+    url: `business/monitorData/siteWaterYieldAnalysisByDate`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 9e999e6..3a6a7ad 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -136,4 +136,12 @@
     method: 'get',
     params,
   });
+}
+
+export function siteWaterYieldAnalysisByDate(params) {
+  return request({
+    url: `business/monitorData/siteWaterYieldAnalysisByDate`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5de5268..4c0219f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -132,7 +132,7 @@
   console.log("arrid.value", arrid.value);
   // debugger;
   if (
-    type == "rain_water_pump_station_info" &&
+    (type == "rain_water_pump_station_info" || type == "sewage_pump_station_info") &&
     router.currentRoute.value.fullPath == "/DrainageSystem" &&
     localStorage.getItem("ReturnPSTX") == "off"
   ) {

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 9e999e6..3a6a7ad 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -136,4 +136,12 @@
     method: 'get',
     params,
   });
+}
+
+export function siteWaterYieldAnalysisByDate(params) {
+  return request({
+    url: `business/monitorData/siteWaterYieldAnalysisByDate`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5de5268..4c0219f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -132,7 +132,7 @@
   console.log("arrid.value", arrid.value);
   // debugger;
   if (
-    type == "rain_water_pump_station_info" &&
+    (type == "rain_water_pump_station_info" || type == "sewage_pump_station_info") &&
     router.currentRoute.value.fullPath == "/DrainageSystem" &&
     localStorage.getItem("ReturnPSTX") == "off"
   ) {
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index ddff7d5..8a5a6f5 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -198,7 +198,6 @@
 }
 .selectTabs {
   position: absolute;
-
   width: 100%;
   left: 0;
   top: 0;

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 9e999e6..3a6a7ad 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -136,4 +136,12 @@
     method: 'get',
     params,
   });
+}
+
+export function siteWaterYieldAnalysisByDate(params) {
+  return request({
+    url: `business/monitorData/siteWaterYieldAnalysisByDate`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5de5268..4c0219f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -132,7 +132,7 @@
   console.log("arrid.value", arrid.value);
   // debugger;
   if (
-    type == "rain_water_pump_station_info" &&
+    (type == "rain_water_pump_station_info" || type == "sewage_pump_station_info") &&
     router.currentRoute.value.fullPath == "/DrainageSystem" &&
     localStorage.getItem("ReturnPSTX") == "off"
   ) {
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index ddff7d5..8a5a6f5 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -198,7 +198,6 @@
 }
 .selectTabs {
   position: absolute;
-
   width: 100%;
   left: 0;
   top: 0;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 9ecae08..b263c92 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -132,30 +132,38 @@
         <div class="modular2_right">
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
-            <!-- 上游水量在接驳口时不展示 -->
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.nowDay + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.nowDay ? AllData.SLFX.nowDay : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">收水量</div>
+              <div class="SlList2P">今日水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.siteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.yesterday + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.yesterday ? AllData.SLFX.yesterday : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">当前站点水量</div>
+              <div class="SlList2P">昨日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.average + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.average ? AllData.SLFX.average : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">7日平均水量</div>
             </div>
           </div>
         </div>
@@ -189,7 +197,7 @@
             <div class="ListInfo100">
               <div class="ListInfo_label">站点编号:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
+                {{ AllData.RightStCode ? AllData.RightStCode : "--" }}
               </div>
             </div>
 
@@ -218,15 +226,15 @@
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">标段片区:</div>
+              <div class="ListInfo_label">所在道路:</div>
               <div class="ListInfo_value">
                 {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">末次运维:</div>
+              <div class="ListInfo_label">所属标段:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
+                {{ AllData.GWBD.watchAreaName ? AllData.GWBD.watchAreaName : "--" }}
               </div>
             </div>
           </div>
@@ -293,6 +301,7 @@
   RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断
   RightShowID: "",
   RightShowType: "",
+  RightStCode: "",
   TitleName: [
     {
       abbreviation: "高新区", //分区缩写-动态
@@ -667,7 +676,9 @@
       // 说明是同样的一个点点了两次,所以进行关闭
       AllData.RightShow = false;
       AllData.RightShowID = "";
+      AllData.RightStCode = "";
     } else {
+      AllData.RightStCode = Row.properties.stCode;
       // 管点
       if (Row.properties.pointType == "sewage_pipeline_quality") {
         AllData.ClicksiteName = Row.properties.name;
@@ -690,13 +701,13 @@
             pointType: "--",
             pointNumber: "--",
             stAsName: "--",
-            stCode: "--",
+            stCode: AllData.RightStCode || "--",
             buildTime: "--",
             pipelineDiameter: "--",
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
 
@@ -1015,11 +1026,11 @@
 };
 // 获取数据 刘芳阳 上下游分析
 const getDataSXY = (row) => {
-  MonitorAPI.siteWaterYieldAnalysis({
+  MonitorAPI.siteWaterYieldAnalysisByDate({
     stCode: row.stCode,
-    stType: row.pointType,
-    start: moment().format("YYYY-MM-DD") + " 00:00:00",
-    end: moment().format("YYYY-MM-DD") + " 23:59:59",
+    // stType: row.pointType,
+    // start: moment().format("YYYY-MM-DD") + " 00:00:00",
+    // end: moment().format("YYYY-MM-DD") + " 23:59:59",
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.SLFX = res.data;
@@ -1120,11 +1131,13 @@
     stName: AllData.ClicksiteName,
     dataCode: "",
     stType: AllData.RightShowType,
-    stCode: AllData.GWBD.stCode,
+    stCode: AllData.RightStCode,
     wellCode: "",
     id: AllData.RightShowID,
     dataId: "",
+    RefName: "jiancefenxiGWFX",
   };
+  localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗  默认为On
   bus.emit("DynamicBus", params);
 };
 onMounted(() => {

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 9e999e6..3a6a7ad 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -136,4 +136,12 @@
     method: 'get',
     params,
   });
+}
+
+export function siteWaterYieldAnalysisByDate(params) {
+  return request({
+    url: `business/monitorData/siteWaterYieldAnalysisByDate`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5de5268..4c0219f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -132,7 +132,7 @@
   console.log("arrid.value", arrid.value);
   // debugger;
   if (
-    type == "rain_water_pump_station_info" &&
+    (type == "rain_water_pump_station_info" || type == "sewage_pump_station_info") &&
     router.currentRoute.value.fullPath == "/DrainageSystem" &&
     localStorage.getItem("ReturnPSTX") == "off"
   ) {
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index ddff7d5..8a5a6f5 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -198,7 +198,6 @@
 }
 .selectTabs {
   position: absolute;
-
   width: 100%;
   left: 0;
   top: 0;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 9ecae08..b263c92 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -132,30 +132,38 @@
         <div class="modular2_right">
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
-            <!-- 上游水量在接驳口时不展示 -->
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.nowDay + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.nowDay ? AllData.SLFX.nowDay : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">收水量</div>
+              <div class="SlList2P">今日水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.siteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.yesterday + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.yesterday ? AllData.SLFX.yesterday : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">当前站点水量</div>
+              <div class="SlList2P">昨日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.average + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.average ? AllData.SLFX.average : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">7日平均水量</div>
             </div>
           </div>
         </div>
@@ -189,7 +197,7 @@
             <div class="ListInfo100">
               <div class="ListInfo_label">站点编号:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
+                {{ AllData.RightStCode ? AllData.RightStCode : "--" }}
               </div>
             </div>
 
@@ -218,15 +226,15 @@
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">标段片区:</div>
+              <div class="ListInfo_label">所在道路:</div>
               <div class="ListInfo_value">
                 {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">末次运维:</div>
+              <div class="ListInfo_label">所属标段:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
+                {{ AllData.GWBD.watchAreaName ? AllData.GWBD.watchAreaName : "--" }}
               </div>
             </div>
           </div>
@@ -293,6 +301,7 @@
   RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断
   RightShowID: "",
   RightShowType: "",
+  RightStCode: "",
   TitleName: [
     {
       abbreviation: "高新区", //分区缩写-动态
@@ -667,7 +676,9 @@
       // 说明是同样的一个点点了两次,所以进行关闭
       AllData.RightShow = false;
       AllData.RightShowID = "";
+      AllData.RightStCode = "";
     } else {
+      AllData.RightStCode = Row.properties.stCode;
       // 管点
       if (Row.properties.pointType == "sewage_pipeline_quality") {
         AllData.ClicksiteName = Row.properties.name;
@@ -690,13 +701,13 @@
             pointType: "--",
             pointNumber: "--",
             stAsName: "--",
-            stCode: "--",
+            stCode: AllData.RightStCode || "--",
             buildTime: "--",
             pipelineDiameter: "--",
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
 
@@ -1015,11 +1026,11 @@
 };
 // 获取数据 刘芳阳 上下游分析
 const getDataSXY = (row) => {
-  MonitorAPI.siteWaterYieldAnalysis({
+  MonitorAPI.siteWaterYieldAnalysisByDate({
     stCode: row.stCode,
-    stType: row.pointType,
-    start: moment().format("YYYY-MM-DD") + " 00:00:00",
-    end: moment().format("YYYY-MM-DD") + " 23:59:59",
+    // stType: row.pointType,
+    // start: moment().format("YYYY-MM-DD") + " 00:00:00",
+    // end: moment().format("YYYY-MM-DD") + " 23:59:59",
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.SLFX = res.data;
@@ -1120,11 +1131,13 @@
     stName: AllData.ClicksiteName,
     dataCode: "",
     stType: AllData.RightShowType,
-    stCode: AllData.GWBD.stCode,
+    stCode: AllData.RightStCode,
     wellCode: "",
     id: AllData.RightShowID,
     dataId: "",
+    RefName: "jiancefenxiGWFX",
   };
+  localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗  默认为On
   bus.emit("DynamicBus", params);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 8d14263..7061aec 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -148,44 +148,38 @@
         <div class="modular2_right">
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
-            <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
-              <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
-                </el-tooltip>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">上游水量</div>
-            </div>
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.siteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
-                </el-tooltip>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">当前站点水量</div>
-            </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.downstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
+                <el-tooltip :content="AllData.SLFX.nowDay + '万吨'" placement="top">
                   <span class="SlListNum">{{
-                    AllData.SLFX.downstreamSiteWaterYield
+                    AllData.SLFX.nowDay ? AllData.SLFX.nowDay : "--"
                   }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">下游水量</div>
+              <div class="SlList2P">今日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.yesterday + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.yesterday ? AllData.SLFX.yesterday : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">昨日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.average + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.average ? AllData.SLFX.average : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">7日平均水量</div>
             </div>
           </div>
         </div>
@@ -219,7 +213,7 @@
             <div class="ListInfo100">
               <div class="ListInfo_label">站点编号:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
+                {{ AllData.RightStCode ? AllData.RightStCode : "--" }}
               </div>
             </div>
 
@@ -248,15 +242,15 @@
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">标段片区:</div>
+              <div class="ListInfo_label">所在道路:</div>
               <div class="ListInfo_value">
                 {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">末次运维:</div>
+              <div class="ListInfo_label">所属标段:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
+                {{ AllData.GWBD.watchAreaName ? AllData.GWBD.watchAreaName : "--" }}
               </div>
             </div>
           </div>
@@ -353,6 +347,7 @@
   RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断
   RightShowID: "",
   RightShowType: "",
+  RightStCode: "",
   TitleName: [
     {
       abbreviation: "高新区", //分区缩写-动态
@@ -729,7 +724,9 @@
       AllData.RightShow = false;
       AllData.RightShowID = "";
       AllData.RightShowType = "";
+      AllData.RightStCode = "";
     } else {
+      AllData.RightStCode = Row.properties.stCode;
       // 管点
       if (Row.properties.pointType == "rainwater_pipeline_quality") {
         AllData.ClicksiteName = Row.properties.name;
@@ -751,13 +748,13 @@
             pointType: "--",
             pointNumber: "--",
             stAsName: "--",
-            stCode: "--",
+            stCode: AllData.RightStCode || "--",
             buildTime: "--",
             pipelineDiameter: "--",
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
         //   根据type 判断是管井还是接驳口
@@ -1153,11 +1150,11 @@
 };
 // 获取数据 刘芳阳 上下游分析
 const getDataSXY = (row) => {
-  MonitorAPI.siteWaterYieldAnalysis({
+  MonitorAPI.siteWaterYieldAnalysisByDate({
     stCode: row.stCode,
-    stType: row.pointType,
-    start: moment().format("YYYY-MM-DD") + " 00:00:00",
-    end: moment().format("YYYY-MM-DD") + " 23:59:59",
+    // stType: row.pointType,
+    // start: moment().format("YYYY-MM-DD") + " 00:00:00",
+    // end: moment().format("YYYY-MM-DD") + " 23:59:59",
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.SLFX = res.data;
@@ -1257,10 +1254,11 @@
     stName: AllData.ClicksiteName,
     dataCode: "",
     stType: AllData.RightShowType,
-    stCode: AllData.GWBD.stCode,
+    stCode: AllData.RightStCode,
     wellCode: "",
     id: AllData.RightShowID,
     dataId: "",
+    RefName: "jiancefenxiGWFX",
   };
   localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗  默认为On
   bus.emit("DynamicBus", params);

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 9e999e6..3a6a7ad 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -136,4 +136,12 @@
     method: 'get',
     params,
   });
+}
+
+export function siteWaterYieldAnalysisByDate(params) {
+  return request({
+    url: `business/monitorData/siteWaterYieldAnalysisByDate`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5de5268..4c0219f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -132,7 +132,7 @@
   console.log("arrid.value", arrid.value);
   // debugger;
   if (
-    type == "rain_water_pump_station_info" &&
+    (type == "rain_water_pump_station_info" || type == "sewage_pump_station_info") &&
     router.currentRoute.value.fullPath == "/DrainageSystem" &&
     localStorage.getItem("ReturnPSTX") == "off"
   ) {
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index ddff7d5..8a5a6f5 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -198,7 +198,6 @@
 }
 .selectTabs {
   position: absolute;
-
   width: 100%;
   left: 0;
   top: 0;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 9ecae08..b263c92 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -132,30 +132,38 @@
         <div class="modular2_right">
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
-            <!-- 上游水量在接驳口时不展示 -->
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.nowDay + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.nowDay ? AllData.SLFX.nowDay : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">收水量</div>
+              <div class="SlList2P">今日水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.siteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.yesterday + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.yesterday ? AllData.SLFX.yesterday : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">当前站点水量</div>
+              <div class="SlList2P">昨日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.average + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.average ? AllData.SLFX.average : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">7日平均水量</div>
             </div>
           </div>
         </div>
@@ -189,7 +197,7 @@
             <div class="ListInfo100">
               <div class="ListInfo_label">站点编号:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
+                {{ AllData.RightStCode ? AllData.RightStCode : "--" }}
               </div>
             </div>
 
@@ -218,15 +226,15 @@
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">标段片区:</div>
+              <div class="ListInfo_label">所在道路:</div>
               <div class="ListInfo_value">
                 {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">末次运维:</div>
+              <div class="ListInfo_label">所属标段:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
+                {{ AllData.GWBD.watchAreaName ? AllData.GWBD.watchAreaName : "--" }}
               </div>
             </div>
           </div>
@@ -293,6 +301,7 @@
   RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断
   RightShowID: "",
   RightShowType: "",
+  RightStCode: "",
   TitleName: [
     {
       abbreviation: "高新区", //分区缩写-动态
@@ -667,7 +676,9 @@
       // 说明是同样的一个点点了两次,所以进行关闭
       AllData.RightShow = false;
       AllData.RightShowID = "";
+      AllData.RightStCode = "";
     } else {
+      AllData.RightStCode = Row.properties.stCode;
       // 管点
       if (Row.properties.pointType == "sewage_pipeline_quality") {
         AllData.ClicksiteName = Row.properties.name;
@@ -690,13 +701,13 @@
             pointType: "--",
             pointNumber: "--",
             stAsName: "--",
-            stCode: "--",
+            stCode: AllData.RightStCode || "--",
             buildTime: "--",
             pipelineDiameter: "--",
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
 
@@ -1015,11 +1026,11 @@
 };
 // 获取数据 刘芳阳 上下游分析
 const getDataSXY = (row) => {
-  MonitorAPI.siteWaterYieldAnalysis({
+  MonitorAPI.siteWaterYieldAnalysisByDate({
     stCode: row.stCode,
-    stType: row.pointType,
-    start: moment().format("YYYY-MM-DD") + " 00:00:00",
-    end: moment().format("YYYY-MM-DD") + " 23:59:59",
+    // stType: row.pointType,
+    // start: moment().format("YYYY-MM-DD") + " 00:00:00",
+    // end: moment().format("YYYY-MM-DD") + " 23:59:59",
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.SLFX = res.data;
@@ -1120,11 +1131,13 @@
     stName: AllData.ClicksiteName,
     dataCode: "",
     stType: AllData.RightShowType,
-    stCode: AllData.GWBD.stCode,
+    stCode: AllData.RightStCode,
     wellCode: "",
     id: AllData.RightShowID,
     dataId: "",
+    RefName: "jiancefenxiGWFX",
   };
+  localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗  默认为On
   bus.emit("DynamicBus", params);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 8d14263..7061aec 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -148,44 +148,38 @@
         <div class="modular2_right">
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
-            <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
-              <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
-                </el-tooltip>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">上游水量</div>
-            </div>
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.siteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
-                </el-tooltip>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">当前站点水量</div>
-            </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.downstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
+                <el-tooltip :content="AllData.SLFX.nowDay + '万吨'" placement="top">
                   <span class="SlListNum">{{
-                    AllData.SLFX.downstreamSiteWaterYield
+                    AllData.SLFX.nowDay ? AllData.SLFX.nowDay : "--"
                   }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">下游水量</div>
+              <div class="SlList2P">今日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.yesterday + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.yesterday ? AllData.SLFX.yesterday : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">昨日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.average + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.average ? AllData.SLFX.average : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">7日平均水量</div>
             </div>
           </div>
         </div>
@@ -219,7 +213,7 @@
             <div class="ListInfo100">
               <div class="ListInfo_label">站点编号:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
+                {{ AllData.RightStCode ? AllData.RightStCode : "--" }}
               </div>
             </div>
 
@@ -248,15 +242,15 @@
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">标段片区:</div>
+              <div class="ListInfo_label">所在道路:</div>
               <div class="ListInfo_value">
                 {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">末次运维:</div>
+              <div class="ListInfo_label">所属标段:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
+                {{ AllData.GWBD.watchAreaName ? AllData.GWBD.watchAreaName : "--" }}
               </div>
             </div>
           </div>
@@ -353,6 +347,7 @@
   RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断
   RightShowID: "",
   RightShowType: "",
+  RightStCode: "",
   TitleName: [
     {
       abbreviation: "高新区", //分区缩写-动态
@@ -729,7 +724,9 @@
       AllData.RightShow = false;
       AllData.RightShowID = "";
       AllData.RightShowType = "";
+      AllData.RightStCode = "";
     } else {
+      AllData.RightStCode = Row.properties.stCode;
       // 管点
       if (Row.properties.pointType == "rainwater_pipeline_quality") {
         AllData.ClicksiteName = Row.properties.name;
@@ -751,13 +748,13 @@
             pointType: "--",
             pointNumber: "--",
             stAsName: "--",
-            stCode: "--",
+            stCode: AllData.RightStCode || "--",
             buildTime: "--",
             pipelineDiameter: "--",
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
         //   根据type 判断是管井还是接驳口
@@ -1153,11 +1150,11 @@
 };
 // 获取数据 刘芳阳 上下游分析
 const getDataSXY = (row) => {
-  MonitorAPI.siteWaterYieldAnalysis({
+  MonitorAPI.siteWaterYieldAnalysisByDate({
     stCode: row.stCode,
-    stType: row.pointType,
-    start: moment().format("YYYY-MM-DD") + " 00:00:00",
-    end: moment().format("YYYY-MM-DD") + " 23:59:59",
+    // stType: row.pointType,
+    // start: moment().format("YYYY-MM-DD") + " 00:00:00",
+    // end: moment().format("YYYY-MM-DD") + " 23:59:59",
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.SLFX = res.data;
@@ -1257,10 +1254,11 @@
     stName: AllData.ClicksiteName,
     dataCode: "",
     stType: AllData.RightShowType,
-    stCode: AllData.GWBD.stCode,
+    stCode: AllData.RightStCode,
     wellCode: "",
     id: AllData.RightShowID,
     dataId: "",
+    RefName: "jiancefenxiGWFX",
   };
   localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗  默认为On
   bus.emit("DynamicBus", params);
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
index bfd5a24..4e0d62f 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
@@ -120,7 +120,7 @@
             // minInterval: 1,
             min: 0,
             axisLabel: {
-              color: "#AAC1CF",
+              color: "#19D5FF",
               show: true,
               formatter: function (value) {
                 return value.toFixed(2); // 保留两位小数
@@ -147,7 +147,7 @@
             // minInterval: 1,
             min: 0,
             axisLabel: {
-              color: "#AAC1CF",
+              color: "#b14de5",
               show: true,
               formatter: function (value) {
                 return value.toFixed(2); // 保留两位小数
@@ -172,7 +172,7 @@
             // minInterval: 1,
             min: 0,
             axisLabel: {
-              color: "#AAC1CF",
+              color: "#99FF55",
               show: true,
               formatter: function (value) {
                 return value.toFixed(2); // 保留两位小数

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 9e999e6..3a6a7ad 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -136,4 +136,12 @@
     method: 'get',
     params,
   });
+}
+
+export function siteWaterYieldAnalysisByDate(params) {
+  return request({
+    url: `business/monitorData/siteWaterYieldAnalysisByDate`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5de5268..4c0219f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -132,7 +132,7 @@
   console.log("arrid.value", arrid.value);
   // debugger;
   if (
-    type == "rain_water_pump_station_info" &&
+    (type == "rain_water_pump_station_info" || type == "sewage_pump_station_info") &&
     router.currentRoute.value.fullPath == "/DrainageSystem" &&
     localStorage.getItem("ReturnPSTX") == "off"
   ) {
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index ddff7d5..8a5a6f5 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -198,7 +198,6 @@
 }
 .selectTabs {
   position: absolute;
-
   width: 100%;
   left: 0;
   top: 0;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 9ecae08..b263c92 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -132,30 +132,38 @@
         <div class="modular2_right">
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
-            <!-- 上游水量在接驳口时不展示 -->
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.nowDay + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.nowDay ? AllData.SLFX.nowDay : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">收水量</div>
+              <div class="SlList2P">今日水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.siteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.yesterday + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.yesterday ? AllData.SLFX.yesterday : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">当前站点水量</div>
+              <div class="SlList2P">昨日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.average + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.average ? AllData.SLFX.average : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">7日平均水量</div>
             </div>
           </div>
         </div>
@@ -189,7 +197,7 @@
             <div class="ListInfo100">
               <div class="ListInfo_label">站点编号:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
+                {{ AllData.RightStCode ? AllData.RightStCode : "--" }}
               </div>
             </div>
 
@@ -218,15 +226,15 @@
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">标段片区:</div>
+              <div class="ListInfo_label">所在道路:</div>
               <div class="ListInfo_value">
                 {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">末次运维:</div>
+              <div class="ListInfo_label">所属标段:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
+                {{ AllData.GWBD.watchAreaName ? AllData.GWBD.watchAreaName : "--" }}
               </div>
             </div>
           </div>
@@ -293,6 +301,7 @@
   RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断
   RightShowID: "",
   RightShowType: "",
+  RightStCode: "",
   TitleName: [
     {
       abbreviation: "高新区", //分区缩写-动态
@@ -667,7 +676,9 @@
       // 说明是同样的一个点点了两次,所以进行关闭
       AllData.RightShow = false;
       AllData.RightShowID = "";
+      AllData.RightStCode = "";
     } else {
+      AllData.RightStCode = Row.properties.stCode;
       // 管点
       if (Row.properties.pointType == "sewage_pipeline_quality") {
         AllData.ClicksiteName = Row.properties.name;
@@ -690,13 +701,13 @@
             pointType: "--",
             pointNumber: "--",
             stAsName: "--",
-            stCode: "--",
+            stCode: AllData.RightStCode || "--",
             buildTime: "--",
             pipelineDiameter: "--",
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
 
@@ -1015,11 +1026,11 @@
 };
 // 获取数据 刘芳阳 上下游分析
 const getDataSXY = (row) => {
-  MonitorAPI.siteWaterYieldAnalysis({
+  MonitorAPI.siteWaterYieldAnalysisByDate({
     stCode: row.stCode,
-    stType: row.pointType,
-    start: moment().format("YYYY-MM-DD") + " 00:00:00",
-    end: moment().format("YYYY-MM-DD") + " 23:59:59",
+    // stType: row.pointType,
+    // start: moment().format("YYYY-MM-DD") + " 00:00:00",
+    // end: moment().format("YYYY-MM-DD") + " 23:59:59",
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.SLFX = res.data;
@@ -1120,11 +1131,13 @@
     stName: AllData.ClicksiteName,
     dataCode: "",
     stType: AllData.RightShowType,
-    stCode: AllData.GWBD.stCode,
+    stCode: AllData.RightStCode,
     wellCode: "",
     id: AllData.RightShowID,
     dataId: "",
+    RefName: "jiancefenxiGWFX",
   };
+  localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗  默认为On
   bus.emit("DynamicBus", params);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 8d14263..7061aec 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -148,44 +148,38 @@
         <div class="modular2_right">
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
-            <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
-              <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
-                </el-tooltip>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">上游水量</div>
-            </div>
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.siteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
-                </el-tooltip>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">当前站点水量</div>
-            </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.downstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
+                <el-tooltip :content="AllData.SLFX.nowDay + '万吨'" placement="top">
                   <span class="SlListNum">{{
-                    AllData.SLFX.downstreamSiteWaterYield
+                    AllData.SLFX.nowDay ? AllData.SLFX.nowDay : "--"
                   }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">下游水量</div>
+              <div class="SlList2P">今日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.yesterday + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.yesterday ? AllData.SLFX.yesterday : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">昨日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.average + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.average ? AllData.SLFX.average : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">7日平均水量</div>
             </div>
           </div>
         </div>
@@ -219,7 +213,7 @@
             <div class="ListInfo100">
               <div class="ListInfo_label">站点编号:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
+                {{ AllData.RightStCode ? AllData.RightStCode : "--" }}
               </div>
             </div>
 
@@ -248,15 +242,15 @@
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">标段片区:</div>
+              <div class="ListInfo_label">所在道路:</div>
               <div class="ListInfo_value">
                 {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">末次运维:</div>
+              <div class="ListInfo_label">所属标段:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
+                {{ AllData.GWBD.watchAreaName ? AllData.GWBD.watchAreaName : "--" }}
               </div>
             </div>
           </div>
@@ -353,6 +347,7 @@
   RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断
   RightShowID: "",
   RightShowType: "",
+  RightStCode: "",
   TitleName: [
     {
       abbreviation: "高新区", //分区缩写-动态
@@ -729,7 +724,9 @@
       AllData.RightShow = false;
       AllData.RightShowID = "";
       AllData.RightShowType = "";
+      AllData.RightStCode = "";
     } else {
+      AllData.RightStCode = Row.properties.stCode;
       // 管点
       if (Row.properties.pointType == "rainwater_pipeline_quality") {
         AllData.ClicksiteName = Row.properties.name;
@@ -751,13 +748,13 @@
             pointType: "--",
             pointNumber: "--",
             stAsName: "--",
-            stCode: "--",
+            stCode: AllData.RightStCode || "--",
             buildTime: "--",
             pipelineDiameter: "--",
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
         //   根据type 判断是管井还是接驳口
@@ -1153,11 +1150,11 @@
 };
 // 获取数据 刘芳阳 上下游分析
 const getDataSXY = (row) => {
-  MonitorAPI.siteWaterYieldAnalysis({
+  MonitorAPI.siteWaterYieldAnalysisByDate({
     stCode: row.stCode,
-    stType: row.pointType,
-    start: moment().format("YYYY-MM-DD") + " 00:00:00",
-    end: moment().format("YYYY-MM-DD") + " 23:59:59",
+    // stType: row.pointType,
+    // start: moment().format("YYYY-MM-DD") + " 00:00:00",
+    // end: moment().format("YYYY-MM-DD") + " 23:59:59",
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.SLFX = res.data;
@@ -1257,10 +1254,11 @@
     stName: AllData.ClicksiteName,
     dataCode: "",
     stType: AllData.RightShowType,
-    stCode: AllData.GWBD.stCode,
+    stCode: AllData.RightStCode,
     wellCode: "",
     id: AllData.RightShowID,
     dataId: "",
+    RefName: "jiancefenxiGWFX",
   };
   localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗  默认为On
   bus.emit("DynamicBus", params);
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
index bfd5a24..4e0d62f 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
@@ -120,7 +120,7 @@
             // minInterval: 1,
             min: 0,
             axisLabel: {
-              color: "#AAC1CF",
+              color: "#19D5FF",
               show: true,
               formatter: function (value) {
                 return value.toFixed(2); // 保留两位小数
@@ -147,7 +147,7 @@
             // minInterval: 1,
             min: 0,
             axisLabel: {
-              color: "#AAC1CF",
+              color: "#b14de5",
               show: true,
               formatter: function (value) {
                 return value.toFixed(2); // 保留两位小数
@@ -172,7 +172,7 @@
             // minInterval: 1,
             min: 0,
             axisLabel: {
-              color: "#AAC1CF",
+              color: "#99FF55",
               show: true,
               formatter: function (value) {
                 return value.toFixed(2); // 保留两位小数
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
index 0133750..e99f04d 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
@@ -1,13 +1,7 @@
 <template>
   <div id="PointAndLine">
     <div class="items-content">
-      <div
-        class="contentitem"
-        v-for="p in GXOBJ"
-        :key="p"
-        v-show="p.name != 'geometry'"
-        :class="[p.type]"
-      >
+      <div class="contentitem" v-for="p in GXOBJ" :key="p" v-show="p.name != 'geometry'" :class="[p.type]">
         <el-tooltip class="item" effect="light" placement="top" :content="p.name">
           <div class="name gxname">{{ p.name }}</div>
         </el-tooltip>
@@ -35,9 +29,7 @@
           placement="top"
           :content="typeof p.value == 'number' ? p.value.toFixed(3) : p.value || '-'"
         >
-          <div class="value gxvalue">
-            ：{{ typeof p.value == "number" ? p.value.toFixed(3) : p.value || "-" }}
-          </div>
+          <div class="value gxvalue">：{{ typeof p.value == 'number' ? p.value.toFixed(3) : p.value || '-' }}</div>
         </el-tooltip>
       </div>
 
@@ -53,16 +45,16 @@
 </template>
 
 <script setup name="PointAndLine">
-import bus from "@/bus";
+import bus from '@/bus';
 import {
   downStreamAnalyse,
   upStreamAnalyse,
   connectAnalyse,
   selectByPointNumber,
   getByPipeLineCode,
-} from "@/api/MonitorAssetsOnMap";
+} from '@/api/MonitorAssetsOnMap';
 const { proxy } = getCurrentInstance();
-
+const { ownership } = proxy.useDict('ownership');
 const props = defineProps({
   // 数据id
   dataID: {
@@ -86,7 +78,7 @@
   },
 });
 
-const typearr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+const typearr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
 const setnamobj = ref([]);
 const GXOBJ = ref();
@@ -112,15 +104,15 @@
  * @param {Object} properties - 包含其他属性的对象
  */
 function Distinguishnames() {
-  console.log("props", props);
+  console.log('props', props);
   let properties = cleanKeyNames(props.Getproperties);
-  console.log("properties", properties);
+  console.log('properties', properties);
   // 假设GXOBJ.value 与本函数无关，如果它也需要被清空或重置，可以取消下面这行的注释
   GXOBJ.value = [];
   // 清除现有的 setnamobj.value（如果需要的话）
   setnamobj.value = [];
   switch (props.dataCode) {
-    case "pipeline_info_text":
+    case 'pipeline_info_text':
       // setnamobj.value = [
       //   '管段编码',
       //   '起始井号',
@@ -138,11 +130,11 @@
       //   '维护管理单位',
       //   '管段长度',
       // ];
-      pointOrline("line");
+      pointOrline('line');
 
       return;
-    case "pipeline_info":
-      pointOrline("line");
+    case 'pipeline_info':
+      pointOrline('line');
 
       // setnamobj.value = [
       //   '管段编码',
@@ -162,8 +154,8 @@
       //   '管段长度',
       // ];
       return;
-    case "pipeline_point":
-      pointOrline("point");
+    case 'pipeline_point':
+      pointOrline('point');
       // let nameobj = [
       //   '设施编号',
       //   '地面高程',
@@ -200,53 +192,59 @@
 
       return;
     // break;
-    case "已建管网测点":
-      setnamobj.value = ["站点名称", "站点编号"];
+    case '已建管网测点':
+      setnamobj.value = ['站点名称', '站点编号'];
 
       GXOBJ.value = [
-        { name: "站点名称", value: properties.st_name },
-        { name: "站点编号", value: properties.st_code },
+        { name: '站点名称', value: properties.st_name },
+        { name: '站点编号', value: properties.st_code },
       ];
 
       break;
-    case "point":
+    case 'point':
       setnamobj.value = [
-        "管段编码",
-        "起始井号",
-        "终止井号",
-        "管线材质",
-        "管径",
-        "起点埋深",
-        "终点埋深",
-        "起点高程",
-        "终点高程",
-        "管段类型",
-        "道路名称",
-        "管网归属",
-        "测区",
-        "维护管理单位",
-        "管段长度",
-        "大管套小管",
-        "断头管",
-        "雨污混接",
-        "管网逆坡",
+        '管段编码',
+        '起始井号',
+        '终止井号',
+        '管线材质',
+        '管径',
+        '起点埋深',
+        '终点埋深',
+        '起点高程',
+        '终点高程',
+        '管段类型',
+        '道路名称',
+        '管网归属',
+        '测区',
+        '维护管理单位',
+        '管段长度',
+        '大管套小管',
+        '断头管',
+        '雨污混接',
+        '管网逆坡',
       ];
 
       GXOBJ.value = [
-        { name: "所在排水系统", value: properties.drainageSystem },
-        { name: "起始井号", value: properties.startPointNumber },
-        { name: "终止井号", value: properties.endPointNumber },
-        { name: "管线材质", value: properties.pipelineTexture },
-        { name: "管径", value: properties.pipelineDiameter },
-        { name: "起点埋深", value: properties.startGroundDepth },
-        { name: "终点埋深", value: properties.endGroundDepth },
-        { name: "起点高程", value: properties.startCopNoseElevation },
-        { name: "终点高程", value: properties.endCopNoseElevation },
-        { name: "管段类型", value: properties.sectionType },
-        { name: "道路名称", value: properties.roadName },
-        { name: "管网归属", value: properties.ownershipUnits },
-        { name: "管段长度", value: properties.pipelineLength },
-        { name: "建设年代", value: properties.constructionDate },
+        { name: '所在排水系统', value: properties.drainageSystem },
+        { name: '起始井号', value: properties.startPointNumber },
+        { name: '终止井号', value: properties.endPointNumber },
+        { name: '管线材质', value: properties.pipelineTexture },
+        { name: '管径', value: properties.pipelineDiameter },
+        { name: '起点埋深', value: properties.startGroundDepth },
+        { name: '终点埋深', value: properties.endGroundDepth },
+        { name: '起点高程', value: properties.startCopNoseElevation },
+        { name: '终点高程', value: properties.endCopNoseElevation },
+        { name: '管段类型', value: properties.sectionType },
+        { name: '道路名称', value: properties.roadName },
+        {
+          name: '管网归属',
+          value:
+            ownership.value.filter(item => {
+              return item.value == properties.ownershipUnits;
+            })[0].label || '-',
+        },
+        { name: '管段长度', value: properties.pipelineLength },
+        { name: '建设年代', value: properties.constructionDate },
         // { name: "大管套小管", value: properties.bigCoverSmallReason  },
         // { name: "断头管", value: properties.cutOffReason},
         // { name: "雨污混接",  value: properties.mixReason  },
@@ -254,53 +252,44 @@
         // { name: "流向错误", value: properties.flowDirectionWrongReason  },
       ];
       if (properties.bigCoverSmallReason) {
-        GXOBJ.value = [
-          ...GXOBJ.value,
-          { name: "大管套小管", value: properties.bigCoverSmallReason },
-        ];
+        GXOBJ.value = [...GXOBJ.value, { name: '大管套小管', value: properties.bigCoverSmallReason }];
       }
       if (properties.cutOffReason) {
-        GXOBJ.value = [
-          ...GXOBJ.value,
-          { name: "断头管", value: properties.cutOffReason },
-        ];
+        GXOBJ.value = [...GXOBJ.value, { name: '断头管', value: properties.cutOffReason }];
       }
       if (properties.mixReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: "雨污混接", value: properties.mixReason }];
+        GXOBJ.value = [...GXOBJ.value, { name: '雨污混接', value: properties.mixReason }];
       }
       if (properties.reverseSlopeReason) {
-        GXOBJ.value = [
-          ...GXOBJ.value,
-          { name: "管网逆坡", value: properties.reverseSlopeReason },
-        ];
+        GXOBJ.value = [...GXOBJ.value, { name: '管网逆坡', value: properties.reverseSlopeReason }];
       }
       // if (properties.flowDirectionWrongReason) {
       //   GXOBJ.value = [...GXOBJ.value, { name: '流向错误', value: properties.flowDirectionWrongReason }];
       // }
       // 流向错误
       break;
-    case "缺陷管点":
+    case '缺陷管点':
       setnamobj.value = [
-        "填报单位",
-        "所属流域",
-        "投入使用年限",
-        "管网是否已移交",
-        "管道材质",
-        "管道类型",
-        "管道缺陷类型",
-        "维护管理单位",
-        "联系方式",
-        "负责人",
-        "道路名称",
-        "需改造长度m",
-        "需要改造内容",
+        '填报单位',
+        '所属流域',
+        '投入使用年限',
+        '管网是否已移交',
+        '管道材质',
+        '管道类型',
+        '管道缺陷类型',
+        '维护管理单位',
+        '联系方式',
+        '负责人',
+        '道路名称',
+        '需改造长度m',
+        '需要改造内容',
       ];
 
       break;
     default:
       // 如果没有匹配到任何id，可以设置默认值或空数组
       setnamobj.value = [];
-      console.log("未知的id:", props.dataCode);
+      console.log('未知的id:', props.dataCode);
       return;
   }
 
@@ -308,63 +297,76 @@
 }
 
 function pointOrline(type) {
-  if (type == "point") {
+  if (type == 'point') {
     // 井底高程：地面高程-井深
     let prams = {
-      pointNumber: props.Getproperties["外业点号"],
+      pointNumber: props.Getproperties['外业点号'],
     };
-    selectByPointNumber(prams).then((res) => {
+    selectByPointNumber(prams).then(res => {
       console.log(res.data);
       let obj = res.data;
       GXOBJ.value = [
-        { name: "设施编号", value: obj.pointNumber || "-" },
-        { name: "地面高程", value: obj.groundElevation || "-" },
-        { name: "井盖尺寸", value: obj.manholeCoverSize || "-" },
-        { name: "井盖材质", value: obj.pointTexture || "-" },
-        { name: "井深", value: obj.bottomBuriedDepth || "-" },
-        { name: "井径", value: obj.wellDiameter || "-" },
-        { name: "特征", value: obj.features || "-" },
-        { name: "坡度", value: obj.slope || "-" },
-        { name: "类型", value: obj.pointType || "-" },
-        { name: "附属物", value: obj.appendage || "-" },
-        { name: "管网归属", value: obj.ownershipUnits || "-" },
-        { name: "维护管理单位", value: obj.operationalUnits || "-" },
-        { name: "道路名称", value: obj.roadName || "-" },
-        { name: "井底高程", value: obj.groundElevation - obj.bottomBuriedDepth || "-" },
+        { name: '设施编号', value: obj.pointNumber || '-' },
+        { name: '地面高程(m)', value: obj.groundElevation || '-' },
+        { name: '井盖尺寸(m)', value: obj.manholeCoverSize || '-' },
+        { name: '井盖材质', value: obj.pointTexture || '-' },
+        { name: '井深(m)', value: obj.bottomBuriedDepth || '-' },
+        { name: '井径(m)', value: obj.wellDiameter || '-' },
+        { name: '特征', value: obj.features || '-' },
+        { name: '坡度', value: obj.slope || '-' },
+        { name: '类型', value: (obj.pointType = 'YS' ? '雨水' : '污水' || '-') },
+        { name: '附属物', value: obj.appendage || '-' },
+        {
+          name: '管网归属',
+          value:
+            ownership.value.filter(item => {
+              return item.value == obj.ownershipUnits;
+            })[0].label || '-',
+        },
+
+        { name: '维护管理单位', value: obj.operationalUnits || '-' },
+        { name: '道路名称', value: obj.roadName || '-' },
+        { name: '井底高程(m)', value: obj.groundElevation - obj.bottomBuriedDepth || '-' },
       ];
     });
   }
-  if (type == "line") {
+  if (type == 'line') {
     let prams = {
-      pipeLineCode: props.Getproperties["管段编码"],
+      pipeLineCode: props.Getproperties['管段编码'],
     };
-    getByPipeLineCode(prams).then((res) => {
+    getByPipeLineCode(prams).then(res => {
       console.log(res.data);
 
       let obj2 = res.data;
       GXOBJ.value = [
-        { name: "排水系统", value: obj2.drainageSystem || "-" },
-        { name: "管道类别", value: obj2.pipelineType || "-" },
-        { name: "起点编号", value: obj2.startPointNumber || "-" },
-        { name: "终点编号", value: obj2.endPointNumber || "-" },
-        { name: "管线材质", value: obj2.pipelineTexture || "-" },
-        { name: "管径", value: obj2.pipelineDiameter || "-" },
-        { name: "起点埋深", value: obj2.startGroundDepth || "-" },
-        { name: "终点埋深", value: obj2.endGroundDepth || "-" },
-        { name: "起点高程", value: obj2.startCopNoseElevation || "-" },
-        { name: "终点高程", value: obj2.endCopNoseElevation || "-" },
-        { name: "道路名称", value: obj2.roadName || "-" },
-        { name: "权属单位", value: obj2.ownershipUnits || "-" },
-        { name: "管段长度", value: obj2.pipelineLength || "-" },
-        { name: "断面类型", value: obj2.sectionType || "-" },
-        { name: "管径1", value: obj2.sectionDataTwo || "-" },
+        { name: '排水系统', value: obj2.drainageSystem || '-' },
+        { name: '管道类别', value: obj2.pipelineType == 'YS' ? '雨水' : '污水' || '-' },
+        { name: '起点编号', value: obj2.startPointNumber || '-' },
+        { name: '终点编号', value: obj2.endPointNumber || '-' },
+        { name: '管线材质', value: obj2.pipelineTexture || '-' },
+        { name: '管径(mm)', value: obj2.pipelineDiameter || '-' },
+        { name: '起点埋深(m)', value: obj2.startGroundDepth || '-' },
+        { name: '终点埋深(m)', value: obj2.endGroundDepth || '-' },
+        { name: '起点高程(m)', value: obj2.startCopNoseElevation || '-' },
+        { name: '终点高程(m)', value: obj2.endCopNoseElevation || '-' },
+        { name: '道路名称', value: obj2.roadName || '-' },
+        {
+          name: '权属单位',
+          value:
+            ownership.value.filter(item => {
+              return item.value == obj2.ownershipUnits;
+            })[0].label || '-',
+        },
+        { name: '管段长度(m)', value: obj2.pipelineLength || '-' },
+        { name: '断面类型', value: obj2.sectionType || '-' },
+        { name: '管径宽(mm)', value: obj2.sectionDataTwo || '-' },
       ];
     });
   }
 }
 
 function setobj(properties) {
-  console.log("aaaa", properties, setnamobj.value);
+  console.log('aaaa', properties, setnamobj.value);
   if (properties) {
     for (var k in properties) {
       if (setnamobj.value.includes(k)) {
@@ -391,7 +393,7 @@
   // 遍历输入对象的所有属性
   for (let key in obj) {
     // 假设“清理”过程就是去除键名中的换行符（尽管在标准情况下这是不必要的）
-    let cleanKey = key.replace(/\n/g, ""); // 去除换行符
+    let cleanKey = key.replace(/\n/g, ''); // 去除换行符
 
     // 将清理后的键名和原始属性值复制到新对象中
     newObj[cleanKey] = obj[key];
@@ -400,23 +402,23 @@
   return newObj;
 }
 
-const key = "问题管线";
+const key = '问题管线';
 const isConnectivity = ref(false); //记录是否选择连通性分析
 const oldConnectivityData = ref({}); //上一个择连通性分析数据
-const guanxianAnalysis = async (type) => {
+const guanxianAnalysis = async type => {
   let properties = props.Getproperties;
 
   // properties['起始外业点号'] = 'I2206PYS1010172';
   // properties['终止外业点号'] = 'I2206PYS1010221';
-  console.log("properties123", properties);
-  console.log("type123", type);
+  console.log('properties123', properties);
+  console.log('type123', type);
   let results = {};
-  bus.emit("removeMapDatas", [key]);
+  bus.emit('removeMapDatas', [key]);
 
-  if(properties['管段编码']){
-    const startEnds =  _.chunk(properties['管段编码'],properties['管段编码'].length/2).map(o => o.join(''));
-    properties["起始外业点号"] = startEnds[0];
-    properties["终止外业点号"] = startEnds[1];
+  if (properties['管段编码']) {
+    const startEnds = _.chunk(properties['管段编码'], properties['管段编码'].length / 2).map(o => o.join(''));
+    properties['起始外业点号'] = startEnds[0];
+    properties['终止外业点号'] = startEnds[1];
   }
   const methods = {
     up: upStreamAnalyse,
@@ -424,47 +426,46 @@
     connectivity: connectAnalyse,
     question: upStreamAnalyse,
   }[type];
-  if (!isConnectivity.value && type == "connectivity") {
+  if (!isConnectivity.value && type == 'connectivity') {
     oldConnectivityData.value = properties;
     isConnectivity.value = true;
-    proxy.$modal.msgWarning("请再次选择需要连通性分析的另一条管线或管点进行分析");
-    bus.emit("closedia", [key]);
+    proxy.$modal.msgWarning('请再次选择需要连通性分析的另一条管线或管点进行分析');
+    bus.emit('closedia', [key]);
 
     return;
   } else if (isConnectivity.value) {
     //流通性分析 第二条管网
-    proxy.$modal.msgSuccess("正在进行流通性分析······");
+    proxy.$modal.msgSuccess('正在进行流通性分析······');
 
     isConnectivity.value = false;
     results = await methods({
-      startPointNumber:
-        oldConnectivityData.value["起始外业点号"] || properties["外业点号"],
-      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
+      startPointNumber: oldConnectivityData.value['起始外业点号'] || properties['外业点号'],
+      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
     });
     oldConnectivityData.value = {};
 
     gx_DataFun(results, properties, type);
-    bus.emit("closedia", [key]);
-  } else if (type == "updown") {
+    bus.emit('closedia', [key]);
+  } else if (type == 'updown') {
     let params = {
-      startPointNumber: properties["起始外业点号"] || properties["外业点号"],
-      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
+      startPointNumber: properties['起始外业点号'] || properties['外业点号'],
+      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
     };
-    await upStreamAnalyse(params).then((res) => {
-      console.log("上下游1", res);
+    await upStreamAnalyse(params).then(res => {
+      console.log('上下游1', res);
       gx_DataFun(res, properties, type);
     });
-    await downStreamAnalyse(params).then((res) => {
-      console.log("上下游2", res);
+    await downStreamAnalyse(params).then(res => {
+      console.log('上下游2', res);
       gx_DataFun(res, properties, type);
     });
   } else {
     oldConnectivityData.value = {};
     isConnectivity.value = false;
-    proxy.$modal.msgSuccess("正在分析中······");
+    proxy.$modal.msgSuccess('正在分析中······');
     results = await methods({
-      startPointNumber: properties["起始外业点号"] || properties["外业点号"],
-      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
+      startPointNumber: properties['起始外业点号'] || properties['外业点号'],
+      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
     });
     gx_DataFun(results, properties, type);
   }
@@ -472,36 +473,36 @@
 
 // 管线分析处理方法
 const gx_DataFun = (results, properties, type) => {
-  proxy.$modal.msgSuccess("分析完成！");
+  proxy.$modal.msgSuccess('分析完成！');
 
   const properKs = [
-    { key: "bigCoverSmallFlag", value: "大管套小管" },
-    { key: "cutOffFlag", value: "断头管" },
-    { key: "mixFlag", value: "雨污混接" },
-    { key: "reverseSlopeFlag", value: "管网逆坡" },
+    { key: 'bigCoverSmallFlag', value: '大管套小管' },
+    { key: 'cutOffFlag', value: '断头管' },
+    { key: 'mixFlag', value: '雨污混接' },
+    { key: 'reverseSlopeFlag', value: '管网逆坡' },
     // { key: 'flowDirectionWrongFlag', value: '流向错误' },
   ];
   //问题管线
   // errorText(i.properties)
   const questionLinePoints = results.data.pipelineInfoList
-    .filter((i) => properKs.map((k) => eval(i[k.key])).filter(Boolean)[0])
-    .map((i) => ({
+    .filter(i => properKs.map(k => eval(i[k.key])).filter(Boolean)[0])
+    .map(i => ({
       ...turf.center(turf.feature(Terraformer.WKT.parse(i.geometrys))),
       properties: i,
     }))
-    .map((i) => ({
+    .map(i => ({
       ...i,
       properties: {
         ...i.properties,
         name: `${key}:\n${properKs
           .map((k, o) => eval(i.properties[k.key]) && k.value)
           .filter(Boolean)
-          .map((k, o) => o + 1 + "、" + k)
-          .join("\n")}`,
+          .map((k, o) => o + 1 + '、' + k)
+          .join('\n')}`,
         geometrys: Terraformer.WKT.convert(i.geometry),
       },
     }));
-    const siteKey = 'rainwater_pipeline_water_level';
+  const siteKey = 'rainwater_pipeline_water_level';
   /*results.data.siteList = [
     {
       id: '2',
@@ -625,36 +626,31 @@
     },
   ];*/
   const siteList = (results.data.siteList || [])
-    .filter((i) => i.geometry)
-    .map((i) =>
+    .filter(i => i.geometry)
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometry), {
         ...i,
-        type: i.pointType + "_" + i.pipeWarn.warnTypeCode,
-        name: [i.pipeWarn.warnTypeName, "持续时间:" + (i.pipeWarn.duration || 0)].join(
-          "\n"
-        ),
+        type: i.pointType + '_' + i.pipeWarn.warnTypeCode,
+        name: [i.pipeWarn.warnTypeName, '持续时间:' + (i.pipeWarn.duration || 0)].join('\n'),
       })
     );
   // const siteList = (results.data.siteList || []).filter(i => i.geometry).map(i => turf.feature(Terraformer.WKT.parse(i.geometry),({...i,type:siteKey,name:[i.name,i.pipeWarn.warnTypeName].concat(i.siteData.monitorPropertyList.map((o,o_idx) => `${o.monitorName}${o.unit}：\t${i.siteData.monitorValueList[o_idx].monitorValue}`)).join('\n')})))
   //上下游管线
-  let pipelines = results.data.pipelineInfoList.map((i) => turf.feature(Terraformer.WKT.parse(i.geometrys), {...i, area: i.pipelineType == "YS" ? "雨水" : "污水",}))
-    .map((i) => i.properties.flowDirection == 1
-        ? turf.lineString(turf.getCoords(i).flat().reverse(), i.properties)
-        : i
-    );
+  let pipelines = results.data.pipelineInfoList
+    .map(i => turf.feature(Terraformer.WKT.parse(i.geometrys), { ...i, area: i.pipelineType == 'YS' ? '雨水' : '污水' }))
+    .map(i => (i.properties.flowDirection == 1 ? turf.lineString(turf.getCoords(i).flat().reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 
-  bus.emit("setGeoJSON", { json: turf.featureCollection(questionLinePoints), key });
-  siteList.length &&
-    bus.emit("setGeoJSON", { json: turf.featureCollection(siteList), key: siteKey });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(questionLinePoints), key });
+  siteList.length && bus.emit('setGeoJSON', { json: turf.featureCollection(siteList), key: siteKey });
 };
 
 onMounted(() => {
-  console.log("props", props);
+  console.log('props', props);
   Distinguishnames();
 });
 </script>

diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js
index 9e999e6..3a6a7ad 100644
--- a/src/api/MonitoringAnalysis.js
+++ b/src/api/MonitoringAnalysis.js
@@ -136,4 +136,12 @@
     method: 'get',
     params,
   });
+}
+
+export function siteWaterYieldAnalysisByDate(params) {
+  return request({
+    url: `business/monitorData/siteWaterYieldAnalysisByDate`,
+    method: 'get',
+    params,
+  });
 }
\ No newline at end of file
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 5de5268..4c0219f 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -132,7 +132,7 @@
   console.log("arrid.value", arrid.value);
   // debugger;
   if (
-    type == "rain_water_pump_station_info" &&
+    (type == "rain_water_pump_station_info" || type == "sewage_pump_station_info") &&
     router.currentRoute.value.fullPath == "/DrainageSystem" &&
     localStorage.getItem("ReturnPSTX") == "off"
   ) {
diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue
index ddff7d5..8a5a6f5 100644
--- a/src/views/pictureOnMap/inputSearch.vue
+++ b/src/views/pictureOnMap/inputSearch.vue
@@ -198,7 +198,6 @@
 }
 .selectTabs {
   position: absolute;
-
   width: 100%;
   left: 0;
   top: 0;
diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 9ecae08..b263c92 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -132,30 +132,38 @@
         <div class="modular2_right">
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
-            <!-- 上游水量在接驳口时不展示 -->
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.nowDay + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.nowDay ? AllData.SLFX.nowDay : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">收水量</div>
+              <div class="SlList2P">今日水量</div>
             </div>
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.siteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
+                <el-tooltip :content="AllData.SLFX.yesterday + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.yesterday ? AllData.SLFX.yesterday : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">当前站点水量</div>
+              <div class="SlList2P">昨日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.average + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.average ? AllData.SLFX.average : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">7日平均水量</div>
             </div>
           </div>
         </div>
@@ -189,7 +197,7 @@
             <div class="ListInfo100">
               <div class="ListInfo_label">站点编号:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
+                {{ AllData.RightStCode ? AllData.RightStCode : "--" }}
               </div>
             </div>
 
@@ -218,15 +226,15 @@
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">标段片区:</div>
+              <div class="ListInfo_label">所在道路:</div>
               <div class="ListInfo_value">
                 {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">末次运维:</div>
+              <div class="ListInfo_label">所属标段:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
+                {{ AllData.GWBD.watchAreaName ? AllData.GWBD.watchAreaName : "--" }}
               </div>
             </div>
           </div>
@@ -293,6 +301,7 @@
   RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断
   RightShowID: "",
   RightShowType: "",
+  RightStCode: "",
   TitleName: [
     {
       abbreviation: "高新区", //分区缩写-动态
@@ -667,7 +676,9 @@
       // 说明是同样的一个点点了两次,所以进行关闭
       AllData.RightShow = false;
       AllData.RightShowID = "";
+      AllData.RightStCode = "";
     } else {
+      AllData.RightStCode = Row.properties.stCode;
       // 管点
       if (Row.properties.pointType == "sewage_pipeline_quality") {
         AllData.ClicksiteName = Row.properties.name;
@@ -690,13 +701,13 @@
             pointType: "--",
             pointNumber: "--",
             stAsName: "--",
-            stCode: "--",
+            stCode: AllData.RightStCode || "--",
             buildTime: "--",
             pipelineDiameter: "--",
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
 
@@ -1015,11 +1026,11 @@
 };
 // 获取数据 刘芳阳 上下游分析
 const getDataSXY = (row) => {
-  MonitorAPI.siteWaterYieldAnalysis({
+  MonitorAPI.siteWaterYieldAnalysisByDate({
     stCode: row.stCode,
-    stType: row.pointType,
-    start: moment().format("YYYY-MM-DD") + " 00:00:00",
-    end: moment().format("YYYY-MM-DD") + " 23:59:59",
+    // stType: row.pointType,
+    // start: moment().format("YYYY-MM-DD") + " 00:00:00",
+    // end: moment().format("YYYY-MM-DD") + " 23:59:59",
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.SLFX = res.data;
@@ -1120,11 +1131,13 @@
     stName: AllData.ClicksiteName,
     dataCode: "",
     stType: AllData.RightShowType,
-    stCode: AllData.GWBD.stCode,
+    stCode: AllData.RightStCode,
     wellCode: "",
     id: AllData.RightShowID,
     dataId: "",
+    RefName: "jiancefenxiGWFX",
   };
+  localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗  默认为On
   bus.emit("DynamicBus", params);
 };
 onMounted(() => {
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 8d14263..7061aec 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -148,44 +148,38 @@
         <div class="modular2_right">
           <div class="leve2Title">水量分析</div>
           <div class="modularBody">
-            <!-- 上游水量在接驳口时不展示 -->
-            <div v-if="!AllData.isJBK" class="SLList">
-              <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
-                </el-tooltip>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">上游水量</div>
-            </div>
             <div class="SLList">
               <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.siteWaterYield + '万吨'"
-                  placement="top"
-                >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
-                </el-tooltip>
-                <span class="SlListUnit">万吨</span>
-              </div>
-              <div class="SlList2P">当前站点水量</div>
-            </div>
-            <div class="SLList">
-              <div class="SlList1P">
-                <el-tooltip
-                  :content="AllData.SLFX.downstreamSiteWaterYield + '万吨'"
-                  placement="top"
-                >
+                <el-tooltip :content="AllData.SLFX.nowDay + '万吨'" placement="top">
                   <span class="SlListNum">{{
-                    AllData.SLFX.downstreamSiteWaterYield
+                    AllData.SLFX.nowDay ? AllData.SLFX.nowDay : "--"
                   }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
-              <div class="SlList2P">下游水量</div>
+              <div class="SlList2P">今日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.yesterday + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.yesterday ? AllData.SLFX.yesterday : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">昨日水量</div>
+            </div>
+            <div class="SLList">
+              <div class="SlList1P">
+                <el-tooltip :content="AllData.SLFX.average + '万吨'" placement="top">
+                  <span class="SlListNum">{{
+                    AllData.SLFX.average ? AllData.SLFX.average : "--"
+                  }}</span>
+                </el-tooltip>
+                <span class="SlListUnit">万吨</span>
+              </div>
+              <div class="SlList2P">7日平均水量</div>
             </div>
           </div>
         </div>
@@ -219,7 +213,7 @@
             <div class="ListInfo100">
               <div class="ListInfo_label">站点编号:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.stCode ? AllData.GWBD.stCode : "--" }}
+                {{ AllData.RightStCode ? AllData.RightStCode : "--" }}
               </div>
             </div>
 
@@ -248,15 +242,15 @@
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">标段片区:</div>
+              <div class="ListInfo_label">所在道路:</div>
               <div class="ListInfo_value">
                 {{ AllData.GWBD.roadName ? AllData.GWBD.roadName : "--" }}
               </div>
             </div>
             <div class="ListInfo50">
-              <div class="ListInfo_label">末次运维:</div>
+              <div class="ListInfo_label">所属标段:</div>
               <div class="ListInfo_value">
-                {{ AllData.GWBD.repairYear ? AllData.GWBD.repairYear : "--" }}
+                {{ AllData.GWBD.watchAreaName ? AllData.GWBD.watchAreaName : "--" }}
               </div>
             </div>
           </div>
@@ -353,6 +347,7 @@
   RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断
   RightShowID: "",
   RightShowType: "",
+  RightStCode: "",
   TitleName: [
     {
       abbreviation: "高新区", //分区缩写-动态
@@ -729,7 +724,9 @@
       AllData.RightShow = false;
       AllData.RightShowID = "";
       AllData.RightShowType = "";
+      AllData.RightStCode = "";
     } else {
+      AllData.RightStCode = Row.properties.stCode;
       // 管点
       if (Row.properties.pointType == "rainwater_pipeline_quality") {
         AllData.ClicksiteName = Row.properties.name;
@@ -751,13 +748,13 @@
             pointType: "--",
             pointNumber: "--",
             stAsName: "--",
-            stCode: "--",
+            stCode: AllData.RightStCode || "--",
             buildTime: "--",
             pipelineDiameter: "--",
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
         //   根据type 判断是管井还是接驳口
@@ -1153,11 +1150,11 @@
 };
 // 获取数据 刘芳阳 上下游分析
 const getDataSXY = (row) => {
-  MonitorAPI.siteWaterYieldAnalysis({
+  MonitorAPI.siteWaterYieldAnalysisByDate({
     stCode: row.stCode,
-    stType: row.pointType,
-    start: moment().format("YYYY-MM-DD") + " 00:00:00",
-    end: moment().format("YYYY-MM-DD") + " 23:59:59",
+    // stType: row.pointType,
+    // start: moment().format("YYYY-MM-DD") + " 00:00:00",
+    // end: moment().format("YYYY-MM-DD") + " 23:59:59",
   }).then((res) => {
     if (res && res.code == 200) {
       AllData.SLFX = res.data;
@@ -1257,10 +1254,11 @@
     stName: AllData.ClicksiteName,
     dataCode: "",
     stType: AllData.RightShowType,
-    stCode: AllData.GWBD.stCode,
+    stCode: AllData.RightStCode,
     wellCode: "",
     id: AllData.RightShowID,
     dataId: "",
+    RefName: "jiancefenxiGWFX",
   };
   localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗  默认为On
   bus.emit("DynamicBus", params);
diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
index bfd5a24..4e0d62f 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/components/RightCharts.vue
@@ -120,7 +120,7 @@
             // minInterval: 1,
             min: 0,
             axisLabel: {
-              color: "#AAC1CF",
+              color: "#19D5FF",
               show: true,
               formatter: function (value) {
                 return value.toFixed(2); // 保留两位小数
@@ -147,7 +147,7 @@
             // minInterval: 1,
             min: 0,
             axisLabel: {
-              color: "#AAC1CF",
+              color: "#b14de5",
               show: true,
               formatter: function (value) {
                 return value.toFixed(2); // 保留两位小数
@@ -172,7 +172,7 @@
             // minInterval: 1,
             min: 0,
             axisLabel: {
-              color: "#AAC1CF",
+              color: "#99FF55",
               show: true,
               formatter: function (value) {
                 return value.toFixed(2); // 保留两位小数
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
index 0133750..e99f04d 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/PointAndLine.vue
@@ -1,13 +1,7 @@
 <template>
   <div id="PointAndLine">
     <div class="items-content">
-      <div
-        class="contentitem"
-        v-for="p in GXOBJ"
-        :key="p"
-        v-show="p.name != 'geometry'"
-        :class="[p.type]"
-      >
+      <div class="contentitem" v-for="p in GXOBJ" :key="p" v-show="p.name != 'geometry'" :class="[p.type]">
         <el-tooltip class="item" effect="light" placement="top" :content="p.name">
           <div class="name gxname">{{ p.name }}</div>
         </el-tooltip>
@@ -35,9 +29,7 @@
           placement="top"
           :content="typeof p.value == 'number' ? p.value.toFixed(3) : p.value || '-'"
         >
-          <div class="value gxvalue">
-            ：{{ typeof p.value == "number" ? p.value.toFixed(3) : p.value || "-" }}
-          </div>
+          <div class="value gxvalue">：{{ typeof p.value == 'number' ? p.value.toFixed(3) : p.value || '-' }}</div>
         </el-tooltip>
       </div>
 
@@ -53,16 +45,16 @@
 </template>
 
 <script setup name="PointAndLine">
-import bus from "@/bus";
+import bus from '@/bus';
 import {
   downStreamAnalyse,
   upStreamAnalyse,
   connectAnalyse,
   selectByPointNumber,
   getByPipeLineCode,
-} from "@/api/MonitorAssetsOnMap";
+} from '@/api/MonitorAssetsOnMap';
 const { proxy } = getCurrentInstance();
-
+const { ownership } = proxy.useDict('ownership');
 const props = defineProps({
   // 数据id
   dataID: {
@@ -86,7 +78,7 @@
   },
 });
 
-const typearr = ["pipeline_point", "pipeline_info", "pipeline_info_text"];
+const typearr = ['pipeline_point', 'pipeline_info', 'pipeline_info_text'];
 
 const setnamobj = ref([]);
 const GXOBJ = ref();
@@ -112,15 +104,15 @@
  * @param {Object} properties - 包含其他属性的对象
  */
 function Distinguishnames() {
-  console.log("props", props);
+  console.log('props', props);
   let properties = cleanKeyNames(props.Getproperties);
-  console.log("properties", properties);
+  console.log('properties', properties);
   // 假设GXOBJ.value 与本函数无关，如果它也需要被清空或重置，可以取消下面这行的注释
   GXOBJ.value = [];
   // 清除现有的 setnamobj.value（如果需要的话）
   setnamobj.value = [];
   switch (props.dataCode) {
-    case "pipeline_info_text":
+    case 'pipeline_info_text':
       // setnamobj.value = [
       //   '管段编码',
       //   '起始井号',
@@ -138,11 +130,11 @@
       //   '维护管理单位',
       //   '管段长度',
       // ];
-      pointOrline("line");
+      pointOrline('line');
 
       return;
-    case "pipeline_info":
-      pointOrline("line");
+    case 'pipeline_info':
+      pointOrline('line');
 
       // setnamobj.value = [
       //   '管段编码',
@@ -162,8 +154,8 @@
       //   '管段长度',
       // ];
       return;
-    case "pipeline_point":
-      pointOrline("point");
+    case 'pipeline_point':
+      pointOrline('point');
       // let nameobj = [
       //   '设施编号',
       //   '地面高程',
@@ -200,53 +192,59 @@
 
       return;
     // break;
-    case "已建管网测点":
-      setnamobj.value = ["站点名称", "站点编号"];
+    case '已建管网测点':
+      setnamobj.value = ['站点名称', '站点编号'];
 
       GXOBJ.value = [
-        { name: "站点名称", value: properties.st_name },
-        { name: "站点编号", value: properties.st_code },
+        { name: '站点名称', value: properties.st_name },
+        { name: '站点编号', value: properties.st_code },
       ];
 
       break;
-    case "point":
+    case 'point':
       setnamobj.value = [
-        "管段编码",
-        "起始井号",
-        "终止井号",
-        "管线材质",
-        "管径",
-        "起点埋深",
-        "终点埋深",
-        "起点高程",
-        "终点高程",
-        "管段类型",
-        "道路名称",
-        "管网归属",
-        "测区",
-        "维护管理单位",
-        "管段长度",
-        "大管套小管",
-        "断头管",
-        "雨污混接",
-        "管网逆坡",
+        '管段编码',
+        '起始井号',
+        '终止井号',
+        '管线材质',
+        '管径',
+        '起点埋深',
+        '终点埋深',
+        '起点高程',
+        '终点高程',
+        '管段类型',
+        '道路名称',
+        '管网归属',
+        '测区',
+        '维护管理单位',
+        '管段长度',
+        '大管套小管',
+        '断头管',
+        '雨污混接',
+        '管网逆坡',
       ];
 
       GXOBJ.value = [
-        { name: "所在排水系统", value: properties.drainageSystem },
-        { name: "起始井号", value: properties.startPointNumber },
-        { name: "终止井号", value: properties.endPointNumber },
-        { name: "管线材质", value: properties.pipelineTexture },
-        { name: "管径", value: properties.pipelineDiameter },
-        { name: "起点埋深", value: properties.startGroundDepth },
-        { name: "终点埋深", value: properties.endGroundDepth },
-        { name: "起点高程", value: properties.startCopNoseElevation },
-        { name: "终点高程", value: properties.endCopNoseElevation },
-        { name: "管段类型", value: properties.sectionType },
-        { name: "道路名称", value: properties.roadName },
-        { name: "管网归属", value: properties.ownershipUnits },
-        { name: "管段长度", value: properties.pipelineLength },
-        { name: "建设年代", value: properties.constructionDate },
+        { name: '所在排水系统', value: properties.drainageSystem },
+        { name: '起始井号', value: properties.startPointNumber },
+        { name: '终止井号', value: properties.endPointNumber },
+        { name: '管线材质', value: properties.pipelineTexture },
+        { name: '管径', value: properties.pipelineDiameter },
+        { name: '起点埋深', value: properties.startGroundDepth },
+        { name: '终点埋深', value: properties.endGroundDepth },
+        { name: '起点高程', value: properties.startCopNoseElevation },
+        { name: '终点高程', value: properties.endCopNoseElevation },
+        { name: '管段类型', value: properties.sectionType },
+        { name: '道路名称', value: properties.roadName },
+        {
+          name: '管网归属',
+          value:
+            ownership.value.filter(item => {
+              return item.value == properties.ownershipUnits;
+            })[0].label || '-',
+        },
+        { name: '管段长度', value: properties.pipelineLength },
+        { name: '建设年代', value: properties.constructionDate },
         // { name: "大管套小管", value: properties.bigCoverSmallReason  },
         // { name: "断头管", value: properties.cutOffReason},
         // { name: "雨污混接",  value: properties.mixReason  },
@@ -254,53 +252,44 @@
         // { name: "流向错误", value: properties.flowDirectionWrongReason  },
       ];
       if (properties.bigCoverSmallReason) {
-        GXOBJ.value = [
-          ...GXOBJ.value,
-          { name: "大管套小管", value: properties.bigCoverSmallReason },
-        ];
+        GXOBJ.value = [...GXOBJ.value, { name: '大管套小管', value: properties.bigCoverSmallReason }];
       }
       if (properties.cutOffReason) {
-        GXOBJ.value = [
-          ...GXOBJ.value,
-          { name: "断头管", value: properties.cutOffReason },
-        ];
+        GXOBJ.value = [...GXOBJ.value, { name: '断头管', value: properties.cutOffReason }];
       }
       if (properties.mixReason) {
-        GXOBJ.value = [...GXOBJ.value, { name: "雨污混接", value: properties.mixReason }];
+        GXOBJ.value = [...GXOBJ.value, { name: '雨污混接', value: properties.mixReason }];
       }
       if (properties.reverseSlopeReason) {
-        GXOBJ.value = [
-          ...GXOBJ.value,
-          { name: "管网逆坡", value: properties.reverseSlopeReason },
-        ];
+        GXOBJ.value = [...GXOBJ.value, { name: '管网逆坡', value: properties.reverseSlopeReason }];
       }
       // if (properties.flowDirectionWrongReason) {
       //   GXOBJ.value = [...GXOBJ.value, { name: '流向错误', value: properties.flowDirectionWrongReason }];
       // }
       // 流向错误
       break;
-    case "缺陷管点":
+    case '缺陷管点':
       setnamobj.value = [
-        "填报单位",
-        "所属流域",
-        "投入使用年限",
-        "管网是否已移交",
-        "管道材质",
-        "管道类型",
-        "管道缺陷类型",
-        "维护管理单位",
-        "联系方式",
-        "负责人",
-        "道路名称",
-        "需改造长度m",
-        "需要改造内容",
+        '填报单位',
+        '所属流域',
+        '投入使用年限',
+        '管网是否已移交',
+        '管道材质',
+        '管道类型',
+        '管道缺陷类型',
+        '维护管理单位',
+        '联系方式',
+        '负责人',
+        '道路名称',
+        '需改造长度m',
+        '需要改造内容',
       ];
 
       break;
     default:
       // 如果没有匹配到任何id，可以设置默认值或空数组
       setnamobj.value = [];
-      console.log("未知的id:", props.dataCode);
+      console.log('未知的id:', props.dataCode);
       return;
   }
 
@@ -308,63 +297,76 @@
 }
 
 function pointOrline(type) {
-  if (type == "point") {
+  if (type == 'point') {
     // 井底高程：地面高程-井深
     let prams = {
-      pointNumber: props.Getproperties["外业点号"],
+      pointNumber: props.Getproperties['外业点号'],
     };
-    selectByPointNumber(prams).then((res) => {
+    selectByPointNumber(prams).then(res => {
       console.log(res.data);
       let obj = res.data;
       GXOBJ.value = [
-        { name: "设施编号", value: obj.pointNumber || "-" },
-        { name: "地面高程", value: obj.groundElevation || "-" },
-        { name: "井盖尺寸", value: obj.manholeCoverSize || "-" },
-        { name: "井盖材质", value: obj.pointTexture || "-" },
-        { name: "井深", value: obj.bottomBuriedDepth || "-" },
-        { name: "井径", value: obj.wellDiameter || "-" },
-        { name: "特征", value: obj.features || "-" },
-        { name: "坡度", value: obj.slope || "-" },
-        { name: "类型", value: obj.pointType || "-" },
-        { name: "附属物", value: obj.appendage || "-" },
-        { name: "管网归属", value: obj.ownershipUnits || "-" },
-        { name: "维护管理单位", value: obj.operationalUnits || "-" },
-        { name: "道路名称", value: obj.roadName || "-" },
-        { name: "井底高程", value: obj.groundElevation - obj.bottomBuriedDepth || "-" },
+        { name: '设施编号', value: obj.pointNumber || '-' },
+        { name: '地面高程(m)', value: obj.groundElevation || '-' },
+        { name: '井盖尺寸(m)', value: obj.manholeCoverSize || '-' },
+        { name: '井盖材质', value: obj.pointTexture || '-' },
+        { name: '井深(m)', value: obj.bottomBuriedDepth || '-' },
+        { name: '井径(m)', value: obj.wellDiameter || '-' },
+        { name: '特征', value: obj.features || '-' },
+        { name: '坡度', value: obj.slope || '-' },
+        { name: '类型', value: (obj.pointType = 'YS' ? '雨水' : '污水' || '-') },
+        { name: '附属物', value: obj.appendage || '-' },
+        {
+          name: '管网归属',
+          value:
+            ownership.value.filter(item => {
+              return item.value == obj.ownershipUnits;
+            })[0].label || '-',
+        },
+
+        { name: '维护管理单位', value: obj.operationalUnits || '-' },
+        { name: '道路名称', value: obj.roadName || '-' },
+        { name: '井底高程(m)', value: obj.groundElevation - obj.bottomBuriedDepth || '-' },
       ];
     });
   }
-  if (type == "line") {
+  if (type == 'line') {
     let prams = {
-      pipeLineCode: props.Getproperties["管段编码"],
+      pipeLineCode: props.Getproperties['管段编码'],
     };
-    getByPipeLineCode(prams).then((res) => {
+    getByPipeLineCode(prams).then(res => {
       console.log(res.data);
 
       let obj2 = res.data;
       GXOBJ.value = [
-        { name: "排水系统", value: obj2.drainageSystem || "-" },
-        { name: "管道类别", value: obj2.pipelineType || "-" },
-        { name: "起点编号", value: obj2.startPointNumber || "-" },
-        { name: "终点编号", value: obj2.endPointNumber || "-" },
-        { name: "管线材质", value: obj2.pipelineTexture || "-" },
-        { name: "管径", value: obj2.pipelineDiameter || "-" },
-        { name: "起点埋深", value: obj2.startGroundDepth || "-" },
-        { name: "终点埋深", value: obj2.endGroundDepth || "-" },
-        { name: "起点高程", value: obj2.startCopNoseElevation || "-" },
-        { name: "终点高程", value: obj2.endCopNoseElevation || "-" },
-        { name: "道路名称", value: obj2.roadName || "-" },
-        { name: "权属单位", value: obj2.ownershipUnits || "-" },
-        { name: "管段长度", value: obj2.pipelineLength || "-" },
-        { name: "断面类型", value: obj2.sectionType || "-" },
-        { name: "管径1", value: obj2.sectionDataTwo || "-" },
+        { name: '排水系统', value: obj2.drainageSystem || '-' },
+        { name: '管道类别', value: obj2.pipelineType == 'YS' ? '雨水' : '污水' || '-' },
+        { name: '起点编号', value: obj2.startPointNumber || '-' },
+        { name: '终点编号', value: obj2.endPointNumber || '-' },
+        { name: '管线材质', value: obj2.pipelineTexture || '-' },
+        { name: '管径(mm)', value: obj2.pipelineDiameter || '-' },
+        { name: '起点埋深(m)', value: obj2.startGroundDepth || '-' },
+        { name: '终点埋深(m)', value: obj2.endGroundDepth || '-' },
+        { name: '起点高程(m)', value: obj2.startCopNoseElevation || '-' },
+        { name: '终点高程(m)', value: obj2.endCopNoseElevation || '-' },
+        { name: '道路名称', value: obj2.roadName || '-' },
+        {
+          name: '权属单位',
+          value:
+            ownership.value.filter(item => {
+              return item.value == obj2.ownershipUnits;
+            })[0].label || '-',
+        },
+        { name: '管段长度(m)', value: obj2.pipelineLength || '-' },
+        { name: '断面类型', value: obj2.sectionType || '-' },
+        { name: '管径宽(mm)', value: obj2.sectionDataTwo || '-' },
       ];
     });
   }
 }
 
 function setobj(properties) {
-  console.log("aaaa", properties, setnamobj.value);
+  console.log('aaaa', properties, setnamobj.value);
   if (properties) {
     for (var k in properties) {
       if (setnamobj.value.includes(k)) {
@@ -391,7 +393,7 @@
   // 遍历输入对象的所有属性
   for (let key in obj) {
     // 假设“清理”过程就是去除键名中的换行符（尽管在标准情况下这是不必要的）
-    let cleanKey = key.replace(/\n/g, ""); // 去除换行符
+    let cleanKey = key.replace(/\n/g, ''); // 去除换行符
 
     // 将清理后的键名和原始属性值复制到新对象中
     newObj[cleanKey] = obj[key];
@@ -400,23 +402,23 @@
   return newObj;
 }
 
-const key = "问题管线";
+const key = '问题管线';
 const isConnectivity = ref(false); //记录是否选择连通性分析
 const oldConnectivityData = ref({}); //上一个择连通性分析数据
-const guanxianAnalysis = async (type) => {
+const guanxianAnalysis = async type => {
   let properties = props.Getproperties;
 
   // properties['起始外业点号'] = 'I2206PYS1010172';
   // properties['终止外业点号'] = 'I2206PYS1010221';
-  console.log("properties123", properties);
-  console.log("type123", type);
+  console.log('properties123', properties);
+  console.log('type123', type);
   let results = {};
-  bus.emit("removeMapDatas", [key]);
+  bus.emit('removeMapDatas', [key]);
 
-  if(properties['管段编码']){
-    const startEnds =  _.chunk(properties['管段编码'],properties['管段编码'].length/2).map(o => o.join(''));
-    properties["起始外业点号"] = startEnds[0];
-    properties["终止外业点号"] = startEnds[1];
+  if (properties['管段编码']) {
+    const startEnds = _.chunk(properties['管段编码'], properties['管段编码'].length / 2).map(o => o.join(''));
+    properties['起始外业点号'] = startEnds[0];
+    properties['终止外业点号'] = startEnds[1];
   }
   const methods = {
     up: upStreamAnalyse,
@@ -424,47 +426,46 @@
     connectivity: connectAnalyse,
     question: upStreamAnalyse,
   }[type];
-  if (!isConnectivity.value && type == "connectivity") {
+  if (!isConnectivity.value && type == 'connectivity') {
     oldConnectivityData.value = properties;
     isConnectivity.value = true;
-    proxy.$modal.msgWarning("请再次选择需要连通性分析的另一条管线或管点进行分析");
-    bus.emit("closedia", [key]);
+    proxy.$modal.msgWarning('请再次选择需要连通性分析的另一条管线或管点进行分析');
+    bus.emit('closedia', [key]);
 
     return;
   } else if (isConnectivity.value) {
     //流通性分析 第二条管网
-    proxy.$modal.msgSuccess("正在进行流通性分析······");
+    proxy.$modal.msgSuccess('正在进行流通性分析······');
 
     isConnectivity.value = false;
     results = await methods({
-      startPointNumber:
-        oldConnectivityData.value["起始外业点号"] || properties["外业点号"],
-      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
+      startPointNumber: oldConnectivityData.value['起始外业点号'] || properties['外业点号'],
+      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
     });
     oldConnectivityData.value = {};
 
     gx_DataFun(results, properties, type);
-    bus.emit("closedia", [key]);
-  } else if (type == "updown") {
+    bus.emit('closedia', [key]);
+  } else if (type == 'updown') {
     let params = {
-      startPointNumber: properties["起始外业点号"] || properties["外业点号"],
-      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
+      startPointNumber: properties['起始外业点号'] || properties['外业点号'],
+      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
     };
-    await upStreamAnalyse(params).then((res) => {
-      console.log("上下游1", res);
+    await upStreamAnalyse(params).then(res => {
+      console.log('上下游1', res);
       gx_DataFun(res, properties, type);
     });
-    await downStreamAnalyse(params).then((res) => {
-      console.log("上下游2", res);
+    await downStreamAnalyse(params).then(res => {
+      console.log('上下游2', res);
       gx_DataFun(res, properties, type);
     });
   } else {
     oldConnectivityData.value = {};
     isConnectivity.value = false;
-    proxy.$modal.msgSuccess("正在分析中······");
+    proxy.$modal.msgSuccess('正在分析中······');
     results = await methods({
-      startPointNumber: properties["起始外业点号"] || properties["外业点号"],
-      endPointNumber: properties["终止外业点号"] || properties["外业点号"],
+      startPointNumber: properties['起始外业点号'] || properties['外业点号'],
+      endPointNumber: properties['终止外业点号'] || properties['外业点号'],
     });
     gx_DataFun(results, properties, type);
   }
@@ -472,36 +473,36 @@
 
 // 管线分析处理方法
 const gx_DataFun = (results, properties, type) => {
-  proxy.$modal.msgSuccess("分析完成！");
+  proxy.$modal.msgSuccess('分析完成！');
 
   const properKs = [
-    { key: "bigCoverSmallFlag", value: "大管套小管" },
-    { key: "cutOffFlag", value: "断头管" },
-    { key: "mixFlag", value: "雨污混接" },
-    { key: "reverseSlopeFlag", value: "管网逆坡" },
+    { key: 'bigCoverSmallFlag', value: '大管套小管' },
+    { key: 'cutOffFlag', value: '断头管' },
+    { key: 'mixFlag', value: '雨污混接' },
+    { key: 'reverseSlopeFlag', value: '管网逆坡' },
     // { key: 'flowDirectionWrongFlag', value: '流向错误' },
   ];
   //问题管线
   // errorText(i.properties)
   const questionLinePoints = results.data.pipelineInfoList
-    .filter((i) => properKs.map((k) => eval(i[k.key])).filter(Boolean)[0])
-    .map((i) => ({
+    .filter(i => properKs.map(k => eval(i[k.key])).filter(Boolean)[0])
+    .map(i => ({
       ...turf.center(turf.feature(Terraformer.WKT.parse(i.geometrys))),
       properties: i,
     }))
-    .map((i) => ({
+    .map(i => ({
       ...i,
       properties: {
         ...i.properties,
         name: `${key}:\n${properKs
           .map((k, o) => eval(i.properties[k.key]) && k.value)
           .filter(Boolean)
-          .map((k, o) => o + 1 + "、" + k)
-          .join("\n")}`,
+          .map((k, o) => o + 1 + '、' + k)
+          .join('\n')}`,
         geometrys: Terraformer.WKT.convert(i.geometry),
       },
     }));
-    const siteKey = 'rainwater_pipeline_water_level';
+  const siteKey = 'rainwater_pipeline_water_level';
   /*results.data.siteList = [
     {
       id: '2',
@@ -625,36 +626,31 @@
     },
   ];*/
   const siteList = (results.data.siteList || [])
-    .filter((i) => i.geometry)
-    .map((i) =>
+    .filter(i => i.geometry)
+    .map(i =>
       turf.feature(Terraformer.WKT.parse(i.geometry), {
         ...i,
-        type: i.pointType + "_" + i.pipeWarn.warnTypeCode,
-        name: [i.pipeWarn.warnTypeName, "持续时间:" + (i.pipeWarn.duration || 0)].join(
-          "\n"
-        ),
+        type: i.pointType + '_' + i.pipeWarn.warnTypeCode,
+        name: [i.pipeWarn.warnTypeName, '持续时间:' + (i.pipeWarn.duration || 0)].join('\n'),
       })
     );
   // const siteList = (results.data.siteList || []).filter(i => i.geometry).map(i => turf.feature(Terraformer.WKT.parse(i.geometry),({...i,type:siteKey,name:[i.name,i.pipeWarn.warnTypeName].concat(i.siteData.monitorPropertyList.map((o,o_idx) => `${o.monitorName}${o.unit}：\t${i.siteData.monitorValueList[o_idx].monitorValue}`)).join('\n')})))
   //上下游管线
-  let pipelines = results.data.pipelineInfoList.map((i) => turf.feature(Terraformer.WKT.parse(i.geometrys), {...i, area: i.pipelineType == "YS" ? "雨水" : "污水",}))
-    .map((i) => i.properties.flowDirection == 1
-        ? turf.lineString(turf.getCoords(i).flat().reverse(), i.properties)
-        : i
-    );
+  let pipelines = results.data.pipelineInfoList
+    .map(i => turf.feature(Terraformer.WKT.parse(i.geometrys), { ...i, area: i.pipelineType == 'YS' ? '雨水' : '污水' }))
+    .map(i => (i.properties.flowDirection == 1 ? turf.lineString(turf.getCoords(i).flat().reverse(), i.properties) : i));
   newfiberMap
     .getLayers()
-    .filter((i) => i.newfiberId == "水系流向")[0]
+    .filter(i => i.newfiberId == '水系流向')[0]
     .getSource()
     .setData(turf.featureCollection(pipelines));
 
-  bus.emit("setGeoJSON", { json: turf.featureCollection(questionLinePoints), key });
-  siteList.length &&
-    bus.emit("setGeoJSON", { json: turf.featureCollection(siteList), key: siteKey });
+  bus.emit('setGeoJSON', { json: turf.featureCollection(questionLinePoints), key });
+  siteList.length && bus.emit('setGeoJSON', { json: turf.featureCollection(siteList), key: siteKey });
 };
 
 onMounted(() => {
-  console.log("props", props);
+  console.log('props', props);
   Distinguishnames();
 });
 </script>
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue b/src/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue
index e96a4e7..7396b2a 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/dialogTabs.vue
@@ -89,7 +89,6 @@
   RefreshName: "",
 });
 
-
 const updateTabsType = (name) => {
   AllData.editableTabsValue = name;
   AllData.RefreshName = name;
@@ -138,7 +137,11 @@
         AllData.editableTabs.push(element);
       }
     });
-    if (props.RefName == "" || props.RefName == undefined) {
+    if (
+      props.RefName == "" ||
+      props.RefName == undefined ||
+      !props.comIDs.includes(props.RefName)
+    ) {
       // 默认展示第一个
       AllData.editableTabsValue = AllData.editableTabs[0].name;
       AllData.RefreshName = AllData.editableTabs[0].name;