diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 52091a4..0518d79 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -319,6 +319,20 @@
     data
   })
 }
+export function pumpDispatchCommandSave(data){
+  return request({
+    url:'/business/pumpDispatchCommand/save',
+    method: 'post',
+    data
+  })
+}
+export function pumpDispatchHistoryList(params){
+  return request({
+    url:'/business/pumpDispatchHistory/list',
+    method: 'get',
+    params
+  })
+}
 // 降雨分布
 export function monitorUnitRainfallDistributionGetRainMap(params) {
   return request({

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 52091a4..0518d79 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -319,6 +319,20 @@
     data
   })
 }
+export function pumpDispatchCommandSave(data){
+  return request({
+    url:'/business/pumpDispatchCommand/save',
+    method: 'post',
+    data
+  })
+}
+export function pumpDispatchHistoryList(params){
+  return request({
+    url:'/business/pumpDispatchHistory/list',
+    method: 'get',
+    params
+  })
+}
 // 降雨分布
 export function monitorUnitRainfallDistributionGetRainMap(params) {
   return request({
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 d29f0a1..3868cce 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
@@ -32,7 +32,7 @@
     </div>
   </div>
   <el-dialog
-    title="下发泵站调度指令"
+    :title="`${serveData.name}下发泵站调度指令`"
     append-to-body
     modal-class="mapTotalDialog"
     v-model="dialogVisible"
@@ -119,6 +119,7 @@
         element.bz=serveData.value.pumpNumber
         if(element.code==serveData.value.warningInfo){
           element.show=true
+          serveData.value.serverPubNum=element.kb
         }
       });
     }

diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 52091a4..0518d79 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -319,6 +319,20 @@
     data
   })
 }
+export function pumpDispatchCommandSave(data){
+  return request({
+    url:'/business/pumpDispatchCommand/save',
+    method: 'post',
+    data
+  })
+}
+export function pumpDispatchHistoryList(params){
+  return request({
+    url:'/business/pumpDispatchHistory/list',
+    method: 'get',
+    params
+  })
+}
 // 降雨分布
 export function monitorUnitRainfallDistributionGetRainMap(params) {
   return request({
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 d29f0a1..3868cce 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
@@ -32,7 +32,7 @@
     </div>
   </div>
   <el-dialog
-    title="下发泵站调度指令"
+    :title="`${serveData.name}下发泵站调度指令`"
     append-to-body
     modal-class="mapTotalDialog"
     v-model="dialogVisible"
@@ -119,6 +119,7 @@
         element.bz=serveData.value.pumpNumber
         if(element.code==serveData.value.warningInfo){
           element.show=true
+          serveData.value.serverPubNum=element.kb
         }
       });
     }
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 6b7d468..3bef71b 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue
@@ -5,15 +5,17 @@
           ref="ruleForm"
           :model="form"
           label-width="100"
+          :rules="rules"
         >
         <el-form-item label="预测情况">
           <el-input
-            v-model="form.name"
+            v-model="form.remark"
+            :disabled='true'
           ></el-input>
         </el-form-item>
-        <el-form-item label="解决建议">
+        <el-form-item label="解决建议" prop="commandOpenPump">
           <el-select 
-            v-model="form.open"
+            v-model="form.commandOpenPump"
             placeholder="请选择解决建议"
             style="width:100%">
               <el-option v-for="item in pupNum"
@@ -22,9 +24,9 @@
                 :value="item.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="开泵数量">
+        <el-form-item label="开泵数量" prop="commandOpenNumber">
           <el-select 
-            v-model="form.pumpNumber"
+            v-model="form.commandOpenNumber"
             placeholder="请选择开泵数"
             style="width:100%">
               <el-option v-for="item in pumpArray"
@@ -34,14 +36,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="起抽水">
-          <div>{{props.data.startLevel}}m(吴淞)</div>
+          <div>{{form.commandQpz}}m(吴淞)</div>
         </el-form-item>
         <el-form-item label="停抽水">
