From 47ddf510c00efb5f514cf6bd1910d19686a9c14d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E6=B5=A9=E8=BD=A9?= <[yihaoxuan@datametatech.com]>
Date: Fri, 29 Dec 2023 10:47:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B5=B7=E5=BA=95?=
 =?UTF-8?q?=E5=8A=A8=E7=89=A9=E9=98=B2=E6=B2=BB=E8=AE=B0=E5=BD=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E9=87=8D=E5=AE=9A=E5=90=91=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/settings.js                               |   2 +-
 src/utils/request.js                          |  81 ++--
 src/views/loginbg.vue                         |   2 +-
 .../engineering/inspectionItems/Dike.vue      |   2 +-
 .../engineering/inspectionItems/Sluice.vue    |   2 +-
 .../engineering/inspectionPlan/Dike.vue       |   2 +-
 .../engineering/inspectionPlan/Sluice.vue     |   2 +-
 .../maintenance/maintenancePlan/Dike.vue      |   2 +-
 .../maintenance/maintenancePlan/Sluice.vue    |   2 +-
 .../maintenance/maintenanceRecords/Dike.vue   |   2 +-
 .../maintenance/maintenanceRecords/Sluice.vue |   2 +-
 .../governanceRecords/Dike.vue                | 450 +++++++++++++-----
 .../pestAnimalControl/planManagement/Dike.vue |  87 ++--
 13 files changed, 428 insertions(+), 210 deletions(-)

diff --git a/src/settings.js b/src/settings.js
index 0ceed22..5044ad7 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
   // title: '安全知识图谱管理平台',
