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 64c4407..e98c0c5 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
@@ -39,7 +39,7 @@
       <div class="showDuty">
         <div class="eachdutyInfo">
           <div class="imgBox jrzbimg"></div>
-          <el-popover :visible="visible" placement="top" :width="260">
+          <el-popover :visible="visible" placement="top" :width="100">
             <div>
               <el-checkbox-group v-model="checkedCities">
                 <el-checkbox v-for="item in jrzbText" :key="item.dutyUserId" :label="item.dutyUserId" :value="item.dutyUserId">
@@ -63,7 +63,7 @@
         </div>
         <div class="eachdutyInfo">
           <div class="imgBox dbldimg"></div>
-          <el-popover :visible="visible2" placement="top" :width="260">
+          <el-popover :visible="visible2" placement="top" :width="100">
             <div>
               <el-checkbox-group v-model="checkedCities">
                 <el-checkbox v-for="item in zbldText" :key="item.dutyUserId" :label="item.dutyUserId" :value="item.dutyUserId">
@@ -258,13 +258,17 @@
   if (type == 1 && jrzbText.value.length) {
     visible.value = true;
     jrzbText.value.map(e => {
-      checkedCities.value.push(e.dutyUserId);
+      if (e.clockStatus) {
+        checkedCities.value.push(e.dutyUserId);
+      }
     });
   }
   if (type == 2 && zbldText.value.length) {
     visible2.value = true;
     zbldText.value.map(e => {
-      checkedCities.value.push(e.dutyUserId);
+      if (e.clockStatus) {
+        checkedCities.value.push(e.dutyUserId);
+      }
     });
   }
 }

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 64c4407..e98c0c5 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue
@@ -39,7 +39,7 @@
       <div class="showDuty">
         <div class="eachdutyInfo">
           <div class="imgBox jrzbimg"></div>
-          <el-popover :visible="visible" placement="top" :width="260">
+          <el-popover :visible="visible" placement="top" :width="100">
             <div>
               <el-checkbox-group v-model="checkedCities">
                 <el-checkbox v-for="item in jrzbText" :key="item.dutyUserId" :label="item.dutyUserId" :value="item.dutyUserId">
@@ -63,7 +63,7 @@
         </div>
         <div class="eachdutyInfo">
           <div class="imgBox dbldimg"></div>
-          <el-popover :visible="visible2" placement="top" :width="260">
+          <el-popover :visible="visible2" placement="top" :width="100">
             <div>
               <el-checkbox-group v-model="checkedCities">
                 <el-checkbox v-for="item in zbldText" :key="item.dutyUserId" :label="item.dutyUserId" :value="item.dutyUserId">
@@ -258,13 +258,17 @@
   if (type == 1 && jrzbText.value.length) {
     visible.value = true;
     jrzbText.value.map(e => {
-      checkedCities.value.push(e.dutyUserId);
+      if (e.clockStatus) {
+        checkedCities.value.push(e.dutyUserId);
+      }
     });
   }
   if (type == 2 && zbldText.value.length) {
     visible2.value = true;
     zbldText.value.map(e => {
-      checkedCities.value.push(e.dutyUserId);
+      if (e.clockStatus) {
+        checkedCities.value.push(e.dutyUserId);
+      }
     });
   }
 }
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue
index 5b5cb95..f218e63 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 降雨预报 -->
   <div class="RainfallForecast">
-    <EachModuleTitle 
+    <EachModuleTitle
       title="降雨预报"
       :rightTabArr="rightTabArr"
       :activeTab="activeTab"
@@ -9,33 +9,28 @@
       @rightTabClick="rightTabClick"
     ></EachModuleTitle>
 
-    <div class="echartJYYB" v-loading="loading"
-    element-loading-background="rgba(11, 18, 52, 0.3)">
-        <div class="barLegend">
-          <div class="flex flex-align-center">
-            <div class="formerly"></div>
-            <div>过去24小时</div>
-          </div>
-          <div class="flex flex-align-center">
-            <div class="future"></div>
-            <div>未来24小时</div>
-          </div>
+    <div class="echartJYYB" v-loading="loading" element-loading-background="rgba(11, 18, 52, 0.3)">
+      <div class="barLegend">
+        <div class="flex flex-align-center">
+          <div class="formerly"></div>
+          <div>过去24小时</div>
         </div>
-          <BarChart
-            :echartData="allData.monitorData"
-            :refresh="allData.refresh"
-          />
+        <div class="flex flex-align-center">
+          <div class="future"></div>
+          <div>未来24小时</div>
         </div>
-
+      </div>
+      <BarChart :echartData="allData.monitorData" :refresh="allData.refresh" />
+    </div>
   </div>
 </template>
 <script setup nama="RainfallForecast">
-import { ref, reactive, onMounted,onBeforeUnmount } from 'vue';
+import { ref, reactive, onMounted, onBeforeUnmount } from 'vue';
 import EachModuleTitle from '@/views/pictureOnMap/page/components/EachModuleTitle.vue';
