diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 0a91610..4824528 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -155,8 +155,8 @@
 });
 
 const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
+  localStorage.setItem('WB_Brad_in_actived', 2);
+  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap#/portalPage`;
   window.open(herf, '_self');
 };
 function weatherForecast() {

diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 0a91610..4824528 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -155,8 +155,8 @@
 });
 
 const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
+  localStorage.setItem('WB_Brad_in_actived', 2);
+  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap#/portalPage`;
   window.open(herf, '_self');
 };
 function weatherForecast() {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
index e2adf37..5df8a4d 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
@@ -48,8 +48,9 @@
             style="width:100%"
           />
         </el-form-item>
-        <el-form-item label="通知成员">
-          <el-tree-select
+        <el-form-item label="通知人员">
+          <div>{{form.user}}</div>
+          <!-- <el-tree-select
             style="width: 100%"
             v-model="form.recipient"
             :data="userData"
@@ -66,7 +67,7 @@
               label: 'name',
               children: 'children',
             }"
-          />
+          /> -->
         </el-form-item>
         <el-form-item label="调度指令">
           <el-input
@@ -108,7 +109,7 @@
 
 <script setup name="pumpDDZL">
 import { ElMessageBox } from 'element-plus';
-import {listByGroupUnit } from '@/api/user';
+// import {listByGroupUnit } from '@/api/user';
 import { getBZFxLogList ,dispatchOutbound} from "@/api/FloodControlAndDrainage.js";
 const { proxy } = getCurrentInstance();
 const emit = defineEmits(["closePop"]);
@@ -132,7 +133,8 @@
 let userData =ref([])
 let tableData =ref([])
 let form =ref({
-  name:`${props.data.warningInfo=='warn_blue'?'启动大雨暴雨蓝色预警':props.data.warningInfo=='warn_yellow'?'启动暴雨黄色预警':props.data.warningInfo=='warn_orange'?'启动暴雨橙色预警':props.data.warningInfo=='red_orange'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`
+  name:`${props.data.warningInfo=='warn_blue'?'启动大雨暴雨蓝色预警':props.data.warningInfo=='warn_yellow'?'启动暴雨黄色预警':props.data.warningInfo=='warn_orange'?'启动暴雨橙色预警':props.data.warningInfo=='red_orange'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`,
+  user:`${props.data.dutyPerson}(${props.data.dutyPersonPhone})`
 })
 
 function onSubmit(){
@@ -150,8 +152,8 @@
       )
       .then(() => {
         let params={
-          phones:'15927167920,13332926003',
-          // phones:'15927167920,18772378012',
+          // phones:props.data.dutyPersonPhone,
+          phones:'13332926003,15827590495',
           title:props.data.name,
           notice:form.value.name
         }
@@ -177,9 +179,9 @@
       tableData.value=res.data.bzList
     }
   })
-  listByGroupUnit().then(res => {
-    userData.value = res.data;
-  });
+  // listByGroupUnit().then(res => {
+  //   userData.value = res.data;
+  // });
 }
 
 function handleClick(row) {

diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 0a91610..4824528 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -155,8 +155,8 @@
 });
 
 const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
+  localStorage.setItem('WB_Brad_in_actived', 2);
+  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap#/portalPage`;
   window.open(herf, '_self');
 };
 function weatherForecast() {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
index e2adf37..5df8a4d 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
@@ -48,8 +48,9 @@
             style="width:100%"
           />
         </el-form-item>
-        <el-form-item label="通知成员">
-          <el-tree-select
+        <el-form-item label="通知人员">
+          <div>{{form.user}}</div>
+          <!-- <el-tree-select
             style="width: 100%"
             v-model="form.recipient"
             :data="userData"
@@ -66,7 +67,7 @@
               label: 'name',
               children: 'children',
             }"
-          />
+          /> -->
         </el-form-item>
         <el-form-item label="调度指令">
           <el-input
@@ -108,7 +109,7 @@
 
 <script setup name="pumpDDZL">
 import { ElMessageBox } from 'element-plus';
-import {listByGroupUnit } from '@/api/user';
+// import {listByGroupUnit } from '@/api/user';
 import { getBZFxLogList ,dispatchOutbound} from "@/api/FloodControlAndDrainage.js";
 const { proxy } = getCurrentInstance();
 const emit = defineEmits(["closePop"]);