-          <div>{{props.data.stopLevel}}m(吴淞)</div>
+          <div>{{form.commandTcz}}m(吴淞)</div>
         </el-form-item>
-        <el-form-item label="希望执行时间">
+        <el-form-item label="希望执行时间" prop="executeTime">
           <el-date-picker
-            v-model="form.time"
+            v-model="form.executeTime"
             type="datetime"
             value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="请选择执行时间"
@@ -49,7 +51,7 @@
           />
         </el-form-item>
         <el-form-item label="通知人员">
-          <div>{{form.user}}</div>
+          <div>{{form.commandUsers}}{{(props.data.dutyPersonPhone)}}</div>
           <!-- <el-tree-select
             style="width: 100%"
             v-model="form.recipient"
@@ -69,10 +71,10 @@
             }"
           /> -->
         </el-form-item>
-        <el-form-item label="调度指令">
+        <el-form-item label="调度指令" prop="commandContent">
           <el-input
             type="textarea"
-            v-model="form.remake"
+            v-model="form.commandContent"
             :autosize="{ minRows: 4, maxRows: 6 }"
           ></el-input>
         </el-form-item>
@@ -84,14 +86,22 @@
     </div>
     <div class="elTable">
       <el-table :data="tableData" height="100%" class="dispatchTable" stripe>
-        <el-table-column label="场次降雨" prop="rainfallVenue" show-overflow-tooltip/>
-        <el-table-column label="累计降雨量(mm)" prop="accumulatedRainfall"/>
-        <el-table-column label="气象预警级别" prop="meteorologicalWarning"/>
+        <el-table-column label="场次降雨" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ row.rainStartTime }}-{{ row.rainEndTime }}
+          </template>
+        </el-table-column>
+        <el-table-column label="累计降雨量(mm)" prop="totalRain"/>
+        <el-table-column label="气象预警级别" prop="meteorologicalWarning">
+          <template #default="{ row }">
+            {{row.weatherWarnLevel ? row.weatherWarnLevel : "无"}}
+          </template>
+        </el-table-column>
         <!-- <el-table-column label="值守人" prop="recipient"/> -->
         <!-- <el-table-column label="建议开泵数" prop="commandOpenNumber"/> -->
         <el-table-column label="实际开泵数" prop="actualOpenNumber"/>
-        <el-table-column label="总台时" prop="kjts"/>
-        <el-table-column label="累计抽排量(万方)" prop="cpl"/>
+        <el-table-column label="总台时" prop="totalOpenHour"/>
+        <el-table-column label="累计抽排量(万方)" prop="totalPumpCapacity"/>
         <!-- <el-table-column label="状态" prop="status" width="90">
           <template #default="{ row }">
             <span :class="row.status==1?'blue':''">{{row.status==0?'未执行':'已执行'}}</span>
@@ -99,7 +109,7 @@
         </el-table-column> -->
         <el-table-column label="操作">
           <template #default="scope">
-            <span @click="handleClick(scope.row)">选用</span>
+            <span @click="handleClick(scope.row)" class="pointer">选用</span>
           </template>
         </el-table-column>
       </el-table>
@@ -110,7 +120,7 @@
 <script setup name="pumpDDZL">
 import { ElMessageBox } from 'element-plus';
 // import {listByGroupUnit } from '@/api/user';
-import { getBZFxLogList ,dispatchOutbound} from "@/api/FloodControlAndDrainage.js";
+import { pumpDispatchHistoryList ,dispatchOutbound,pumpDispatchCommandSave} from "@/api/FloodControlAndDrainage.js";
 const { proxy } = getCurrentInstance();
 const emit = defineEmits(["closePop"]);
 const props = defineProps({
@@ -130,14 +140,32 @@
     value:'0'
   }
 ]
+const rules = reactive({
+  commandOpenPump: [
+    { required: true, message: '请选择决策建议', trigger: 'change' },
+  ],
+  executeTime: [
+    { required: true, message: '请选择执行时间', trigger: 'change' },
+  ],
+  commandContent: [
+    { required: true, message: '请输入调度指令', trigger: 'blur' },
+  ],
+})
 let userData =ref([])
 let tableData =ref([])
 let pumpArray =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'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`,
