diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 92f29c8..9de1b44 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -439,4 +439,12 @@
     method: 'get',
     params: query
   })
+}
+
+export function areaPersonList(query) {
+  return request({
+    url: '/business/watchArea/areaPersonList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 92f29c8..9de1b44 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -439,4 +439,12 @@
     method: 'get',
     params: query
   })
+}
+
+export function areaPersonList(query) {
+  return request({
+    url: '/business/watchArea/areaPersonList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 55be958..58d4658 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -738,7 +738,7 @@
 
 let prevObj = null;
 const panelDataToMap = (obj) => {
-  debugger;
+  // debugger;
   let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 92f29c8..9de1b44 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -439,4 +439,12 @@
     method: 'get',
     params: query
   })
+}
+
+export function areaPersonList(query) {
+  return request({
+    url: '/business/watchArea/areaPersonList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 55be958..58d4658 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -738,7 +738,7 @@
 
 let prevObj = null;
 const panelDataToMap = (obj) => {
-  debugger;
+  // debugger;
   let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index c3dab83..0feab56 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -125,6 +125,7 @@
   'storehouse', //物资仓库
   'dikeGood', //堤防备料
   "waterlog_community",
+  "waterlogging_scheduling",//渍水风险点
 ]);
 // 视频点
 const videoList = ref([
@@ -556,14 +557,18 @@
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
-
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
+  if(item.stType=="waterlogging"){
+    Getproperties.value.peopleUser=item.watchId
+  }else {
+    Getproperties.value.peopleUser = null;
+  }
+  console.log('Getproperties', Getproperties.value);
   GetBoxmenu('', item.stType);
 }
 

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 92f29c8..9de1b44 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -439,4 +439,12 @@
     method: 'get',
     params: query
   })
+}
+
+export function areaPersonList(query) {
+  return request({
+    url: '/business/watchArea/areaPersonList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 55be958..58d4658 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -738,7 +738,7 @@
 
 let prevObj = null;
 const panelDataToMap = (obj) => {
-  debugger;
+  // debugger;
   let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index c3dab83..0feab56 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -125,6 +125,7 @@
   'storehouse', //物资仓库
   'dikeGood', //堤防备料
   "waterlog_community",
+  "waterlogging_scheduling",//渍水风险点
 ]);
 // 视频点
 const videoList = ref([
@@ -556,14 +557,18 @@
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
-
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
+  if(item.stType=="waterlogging"){
+    Getproperties.value.peopleUser=item.watchId
+  }else {
+    Getproperties.value.peopleUser = null;
+  }
+  console.log('Getproperties', Getproperties.value);
   GetBoxmenu('', item.stType);
 }
 
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
index 6247c51..9f2b236 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
@@ -49,6 +49,7 @@
 import * as reviewApi from "@/api/FloodControlAndDrainage.js";
 import drainageDDZL from './drainageDDZL';
 import bus from '@/bus';
+import _bus from '@/bus';
 const classData=ref([
   {label:'值守签到',value:'1',num:'0'},
   {label:'上报/处理',value:'2',num:'0'},
@@ -112,9 +113,11 @@
   getData()
 
   //排渍调度
-  bus.on("showZSdispatch", (e) => {
-    pzData.value = e
-    dialogVisible.value=true
+  bus.on("showZSdispatch", (item) => {
+    pzData.value = item
+    _bus.emit("panelDataToMap", {...item,name:item.name,id:undefined,isUp:false})
+    _bus.emit("DynamicBus", item);
+    // dialogVisible.value=true
   });
 })
 onBeforeUnmount(() => {

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 92f29c8..9de1b44 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -439,4 +439,12 @@
     method: 'get',
     params: query
   })
+}
+
+export function areaPersonList(query) {
+  return request({
+    url: '/business/watchArea/areaPersonList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 55be958..58d4658 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -738,7 +738,7 @@
 
 let prevObj = null;
 const panelDataToMap = (obj) => {
-  debugger;
+  // debugger;
   let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index c3dab83..0feab56 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -125,6 +125,7 @@
   'storehouse', //物资仓库
   'dikeGood', //堤防备料
   "waterlog_community",
+  "waterlogging_scheduling",//渍水风险点
 ]);
 // 视频点
 const videoList = ref([
@@ -556,14 +557,18 @@
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
-
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
+  if(item.stType=="waterlogging"){
+    Getproperties.value.peopleUser=item.watchId
+  }else {
+    Getproperties.value.peopleUser = null;
+  }
+  console.log('Getproperties', Getproperties.value);
   GetBoxmenu('', item.stType);
 }
 
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
index 6247c51..9f2b236 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
@@ -49,6 +49,7 @@
 import * as reviewApi from "@/api/FloodControlAndDrainage.js";
 import drainageDDZL from './drainageDDZL';
 import bus from '@/bus';
+import _bus from '@/bus';
 const classData=ref([
   {label:'值守签到',value:'1',num:'0'},
   {label:'上报/处理',value:'2',num:'0'},
@@ -112,9 +113,11 @@
   getData()
 
   //排渍调度
-  bus.on("showZSdispatch", (e) => {
-    pzData.value = e
-    dialogVisible.value=true
+  bus.on("showZSdispatch", (item) => {
+    pzData.value = item
+    _bus.emit("panelDataToMap", {...item,name:item.name,id:undefined,isUp:false})
+    _bus.emit("DynamicBus", item);
+    // dialogVisible.value=true
   });
 })
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
index 3868cce..12a909e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
@@ -105,7 +105,7 @@
 const tableData=ref([])
 function gitData() {
   let params={
-    code:bzData.value.code
+    code:bzData.value.stCode
   }
   watchAreaDutyPumpScheduling(params).then(res => {
     if (res && res.code == 200) {
@@ -124,7 +124,7 @@
       });
     }
   });
-  getBZFxLogList({code:bzData.value.code}).then(res=>{
+  getBZFxLogList({code:bzData.value.stCode}).then(res=>{
     if(res.code==200){
       tableData.value=res.data.bzList
     }

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 92f29c8..9de1b44 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -439,4 +439,12 @@
     method: 'get',
     params: query
   })
+}
+
+export function areaPersonList(query) {
+  return request({
+    url: '/business/watchArea/areaPersonList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 55be958..58d4658 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -738,7 +738,7 @@
 
 let prevObj = null;
 const panelDataToMap = (obj) => {
-  debugger;
+  // debugger;
   let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index c3dab83..0feab56 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -125,6 +125,7 @@
   'storehouse', //物资仓库
   'dikeGood', //堤防备料
   "waterlog_community",
+  "waterlogging_scheduling",//渍水风险点
 ]);
 // 视频点
 const videoList = ref([
@@ -556,14 +557,18 @@
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
-
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
+  if(item.stType=="waterlogging"){
+    Getproperties.value.peopleUser=item.watchId
+  }else {
+    Getproperties.value.peopleUser = null;
+  }
+  console.log('Getproperties', Getproperties.value);
   GetBoxmenu('', item.stType);
 }
 
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
index 6247c51..9f2b236 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
@@ -49,6 +49,7 @@
 import * as reviewApi from "@/api/FloodControlAndDrainage.js";
 import drainageDDZL from './drainageDDZL';
 import bus from '@/bus';
+import _bus from '@/bus';
 const classData=ref([
   {label:'值守签到',value:'1',num:'0'},
   {label:'上报/处理',value:'2',num:'0'},
@@ -112,9 +113,11 @@
   getData()
 
   //排渍调度
-  bus.on("showZSdispatch", (e) => {
-    pzData.value = e
-    dialogVisible.value=true
+  bus.on("showZSdispatch", (item) => {
+    pzData.value = item
+    _bus.emit("panelDataToMap", {...item,name:item.name,id:undefined,isUp:false})
+    _bus.emit("DynamicBus", item);
+    // dialogVisible.value=true
   });
 })
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
index 3868cce..12a909e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
@@ -105,7 +105,7 @@
 const tableData=ref([])
 function gitData() {
   let params={
-    code:bzData.value.code
+    code:bzData.value.stCode
   }
   watchAreaDutyPumpScheduling(params).then(res => {
     if (res && res.code == 200) {
@@ -124,7 +124,7 @@
       });
     }
   });
-  getBZFxLogList({code:bzData.value.code}).then(res=>{
+  getBZFxLogList({code:bzData.value.stCode}).then(res=>{
     if(res.code==200){
       tableData.value=res.data.bzList
     }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js b/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js
index cdbd5f1..d6ba8a1 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js
+++ b/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js
@@ -123,6 +123,16 @@
       name: 'jiancefenxiZSFX',
     },
     {
+      title: '渍水点调度',
+      content: markRaw(res_components['zishuidiaodu']),//渍水点监测分析
+      name: 'zishuidiaodu',
+    },
+    {
+      title: '泵站调度',
+      content: markRaw(res_components['bengzhandiaodu']),//渍水点监测分析
+      name: 'bengzhandiaodu',
+    },
+    {
       title: '监测分析',
       content: markRaw(res_components['jiancefenxiGWFX']),//管网数据分析
       name: 'jiancefenxiGWFX',

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 92f29c8..9de1b44 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -439,4 +439,12 @@
     method: 'get',
     params: query
   })
+}
+
+export function areaPersonList(query) {
+  return request({
+    url: '/business/watchArea/areaPersonList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 55be958..58d4658 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -738,7 +738,7 @@
 
 let prevObj = null;
 const panelDataToMap = (obj) => {
-  debugger;
+  // debugger;
   let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index c3dab83..0feab56 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -125,6 +125,7 @@
   'storehouse', //物资仓库
   'dikeGood', //堤防备料
   "waterlog_community",
+  "waterlogging_scheduling",//渍水风险点
 ]);
 // 视频点
 const videoList = ref([
@@ -556,14 +557,18 @@
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
-
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
+  if(item.stType=="waterlogging"){
+    Getproperties.value.peopleUser=item.watchId
+  }else {
+    Getproperties.value.peopleUser = null;
+  }
+  console.log('Getproperties', Getproperties.value);
   GetBoxmenu('', item.stType);
 }
 
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
index 6247c51..9f2b236 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
@@ -49,6 +49,7 @@
 import * as reviewApi from "@/api/FloodControlAndDrainage.js";
 import drainageDDZL from './drainageDDZL';
 import bus from '@/bus';
+import _bus from '@/bus';
 const classData=ref([
   {label:'值守签到',value:'1',num:'0'},
   {label:'上报/处理',value:'2',num:'0'},
@@ -112,9 +113,11 @@
   getData()
 
   //排渍调度
-  bus.on("showZSdispatch", (e) => {
-    pzData.value = e
-    dialogVisible.value=true
+  bus.on("showZSdispatch", (item) => {
+    pzData.value = item
+    _bus.emit("panelDataToMap", {...item,name:item.name,id:undefined,isUp:false})
+    _bus.emit("DynamicBus", item);
+    // dialogVisible.value=true
   });
 })
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
index 3868cce..12a909e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
@@ -105,7 +105,7 @@
 const tableData=ref([])
 function gitData() {
   let params={
-    code:bzData.value.code
+    code:bzData.value.stCode
   }
   watchAreaDutyPumpScheduling(params).then(res => {
     if (res && res.code == 200) {
@@ -124,7 +124,7 @@
       });
     }
   });
-  getBZFxLogList({code:bzData.value.code}).then(res=>{
+  getBZFxLogList({code:bzData.value.stCode}).then(res=>{
     if(res.code==200){
       tableData.value=res.data.bzList
     }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js b/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js
index cdbd5f1..d6ba8a1 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js
+++ b/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js
@@ -123,6 +123,16 @@
       name: 'jiancefenxiZSFX',
     },
     {
+      title: '渍水点调度',
+      content: markRaw(res_components['zishuidiaodu']),//渍水点监测分析
+      name: 'zishuidiaodu',
+    },
+    {
+      title: '泵站调度',
+      content: markRaw(res_components['bengzhandiaodu']),//渍水点监测分析
+      name: 'bengzhandiaodu',
+    },
+    {
       title: '监测分析',
       content: markRaw(res_components['jiancefenxiGWFX']),//管网数据分析
       name: 'jiancefenxiGWFX',
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue
new file mode 100644
index 0000000..3b72bf6
--- /dev/null
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue
@@ -0,0 +1,422 @@
+<template>
+  
+  <div class="pumpContentBox flex">
+    <div class="elForm">
+      <el-form
+          ref="ruleForm"
+          :model="form"
+          label-width="100"
+          :rules='rules'
+        >
+        <el-form-item label="预测情况">
+          <el-input
+            v-model="form.qk"
+            :disabled='true'
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="指派人员" prop="dispatchUser">
+          <el-select 
+            v-model="form.dispatchUser"
+            placeholder="请选择指派人员"
+            multiple
+            filterable
+            collapse-tags
+            style="width:100%">
+              <el-option v-for="item in userData"
+                :key="item.userId"
+                :label="item.nickName"
+                :value="item.userId" />
+          </el-select>
+          <!-- <el-tree-select
+            style="width: 100%"
+            v-model="form.dispatchUser"
+            :data="userData"
+            placeholder="请选择接收人员"
+            node-key="id"
+            filterable
+            multiple
+            show-checkbox
+            collapse-tags
+            :render-after-expand="false"
+            clearable
+            :props="{
+              value: 'id',
+              label: 'name',
+              children: 'children',
+            }"
+          /> -->
+        </el-form-item>
+        <el-form-item label="排渍车辆">
+          <el-select 
+            v-model="form.dispatchCar"
+            placeholder="请选择排渍车辆"
+            multiple
+            filterable
+            collapse-tags
+            style="width:100%">
+              <el-option v-for="item in carData"
+                :key="item.id"
+                :label="item.licensePlate"
+                :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="应急排水泵">
+          <el-input-number v-model="form.pumpNumber" placeholder="请输入数量" style="width:40%"/>
+        </el-form-item>
+        <el-form-item label="预计值守" prop="datetimerange">
+          <el-date-picker
+            v-model="form.datetimerange"
+            type="datetimerange"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            date-format="YYYY-MM-DD HH:mm:ss"
+            style="width:100%"
+          />
+        </el-form-item>
+        <el-form-item label="其他物资" prop="goodList">
+          <div class="goodList">
+            <el-row :gutter="10" v-for="(item,index) in form.goodList" :key="index" style="margin-bottom:10px">
+              <el-col :span="12">
+                <el-select 
+                  filterable
+                  v-model="item.supplyGoodId"
+                  placeholder="请选择物资"
+                  style="width:100%">
+                    <el-option v-for="item in wzList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"/>
+                </el-select>
+              </el-col>
+              <el-col :span="9">
+                <el-input-number v-model="item.supplyGoodNum" placeholder="请输入数量" style="width:100%"/>
+              </el-col>
+              <el-col :span="3" v-if="index==0">
+                <el-button type="primary" :icon="Plus" circle @click="addGoodList()"/>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form-item>
+        <el-form-item label="调度指令">
+          <el-input
+            type="textarea"
+            v-model="dispatchInstruct"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="现场图片" prop="fileList">
+          <ImageFileUpload :limit="4" :listType="'picture'" :saveFileArr="form.fileList"></ImageFileUpload>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">下发调度建议</el-button>
+          <!-- <el-button type="primary" @click="">视频通话</el-button> -->
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="elTable">
+      <el-table :data="tableData" height="100%" class="dispatchTable" stripe>
+        <el-table-column label="场次降雨" prop="rainfallVenue" show-overflow-tooltip>
+          <template #default="scope">
+            {{ scope.row.rainBeginTime!=''?moment(scope.row.rainBeginTime).format("YYYY-MM-DD HH:mm:ss"):'暂无' + "-" + scope.row.rainEndTime!=''?moment(scope.row.rainEndTime).format("YYYY-MM-DD HH:mm:ss"):'暂无'}}
+          </template>
+        </el-table-column>
+        <el-table-column label="累计降雨量(mm)" prop="rainfall"/>
+        <el-table-column label="气象预警级别">
+          <template #default="scope">
+            {{
+              scope.row.warnGrade == "1"
+                ? "Ⅰ"
+                : scope.row.warnGrade == "2"
+                ? "Ⅱ"
+                : scope.row.warnGrade == "3"
+                ? "Ⅲ"
+                : scope.row.warnGrade == "4"
+                ? "Ⅳ"
+                : scope.row.warnGrade == "5"
+                ? "预警"
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="值守人">
+          <template #default="scope">
+            {{getChineseFun(userData, "userId",scope.row.watchUser, "nickName")}}
+          </template>
+        </el-table-column>
+        <el-table-column label="是否内涝">
+          <template #default="scope">
+            {{
+              scope.row.isWaterlogging == "0"
+                ? "否"
+                : scope.row.isWaterlogging == "1"
+                ? "是"
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template #default="scope">
+            <span @click="handleClick(scope.row)" class="pointer">选用</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script setup name="zishuidiaodu">
+import { Plus } from '@element-plus/icons-vue'
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import { ElMessageBox } from 'element-plus';
+import { watchDispatchList ,dispatchOutbound,distributeTask} from "@/api/FloodControlAndDrainage.js";
+import { vehicleListN } from "@/api/carApi";
+import {listByGroupUnit } from '@/api/user';
+import { getChineseFun } from '@/utils/ruoyi';
+import { getDataName } from '@/utils/util.js'
+// import { listUser } from '@/api/user';
+import { managementWarehouseGoodList ,areaPersonList} from '@/api/MonitorAssetsOnMap';
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  Getproperties: {
+    type: Object,
+  },
+  // 数据id
+  dataID: {
+    type: [String, Number],
+  },
+  dataCode: {
+    type: String,
+  },
+  // 默认打开tabs的key
+  RefName: {
+    type: String,
+  },
+  tabsType: {
+    type: String,
+  },
+  typeName: {
+    type: String,
+  },
+});
+console.log(props)
+let carData =ref([])
+let userData =ref([])
+let tableData =ref([])
+let wzList =ref([])
+let dispatchInstruct =ref('')
+
+let baseInfo=ref({
+  name:props.dataCode=="waterlogging"?props.Getproperties.wellCode:props.Getproperties.name,
+  user:props.dataCode=="waterlogging"?props.Getproperties.peopleUser:props.Getproperties.watchAreaId,
+})
+
+let form =ref({
+  dispatchType:'2',
+  qk:`${baseInfo.value.name}可能发生内涝`,
+  goodList:[
+    {
+      supplyGoodId:'',
+      supplyGoodNum:0
+    }
+  ],
+  dispatchUser:[],
+  dispatchCar:[],
+  watchPointId:props.dataID,
+  fileList:[]
+})
+
+const rules = reactive({
+  dispatchUser: [
+    { required: true, message: '请选择指派人员', trigger: 'change' },
+  ],
+  datetimerange: [
+    { required: true, message: '请选择预计执行时间', trigger: 'change' },
+  ],
+})
+// 添加物资列表
+function addGoodList(){
+  form.value.goodList.push(
+    {
+      supplyGoodId:'',
+      supplyGoodNum:0,
+    }
+  )
+}
+function onSubmit(){
+  proxy.$refs["ruleForm"].validate(valid => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '审核通过后调度指令后系统将向APP发送调度指令并通过语音外呼自动语音拨打电话提醒!',
+        `确认要将调度指令下发给${baseInfo.value.name}值班及带班领导吗？`,
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          center: true,
+        }
+      )
+      .then(() => {
+        let parms=JSON.parse(JSON.stringify(form.value))
+        parms.planWatchStartTime=proxy.moment(parms.datetimerange[0]).format("YYYY-MM-DD HH:mm:ss")
+        parms.planWatchEndTime=proxy.moment(parms.datetimerange[1]).format("YYYY-MM-DD HH:mm:ss")
+        parms.dispatchCar=parms.dispatchCar.length>0?parms.dispatchCar.join(","):''
+        parms.dispatchUser=parms.dispatchUser.length>0?parms.dispatchUser.join(","):''
+        parms.dispatchInstruct=dispatchInstruct.value
+        parms.rainBeginTime=`${proxy.moment().format("YYYY-MM-DD")} 08:00:00`
+        parms.rainEndTime=`${proxy.moment().add(1, 'days').format("YYYY-MM-DD")} 08:00:00`
+        parms.dispatchImageAttachUrl= parms.fileList.length>0?(parms.fileList.map(i=>{return i.url})).join(','):''
+        parms.taskType=props.dataCode=="waterlogging"?1:props.dataCode=="waterlogging_scheduling"?2:3
+        delete parms.datetimerange
+        
+        distributeTask(parms).then(res => {
+          if (res && res.code == 200) {
+              let params={
+                phones:getChineseFun(userData.value, "userId", form.value.dispatchUser.join(","), "phonenumber"),
+                // phones:'15927167920',
+                title:baseInfo.value.name,
+                notice:dispatchInstruct.value
+              }
+              dispatchOutbound(params).then(res => {
+                if (res && res.code == 200) {
+                  proxy.$modal.msgSuccess("已下发")
+                  emit('closePop',true)
+                }else{
+                  proxy.$modal.msgError(res.msg)
+                }
+              });
+          }else{
+            proxy.$modal.msgError(res.msg)
+          }
+        });
+      })
+      .catch(() => {
+      })
+    }
+  })
+}
+
+/** 查询用户tree列表 */
+function getData() {
+  watchDispatchList({watchPointId:props.dataID,taskType:props.dataCode=="waterlogging"?1:props.dataCode=="waterlogging_scheduling"?2:3}).then(res=>{
+    if(res.code==200){
+      tableData.value=res.data
+    }
+  })
+  areaPersonList({id:baseInfo.value.user}).then(res => {
+    userData.value = res.data;
+  });
+  vehicleListN().then(res => {
+    carData.value = res.data;
+  });
+  managementWarehouseGoodList().then(res => {
+    wzList.value = res.data;
+  });
+}
+
+function handleClick(row) {
+  form.value.goodList=row.goodList
+  form.value.dispatchUser=(row.dispatchUser.split(',')).map(Number)
+  form.value.dispatchCar=row.dispatchCar!=''?row.dispatchCar.split(','):[]
+}
+
+watch(
+  () => form.value,
+  (value) => {
+    console.log('w')
+    let ry=''
+    if(value.dispatchUser.length>0){
+      ry= getChineseFun(userData.value, "userId", value.dispatchUser.join(","), "nickName")
+    }
+    let cl=''
+    if(value.dispatchCar.length>0){
+      cl= getChineseFun(carData.value, "id", value.dispatchCar.join(","), "licensePlate")
+    }
+    let textWz='无'
+    let text=[]
+    if(value.goodList.length>0){
+      value.goodList.forEach(element => {
+        if( element.supplyGoodId!=''&&element.supplyGoodNum>0){
+          let name=getDataName({
+            dataList:wzList.value,
+            value:"id",
+            label:"name",
+            data: element.supplyGoodId
+          })
+          text.push(`${name}`+`${element.supplyGoodNum}`)
+        }
+      });
+    }
+    if(text.length>0){
+      textWz=text.join("、")
+    }
+    let timeText='请填写预计值守时间'
+    if (value.datetimerange && value.datetimerange.length > 0) {
+      timeText = `预计值守时间${proxy.moment(value.datetimerange[0]).format("YYYY-MM-DD HH:mm:ss")}~${proxy.moment(value.datetimerange[1]).format("YYYY-MM-DD HH:mm:ss")}`;
+    }
+    let content = `${value.qk || ""}，建议指派${value.pq || ""}值守人员${
+        ry || ""
+      }立即前往值守点，派遣车辆${cl || ""},应急排水泵${value.pumpNumber || "0"}个，派遣物资${
+        textWz || ""
+      }，${timeText}。`;
+      dispatchInstruct.value=content
+  },
+  { immediate: true ,deep:true}
+);
+onMounted(() => {
+  console.log(props)
+  getData();
+});
+</script>
+
+<style lang="scss" scoped>
+.pumpContentBox{
+  height: 760px;
+  .elForm{
+    width:40%;
+    overflow-y: auto;
+    color: #CCDFFF;
+  }
+  .elTable{
+    width:60%;
+    overflow: hidden;
+    padding-left: 20px;
+  }
+}
+:deep(.el-textarea__inner){
+  background: none;
+  // box-shadow:0 0 1px #4364ac;
+}
+:deep(.el-form-item__label){
+  color: #CCDFFF !important;
+}
+:deep(.el-textarea__inner){
+  color: #CCDFFF !important;
+}
+:deep(.el-input__inner){
+  color: #CCDFFF !important;
+}
+:deep(.el-textarea__inner){
+  box-shadow:0 0 0 1px #4364ac inset !important;
+}
+:deep(.el-date-editor.el-input__wrapper){
+  box-shadow:0 0 0 1px #4364ac inset !important;
+}
+:deep(.el-input-number__decrease){
+  background: none;
+  color: #409eff;
+  border-color: #4364ac;
+}
+:deep(.el-input-number__increase){
+  background: none;
+  color: #409eff;
+  border-color: #4364ac;
+}
+.goodList{
+  width: 100%;
+  overflow: hidden;
+}
+.pointer{
+  cursor: pointer;
+}
+</style>
\ No newline at end of file

diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index 92f29c8..9de1b44 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -439,4 +439,12 @@
     method: 'get',
     params: query
   })
+}
+
+export function areaPersonList(query) {
+  return request({
+    url: '/business/watchArea/areaPersonList',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue
index 55be958..58d4658 100644
--- a/src/components/Map/MapBox.vue
+++ b/src/components/Map/MapBox.vue
@@ -738,7 +738,7 @@
 
 let prevObj = null;
 const panelDataToMap = (obj) => {
-  debugger;
+  // debugger;
   let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件  默认触发
   const { setLayerVisible, setHighlight } = events_params;
   // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false });
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index c3dab83..0feab56 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -125,6 +125,7 @@
   'storehouse', //物资仓库
   'dikeGood', //堤防备料
   "waterlog_community",
+  "waterlogging_scheduling",//渍水风险点
 ]);
 // 视频点
 const videoList = ref([
@@ -556,14 +557,18 @@
   } else {
     Getproperties.value.daterange = null;
   }
-  console.log('Getproperties', Getproperties.value);
   if (arrstcode.value.includes(item.stType)) {
     properties.stCode = item.stCode;
   }
-
   if (arrid.value.includes(item.stType)) {
     properties.id = item.pid || item.id;
   }
+  if(item.stType=="waterlogging"){
+    Getproperties.value.peopleUser=item.watchId
+  }else {
+    Getproperties.value.peopleUser = null;
+  }
+  console.log('Getproperties', Getproperties.value);
   GetBoxmenu('', item.stType);
 }
 
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
index 6247c51..9f2b236 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue
@@ -49,6 +49,7 @@
 import * as reviewApi from "@/api/FloodControlAndDrainage.js";
 import drainageDDZL from './drainageDDZL';
 import bus from '@/bus';
+import _bus from '@/bus';
 const classData=ref([
   {label:'值守签到',value:'1',num:'0'},
   {label:'上报/处理',value:'2',num:'0'},
@@ -112,9 +113,11 @@
   getData()
 
   //排渍调度
-  bus.on("showZSdispatch", (e) => {
-    pzData.value = e
-    dialogVisible.value=true
+  bus.on("showZSdispatch", (item) => {
+    pzData.value = item
+    _bus.emit("panelDataToMap", {...item,name:item.name,id:undefined,isUp:false})
+    _bus.emit("DynamicBus", item);
+    // dialogVisible.value=true
   });
 })
 onBeforeUnmount(() => {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
index 3868cce..12a909e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
@@ -105,7 +105,7 @@
 const tableData=ref([])
 function gitData() {
   let params={
-    code:bzData.value.code
+    code:bzData.value.stCode
   }
   watchAreaDutyPumpScheduling(params).then(res => {
     if (res && res.code == 200) {
@@ -124,7 +124,7 @@
       });
     }
   });
-  getBZFxLogList({code:bzData.value.code}).then(res=>{
+  getBZFxLogList({code:bzData.value.stCode}).then(res=>{
     if(res.code==200){
       tableData.value=res.data.bzList
     }
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js b/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js
index cdbd5f1..d6ba8a1 100644
--- a/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js
+++ b/src/views/pictureOnMap/page/components/DialogTabs/DialogConfig.js
@@ -123,6 +123,16 @@
       name: 'jiancefenxiZSFX',
     },
     {
+      title: '渍水点调度',
+      content: markRaw(res_components['zishuidiaodu']),//渍水点监测分析
+      name: 'zishuidiaodu',
+    },
+    {
+      title: '泵站调度',
+      content: markRaw(res_components['bengzhandiaodu']),//渍水点监测分析
+      name: 'bengzhandiaodu',
+    },
+    {
       title: '监测分析',
       content: markRaw(res_components['jiancefenxiGWFX']),//管网数据分析
       name: 'jiancefenxiGWFX',
diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue
new file mode 100644
index 0000000..3b72bf6
--- /dev/null
+++ b/src/views/pictureOnMap/page/components/DialogTabs/component/zishuidiaodu.vue
@@ -0,0 +1,422 @@
+<template>
+  
+  <div class="pumpContentBox flex">
+    <div class="elForm">
+      <el-form
+          ref="ruleForm"
+          :model="form"
+          label-width="100"
+          :rules='rules'
+        >
+        <el-form-item label="预测情况">
+          <el-input
+            v-model="form.qk"
+            :disabled='true'
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="指派人员" prop="dispatchUser">
+          <el-select 
+            v-model="form.dispatchUser"
+            placeholder="请选择指派人员"
+            multiple
+            filterable
+            collapse-tags
+            style="width:100%">
+              <el-option v-for="item in userData"
+                :key="item.userId"
+                :label="item.nickName"
+                :value="item.userId" />
+          </el-select>
+          <!-- <el-tree-select
+            style="width: 100%"
+            v-model="form.dispatchUser"
+            :data="userData"
+            placeholder="请选择接收人员"
+            node-key="id"
+            filterable
+            multiple
+            show-checkbox
+            collapse-tags
+            :render-after-expand="false"
+            clearable
+            :props="{
+              value: 'id',
+              label: 'name',
+              children: 'children',
+            }"
+          /> -->
+        </el-form-item>
+        <el-form-item label="排渍车辆">
+          <el-select 
+            v-model="form.dispatchCar"
+            placeholder="请选择排渍车辆"
+            multiple
+            filterable
+            collapse-tags
+            style="width:100%">
+              <el-option v-for="item in carData"
+                :key="item.id"
+                :label="item.licensePlate"
+                :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="应急排水泵">
+          <el-input-number v-model="form.pumpNumber" placeholder="请输入数量" style="width:40%"/>
+        </el-form-item>
+        <el-form-item label="预计值守" prop="datetimerange">
+          <el-date-picker
+            v-model="form.datetimerange"
+            type="datetimerange"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            date-format="YYYY-MM-DD HH:mm:ss"
+            style="width:100%"
+          />
+        </el-form-item>
+        <el-form-item label="其他物资" prop="goodList">
+          <div class="goodList">
+            <el-row :gutter="10" v-for="(item,index) in form.goodList" :key="index" style="margin-bottom:10px">
+              <el-col :span="12">
+                <el-select 
+                  filterable
+                  v-model="item.supplyGoodId"
+                  placeholder="请选择物资"
+                  style="width:100%">
+                    <el-option v-for="item in wzList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"/>
+                </el-select>
+              </el-col>
+              <el-col :span="9">
+                <el-input-number v-model="item.supplyGoodNum" placeholder="请输入数量" style="width:100%"/>
+              </el-col>
+              <el-col :span="3" v-if="index==0">
+                <el-button type="primary" :icon="Plus" circle @click="addGoodList()"/>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form-item>
+        <el-form-item label="调度指令">
+          <el-input
+            type="textarea"
+            v-model="dispatchInstruct"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="现场图片" prop="fileList">
+          <ImageFileUpload :limit="4" :listType="'picture'" :saveFileArr="form.fileList"></ImageFileUpload>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onSubmit">下发调度建议</el-button>
+          <!-- <el-button type="primary" @click="">视频通话</el-button> -->
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="elTable">
+      <el-table :data="tableData" height="100%" class="dispatchTable" stripe>
+        <el-table-column label="场次降雨" prop="rainfallVenue" show-overflow-tooltip>
+          <template #default="scope">
+            {{ scope.row.rainBeginTime!=''?moment(scope.row.rainBeginTime).format("YYYY-MM-DD HH:mm:ss"):'暂无' + "-" + scope.row.rainEndTime!=''?moment(scope.row.rainEndTime).format("YYYY-MM-DD HH:mm:ss"):'暂无'}}
+          </template>
+        </el-table-column>
+        <el-table-column label="累计降雨量(mm)" prop="rainfall"/>
+        <el-table-column label="气象预警级别">
+          <template #default="scope">
+            {{
+              scope.row.warnGrade == "1"
+                ? "Ⅰ"
+                : scope.row.warnGrade == "2"
+                ? "Ⅱ"
+                : scope.row.warnGrade == "3"
+                ? "Ⅲ"
+                : scope.row.warnGrade == "4"
+                ? "Ⅳ"
+                : scope.row.warnGrade == "5"
+                ? "预警"
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="值守人">
+          <template #default="scope">
+            {{getChineseFun(userData, "userId",scope.row.watchUser, "nickName")}}
+          </template>
+        </el-table-column>
+        <el-table-column label="是否内涝">
+          <template #default="scope">
+            {{
+              scope.row.isWaterlogging == "0"
+                ? "否"
+                : scope.row.isWaterlogging == "1"
+                ? "是"
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template #default="scope">
+            <span @click="handleClick(scope.row)" class="pointer">选用</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script setup name="zishuidiaodu">
+import { Plus } from '@element-plus/icons-vue'
+import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
+import { ElMessageBox } from 'element-plus';
+import { watchDispatchList ,dispatchOutbound,distributeTask} from "@/api/FloodControlAndDrainage.js";
+import { vehicleListN } from "@/api/carApi";
+import {listByGroupUnit } from '@/api/user';
+import { getChineseFun } from '@/utils/ruoyi';
+import { getDataName } from '@/utils/util.js'
+// import { listUser } from '@/api/user';
+import { managementWarehouseGoodList ,areaPersonList} from '@/api/MonitorAssetsOnMap';
+const { proxy } = getCurrentInstance();
+const props = defineProps({
+  Getproperties: {
+    type: Object,
+  },
+  // 数据id
+  dataID: {
+    type: [String, Number],
+  },
+  dataCode: {
+    type: String,
+  },
+  // 默认打开tabs的key
+  RefName: {
+    type: String,
+  },
+  tabsType: {
+    type: String,
+  },
+  typeName: {
+    type: String,
+  },
+});
+console.log(props)
+let carData =ref([])
+let userData =ref([])
+let tableData =ref([])
+let wzList =ref([])
+let dispatchInstruct =ref('')
+
+let baseInfo=ref({
+  name:props.dataCode=="waterlogging"?props.Getproperties.wellCode:props.Getproperties.name,
+  user:props.dataCode=="waterlogging"?props.Getproperties.peopleUser:props.Getproperties.watchAreaId,
+})
+
+let form =ref({
+  dispatchType:'2',
+  qk:`${baseInfo.value.name}可能发生内涝`,
+  goodList:[
+    {
+      supplyGoodId:'',
+      supplyGoodNum:0
+    }
+  ],
+  dispatchUser:[],
+  dispatchCar:[],
+  watchPointId:props.dataID,
+  fileList:[]
+})
+
+const rules = reactive({
+  dispatchUser: [
+    { required: true, message: '请选择指派人员', trigger: 'change' },
+  ],
+  datetimerange: [
+    { required: true, message: '请选择预计执行时间', trigger: 'change' },
+  ],
+})
+// 添加物资列表
+function addGoodList(){
+  form.value.goodList.push(
+    {
+      supplyGoodId:'',
+      supplyGoodNum:0,
+    }
+  )
+}
+function onSubmit(){
+  proxy.$refs["ruleForm"].validate(valid => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '审核通过后调度指令后系统将向APP发送调度指令并通过语音外呼自动语音拨打电话提醒!',
+        `确认要将调度指令下发给${baseInfo.value.name}值班及带班领导吗？`,
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          center: true,
+        }
+      )
+      .then(() => {
+        let parms=JSON.parse(JSON.stringify(form.value))
+        parms.planWatchStartTime=proxy.moment(parms.datetimerange[0]).format("YYYY-MM-DD HH:mm:ss")
+        parms.planWatchEndTime=proxy.moment(parms.datetimerange[1]).format("YYYY-MM-DD HH:mm:ss")
+        parms.dispatchCar=parms.dispatchCar.length>0?parms.dispatchCar.join(","):''
+        parms.dispatchUser=parms.dispatchUser.length>0?parms.dispatchUser.join(","):''
+        parms.dispatchInstruct=dispatchInstruct.value
+        parms.rainBeginTime=`${proxy.moment().format("YYYY-MM-DD")} 08:00:00`
+        parms.rainEndTime=`${proxy.moment().add(1, 'days').format("YYYY-MM-DD")} 08:00:00`
+        parms.dispatchImageAttachUrl= parms.fileList.length>0?(parms.fileList.map(i=>{return i.url})).join(','):''
+        parms.taskType=props.dataCode=="waterlogging"?1:props.dataCode=="waterlogging_scheduling"?2:3
+        delete parms.datetimerange
+        
+        distributeTask(parms).then(res => {
+          if (res && res.code == 200) {
+              let params={
+                phones:getChineseFun(userData.value, "userId", form.value.dispatchUser.join(","), "phonenumber"),
+                // phones:'15927167920',
+                title:baseInfo.value.name,
+                notice:dispatchInstruct.value
+              }
+              dispatchOutbound(params).then(res => {
+                if (res && res.code == 200) {
+                  proxy.$modal.msgSuccess("已下发")
+                  emit('closePop',true)
+                }else{
+                  proxy.$modal.msgError(res.msg)
+                }
+              });
+          }else{
+            proxy.$modal.msgError(res.msg)
+          }
+        });
+      })
+      .catch(() => {
+      })
+    }
+  })
+}
+
+/** 查询用户tree列表 */
+function getData() {
+  watchDispatchList({watchPointId:props.dataID,taskType:props.dataCode=="waterlogging"?1:props.dataCode=="waterlogging_scheduling"?2:3}).then(res=>{
+    if(res.code==200){
+      tableData.value=res.data
+    }
+  })
+  areaPersonList({id:baseInfo.value.user}).then(res => {
+    userData.value = res.data;
+  });
+  vehicleListN().then(res => {
+    carData.value = res.data;
+  });
+  managementWarehouseGoodList().then(res => {
+    wzList.value = res.data;
+  });
+}
+
+function handleClick(row) {
+  form.value.goodList=row.goodList
+  form.value.dispatchUser=(row.dispatchUser.split(',')).map(Number)
+  form.value.dispatchCar=row.dispatchCar!=''?row.dispatchCar.split(','):[]
+}
+
+watch(
+  () => form.value,
+  (value) => {
+    console.log('w')
+    let ry=''
+    if(value.dispatchUser.length>0){
+      ry= getChineseFun(userData.value, "userId", value.dispatchUser.join(","), "nickName")
+    }
+    let cl=''
+    if(value.dispatchCar.length>0){
+      cl= getChineseFun(carData.value, "id", value.dispatchCar.join(","), "licensePlate")
+    }
+    let textWz='无'
+    let text=[]
+    if(value.goodList.length>0){
+      value.goodList.forEach(element => {
+        if( element.supplyGoodId!=''&&element.supplyGoodNum>0){
+          let name=getDataName({
+            dataList:wzList.value,
+            value:"id",
+            label:"name",
+            data: element.supplyGoodId
+          })
+          text.push(`${name}`+`${element.supplyGoodNum}`)
+        }
+      });
+    }
+    if(text.length>0){
+      textWz=text.join("、")
+    }
+    let timeText='请填写预计值守时间'
+    if (value.datetimerange && value.datetimerange.length > 0) {
+      timeText = `预计值守时间${proxy.moment(value.datetimerange[0]).format("YYYY-MM-DD HH:mm:ss")}~${proxy.moment(value.datetimerange[1]).format("YYYY-MM-DD HH:mm:ss")}`;
+    }
+    let content = `${value.qk || ""}，建议指派${value.pq || ""}值守人员${
+        ry || ""
+      }立即前往值守点，派遣车辆${cl || ""},应急排水泵${value.pumpNumber || "0"}个，派遣物资${
+        textWz || ""
+      }，${timeText}。`;
+      dispatchInstruct.value=content
+  },
+  { immediate: true ,deep:true}
+);
+onMounted(() => {
+  console.log(props)
+  getData();
+});
+</script>
+
+<style lang="scss" scoped>
+.pumpContentBox{
+  height: 760px;
+  .elForm{
+    width:40%;
+    overflow-y: auto;
+    color: #CCDFFF;
+  }
+  .elTable{
+    width:60%;
+    overflow: hidden;
+    padding-left: 20px;
+  }
+}
+:deep(.el-textarea__inner){
+  background: none;
+  // box-shadow:0 0 1px #4364ac;
+}
+:deep(.el-form-item__label){
+  color: #CCDFFF !important;
+}
+:deep(.el-textarea__inner){
+  color: #CCDFFF !important;
+}
+:deep(.el-input__inner){
+  color: #CCDFFF !important;
+}
+:deep(.el-textarea__inner){
+  box-shadow:0 0 0 1px #4364ac inset !important;
+}
+:deep(.el-date-editor.el-input__wrapper){
+  box-shadow:0 0 0 1px #4364ac inset !important;
+}
+:deep(.el-input-number__decrease){
+  background: none;
+  color: #409eff;
+  border-color: #4364ac;
+}
+:deep(.el-input-number__increase){
+  background: none;
+  color: #409eff;
+  border-color: #4364ac;
+}
+.goodList{
+  width: 100%;
+  overflow: hidden;
+}
+.pointer{
+  cursor: pointer;
+}
+</style>
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index 2190341..60aaa88 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,10 +7,10 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 // let ipLink = 'https://server1.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.135:9100';
-let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api';
+// let ipLink = 'https://dhgx.wh-nf.cn:8201/prod-api';
 // let ipLink = 'http://192.168.16.124:9100';
 // let ipLink = 'http://192.168.20.43:9100'; // 刘总
-// let ipLink = 'http://192.168.16.43:9100';
+let ipLink = 'http://192.168.16.43:9100';
 
 /*  */
 // https://vitejs.dev/config/