-  title: '广东省水工程建设管理系统后台',
+  title: '广东省水工程运行管理系统后台',
 
   /**
    * 是否系统布局配置
diff --git a/src/utils/request.js b/src/utils/request.js
index 193d4dc..5397e07 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -32,52 +32,51 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-    if (res && res.data ) {
-      // 未设置状态码则默认成功状态
-      const code = res.data.code || 200
-      // 获取错误信息
-      const msg = errorCode[code] || res.data.msg || errorCode['default']
-      if (code === 401) {
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('LogOut').then(() => {
-            location.href = '/index'
-          })
+  if (res && res.data) {
+    // 未设置状态码则默认成功状态
+    const code = res.data.code || 200
+    // 获取错误信息
+    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    if (code === 401) {
+      MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
+        confirmButtonText: '重新登录',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }
+      ).then(() => {
+        store.dispatch('LogOut').then(() => {
+          location.href = '/'
         })
+      })
+    }
+    if (code === 403) {
+      MessageBox.confirm('登录状态已过期，请重新登录', '系统提示', {
+        confirmButtonText: '重新登录',
+        cancelButtonText: '取消',
+        type: 'warning'
       }
-      if (code === 403) {
-        MessageBox.confirm('登录状态已过期，请重新登录', '系统提示', {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('LogOut').then(() => {
-            location.href = '/index'
-          })
+      ).then(() => {
+        store.dispatch('LogOut').then(() => {
+          location.href = '/'
         })
+      })
 
-      } else if (code !== 200) {
-        Notification.error({
-          title: msg
-        })
-        return Promise.reject('error')
-      } else if (code === 500) {
-        Message({
-          message: msg,
-          type: 'error'
-        })
-        return Promise.reject(new Error(msg))
-      } else {
-        return res.data
-      }
+    } else if (code !== 200) {
+      Notification.error({
+        title: msg
+      })
+      return Promise.reject('error')
+    } else if (code === 500) {
+      Message({
+        message: msg,
+        type: 'error'
+      })
+      return Promise.reject(new Error(msg))
+    } else {
+      return res.data
     }
-
-  },
+  }
+},
   error => {
     console.log('err' + error)
     let { message } = error
diff --git a/src/views/loginbg.vue b/src/views/loginbg.vue
index 68e0c57..ea2180a 100644
--- a/src/views/loginbg.vue
+++ b/src/views/loginbg.vue
@@ -3,7 +3,7 @@
     <div class="logo-text" style="text-align: center">
       <!-- <img src="@/assets/image/bg/title.png" style="width: 579px" alt="" /> -->
       <img src="@/assets/logo/logo-shuili.jpg" alt="" />
-      <span>广东省水工程建设管理系统</span>
+      <span>广东省水工程运行管理系统</span>
     </div>
 
     <div class="wrapper">
diff --git a/src/views/runManage/engineering/inspectionItems/Dike.vue b/src/views/runManage/engineering/inspectionItems/Dike.vue
index 126f74b..d09d8e9 100644
--- a/src/views/runManage/engineering/inspectionItems/Dike.vue
+++ b/src/views/runManage/engineering/inspectionItems/Dike.vue
@@ -283,7 +283,7 @@ export default {
         <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div><span
           style="font-weight: 600;">基础信息</span>
       </div>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" >
         <el-form-item label-width="120px" label="巡视检查名称" prop="name">
           <el-input style="width: 202px;" v-model="ruleForm.name"></el-input>
         </el-form-item>
diff --git a/src/views/runManage/engineering/inspectionItems/Sluice.vue b/src/views/runManage/engineering/inspectionItems/Sluice.vue
index 79b832a..056f55b 100644
--- a/src/views/runManage/engineering/inspectionItems/Sluice.vue
+++ b/src/views/runManage/engineering/inspectionItems/Sluice.vue
@@ -284,7 +284,7 @@ export default {
         <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div><span
           style="font-weight: 600;">基础信息</span>
       </div>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" >
         <el-form-item label-width="120px" label="巡视检查名称" prop="name">
           <el-input style="width: 202px;" v-model="ruleForm.name"></el-input>
         </el-form-item>
diff --git a/src/views/runManage/engineering/inspectionPlan/Dike.vue b/src/views/runManage/engineering/inspectionPlan/Dike.vue
index 313fb39..e17308a 100644
--- a/src/views/runManage/engineering/inspectionPlan/Dike.vue
+++ b/src/views/runManage/engineering/inspectionPlan/Dike.vue
@@ -287,7 +287,7 @@ export default {
       </el-pagination>
     </div>
     <el-dialog title="新增/编辑巡查计划" @close="closeDialog" :visible.sync="dialogVisible" width="50%">
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" >
         <el-form-item label-width="120px" label="计划名称" prop="name">
           <el-input style="width: 202px;" v-model="ruleForm.name"></el-input>
         </el-form-item>
diff --git a/src/views/runManage/engineering/inspectionPlan/Sluice.vue b/src/views/runManage/engineering/inspectionPlan/Sluice.vue
index 33274f5..e142691 100644
--- a/src/views/runManage/engineering/inspectionPlan/Sluice.vue
+++ b/src/views/runManage/engineering/inspectionPlan/Sluice.vue
@@ -289,7 +289,7 @@ export default {
       </el-pagination>
     </div>
     <el-dialog title="新增/编辑巡查计划" @close="closeDialog" :visible.sync="dialogVisible" width="50%">
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" >
         <el-form-item label-width="120px" label="计划名称" prop="name">
           <el-input style="width: 202px;" v-model="ruleForm.name"></el-input>
         </el-form-item>
diff --git a/src/views/runManage/maintenance/maintenancePlan/Dike.vue b/src/views/runManage/maintenance/maintenancePlan/Dike.vue
index 91c86ce..0cd4e0c 100644
--- a/src/views/runManage/maintenance/maintenancePlan/Dike.vue
+++ b/src/views/runManage/maintenance/maintenancePlan/Dike.vue
@@ -272,7 +272,7 @@ export default {
         <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div><span
           style="font-weight: 600;">基础信息</span>
       </div>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" >
         <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
           <el-select v-model="ruleForm.dikeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dikeCode"
             :disabled="prohibitEditing">
diff --git a/src/views/runManage/maintenance/maintenancePlan/Sluice.vue b/src/views/runManage/maintenance/maintenancePlan/Sluice.vue
index 5bf06c2..e4d6594 100644
--- a/src/views/runManage/maintenance/maintenancePlan/Sluice.vue
+++ b/src/views/runManage/maintenance/maintenancePlan/Sluice.vue
@@ -268,7 +268,7 @@ export default {
         <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div><span
           style="font-weight: 600;">基础信息</span>
       </div>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" >
         <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
           <el-select v-model="ruleForm.dikeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dikeCode"
             :disabled="prohibitEditing">
diff --git a/src/views/runManage/maintenance/maintenanceRecords/Dike.vue b/src/views/runManage/maintenance/maintenanceRecords/Dike.vue
index d445c05..54857bd 100644
--- a/src/views/runManage/maintenance/maintenanceRecords/Dike.vue
+++ b/src/views/runManage/maintenance/maintenanceRecords/Dike.vue
@@ -346,7 +346,7 @@ export default {
         <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div><span
           style="font-weight: 600;">基础信息</span>
       </div>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" >
         <el-form-item label-width="130px" label="维养计划名称" prop="planId">
           <el-select v-model="ruleForm.planId" filterable remote :remote-method="searchPlan" placeholder="请输入"
             @change="changeSelectPlan" :disabled="prohibitEditing">
diff --git a/src/views/runManage/maintenance/maintenanceRecords/Sluice.vue b/src/views/runManage/maintenance/maintenanceRecords/Sluice.vue
index aa1b396..42917f1 100644
--- a/src/views/runManage/maintenance/maintenanceRecords/Sluice.vue
+++ b/src/views/runManage/maintenance/maintenanceRecords/Sluice.vue
@@ -346,7 +346,7 @@ export default {
         <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div><span
           style="font-weight: 600;">基础信息</span>
       </div>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" >
         <el-form-item label-width="130px" label="维养计划名称" prop="planId">
           <el-select v-model="ruleForm.planId" filterable remote :remote-method="searchPlan" placeholder="请输入"
             @change="changeSelectPlan" :disabled="prohibitEditing">
diff --git a/src/views/runManage/pestAnimalControl/governanceRecords/Dike.vue b/src/views/runManage/pestAnimalControl/governanceRecords/Dike.vue
index 5857c1e..165694f 100644
--- a/src/views/runManage/pestAnimalControl/governanceRecords/Dike.vue
+++ b/src/views/runManage/pestAnimalControl/governanceRecords/Dike.vue
@@ -1,45 +1,20 @@
-<!-- 维修计划管理-堤防 -->
+<!-- 害堤动物防护记录-堤防 -->
 <script>
-import { putDFMaintenancePlan, deleteDFMaintenancePlan, postDFMaintenancePlan, postDFMaintenancePlanList, getDFMaintenancePlan } from '@/api/management'
+import { putDFMaintenancePlan, deleteDFMaintenancePlan, postDFMaintenancePlan, postDFMaintenancePlanList, getDFMaintenancePlan, listUser } from '@/api/management'
 export default {
   name: 'InspectionItems',
   data() {
     return {
       searchInput: '',
+      controlInput: '',
+      selectType: 3,
+      workMonth: '',
+      constructionLocation: '',
       dialogVisible: false,
+      imageDialog: false,
+      dialogImageUrl: '',
       prohibitEditing: false,
-      dikeLevel: [
-        {
-          id: 1,
-          label: '全部',
-          value: 1
-        },
-        {
-          id: 2,
-          label: '一级',
-          value: 2
-        },
-        {
-          id: 3,
-          label: '二级',
-          value: 3
-        },
-        {
-          id: 4,
-          label: '三级',
-          value: 4
-        },
-        {
-          id: 5,
-          label: '四级',
-          value: 5
-        },
-        {
-          id: 6,
-          label: '五级及以下',
-          value: 6
-        },
-      ], // 堤防级别列表
+      personnelList: [], // 人员列表
       embankmentList: [
         {
           label: '堤防1',
@@ -57,25 +32,69 @@ export default {
           id: '3',
         }
       ], // 堤防名称列表
-      searchLevel: 1, // 筛选堤防级别
+      controlType: [
+        {
+          id: 1,
+          label: '普查',
+          value: 0
+        },
+        {
+          id: 2,
+          label: '防治',
+          value: 1
+        },
+        {
+          id: 3,
+          label: '治理',
+          value: 2
+        }
+      ],
       tableData: [], // 检查列表
+      workTable: [
+        {
+          id: 1,
+          content: '对堤坝进行巡查，对发现的红火蚁巢穴、鼠洞及时处理并对鼠洞进行回填。',
+          date: '11月1日-11月30日',
+          weekday: '1',
+        }
+      ], // 工作内容表格
+      drugTable: [
+        {
+          id: 1,
+          name: '杀虫剂',
+          concentration: '80%',
+          dose: '1瓶'
+        }
+
+      ],
       pageData: {
         pageNum: 1, // 当前页
         pageSize: 10, // 请求数量
         pageSizes: [10, 20, 50, 100],
         total: 0 // 总数量
       },
-      ruleForm: {
+      planForm: {
         dikeCode: '',
         name: '',
-        planTime: '',
-        nationalSupplement: 0,
-        selfSupplement: 0,
-        budget: 0,
-        location: '',
-        content: '',
+        planTime: 0,
+        nationalSupplement: '',
+        workMonth: '1月',
+        reminderCycle: '',
+        selectDate: 1,
+        selectUser: [],
+        messageReminder: false,
+        week: 1,
+        date: 1,
+        reminderTime: '',
+      },
+      recordForm: {
+        constructionLocation: '',
+        constructionSituation: '',
+        harmfulOrganisms: '',
+        image: '',
+        notes: ''
       },
-      rules: {
+      planRules: {
         dikeCode: [
           { required: true, message: '请选择堤防名称', trigger: 'blur' }
         ],
@@ -84,20 +103,32 @@ export default {
           { max: 100, message: '名称最长为100个字符', trigger: 'blur' }
         ],
         planTime: [
-          { required: true, message: '请选计划时间', trigger: 'change' }
+          { required: true, message: '请选择计划名称', trigger: 'change' }
         ],
         nationalSupplement: [
           { required: true, message: '请输入资金', trigger: 'change' }
         ],
-        selfSupplement: [
+        workMonth: [
           { required: true, message: '请输入资金', trigger: 'change' }
         ],
-        location: [
-          { required: true, message: '请输入具体地点', trigger: 'change' }
+        reminderCycle: [
+          { required: true, message: '请选择提醒日期', trigger: 'change' }
+        ],
+        selectUser: [
+          { required: true, message: '请选择责任人', trigger: 'change' }
         ],
-        content: [
-          { required: true, message: '请输入维修养护内容', trigger: 'change' }
+        reminderTime: [
+          { required: true, message: '请选择提醒时间', trigger: 'change' }
+        ],
+      },
+      recordRules: {
+        constructionLocation: [
+          { required: true, message: '请选择施工地点', trigger: 'blur' }
         ],
+        constructionSituation: [
+          { required: true, message: '请输入检查施工情况', trigger: 'blur' },
+          { max: 100, message: '最长为100个字符', trigger: 'blur' }
+        ]
       }
     }
   },
@@ -109,14 +140,39 @@ export default {
     }
   },
   methods: {
-    // 删除对应维修计划
+    // 删除对应防治计划
     deleteTableItem(row) {
       deleteDFMaintenancePlan(row.id).then((res) => {
-        console.log('🚀res🚀', res)
         this.getTableData()
         this.$message.success('删除成功');
       })
     },
+    // 删除对应工作内容
+    deleteWorkTableItem(id) {
+      const index = this.workTable.findIndex((item) => item.id === id);
+      if (index !== -1) {
+        this.workTable.splice(index, 1);
+      }
+    },
+    // 搜索用户
+    searchUser(e) {
+      listUser({
+        data: {
+          timeView: {
+            timeField: "create_time"
+          },
+        },
+        cv: {
+          name: "nickName",
+          type: "like",
+          value: e
+        },
+        pageSize: 100,
+        pageNum: 1
+      }).then((res) => {
+        this.personnelList = res.records
+      })
+    },
     // 查看或编辑计划详情
     viewOrEditPlanDetails(row, edit = false) {
       if (!edit) {
@@ -124,17 +180,27 @@ export default {
       }
       getDFMaintenancePlan(row.id).then((res) => {
         console.log('🚀res🚀', res)
-        this.ruleForm = res.data
-        this.ruleForm.budget = res.data.nationalSupplement + res.data.selfSupplement
+        this.planForm = res.data
+        this.planForm.reminderCycle = res.data.nationalSupplement + res.data.workMonth
         this.dialogVisible = true
       })
     },
+    handleRemove(file) {
+      console.log(file);
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.imageDialog = true;
+    },
+    handleDownload(file) {
+      console.log(file);
+    },
     // 保存维修计划
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.ruleForm.id) {
-            putDFMaintenancePlan(this.ruleForm).then(() => {
+          if (this.planForm.id) {
+            putDFMaintenancePlan(this.planForm).then(() => {
               this.getTableData()
               this.dialogVisible = false
               this.$message({
@@ -143,7 +209,7 @@ export default {
               })
             })
           } else {
-            postDFMaintenancePlan(this.ruleForm).then(() => {
+            postDFMaintenancePlan(this.planForm).then(() => {
               this.getTableData()
               this.dialogVisible = false
               this.$message({
@@ -163,25 +229,29 @@ export default {
       this.$refs[formName].resetFields();
       this.dialogVisible = false
     },
-
     // 关闭dialog
-    closeDialog(ruleForm = 'ruleForm') {
-      console.log('触发关闭dialog', ruleForm);
-      this.$refs[ruleForm].resetFields();
-      this.ruleForm = {
+    closeDialog(planForm = 'planForm') {
+      console.log('触发关闭dialog', planForm);
+      this.$refs[planForm].resetFields();
+      this.planForm = {
         dikeCode: '',
         name: '',
         planTime: '',
         nationalSupplement: 0,
-        selfSupplement: 0,
+        workMonth: 0,
         location: '',
-        budget: 0,
+        reminderCycle: 0,
         content: '',
       }
     },
-    // 计算预算
-    calculateBudget() {
-      this.ruleForm.budget = Number(this.ruleForm.selfSupplement) + Number(this.ruleForm.nationalSupplement)
+    // 添加工作项
+    addWorkItem() {
+      this.drugTable.push({
+        id: this.workTable.length + 1,
+        name: '',
+        concentration: '',
+        dose: ''
+      })
     },
     // 获取数据
     getTableData(value = '') {
@@ -205,6 +275,12 @@ export default {
         }
         console.log('🚀表格数据🚀', res)
       })
+    },
+    // 重置搜索
+    resetSearch() {
+      this.searchInput = ''
+      this.selectStatus = '2'
+      this.getTableData()
     }
   },
   mounted() {
@@ -221,28 +297,35 @@ export default {
     </div>
     <div class="table-box">
       <div class="top-search">
-        <span>维养计划名称：</span>
-        <el-input class="search-input" v-model="searchInput" placeholder="请输入维养计划名称" />
-        <span>堤防级别：</span>
-        <el-select v-model="searchLevel" placeholder="请选择">
-          <el-option v-for="item in dikeLevel" :label="item.label" :value="item.value" :key="item.id"></el-option>
+        <span>防治计划名称：</span>
+        <el-input class="search-input" v-model="searchInput" placeholder="请输入" />
+        <span>防治堤防：</span>
+        <el-input class="search-input" v-model="controlInput" placeholder="请输入" />
+        <span>施工地点：</span>
+        <el-input class="search-input" v-model="constructionLocation" placeholder="请输入" />
+        <span style="margin-left: 10px;">防治类型：</span>
+        <el-select v-model="selectType" placeholder="请选择">
+          <el-option label="全部" :value="3" />
+          <el-option v-for="item in controlType" :label="item.label" :value="item.value" :key="item.id" />
+        </el-select>
+        <span style="margin-left: 10px;">工作月份：</span>
+        <el-select v-model="workMonth" placeholder="请选择">
+          <el-option v-for="(item, index) in  12 " :label="(index + 1) + '月'" :value="item" />
         </el-select>
         <el-button class="search-btn" type="success" @click="getTableData(searchInput)">搜索</el-button>
+        <el-button @click="resetSearch()">重置</el-button>
       </div>
       <el-button class="search-btn" style=" margin-right: 16px;margin-bottom: 8px; float: right;" type="success"
         @click="dialogVisible = true">添加</el-button>
-      <el-table class="table" height="640" :data="tableData" border>
+      <el-table class="table" height="590" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="100" />
-        <el-table-column prop="name" align="center" label="维养计划名称" />
-        <el-table-column prop="" align="center" label="堤防级别" />
-        <el-table-column prop="location" align="center" label="具体地点" />
-        <el-table-column prop="content" align="center" label="维修养护内容" />
-        <el-table-column prop="nationalSupplement" align="center" label="国补" />
-        <el-table-column prop="selfSupplement" align="center" label="自筹" />
-        <el-table-column prop="createTime" align="center" sortable label="创建时间">
-        </el-table-column>
-        <el-table-column prop="updateTime" align="center" sortable label="更新时间">
-        </el-table-column>
+        <el-table-column prop="name" align="center" label="防治计划名称" />
+        <el-table-column prop="" align="center" label="防治堤防" />
+        <el-table-column prop="location" align="center" label="堤防级别" />
+        <el-table-column prop="content" align="center" label="堤防类型" />
+        <el-table-column prop="nationalSupplement" align="center" label="防治类型" />
+        <el-table-column prop="createTime" align="center" sortable label="创建时间" />
+        <el-table-column prop="updateTime" align="center" sortable label="更新时间" />
         <el-table-column prop="address" align="center" label="操作">
           <template slot-scope="scope">
             <el-button @click="viewOrEditPlanDetails(scope.row)" type="text" size="small">查看</el-button>
@@ -260,55 +343,187 @@ export default {
         :total="pageData.total" @size-change="getTableData()">
       </el-pagination>
     </div>
-    <el-dialog title="新增/编辑维养计划" @close="closeDialog" :visible.sync="dialogVisible" width="38%">
+    <el-dialog title="新增/编辑防治计划" @close="closeDialog" :visible.sync="dialogVisible" width="50%">
       <div style="display: flex; margin-bottom: 16px;">
-        <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div><span
-          style="font-weight: 600;">基础信息</span>
+        <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div>
+        <span style="font-weight: 600;">基础信息</span>
       </div>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-        <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
-          <el-select v-model="ruleForm.dikeCode" placeholder="请选择" @change="ruleForm.name = ruleForm.dikeCode"
-            :disabled="prohibitEditing">
-            <el-option v-for="item in embankmentList" :label="item.label" :value="item.value" :key="item.id"></el-option>
-          </el-select>
+      <el-form :model="planForm" :rules="planRules" ref="planForm" label-width="100px">
+        <el-form-item label-width="120px" label="防治堤防" prop="dikeCode">
+          <el-input style="width: 202px;" v-model="planForm.dikeCode" placeholder="请输入" disabled />
           <el-button button class="search-btn" type="success" size="small">详情</el-button>
           <el-button button class="search-btn" type="success" size="small">打开地图</el-button>
         </el-form-item>
         <div style="display: flex;">
-          <el-form-item label-width="120px" label="维养计划名称" prop="name">
-            <el-input style="width: 202px;" v-model="ruleForm.name" placeholder="请输入" :disabled="prohibitEditing" />
+          <el-form-item label-width="120px" label="防治计划名称" prop="name">
+            <el-input style="width: 202px;" v-model="planForm.name" placeholder="请输入" disabled />
           </el-form-item>
-          <el-form-item label-width="120px" label="计划时间" prop="planTime">
-            <el-date-picker v-model="ruleForm.planTime" type="month" placeholder="选择月" :disabled="prohibitEditing"
-              value-format="yy-MM-dd">
-            </el-date-picker>
+          <el-form-item label-width="120px" label="防治类型" prop="planTime">
+            <el-select v-model="planForm.planTime" placeholder="请输入" disabled>
+              <el-option v-for="item in controlType" :key="item.id" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </div>
+        <el-form-item label-width="120px" label="防治说明" prop="nationalSupplement">
+          <el-input v-model="planForm.nationalSupplement" type="textarea" placeholder=" 请输入" disabled />
+        </el-form-item>
+        <div style="display: flex; margin-bottom: 16px;">
+          <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div>
+          <span style="font-weight: 600;">工作内容</span>
+        </div>
+        <el-form-item label-width="120px" label="工作月份" prop="workMonth">
+          <el-select v-model="planForm.workMonth" placeholder="请输入" disabled>
+            <el-option v-for="(item, index) in  12 " :label="(index + 1) + '月'" :value="item" />
+          </el-select>
+        </el-form-item>
+        <el-table style="margin-bottom: 22px;" max-height="330" :data="workTable" border>
+          <el-table-column type="index" align="center" label="序号" width="50" />
+          <el-table-column prop="content" align="center" label="工作内容">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.content" placeholder="请输入工作内容" disabled />
+            </template>
+          </el-table-column>
+          <el-table-column prop="date" align="center" label="施工日期">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.date" placeholder="请输入施工日期" disabled />
+            </template>
+          </el-table-column>
+          <el-table-column prop="weekday" align="center" label="计划工日" width="80">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.weekday" placeholder="请输入计划工日" disabled />
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作" width="100">
+            <template slot-scope="scope">
+              <el-button style=" margin-right: 9px;" type="text" size="small" @click="addWorkItem" disabled>添加</el-button>
+              <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
+                title="确定删除吗？" @confirm="deleteWorkTableItem(scope.row.id)">
+                <el-button v-if="workTable.length > 1" style="color: red;" type="text" size="small" slot="reference"
+                  disabled>删除</el-button>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </el-table>
         <div style="display: flex;">
-          <el-form-item label-width="120px" label="国补资金" prop="nationalSupplement">
-            <el-input style="width: 79px;" v-model="ruleForm.nationalSupplement" type="number" @input="calculateBudget()"
-              placeholder="请输入" :disabled="prohibitEditing" /> 万元
+          <el-form-item label-width="120px" label="提醒周期" prop="reminderCycle">
+            <el-input style="width: 80px;" v-model="planForm.reminderCycle" disabled />
+            /次
+            <el-select style="width: 80px;" v-model="planForm.selectDate" placeholder="请选择日期" disabled>
+              <el-option label="天" :value="0" />
+              <el-option label="周" :value="1" />
+              <el-option label="月" :value="2" />
+            </el-select> /日期
+          </el-form-item>
+          <el-form-item label-width="120px" label="责任人" prop="selectUser">
+            <el-select v-model="planForm.selectUser" multiple filterable remote :remote-method="searchUser" value-key="id"
+              placeholder="请输入关键词搜索用户" prop="selectUser" disabled>
+              <el-option v-for=" item  in  personnelList " :key="item.id" :label="item.nickName" :value="item">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label-width="120px" label="自筹资金" prop="selfSupplement">
-            <el-input style="width: 79px;" v-model="ruleForm.selfSupplement" type="number" @input="calculateBudget()"
-              placeholder="请输入" :disabled="prohibitEditing" /> 万元
+        </div>
+        <div style="display: flex;">
+          <el-form-item label-width="120px" label="消息提醒" prop="messageReminder">
+            <el-switch v-model="planForm.messageReminder" active-color="#31a08e" inactive-color="#dcdfe6" disabled>
+            </el-switch>
           </el-form-item>
-          <el-form-item label-width="120px" label="项目预算">
-            <el-input style="width: 79px;" v-model="ruleForm.budget" disabled />
+          <el-form-item v-if="planForm.messageReminder" label-width="120px" label="提醒时间" prop="reminderTime">
+            <el-radio-group v-if="planForm.selectDate == 1" style="margin-bottom: 16px;" v-model="planForm.week" disabled>
+              <el-radio :label="1">星期一</el-radio>
+              <el-radio :label="2">星期二</el-radio>
+              <el-radio :label="3">星期三</el-radio>
+              <el-radio :label="4">星期四</el-radio>
+              <el-radio :label="5">星期五</el-radio>
+              <el-radio :label="6">星期六</el-radio>
+              <el-radio :label="7">星期日</el-radio>
+            </el-radio-group>
+            <div v-if="planForm.selectDate == 2" style="margin-bottom: 16px;">每月<el-input style="width: 202px;"
+                v-model="planForm.date" />号
+            </div>
+            <el-time-picker v-model="planForm.reminderTime" value-format="yyyy-MM-dd hh:mm:ss" placeholder="选择时间"
+              disabled />
           </el-form-item>
         </div>
-        <el-form-item label-width="120px" label="具体地点" prop="location">
-          <el-input style="width: 542px;" :autosize="{ minRows: 5 }" type="textarea" maxlength="500" show-word-limit
-            v-model="ruleForm.location" placeholder="请输入" :disabled="prohibitEditing" />
+      </el-form>
+      <div style="display: flex; margin-bottom: 16px;">
+        <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div>
+        <span style="font-weight: 600;">防治记录</span>
+      </div>
+      <el-form :model="recordForm" :rules="recordRules" ref="recordForm" label-width="100px">
+        <div style="display: flex;">
+          <el-form-item label-width="120px" label="施工地点" prop="constructionLocation">
+            <el-select v-model="recordForm.constructionLocation" placeholder="请选择">
+              <!-- <el-option v-for="(item, index) in  12 " :label="(index + 1) + '月'" :value="item" /> -->
+            </el-select>
+          </el-form-item>
+          <el-form-item label-width="120px" label="检查施工情况" prop="constructionSituation">
+            <el-input v-model="recordForm.constructionSituation" />
+          </el-form-item>
+          <el-form-item label-width="80px" label="有害生物" prop="harmfulOrganisms">
+            <el-select v-model="recordForm.harmfulOrganisms" placeholder="请输入">
+              <!-- <el-option v-for="(item, index) in  12 " :label="(index + 1) + '月'" :value="item" /> -->
+            </el-select>
+          </el-form-item>
+        </div>
+        <el-table style="margin-bottom: 22px;" max-height="330" :data="drugTable" border>
+          <el-table-column type="index" align="center" label="序号" width="50" />
+          <el-table-column prop="name" align="center" label="药物名称">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.name" placeholder="请输入药物名称" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="concentration" align="center" label="浓度">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.concentration" placeholder="请输入浓度" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dose" align="center" label="剂量" width="80">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.dose" placeholder="请输入剂量" />
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作" width="100">
+            <template slot-scope="scope">
+              <el-button style=" margin-right: 9px;" type="text" size="small" @click="addWorkItem">添加</el-button>
+              <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
+                title="确定删除吗？" @confirm="deleteWorkTableItem(scope.row.id)">
+                <el-button v-if="drugTable.length > 1" style="color: red;" type="text" size="small"
+                  slot="reference">删除</el-button>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-form-item label-width="120px" label="上传图片" prop="image">
+          <el-upload action="#" list-type="picture-card" :auto-upload="false">
+            <i slot="default" class="el-icon-plus"></i>
+            <div slot="file" slot-scope="{file}">
+              <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+              <span class="el-upload-list__item-actions">
+                <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                  <i class="el-icon-zoom-in"></i>
+                </span>
+                <span class="el-upload-list__item-delete" @click="handleDownload(file)">
+                  <i class="el-icon-download"></i>
+                </span>
+                <span class="el-upload-list__item-delete" @click="handleRemove(file)">
+                  <i class="el-icon-delete"></i>
+                </span>
+              </span>
+            </div>
+          </el-upload>
+          <el-dialog :visible.sync="imageDialog">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
         </el-form-item>
-        <el-form-item label-width="120px" label="维修养护内容" prop="content">
-          <el-input style="width: 542px;" :autosize="{ minRows: 5 }" type="textarea" maxlength="500" show-word-limit
-            v-model="ruleForm.content" placeholder="请输入" :disabled="prohibitEditing" />
+        <el-form-item label-width="120px" label="备注" prop="notes">
+          <el-input type="textarea" :rows="2" placeholder="请输入" v-model="recordForm.notes">
+          </el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="resetForm('ruleForm')">取 消</el-button>
-        <el-button v-if="!prohibitEditing" size="mini" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+        <el-button size="mini" @click="resetForm('recordForm')">取 消</el-button>
+        <el-button v-if="!prohibitEditing" size="mini" type="primary" @click="submitForm('recordForm')">保存</el-button>
       </div>
     </el-dialog>
   </div>
@@ -338,17 +553,18 @@ export default {
 
     .top-search {
       display: flex;
-      align-items: center;
+      flex-wrap: wrap;
+      align-content: space-between;
+      height: 85px;
+      width: 75%;
       margin-bottom: 8px;
 
       .search-input {
-        width: 300px;
+        width: 202px;
         margin-right: 10px;
       }
-
     }
 
-
     .table {
       height: calc(680px - 34px);
     }
diff --git a/src/views/runManage/pestAnimalControl/planManagement/Dike.vue b/src/views/runManage/pestAnimalControl/planManagement/Dike.vue
index b91f02e..972a897 100644
--- a/src/views/runManage/pestAnimalControl/planManagement/Dike.vue
+++ b/src/views/runManage/pestAnimalControl/planManagement/Dike.vue
@@ -193,25 +193,28 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.ruleForm.id) {
-            putDFMaintenancePlan(this.ruleForm).then(() => {
-              this.getTableData()
-              this.dialogVisible = false
-              this.$message({
-                message: '保存成功',
-                type: 'success'
-              })
-            })
-          } else {
-            postDFMaintenancePlan(this.ruleForm).then(() => {
-              this.getTableData()
-              this.dialogVisible = false
-              this.$message({
-                message: '保存成功',
-                type: 'success'
-              })
-            })
-          }
+          console.log('🏝️this.ruleForm🏝️', this.ruleForm)
+          this.tableData.push(this.ruleForm)
+          this.dialogVisible = false
+          // if (this.ruleForm.id) {
+          //   putDFMaintenancePlan(this.ruleForm).then(() => {
+          //     this.getTableData()
+              // this.dialogVisible = false
+          //     this.$message({
+          //       message: '保存成功',
+          //       type: 'success'
+          //     })
+          //   })
+          // } else {
+          //   postDFMaintenancePlan(this.ruleForm).then(() => {
+          //     this.getTableData()
+          //     this.dialogVisible = false
+          //     this.$message({
+          //       message: '保存成功',
+          //       type: 'success'
+          //     })
+          //   })
+          // }
         } else {
           console.log('校验不通过');
           return false;
@@ -250,26 +253,26 @@ export default {
     },
     // 获取数据
     getTableData(value = '') {
-      postDFMaintenancePlanList({
-        data: {
-          timeView: {
-            timeField: "create_time"
-          },
-        },
-        cv: {
-          name: "name",
-          type: "like",
-          value
-        },
-        pageSize: this.pageData.pageSize,
-        pageNum: this.pageData.pageNum
-      }).then((res) => {
-        if (res) {
-          this.tableData = res.records
-          this.pageData.total = res.total
-        }
-        console.log('🚀表格数据🚀', res)
-      })
+      // postDFMaintenancePlanList({
+      //   data: {
+      //     timeView: {
+      //       timeField: "create_time"
+      //     },
+      //   },
+      //   cv: {
+      //     name: "name",
+      //     type: "like",
+      //     value
+      //   },
+      //   pageSize: this.pageData.pageSize,
+      //   pageNum: this.pageData.pageNum
+      // }).then((res) => {
+      //   if (res) {
+      //     this.tableData = res.records
+      //     this.pageData.total = res.total
+      //   }
+      //   console.log('🚀表格数据🚀', res)
+      // })
     },
     // 重置搜索
     resetSearch() {
@@ -313,7 +316,7 @@ export default {
       <el-table class="table" height="640" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="100" />
         <el-table-column prop="name" align="center" label="防治计划名称" />
-        <el-table-column prop="" align="center" label="防治堤防" />
+        <el-table-column prop="dikeCode" align="center" label="防治堤防" />
         <el-table-column prop="location" align="center" label="堤防级别" />
         <el-table-column prop="content" align="center" label="堤防类型" />
         <el-table-column prop="nationalSupplement" align="center" label="防治类型" />
@@ -336,12 +339,12 @@ export default {
         :total="pageData.total" @size-change="getTableData()">
       </el-pagination>
     </div>
-    <el-dialog title="新增/编辑防治计划" @close="closeDialog" :visible.sync="dialogVisible" width="38%">
+    <el-dialog title="新增/编辑防治计划" @close="" :visible.sync="dialogVisible" width="38%">
       <div style="display: flex; margin-bottom: 16px;">
         <div style="width: 5px; height: 16px; background-color: #31a08e; margin-right: 8px;"></div>
         <span style="font-weight: 600;">基础信息</span>
       </div>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" >
         <el-form-item label-width="120px" label="防治堤防" prop="dikeCode">
           <el-input style="width: 202px;" v-model="ruleForm.dikeCode" placeholder="请输入" :disabled="prohibitEditing" />
           <el-button button class="search-btn" type="success" size="small">详情</el-button>