diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 86078ff..690f489 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -470,4 +470,27 @@
     params
   });
 }
-// ``````````EDN`````````````````````
\ No newline at end of file
+// 辅助决策  防汛检查 街道数据
+export function dutyCheckInfoGetCheckCount(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckCount',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选列表
+export function dutyCheckInfoGetCheckResultList(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckResultList',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选新增
+export function dutyCheckResultBatchSave(params){
+  return request({
+    url:'/business/dutyCheckResult/batchSave',
+    method: 'post',
+    params
+  })
+}
\ No newline at end of file

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 86078ff..690f489 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -470,4 +470,27 @@
     params
   });
 }
-// ``````````EDN`````````````````````
\ No newline at end of file
+// 辅助决策  防汛检查 街道数据
+export function dutyCheckInfoGetCheckCount(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckCount',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选列表
+export function dutyCheckInfoGetCheckResultList(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckResultList',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选新增
+export function dutyCheckResultBatchSave(params){
+  return request({
+    url:'/business/dutyCheckResult/batchSave',
+    method: 'post',
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
index db6533a..41dc9dd 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
@@ -2,8 +2,7 @@
   <!-- 值班 -->
   <div class="Beonduty ">
     <EachModuleTitle title="辅助研判" :isTab="false"></EachModuleTitle>
-    <div class="typeList flex">
-      <!-- <div
+          <!-- <div
         class="flex-1 tab"
         :class="tabActive == i.value ? 'active' : ''"
         v-for="i in tabData"
@@ -12,6 +11,8 @@
       >
         {{ i.label }}
       </div> -->
+    <!-- <div class="typeList flex">
+
       <div
         class="flex-1 tab"
       >
@@ -27,9 +28,9 @@
       >
         排涝车辆{{ ZBTJData?.carOnlineNum||0 }}/{{ZBTJData?.carNum||0}}
       </div>
-    </div>
+    </div> -->
     <div class="yjBtn flex flex-align-center">
-      警情建议
+      预警建议
       <div class="blue pointer" @click="startEmergencyResponse">{{yjtj?.recommendGrade}}</div>
     </div>
     <!-- 防汛值班 -->

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 86078ff..690f489 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -470,4 +470,27 @@
     params
   });
 }
-// ``````````EDN`````````````````````
\ No newline at end of file
+// 辅助决策  防汛检查 街道数据
+export function dutyCheckInfoGetCheckCount(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckCount',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选列表
+export function dutyCheckInfoGetCheckResultList(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckResultList',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选新增
+export function dutyCheckResultBatchSave(params){
+  return request({
+    url:'/business/dutyCheckResult/batchSave',
+    method: 'post',
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
index db6533a..41dc9dd 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
@@ -2,8 +2,7 @@
   <!-- 值班 -->
   <div class="Beonduty ">
     <EachModuleTitle title="辅助研判" :isTab="false"></EachModuleTitle>
-    <div class="typeList flex">
-      <!-- <div
+          <!-- <div
         class="flex-1 tab"
         :class="tabActive == i.value ? 'active' : ''"
         v-for="i in tabData"
@@ -12,6 +11,8 @@
       >
         {{ i.label }}
       </div> -->
+    <!-- <div class="typeList flex">
+
       <div
         class="flex-1 tab"
       >
@@ -27,9 +28,9 @@
       >
         排涝车辆{{ ZBTJData?.carOnlineNum||0 }}/{{ZBTJData?.carNum||0}}
       </div>
-    </div>
+    </div> -->
     <div class="yjBtn flex flex-align-center">
-      警情建议
+      预警建议
       <div class="blue pointer" @click="startEmergencyResponse">{{yjtj?.recommendGrade}}</div>
     </div>
     <!-- 防汛值班 -->
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue
index e15387e..d79b92e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue
@@ -1,23 +1,48 @@
 <template>
   <!-- 防汛检查 -->
   <div class="Fangxunjiancha">
-    <div class="leve2Title">防汛检查</div>
-    <div v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-    <div class="sumInfo">
-      <div class="dataFrame">
-        <div class="sum">{{listData.pumpDispatchNum||0}}/{{listData.pumpNum||0}}</div>
-        <div class="name">泵站调度</div>
+    <div class="leve2Title" @click="dutyCheckInfoGetCheckCountFun">防汛检查</div>
+    <div v-loading="loading" element-loading-background="rgba(11, 18, 52, 0.3)">
+      <div class="sumInfo">
+        <div class="dataFrame">
+          <div class="sum">{{ listData.pumpDispatchNum || 0 }}/{{ listData.pumpNum || 0 }}</div>
+          <div class="name">泵站调度</div>
+        </div>
+        <div class="dataFrame">
+          <div class="sum">{{ listData.checkGoods || '' }}</div>
+          <div class="name">物资检查</div>
+        </div>
+        <el-popover :visible="visible" placement="top" :width="160">
+          <div>
+            <el-checkbox-group v-model="checkedCities">
+              <el-checkbox
+                v-for="item in cities"
+                :key="item.checkObjId"
+                :label="item.checkObjId"
+                :value="item.checkObjId"
+              >
+                {{ item.checkObjName}}
+              </el-checkbox>
+            </el-checkbox-group>
+          </div>
+          <div style="text-align: right; margin: 0">
+            <el-button size="small" text @click="visible = false">关闭</el-button>
+            <el-button size="small" type="primary" @click="confirmClick()"> 确定 </el-button>
+          </div>
+          <template #reference>
+            <div
+              class="dataFrame"
+              v-loading="loadingjiedao"
+              element-loading-background="rgba(11, 18, 52, 0.3)"
+              style="cursor: pointer"
+              @click="jiedaoFun()"
+            >
+              <div class="sum">{{ jiedaoData.regionHasCheckNum || 0 }}/{{ jiedaoData.regionNeedCheckNum || 0 }}</div>
+              <div class="name">街道</div>
+            </div>
+          </template>
+        </el-popover>
       </div>
-      <div class="dataFrame">
-        <div class="sum">{{listData.checkGoods||''}}</div>
-        <div class="name">物资检查</div>
-      </div>
-      <div class="dataFrame">
-        <div class="sum">{{listData.checkCars||''}}</div>
-        <div class="name">车辆检查</div>
-      </div>
-    </div>
     </div>
   </div>
 </template>
@@ -25,26 +50,80 @@
 import { ref, reactive, onMounted } from 'vue';
 import {
   drainageDispatchGetCheckCount,
+  dutyCheckInfoGetCheckCount,
+  dutyCheckInfoGetCheckResultList,
+  dutyCheckResultBatchSave,
 } from '@/api/FloodControlAndDrainage.js';
 const { proxy } = getCurrentInstance();
-const loading=ref(false)
-const listData=ref({
-  
-})
+const loading = ref(false);
+const jiedaoData = ref({});
+const visible = ref(false);
+const listData = ref({});
+const checkedCities = ref([]);
+const cities =  ref([]);
 function gitDataFun() {
-  loading.value=true
-  drainageDispatchGetCheckCount().then(res => {
-    console.log('获取防汛检查', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
+  loading.value = true;
+  drainageDispatchGetCheckCount().then(
+    res => {
+      console.log('获取防汛检查', res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+      }
+    },
+    error => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
+}
+// 街道应到操作
+const loadingjiedao = ref(false);
+function jiedaoFun() {
+  loadingjiedao.value = true;
+  dutyCheckInfoGetCheckResultList().then(
+    res => {
+      console.log('获取街道数据', res);
+      loadingjiedao.value = false;
+      if (res && res.code == 200) {
+        cities.value = res.data.regionCheckList;
+        res.data.regionHasCheckList.map((e)=>{
+           checkedCities.value.push(e.checkObjId)
+        })
+        console.log('cities.value', cities.value);
+        visible.value = true;
+      }
+    },
+    error => {
+      loadingjiedao.value = false;
+    }
+  );
+}
+// 获取街道数据
+async function dutyCheckInfoGetCheckCountFun() {
+  let res = await dutyCheckInfoGetCheckCount();
+  if (res && res.code == 200) {
+    jiedaoData.value = res.data;
+  }
+}
+async function confirmClick() {
+      console.log('checkedCities', checkedCities.value);
+
+  if(checkedCities.value.length>0){
+  let paams={
+    checkIds:checkedCities.value.join(',')
+  }
+  let res = await dutyCheckResultBatchSave(paams);
+  if (res && res.code == 200) {
+    proxy.$modal.msgSuccess('操作成功');
+    dutyCheckInfoGetCheckCountFun();
+    visible.value = false;
+  }
+  }
+
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
+  dutyCheckInfoGetCheckCountFun();
 });
 </script>
 <style lang="scss" scoped>
@@ -56,6 +135,7 @@
     padding-top: 5px;
     .dataFrame {
       width: 136px;
+
       height: 76px;
       text-align: center;
       background: url('@/assets/images/pictureOnMap/dataFrame.png') no-repeat center;
@@ -71,10 +151,12 @@
         font-weight: 500;
         font-size: 16px;
         color: #ccdfff;
-      font-family: 'SourceHanSansCN-Regular';
-
+        font-family: 'SourceHanSansCN-Regular';
       }
     }
   }
+  .el-radio__original {
+    display: none !important; /* 隐藏原生 radio 输入，但仍然允许交互 */
+  }
 }
 </style>

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 86078ff..690f489 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -470,4 +470,27 @@
     params
   });
 }
-// ``````````EDN`````````````````````
\ No newline at end of file
+// 辅助决策  防汛检查 街道数据
+export function dutyCheckInfoGetCheckCount(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckCount',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选列表
+export function dutyCheckInfoGetCheckResultList(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckResultList',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选新增
+export function dutyCheckResultBatchSave(params){
+  return request({
+    url:'/business/dutyCheckResult/batchSave',
+    method: 'post',
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
index db6533a..41dc9dd 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
@@ -2,8 +2,7 @@
   <!-- 值班 -->
   <div class="Beonduty ">
     <EachModuleTitle title="辅助研判" :isTab="false"></EachModuleTitle>
-    <div class="typeList flex">
-      <!-- <div
+          <!-- <div
         class="flex-1 tab"
         :class="tabActive == i.value ? 'active' : ''"
         v-for="i in tabData"
@@ -12,6 +11,8 @@
       >
         {{ i.label }}
       </div> -->
+    <!-- <div class="typeList flex">
+
       <div
         class="flex-1 tab"
       >
@@ -27,9 +28,9 @@
       >
         排涝车辆{{ ZBTJData?.carOnlineNum||0 }}/{{ZBTJData?.carNum||0}}
       </div>
-    </div>
+    </div> -->
     <div class="yjBtn flex flex-align-center">
-      警情建议
+      预警建议
       <div class="blue pointer" @click="startEmergencyResponse">{{yjtj?.recommendGrade}}</div>
     </div>
     <!-- 防汛值班 -->
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue
index e15387e..d79b92e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue
@@ -1,23 +1,48 @@
 <template>
   <!-- 防汛检查 -->
   <div class="Fangxunjiancha">
-    <div class="leve2Title">防汛检查</div>
-    <div v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-    <div class="sumInfo">
-      <div class="dataFrame">
-        <div class="sum">{{listData.pumpDispatchNum||0}}/{{listData.pumpNum||0}}</div>
-        <div class="name">泵站调度</div>
+    <div class="leve2Title" @click="dutyCheckInfoGetCheckCountFun">防汛检查</div>
+    <div v-loading="loading" element-loading-background="rgba(11, 18, 52, 0.3)">
+      <div class="sumInfo">
+        <div class="dataFrame">
+          <div class="sum">{{ listData.pumpDispatchNum || 0 }}/{{ listData.pumpNum || 0 }}</div>
+          <div class="name">泵站调度</div>
+        </div>
+        <div class="dataFrame">
+          <div class="sum">{{ listData.checkGoods || '' }}</div>
+          <div class="name">物资检查</div>
+        </div>
+        <el-popover :visible="visible" placement="top" :width="160">
+          <div>
+            <el-checkbox-group v-model="checkedCities">
+              <el-checkbox
+                v-for="item in cities"
+                :key="item.checkObjId"
+                :label="item.checkObjId"
+                :value="item.checkObjId"
+              >
+                {{ item.checkObjName}}
+              </el-checkbox>
+            </el-checkbox-group>
+          </div>
+          <div style="text-align: right; margin: 0">
+            <el-button size="small" text @click="visible = false">关闭</el-button>
+            <el-button size="small" type="primary" @click="confirmClick()"> 确定 </el-button>
+          </div>
+          <template #reference>
+            <div
+              class="dataFrame"
+              v-loading="loadingjiedao"
+              element-loading-background="rgba(11, 18, 52, 0.3)"
+              style="cursor: pointer"
+              @click="jiedaoFun()"
+            >
+              <div class="sum">{{ jiedaoData.regionHasCheckNum || 0 }}/{{ jiedaoData.regionNeedCheckNum || 0 }}</div>
+              <div class="name">街道</div>
+            </div>
+          </template>
+        </el-popover>
       </div>
-      <div class="dataFrame">
-        <div class="sum">{{listData.checkGoods||''}}</div>
-        <div class="name">物资检查</div>
-      </div>
-      <div class="dataFrame">
-        <div class="sum">{{listData.checkCars||''}}</div>
-        <div class="name">车辆检查</div>
-      </div>
-    </div>
     </div>
   </div>
 </template>
@@ -25,26 +50,80 @@
 import { ref, reactive, onMounted } from 'vue';
 import {
   drainageDispatchGetCheckCount,
+  dutyCheckInfoGetCheckCount,
+  dutyCheckInfoGetCheckResultList,
+  dutyCheckResultBatchSave,
 } from '@/api/FloodControlAndDrainage.js';
 const { proxy } = getCurrentInstance();
-const loading=ref(false)
-const listData=ref({
-  
-})
+const loading = ref(false);
+const jiedaoData = ref({});
+const visible = ref(false);
+const listData = ref({});
+const checkedCities = ref([]);
+const cities =  ref([]);
 function gitDataFun() {
-  loading.value=true
-  drainageDispatchGetCheckCount().then(res => {
-    console.log('获取防汛检查', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
+  loading.value = true;
+  drainageDispatchGetCheckCount().then(
+    res => {
+      console.log('获取防汛检查', res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+      }
+    },
+    error => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
+}
+// 街道应到操作
+const loadingjiedao = ref(false);
+function jiedaoFun() {
+  loadingjiedao.value = true;
+  dutyCheckInfoGetCheckResultList().then(
+    res => {
+      console.log('获取街道数据', res);
+      loadingjiedao.value = false;
+      if (res && res.code == 200) {
+        cities.value = res.data.regionCheckList;
+        res.data.regionHasCheckList.map((e)=>{
+           checkedCities.value.push(e.checkObjId)
+        })
+        console.log('cities.value', cities.value);
+        visible.value = true;
+      }
+    },
+    error => {
+      loadingjiedao.value = false;
+    }
+  );
+}
+// 获取街道数据
+async function dutyCheckInfoGetCheckCountFun() {
+  let res = await dutyCheckInfoGetCheckCount();
+  if (res && res.code == 200) {
+    jiedaoData.value = res.data;
+  }
+}
+async function confirmClick() {
+      console.log('checkedCities', checkedCities.value);
+
+  if(checkedCities.value.length>0){
+  let paams={
+    checkIds:checkedCities.value.join(',')
+  }
+  let res = await dutyCheckResultBatchSave(paams);
+  if (res && res.code == 200) {
+    proxy.$modal.msgSuccess('操作成功');
+    dutyCheckInfoGetCheckCountFun();
+    visible.value = false;
+  }
+  }
+
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
+  dutyCheckInfoGetCheckCountFun();
 });
 </script>
 <style lang="scss" scoped>
@@ -56,6 +135,7 @@
     padding-top: 5px;
     .dataFrame {
       width: 136px;
+
       height: 76px;
       text-align: center;
       background: url('@/assets/images/pictureOnMap/dataFrame.png') no-repeat center;
@@ -71,10 +151,12 @@
         font-weight: 500;
         font-size: 16px;
         color: #ccdfff;
-      font-family: 'SourceHanSansCN-Regular';
-
+        font-family: 'SourceHanSansCN-Regular';
       }
     }
   }
+  .el-radio__original {
+    display: none !important; /* 隐藏原生 radio 输入，但仍然允许交互 */
+  }
 }
 </style>
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
index 140f6d4..3345c0f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
@@ -15,8 +15,8 @@
             <div style="color:rgba(254, 103, 128, 1)">污水泵站</div>
           </div>
           <div class="acrossBox acrossBox2 flex flex-justcontent-spacearound">
-            <div>{{sumObj.rainPumpNum}}</div>
-            <div>{{sumObj.sewagePumpNum}}</div>
+            <div>{{sumObj.rainPumpOpenNum}}/{{sumObj.rainPumpNum}}</div>
+            <div>{{sumObj.sewagePumpOpenNum}}/{{sumObj.sewagePumpNum}}</div>
           </div>
           <div class="acrossBox acrossBox3 flex flex-justcontent-spacearound">
             <div>{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}</div>

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 86078ff..690f489 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -470,4 +470,27 @@
     params
   });
 }
-// ``````````EDN`````````````````````
\ No newline at end of file
+// 辅助决策  防汛检查 街道数据
+export function dutyCheckInfoGetCheckCount(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckCount',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选列表
+export function dutyCheckInfoGetCheckResultList(params) {
+  return request({
+    url: '/business/dutyCheckInfo/getCheckResultList',
+    method: 'get',
+    params
+  });
+}
+// 辅助决策  防汛检查 街道勾选新增
+export function dutyCheckResultBatchSave(params){
+  return request({
+    url:'/business/dutyCheckResult/batchSave',
+    method: 'post',
+    params
+  })
+}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
index db6533a..41dc9dd 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
@@ -2,8 +2,7 @@
   <!-- 值班 -->
   <div class="Beonduty ">
     <EachModuleTitle title="辅助研判" :isTab="false"></EachModuleTitle>
-    <div class="typeList flex">
-      <!-- <div
+          <!-- <div
         class="flex-1 tab"
         :class="tabActive == i.value ? 'active' : ''"
         v-for="i in tabData"
@@ -12,6 +11,8 @@
       >
         {{ i.label }}
       </div> -->
+    <!-- <div class="typeList flex">
+
       <div
         class="flex-1 tab"
       >
@@ -27,9 +28,9 @@
       >
         排涝车辆{{ ZBTJData?.carOnlineNum||0 }}/{{ZBTJData?.carNum||0}}
       </div>
-    </div>
+    </div> -->
     <div class="yjBtn flex flex-align-center">
-      警情建议
+      预警建议
       <div class="blue pointer" @click="startEmergencyResponse">{{yjtj?.recommendGrade}}</div>
     </div>
     <!-- 防汛值班 -->
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue
index e15387e..d79b92e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue
@@ -1,23 +1,48 @@
 <template>
   <!-- 防汛检查 -->
   <div class="Fangxunjiancha">
-    <div class="leve2Title">防汛检查</div>
-    <div v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-    <div class="sumInfo">
-      <div class="dataFrame">
-        <div class="sum">{{listData.pumpDispatchNum||0}}/{{listData.pumpNum||0}}</div>
-        <div class="name">泵站调度</div>
+    <div class="leve2Title" @click="dutyCheckInfoGetCheckCountFun">防汛检查</div>
+    <div v-loading="loading" element-loading-background="rgba(11, 18, 52, 0.3)">
+      <div class="sumInfo">
+        <div class="dataFrame">
+          <div class="sum">{{ listData.pumpDispatchNum || 0 }}/{{ listData.pumpNum || 0 }}</div>
+          <div class="name">泵站调度</div>
+        </div>
+        <div class="dataFrame">
+          <div class="sum">{{ listData.checkGoods || '' }}</div>
+          <div class="name">物资检查</div>
+        </div>
+        <el-popover :visible="visible" placement="top" :width="160">
+          <div>
+            <el-checkbox-group v-model="checkedCities">
+              <el-checkbox
+                v-for="item in cities"
+                :key="item.checkObjId"
+                :label="item.checkObjId"
+                :value="item.checkObjId"
+              >
+                {{ item.checkObjName}}
+              </el-checkbox>
+            </el-checkbox-group>
+          </div>
+          <div style="text-align: right; margin: 0">
+            <el-button size="small" text @click="visible = false">关闭</el-button>
+            <el-button size="small" type="primary" @click="confirmClick()"> 确定 </el-button>
+          </div>
+          <template #reference>
+            <div
+              class="dataFrame"
+              v-loading="loadingjiedao"
+              element-loading-background="rgba(11, 18, 52, 0.3)"
+              style="cursor: pointer"
+              @click="jiedaoFun()"
+            >
+              <div class="sum">{{ jiedaoData.regionHasCheckNum || 0 }}/{{ jiedaoData.regionNeedCheckNum || 0 }}</div>
+              <div class="name">街道</div>
+            </div>
+          </template>
+        </el-popover>
       </div>
-      <div class="dataFrame">
-        <div class="sum">{{listData.checkGoods||''}}</div>
-        <div class="name">物资检查</div>
-      </div>
-      <div class="dataFrame">
-        <div class="sum">{{listData.checkCars||''}}</div>
-        <div class="name">车辆检查</div>
-      </div>
-    </div>
     </div>
   </div>
 </template>
@@ -25,26 +50,80 @@
 import { ref, reactive, onMounted } from 'vue';
 import {
   drainageDispatchGetCheckCount,
+  dutyCheckInfoGetCheckCount,
+  dutyCheckInfoGetCheckResultList,
+  dutyCheckResultBatchSave,
 } from '@/api/FloodControlAndDrainage.js';
 const { proxy } = getCurrentInstance();
-const loading=ref(false)
-const listData=ref({
-  
-})
+const loading = ref(false);
+const jiedaoData = ref({});
+const visible = ref(false);
+const listData = ref({});
+const checkedCities = ref([]);
+const cities =  ref([]);
 function gitDataFun() {
-  loading.value=true
-  drainageDispatchGetCheckCount().then(res => {
-    console.log('获取防汛检查', res);
-  loading.value=false
-    if (res && res.code == 200) {
-      listData.value=res.data
+  loading.value = true;
+  drainageDispatchGetCheckCount().then(
+    res => {
+      console.log('获取防汛检查', res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        listData.value = res.data;
+      }
+    },
+    error => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
+}
+// 街道应到操作
+const loadingjiedao = ref(false);
+function jiedaoFun() {
+  loadingjiedao.value = true;
+  dutyCheckInfoGetCheckResultList().then(
+    res => {
+      console.log('获取街道数据', res);
+      loadingjiedao.value = false;
+      if (res && res.code == 200) {
+        cities.value = res.data.regionCheckList;
+        res.data.regionHasCheckList.map((e)=>{
+           checkedCities.value.push(e.checkObjId)
+        })
+        console.log('cities.value', cities.value);
+        visible.value = true;
+      }
+    },
+    error => {
+      loadingjiedao.value = false;
+    }
+  );
+}
+// 获取街道数据
+async function dutyCheckInfoGetCheckCountFun() {
+  let res = await dutyCheckInfoGetCheckCount();
+  if (res && res.code == 200) {
+    jiedaoData.value = res.data;
+  }
+}
+async function confirmClick() {
+      console.log('checkedCities', checkedCities.value);
+
+  if(checkedCities.value.length>0){
+  let paams={
+    checkIds:checkedCities.value.join(',')
+  }
+  let res = await dutyCheckResultBatchSave(paams);
+  if (res && res.code == 200) {
+    proxy.$modal.msgSuccess('操作成功');
+    dutyCheckInfoGetCheckCountFun();
+    visible.value = false;
+  }
+  }
+
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
+  dutyCheckInfoGetCheckCountFun();
 });
 </script>
 <style lang="scss" scoped>
@@ -56,6 +135,7 @@
     padding-top: 5px;
     .dataFrame {
       width: 136px;
+
       height: 76px;
       text-align: center;
       background: url('@/assets/images/pictureOnMap/dataFrame.png') no-repeat center;
@@ -71,10 +151,12 @@
         font-weight: 500;
         font-size: 16px;
         color: #ccdfff;
-      font-family: 'SourceHanSansCN-Regular';
-
+        font-family: 'SourceHanSansCN-Regular';
       }
     }
   }
+  .el-radio__original {
+    display: none !important; /* 隐藏原生 radio 输入，但仍然允许交互 */
+  }
 }
 </style>
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
index 140f6d4..3345c0f 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue
@@ -15,8 +15,8 @@
             <div style="color:rgba(254, 103, 128, 1)">污水泵站</div>
           </div>
           <div class="acrossBox acrossBox2 flex flex-justcontent-spacearound">
-            <div>{{sumObj.rainPumpNum}}</div>
-            <div>{{sumObj.sewagePumpNum}}</div>
+            <div>{{sumObj.rainPumpOpenNum}}/{{sumObj.rainPumpNum}}</div>
+            <div>{{sumObj.sewagePumpOpenNum}}/{{sumObj.sewagePumpNum}}</div>
           </div>
           <div class="acrossBox acrossBox3 flex flex-justcontent-spacearound">
             <div>{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}</div>
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue
index 58cddc8..86e9e0a 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue
@@ -78,7 +78,7 @@
 const activeSublevel = ref("Jianceyujin");
 const tabArr = ref([
   {
-    label: "监测预警",
+    label: "预报预警",
     value: "Jianceyujin",
     keys: [
       { key: "waterlogging", visible: true },