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/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 4d4d1d4..1221640 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -139,7 +139,11 @@
                   :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
                   placement="top"
                 >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
+                  <span class="SlListNum">{{
+                    AllData.SLFX.upstreamSiteWaterYield
+                      ? AllData.SLFX.upstreamSiteWaterYield
+                      : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
@@ -151,7 +155,9 @@
                   :content="AllData.SLFX.siteWaterYield + '万吨'"
                   placement="top"
                 >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
+                  <span class="SlListNum">{{
+                    AllData.SLFX.siteWaterYield ? AllData.SLFX.siteWaterYield : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
@@ -224,9 +230,9 @@
               </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>
@@ -699,7 +705,7 @@
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
 

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/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
index 4d4d1d4..1221640 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue
@@ -139,7 +139,11 @@
                   :content="AllData.SLFX.upstreamSiteWaterYield + '万吨'"
                   placement="top"
                 >
-                  <span class="SlListNum">{{ AllData.SLFX.upstreamSiteWaterYield }}</span>
+                  <span class="SlListNum">{{
+                    AllData.SLFX.upstreamSiteWaterYield
+                      ? AllData.SLFX.upstreamSiteWaterYield
+                      : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
@@ -151,7 +155,9 @@
                   :content="AllData.SLFX.siteWaterYield + '万吨'"
                   placement="top"
                 >
-                  <span class="SlListNum">{{ AllData.SLFX.siteWaterYield }}</span>
+                  <span class="SlListNum">{{
+                    AllData.SLFX.siteWaterYield ? AllData.SLFX.siteWaterYield : "--"
+                  }}</span>
                 </el-tooltip>
                 <span class="SlListUnit">万吨</span>
               </div>
@@ -224,9 +230,9 @@
               </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>
@@ -699,7 +705,7 @@
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
 
diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
index 85dc01b..c11c8c5 100644
--- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
+++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue
@@ -151,41 +151,36 @@
             <!-- 上游水量在接驳口时不展示 -->
             <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>
@@ -254,9 +249,9 @@
               </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>
@@ -760,7 +755,7 @@
             pipelineTexture: "--",
             issueType: "--",
             roadName: "--",
-            repairYear: "--",
+            watchAreaName: "--",
           };
         }
         //   根据type 判断是管井还是接驳口
@@ -1156,11 +1151,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;