-import * as reviewApi from "@/api/FloodControlAndDrainage.js";
+import * as reviewApi from '@/api/FloodControlAndDrainage.js';
 
 import BarChart from './BarChart.vue';
-import bus from "@/bus";
+import bus from '@/bus';
 
 const { proxy } = getCurrentInstance();
 const activeTab = ref('');
@@ -50,82 +45,81 @@
   // },
 ]);
 // 获取数据
-const loading=ref(false)
+const loading = ref(false);
 let allData = reactive({
   monitorData: {},
-  refresh: "",
+  refresh: '',
 });
 function gitDataFun() {
-  loading.value=true
-  let params={
-    type:12
-  }
-  reviewApi.dataSiteRelationRainTrend(params).then(res => {
-    console.log('获取降雨预报数据', res);
-  loading.value=false
-    if (res && res.code == 200) {
-    //   let data={
-    //     "dateRange": [
-    //         "2024-11-20 20:00:00",
-    //         "2024-11-21 08:00:00",
-    //         "2024-11-21 20:00:00",
-    //         "2024-11-22 08:00:00"
-    //     ],
-    //     "history": [
-    //         "1.00",
-    //         "2.00"
-    //     ],
-    //     "forecast": [
-    //         "3.00",
-    //         "4.00"
-    //     ],
-    //     "historyTotalRain": "0",
-    //     "forecastTotalRain": "0"
-    // }
-      allData.monitorData = res.data;
-      allData.monitorData.totalData = [
-        ...allData.monitorData.history,
-        ...allData.monitorData.forecast,
-      ];
-      allData.refresh = Math.random();
+  loading.value = true;
+  let params = {
+    type: 1,
+  };
+  reviewApi.dataSiteRelationRainTrend(params).then(
+    res => {
+      console.log('获取降雨预报数据', res);
+      loading.value = false;
+      if (res && res.code == 200) {
+        //   let data={
+        //     "dateRange": [
+        //         "2024-11-20 20:00:00",
+        //         "2024-11-21 08:00:00",
+        //         "2024-11-21 20:00:00",
+        //         "2024-11-22 08:00:00"
+        //     ],
+        //     "history": [
+        //         "1.00",
+        //         "2.00"
+        //     ],
+        //     "forecast": [
+        //         "3.00",
+        //         "4.00"
+        //     ],
+        //     "historyTotalRain": "0",
+        //     "forecastTotalRain": "0"
+        // }
+        allData.monitorData = res.data;
+        allData.monitorData.totalData = [...allData.monitorData.history, ...allData.monitorData.forecast];
+        allData.refresh = Math.random();
+      }
+    },
+    error => {
+      loading.value = false;
     }
-  },(error)=>{
-    loading.value=false
-  });
+  );
 }
 
-function rightTabClick(item){
+function rightTabClick(item) {
   ({
-    "0":()=>{
+    0: () => {
       // newfiberMap.rainsLayer.show();
       // newfiberMap.rainsInterval = setInterval(()=> newfiberMap.rainsLayer.next(1),1000)
-    bus.emit("MeteorologicalCloudMapBus", true);
+      bus.emit('MeteorologicalCloudMapBus', true);
 
-      rightTabArr.value[0].value='1'
-      activeTab.value='1'
+      rightTabArr.value[0].value = '1';
+      activeTab.value = '1';
     },
-    "1":()=>{
+    1: () => {
       // 暂停
       // newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval);
       // newfiberMap.rainsInterval = null;
       // 停止
       newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval);
-  newfiberMap.rainsLayer.hide();
-    bus.emit("MeteorologicalCloudMapBus", false);
+      newfiberMap.rainsLayer.hide();
+      bus.emit('MeteorologicalCloudMapBus', false);
 
-      rightTabArr.value[0].value='0'
-      activeTab.value='3'
-
+      rightTabArr.value[0].value = '0';
+      activeTab.value = '3';
     },
-  }[item.value])();
+  })[item.value]();
 }
 onMounted(() => {
-  gitDataFun()
+  gitDataFun();
 });
-onBeforeUnmount(()=>{
+onBeforeUnmount(() => {
   newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval);
   newfiberMap.rainsLayer.hide();
-})
+});
 </script>
 <style lang="scss" scoped>
 .RainfallForecast {
@@ -136,28 +130,26 @@
       position: absolute;
       top: 0;
       left: 50%;
-       transform: translateX(-20%);
+      transform: translateX(-20%);
       display: flex;
       align-items: center;
       position: relative;
-       font-family: 'SourceHanSansCN-Regular';
-       font-size: 14px;
+      font-family: 'SourceHanSansCN-Regular';
+      font-size: 14px;
       .formerly {
         width: 10px;
-height: 10px;
-background: #18A7F2;
-margin-right: 10px;
+        height: 10px;
+        background: #18a7f2;
+        margin-right: 10px;
       }
       .future {
         width: 10px;
-height: 10px;
-background: #D7AC38;
-margin-right: 10px;
-margin-left: 25px;
-
+        height: 10px;
+        background: #d7ac38;
+        margin-right: 10px;
+        margin-left: 25px;
       }
     }
   }
-
 }
 </style>