-  user:`${props.data.dutyPerson}(${props.data.dutyPersonPhone})`
+  commandState:'1',
+  pumpSiteId:props.data.id,
+  siteType:'bz',
+  remark:`${props.data.warningInfo=='warn_blue'?'启动大雨暴雨蓝色预警':props.data.warningInfo=='warn_yellow'?'启动暴雨黄色预警':props.data.warningInfo=='warn_orange'?'启动暴雨橙色预警':props.data.warningInfo=='red_orange'?'启动暴雨红色预警':'启动小雨中雨预警'}建议提前开泵`,
+  commandOpenPump:'1',
+  commandOpenNumber:props.data.serverPubNum,
+  commandUsers:props.data.dutyPerson,
+  commandQpz:props.data.startLevel,
+  commandTcz:props.data.stopLevel,
+  commandContent:`根据历史调度经验及平台辅助研判，${props.data.name}过往在${props.data.warningInfo=='warn_blue'?'蓝色预警':props.data.warningInfo=='warn_yellow'?'雨黄色预警':props.data.warningInfo=='warn_orange'?'雨橙色预警':props.data.warningInfo=='red_orange'?'红色预警':'无预警'}下需要开启泵机${props.data.serverPubNum}/${props.data.pumpNumber}，起抽水位${props.data.startLevel}m(吴淞)，水位降至${props.data.stopLevel}m(吴淞)，建议立即开泵。`
 })
-
 function onSubmit(){
   proxy.$refs["ruleForm"].validate(valid => {
     if (valid) {
@@ -152,20 +180,29 @@
         }
       )
       .then(() => {
-        let params={
-          // phones:props.data.dutyPersonPhone,
-          phones:'13332926003,15827590495',
-          title:props.data.name,
-          notice:form.value.name
-        }
-        dispatchOutbound(params).then(res => {
+        pumpDispatchCommandSave(form.value).then(res => {
           if (res && res.code == 200) {
-            proxy.$modal.msgSuccess("已下发")
-           emit('closePop',true)
+            if(props.data.dutyPersonPhone!=''){
+              let params={
+                phones:props.data.dutyPersonPhone,
+                // phones:'18772378012',
+                title:props.data.name,
+                notice:form.value.commandContent
+              }
+              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(() => {
       })
@@ -175,9 +212,9 @@
 
 /** 查询用户tree列表 */
 function getData() {
-  getBZFxLogList({code:props.data.code}).then(res=>{
+  pumpDispatchHistoryList({pumpSiteId:props.data.id}).then(res=>{
     if(res.code==200){
-      tableData.value=res.data.bzList
+      tableData.value=res.data
     }
   })
   // listByGroupUnit().then(res => {
@@ -189,10 +226,15 @@
 
 }
 
+watch(
+  () => form.value.commandOpenNumber,
+  (value) => {
+    form.value.commandContent=`根据历史调度经验及平台辅助研判，${props.data.name}过往在${props.data.warningInfo=='warn_blue'?'蓝色预警':props.data.warningInfo=='warn_yellow'?'雨黄色预警':props.data.warningInfo=='warn_orange'?'雨橙色预警':props.data.warningInfo=='red_orange'?'红色预警':'无预警'}下需要开启泵机${value}/${props.data.pumpNumber}，起抽水位${props.data.startLevel}m(吴淞)，水位降至${props.data.stopLevel}m(吴淞)，建议立即开泵。`
+  }
+);
 onMounted(() => {
   for(let i=1;i<=props.data.pumpNumber;i++){
     pumpArray.value.push(i)
-    console.log(i)
   }
   getData();
 });
@@ -208,6 +250,7 @@
   }
   .elTable{
     width: 60%;
+    height:calc(100% - 10px);
     overflow: hidden;
     padding-left: 20px;
   }
@@ -225,4 +268,5 @@
 :deep(.el-input__inner){
   color: #CCDFFF !important;
 }
+.pointer{cursor: pointer;}
 </style>
\ No newline at end of file