@@ -132,7 +133,8 @@
 let userData =ref([])
 let tableData =ref([])
 let form =ref({
-  name:`${props.data.warningInfo=='warn_blue'?'启动大雨暴雨蓝色预警':props.data.warningInfo=='warn_yellow'?'启动暴雨黄色预警':props.data.warningInfo=='warn_orange'?'启动暴雨橙色预警':props.data.warningInfo=='red_orange'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`
+  name:`${props.data.warningInfo=='warn_blue'?'启动大雨暴雨蓝色预警':props.data.warningInfo=='warn_yellow'?'启动暴雨黄色预警':props.data.warningInfo=='warn_orange'?'启动暴雨橙色预警':props.data.warningInfo=='red_orange'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`,
+  user:`${props.data.dutyPerson}(${props.data.dutyPersonPhone})`
 })
 
 function onSubmit(){
@@ -150,8 +152,8 @@
       )
       .then(() => {
         let params={
-          phones:'15927167920,13332926003',
-          // phones:'15927167920,18772378012',
+          // phones:props.data.dutyPersonPhone,
+          phones:'13332926003,15827590495',
           title:props.data.name,
           notice:form.value.name
         }
@@ -177,9 +179,9 @@
       tableData.value=res.data.bzList
     }
   })
-  listByGroupUnit().then(res => {
-    userData.value = res.data;
-  });
+  // listByGroupUnit().then(res => {
+  //   userData.value = res.data;
+  // });
 }
 
 function handleClick(row) {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
index 5ec6b7f..c279408 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
@@ -309,6 +309,7 @@
   })
 }
 function runDayTime() {
+  // newfiberMap.map.easeTo(newfiberMap.config_.params.init);
   bus.emit('clearTrajectory')
   hgEndActive.value = "";
   showRainLegend.value = true;

diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 0a91610..4824528 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -155,8 +155,8 @@
 });
 
 const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
+  localStorage.setItem('WB_Brad_in_actived', 2);
+  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap#/portalPage`;
   window.open(herf, '_self');
 };
 function weatherForecast() {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
index e2adf37..5df8a4d 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
@@ -48,8 +48,9 @@
             style="width:100%"
           />
         </el-form-item>
-        <el-form-item label="通知成员">
-          <el-tree-select
+        <el-form-item label="通知人员">
+          <div>{{form.user}}</div>
+          <!-- <el-tree-select
             style="width: 100%"
             v-model="form.recipient"
             :data="userData"
@@ -66,7 +67,7 @@
               label: 'name',
               children: 'children',
             }"
-          />
+          /> -->
         </el-form-item>
         <el-form-item label="调度指令">
           <el-input
@@ -108,7 +109,7 @@
 
 <script setup name="pumpDDZL">
 import { ElMessageBox } from 'element-plus';
-import {listByGroupUnit } from '@/api/user';
+// import {listByGroupUnit } from '@/api/user';
 import { getBZFxLogList ,dispatchOutbound} from "@/api/FloodControlAndDrainage.js";
 const { proxy } = getCurrentInstance();
 const emit = defineEmits(["closePop"]);
@@ -132,7 +133,8 @@
 let userData =ref([])
 let tableData =ref([])
 let form =ref({
-  name:`${props.data.warningInfo=='warn_blue'?'启动大雨暴雨蓝色预警':props.data.warningInfo=='warn_yellow'?'启动暴雨黄色预警':props.data.warningInfo=='warn_orange'?'启动暴雨橙色预警':props.data.warningInfo=='red_orange'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`
+  name:`${props.data.warningInfo=='warn_blue'?'启动大雨暴雨蓝色预警':props.data.warningInfo=='warn_yellow'?'启动暴雨黄色预警':props.data.warningInfo=='warn_orange'?'启动暴雨橙色预警':props.data.warningInfo=='red_orange'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`,
+  user:`${props.data.dutyPerson}(${props.data.dutyPersonPhone})`
 })
 
 function onSubmit(){
@@ -150,8 +152,8 @@
       )
       .then(() => {
         let params={
-          phones:'15927167920,13332926003',
-          // phones:'15927167920,18772378012',
+          // phones:props.data.dutyPersonPhone,
+          phones:'13332926003,15827590495',
           title:props.data.name,
           notice:form.value.name
         }
@@ -177,9 +179,9 @@
       tableData.value=res.data.bzList
     }
   })
-  listByGroupUnit().then(res => {
-    userData.value = res.data;
-  });
+  // listByGroupUnit().then(res => {
+  //   userData.value = res.data;
+  // });
 }
 
 function handleClick(row) {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
index 5ec6b7f..c279408 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
@@ -309,6 +309,7 @@
   })
 }
 function runDayTime() {
+  // newfiberMap.map.easeTo(newfiberMap.config_.params.init);
   bus.emit('clearTrajectory')
   hgEndActive.value = "";
   showRainLegend.value = true;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
index 5fab15f..2cc36f6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
@@ -304,12 +304,12 @@
 }
 onMounted(() => {
 
-    console.log('Getproperties123',props.Getproperties);
-    getDataEchart()
-  gitDataFun()
+  console.log('Getproperties123',props.Getproperties);
   if(props.Getproperties.daterange){
     Timers.value=props.Getproperties.daterange
   }
+  getDataEchart()
+  gitDataFun()
 
 
 });

diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue
index 0a91610..4824528 100644
--- a/src/views/pictureOnMap/TopTab/index.vue
+++ b/src/views/pictureOnMap/TopTab/index.vue
@@ -155,8 +155,8 @@
 });
 
 const Tojiance = () => {
-  localStorage.setItem('WB_Brad_in_actived', 1);
-  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap`;
+  localStorage.setItem('WB_Brad_in_actived', 2);
+  let herf = `${window.location.origin}/MonitoringAssets/MonitorAssetsOnMap#/portalPage`;
   window.open(herf, '_self');
 };
 function weatherForecast() {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
index e2adf37..5df8a4d 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
@@ -48,8 +48,9 @@
             style="width:100%"
           />
         </el-form-item>
-        <el-form-item label="通知成员">
-          <el-tree-select
+        <el-form-item label="通知人员">
+          <div>{{form.user}}</div>
+          <!-- <el-tree-select
             style="width: 100%"
             v-model="form.recipient"
             :data="userData"
@@ -66,7 +67,7 @@
               label: 'name',
               children: 'children',
             }"
-          />
+          /> -->
         </el-form-item>
         <el-form-item label="调度指令">
           <el-input
@@ -108,7 +109,7 @@
 
 <script setup name="pumpDDZL">
 import { ElMessageBox } from 'element-plus';
-import {listByGroupUnit } from '@/api/user';
+// import {listByGroupUnit } from '@/api/user';
 import { getBZFxLogList ,dispatchOutbound} from "@/api/FloodControlAndDrainage.js";
 const { proxy } = getCurrentInstance();
 const emit = defineEmits(["closePop"]);
@@ -132,7 +133,8 @@
 let userData =ref([])
 let tableData =ref([])
 let form =ref({
-  name:`${props.data.warningInfo=='warn_blue'?'启动大雨暴雨蓝色预警':props.data.warningInfo=='warn_yellow'?'启动暴雨黄色预警':props.data.warningInfo=='warn_orange'?'启动暴雨橙色预警':props.data.warningInfo=='red_orange'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`
+  name:`${props.data.warningInfo=='warn_blue'?'启动大雨暴雨蓝色预警':props.data.warningInfo=='warn_yellow'?'启动暴雨黄色预警':props.data.warningInfo=='warn_orange'?'启动暴雨橙色预警':props.data.warningInfo=='red_orange'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`,
+  user:`${props.data.dutyPerson}(${props.data.dutyPersonPhone})`
 })
 
 function onSubmit(){
@@ -150,8 +152,8 @@
       )
       .then(() => {
         let params={
-          phones:'15927167920,13332926003',
-          // phones:'15927167920,18772378012',
+          // phones:props.data.dutyPersonPhone,
+          phones:'13332926003,15827590495',
           title:props.data.name,
           notice:form.value.name
         }
@@ -177,9 +179,9 @@
       tableData.value=res.data.bzList
     }
   })
-  listByGroupUnit().then(res => {
-    userData.value = res.data;
-  });
+  // listByGroupUnit().then(res => {
+  //   userData.value = res.data;
+  // });
 }
 
 function handleClick(row) {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
index 5ec6b7f..c279408 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue
@@ -309,6 +309,7 @@
   })
 }
 function runDayTime() {
+  // newfiberMap.map.easeTo(newfiberMap.config_.params.init);
   bus.emit('clearTrajectory')
   hgEndActive.value = "";
   showRainLegend.value = true;
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
index 5fab15f..2cc36f6 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiGWFX.vue
@@ -304,12 +304,12 @@
 }
 onMounted(() => {
 
-    console.log('Getproperties123',props.Getproperties);
-    getDataEchart()
-  gitDataFun()
+  console.log('Getproperties123',props.Getproperties);
   if(props.Getproperties.daterange){
     Timers.value=props.Getproperties.daterange
   }
+  getDataEchart()
+  gitDataFun()
 
 
 });
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
index 4eea895..ff25389 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/jiancefenxiZSFX.vue
@@ -305,13 +305,13 @@
 }
 onMounted(() => {
 
-    console.log('Getproperties123',props.Getproperties);
-    getDataEchart()
-  gitDataFun()
-
+  console.log('Getproperties123',props.Getproperties);
   if(props.Getproperties.daterange){
     Timers.value=props.Getproperties.daterange
   }
+  getDataEchart()
+  gitDataFun()
+
 
 });
 </script>