From 33526644b3fd83215fb2fa9cc9f27e7fc966c154 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 25 Jan 2024 17:50:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=A8=E7=89=A9=E9=98=B2=E6=B2=BB?=
 =?UTF-8?q?=E6=94=B9=E4=B8=80=E5=8D=8A=EF=BC=8C=E9=9C=80=E6=B1=82=E6=9C=89?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=9A=82=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dike/index.js                         |  17 +
 .../enginerring/inspectionItems/index.vue     | 462 ++++++----
 .../enginerring/patrolManage/index.vue        | 225 ++++-
 .../governanceRecords/index.vue               | 809 +++++++++++++-----
 .../planManagement/index.vue                  | 692 ++++++++++-----
 5 files changed, 1589 insertions(+), 616 deletions(-)

diff --git a/src/api/dike/index.js b/src/api/dike/index.js
index 7d6ad7f..b40a67c 100644
--- a/src/api/dike/index.js
+++ b/src/api/dike/index.js
@@ -17,3 +17,20 @@ export function getDikePatrolDetails(id) {
     method: 'get',
   })
 }
+
+// 巡查管理-绑定巡查项目
+export function postProjectChecking(data) {
+  return request({
+    url: `/run/df/project/rel-checking`,
+    method: 'post',
+    data
+  })
+}
+
+// 海堤动物防治--获取海堤上报记录详情
+export function getDikeAnimalRecordDetails(id) {
+  return request({
+    url: `/run/df/animal/record/${id}`,
+    method: 'get',
+  })
+}
diff --git a/src/views/dike/runManage/enginerring/inspectionItems/index.vue b/src/views/dike/runManage/enginerring/inspectionItems/index.vue
index 9974c76..ac065f5 100644
--- a/src/views/dike/runManage/enginerring/inspectionItems/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionItems/index.vue
@@ -1,14 +1,21 @@
 <!-- 巡查项目管理-堤防 -->
 <script>
-import { getDicts, postDFInspectionProjectList, postDFInspectionProject, putDFInspectionProject, deleteDFInspectionProject, getDFInspectionProject } from '@/api/management'
+import {
+  getDicts,
+  postDFInspectionProjectList,
+  postDFInspectionProject,
+  putDFInspectionProject,
+  deleteDFInspectionProject,
+  getDFInspectionProject,
+} from "@/api/management";
 export default {
-  name: 'InspectionItems',
+  name: "InspectionItems",
   data() {
     return {
-      searchInput: '',
+      searchInput: "",
       searchType: 3,
       dialogVisible: false,
-      ContentType: '',
+      ContentType: "",
       firstType: [], // 一级检查内容类型
       secondType: [], // 二级检查内容类型
       examType: [], // 检查类型
@@ -17,28 +24,27 @@ export default {
         pageNum: 1, // 当前页
         pageSize: 10, // 请求数量
         pageSizes: [10, 20, 50, 100],
-        total: 0 // 总数量
+        total: 0, // 总数量
       },
       ruleForm: {
-        name: '',
-        type: '',
-        checkContentType: '',
-        items: [
-        ],
+        name: "",
+        type: "",
+        checkContentType: "",
+        items: [],
       },
       rules: {
         name: [
-          { required: true, message: '请输入巡视检查名称', trigger: 'blur' },
-          { max: 50, message: '名称最长为50个字符', trigger: 'blur' }
+          { required: true, message: "请输入巡视检查名称", trigger: "blur" },
+          { max: 50, message: "名称最长为50个字符", trigger: "blur" },
         ],
         type: [
-          { required: true, message: '请选择巡查类型', trigger: 'change' }
+          { required: true, message: "请选择巡查类型", trigger: "change" },
         ],
         checkContentType: [
-          { required: true, message: '请选择巡视检查内容', trigger: 'change' }
-        ]
-      }
-    }
+          { required: true, message: "请选择巡视检查内容", trigger: "change" },
+        ],
+      },
+    };
   },
   methods: {
     // 表格筛选
@@ -46,96 +52,96 @@ export default {
       postDFInspectionProjectList({
         data: {
           timeView: {
-            timeField: "create_time"
+            timeField: "create_time",
           },
-          type: this.searchType == 3 ? '' : this.searchType
+          type: this.searchType == 3 ? "" : this.searchType,
         },
         cv: {
           name: "name",
           type: "like",
-          value: this.searchInput
+          value: this.searchInput,
         },
         pageSize: this.pageData.pageSize,
-        pageNum: this.pageData.pageNum
+        pageNum: this.pageData.pageNum,
       }).then((res) => {
         if (res) {
-          this.tableData = res.records
-          this.pageData.total = res.total
+          this.tableData = res.records;
+          this.pageData.total = res.total;
         }
-        console.log('🚀表格数据🚀', res)
-      })
+        console.log("🚀表格数据🚀", res);
+      });
     },
     // 重置搜索
     resetSearch() {
-      this.searchInput = ''
-      this.searchType = 3
-      this.searchTableList()
+      this.searchInput = "";
+      this.searchType = 3;
+      this.searchTableList();
     },
     // 编辑巡查项目
     editTableItem(row) {
       getDFInspectionProject(row.id).then((res) => {
-        console.log('🚀res🚀', res.data)
-        this.ruleForm = res.data
-        this.ruleForm.checkContentType = res.data.items[0].parts[0]
+        console.log("🚀res🚀", res.data);
+        this.ruleForm = res.data;
+        this.ruleForm.checkContentType = res.data.items[0].parts[0];
         getDicts(res.data.items[0].parts[0]).then((res) => {
-          this.secondType = res.data
-          console.log('🚀一级🚀', res.data)
-        })
-        this.ruleForm.items.forEach(element => {
+          this.secondType = res.data;
+          console.log("🚀一级🚀", res.data);
+        });
+        this.ruleForm.items.forEach((element) => {
           getDicts(element.parts[1]).then((res) => {
-            this.$set(element, 'third', res.data)
-          })
+            this.$set(element, "third", res.data);
+          });
         });
-        this.dialogVisible = true
-        console.log('🚀this.ruleForm🚀', this.ruleForm)
-      })
+        this.dialogVisible = true;
+        console.log("🚀this.ruleForm🚀", this.ruleForm);
+      });
     },
     // 删除对应巡查项目
     deleteTableItem(row) {
       deleteDFInspectionProject(row.id).then((res) => {
-        this.getTableData()
-        this.$message.success('删除成功');
-      })
+        this.getTableData();
+        this.$message.success("删除成功");
+      });
     },
     // 新增巡查内容
     addPatrolItem(checkContentType) {
-      console.log('🚀checkContentType🚀', checkContentType)
-      this.ruleForm.items.push(
-        {
-          content: '',
-          parts: [checkContentType, '', '']
-        }
-      )
+      console.log("🚀checkContentType🚀", checkContentType);
+      this.ruleForm.items.push({
+        content: "",
+        parts: [checkContentType, "", ""],
+      });
     },
     // 删除对应巡查内容
     deletePatrolItem(index) {
-      this.ruleForm.items.splice(index, 1)
+      this.ruleForm.items.splice(index, 1);
     },
     // 改变一级巡视检查内容
     changeContentType(dictValue) {
       getDicts(dictValue).then((res) => {
-        this.secondType = res.data
-        console.log('🚀一级🚀', res.data)
-      })
+        this.secondType = res.data;
+        console.log("🚀一级🚀", res.data);
+      });
       this.ruleForm.items = [
         {
-          content: '',
-          parts: [this.ruleForm.checkContentType]
-        }
-      ]
+          content: "",
+          parts: [this.ruleForm.checkContentType],
+        },
+      ];
     },
     // 改变二级巡视检查内容
     changeSecondType(row) {
       getDicts(row.parts[1]).then((res) => {
-        row.parts[2] = ''
-        this.$set(row, 'third', res.data)
-      })
+        row.parts[2] = "";
+        this.$set(row, "third", res.data);
+      });
     },
     // 改变三级巡视检查内容
     changeThirdType(row) {
-      let value = row.third.find(item => item.dictValue == row.parts[2]).remark
+      let value = row.third.find(
+        (item) => item.dictValue == row.parts[2]
+      ).remark;
       if (value) {
-        row.content = value
+        row.content = value;
       }
     },
     // 保存巡查项目
@@ -145,106 +151,120 @@ export default {
           console.log(this.ruleForm);
           if (this.ruleForm.id) {
             putDFInspectionProject(this.ruleForm).then(() => {
-              this.getTableData()
-              this.dialogVisible = false
-              this.$message.success('更新成功');
-            })
+              this.getTableData();
+              this.dialogVisible = false;
+              this.$message.success("更新成功");
+            });
           } else {
             postDFInspectionProject(this.ruleForm).then(() => {
-              this.getTableData()
-              this.dialogVisible = false
-              this.$message.success('添加成功');
-            })
+              this.getTableData();
+              this.dialogVisible = false;
+              this.$message.success("添加成功");
+            });
           }
         } else {
-          console.log('校验不通过');
+          console.log("校验不通过");
           return false;
         }
       });
     },
     // 关闭dialog
-    closeDialog(ruleForm = 'ruleForm') {
-      console.log('触发关闭dialog', ruleForm);
+    closeDialog(ruleForm = "ruleForm") {
+      console.log("触发关闭dialog", ruleForm);
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
-        name: '',
-        type: '',
-        checkContentType: '',
+        name: "",
+        type: "",
+        checkContentType: "",
         items: [
           {
-            content: '',
-            parts: ['', '', '']
-          }
-        ]
-      }
+            content: "",
+            parts: ["", "", ""],
+          },
+        ],
+      };
     },
     // 获取列表数据
     getTableData() {
-      this.searchInput = '',
-        this.searchType = 3,
+      (this.searchInput = ""),
+        (this.searchType = 3),
         postDFInspectionProjectList({
           data: {
             timeView: {
-              timeField: "create_time"
+              timeField: "create_time",
             },
           },
           cv: {
             name: "name",
-            type: "like"
+            type: "like",
           },
           pageSize: this.pageData.pageSize,
-          pageNum: this.pageData.pageNum
+          pageNum: this.pageData.pageNum,
         }).then((res) => {
           if (res) {
-            this.tableData = res.records
-            this.pageData.total = res.total
+            this.tableData = res.records;
+            this.pageData.total = res.total;
           }
-          console.log('🚀表格数据🚀', res)
-        })
-    }
+          console.log("🚀表格数据🚀", res);
+        });
+    },
   },
   mounted() {
     // 获取列表数据
-    this.getTableData()
+    this.getTableData();
     // 获取巡查类型
-    getDicts('xs_classfy').then((res) => {
+    getDicts("xs_classfy").then((res) => {
       if (res.data && Array.isArray(res.data)) {
-        res.data.forEach(element => {
-          element.dictValue = Number(element.dictValue)
+        res.data.forEach((element) => {
+          element.dictValue = Number(element.dictValue);
         });
-        console.log('🚀res.data🚀', res.data)
-        this.examType = res.data
+        console.log("🚀res.data🚀", res.data);
+        this.examType = res.data;
       }
-    })
+    });
     // 获取一级数据
-    getDicts('df_xs_c_classfy').then((res) => {
+    getDicts("df_xs_c_classfy").then((res) => {
       if (res.data && Array.isArray(res.data)) {
-        this.firstType = res.data
+        this.firstType = res.data;
       }
-    })
+    });
   },
-}
+};
 </script>
 
 <template>
   <div class="slider-right">
-    <div class="top-title">
-      基础信息管理
-    </div>
+    <div class="top-title">基础信息管理</div>
     <div class="table-box">
       <div class="top-search">
         <span>巡视检查名称：</span>
-        <el-input class="search-input" v-model="searchInput" placeholder="请输入巡视检查名称" />
+        <el-input
+          class="search-input"
+          v-model="searchInput"
+          placeholder="请输入巡视检查名称"
+        />
         <span>巡查类型：</span>
         <el-select v-model="searchType" placeholder="请选择">
-          <el-option v-for="item in examType" :label="item.dictLabel" :value="item.dictValue" :key="item.id"></el-option>
+          <el-option
+            v-for="item in examType"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+            :key="item.id"
+          ></el-option>
           <el-option label="全部" :value="3"></el-option>
         </el-select>
-        <el-button class="search-btn" type="success" @click="searchTableList()">搜索</el-button>
+        <el-button class="search-btn" type="success" @click="searchTableList()"
+          >搜索</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-button
+        class="search-btn"
+        style="margin-right: 16px; margin-bottom: 8px; float: right"
+        type="success"
+        @click="dialogVisible = true"
+        >添加</el-button
+      >
       <el-table height="625" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="100">
         </el-table-column>
@@ -252,97 +272,222 @@ export default {
         </el-table-column>
         <el-table-column align="center" label="巡查类型">
           <template slot-scope="scope">
-            <span v-if="examType.length > 0 && scope.row.type !== null">{{ examType.find(item => item.dictValue ==
-              scope.row.type).dictLabel ||
-              ''
+            <span v-if="examType.length > 0 && scope.row.type !== null">{{
+              examType.find((item) => item.dictValue == scope.row.type)
+                .dictLabel || ""
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" align="center" sortable 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
+          prop="updateTime"
+          align="center"
+          sortable
+          label="更新时间"
+        >
         </el-table-column>
         <el-table-column prop="address" align="center" label="操作">
           <template slot-scope="scope">
-            <el-button style=" margin-right: 16px;" @click="editTableItem(scope.row)" type="text"
-              size="small">编辑</el-button>
-            <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
-              title="确定删除吗？" @confirm="deleteTableItem(scope.row)">
-              <el-button style="color: red;" type="text" size="small" slot="reference">删除</el-button>
+            <el-button
+              style="margin-right: 16px"
+              @click="editTableItem(scope.row)"
+              type="text"
+              size="small"
+              >编辑</el-button
+            >
+            <el-popconfirm
+              confirm-button-text="确定"
+              cancel-button-text="取消"
+              icon="el-icon-info"
+              icon-color="red"
+              title="确定删除吗？"
+              @confirm="deleteTableItem(scope.row)"
+            >
+              <el-button
+                style="color: red"
+                type="text"
+                size="small"
+                slot="reference"
+                >删除</el-button
+              >
             </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination background class="pagination" style="margin-top: 16px;margin-right: 16px;float: right;"
-        :current-page="pageData.pageNum" :page-sizes="pageData.pageSizes" layout="total, prev, pager, next, sizes, jumper"
-        :total="pageData.total" @size-change="getTableData()">
+      <el-pagination
+        background
+        class="pagination"
+        style="margin-top: 16px; margin-right: 16px; float: right"
+        :current-page="pageData.pageNum"
+        :page-sizes="pageData.pageSizes"
+        layout="total, prev, pager, next, sizes, jumper"
+        :total="pageData.total"
+        @size-change="getTableData()"
+      >
       </el-pagination>
     </div>
-    <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>
+    <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>
-      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
+      <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-input style="width: 202px" v-model="ruleForm.name"></el-input>
         </el-form-item>
         <el-form-item label-width="120px" label="巡查类型" prop="type">
           <el-select v-model="ruleForm.type" placeholder="请选择巡查类型">
-            <el-option v-for="item in examType" :label="item.dictLabel" :value="item.dictValue"
-              :key="item.id"></el-option>
+            <el-option
+              v-for="item in examType"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              :key="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label-width="120px" label="巡视检查内容" prop="checkContentType">
-          <el-select v-model="ruleForm.checkContentType" @change="changeContentType(ruleForm.checkContentType)"
-            placeholder="请选择巡视检查内容">
-            <el-option v-for="item in firstType" :label="item.dictLabel" :value="item.dictValue"
-              :key="item.id"></el-option>
+        <el-form-item
+          label-width="120px"
+          label="巡视检查内容"
+          prop="checkContentType"
+        >
+          <el-select
+            v-model="ruleForm.checkContentType"
+            @change="changeContentType(ruleForm.checkContentType)"
+            placeholder="请选择巡视检查内容"
+          >
+            <el-option
+              v-for="item in firstType"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              :key="item.id"
+            ></el-option>
             <el-option label="其他" value="2"></el-option>
           </el-select>
-          <span style="margin-left: 8px; color: red;">注意：切换选项后检查内容将会清空！</span>
+          <span style="margin-left: 8px; color: red"
+            >注意：切换选项后检查内容将会清空！</span
+          >
         </el-form-item>
       </el-form>
       <el-table height="350" :data="ruleForm.items" border>
-        <el-table-column type="index" align="center" label="序号" center width="80">
+        <el-table-column
+          type="index"
+          align="center"
+          label="序号"
+          center
+          width="80"
+        >
         </el-table-column>
-        <el-table-column align="center" label="检查项目和内容" v-if="ruleForm.checkContentType != '2'">
+        <el-table-column
+          align="center"
+          label="检查项目和内容"
+          v-if="ruleForm.checkContentType != '2'"
+        >
           <template slot-scope="scope">
-            <el-select v-model="scope.row.parts[1]" @change="changeSecondType(scope.row)" placeholder="请选择检查项目和内容">
-              <el-option v-for="item in secondType" :label="item.dictLabel" :value="item.dictValue"
-                :key="item.id"></el-option>
+            <el-select
+              v-model="scope.row.parts[1]"
+              @change="changeSecondType(scope.row)"
+              placeholder="请选择检查项目和内容"
+            >
+              <el-option
+                v-for="item in secondType"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+                :key="item.id"
+              ></el-option>
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="检查部位" v-if="ruleForm.checkContentType != '2'">
+        <el-table-column
+          align="center"
+          label="检查部位"
+          v-if="ruleForm.checkContentType != '2'"
+        >
           <template slot-scope="scope">
-            <el-select v-model="scope.row.parts[2]" v-if="scope.row.third" @change="changeThirdType(scope.row)"
-              placeholder="请选择检查部位">
-              <el-option v-for="item in scope.row.third" :label="item.dictLabel" :value="item.dictValue"
-                :key="item.id"></el-option>
+            <el-select
+              v-model="scope.row.parts[2]"
+              v-if="scope.row.third"
+              @change="changeThirdType(scope.row)"
+              placeholder="请选择检查部位"
+            >
+              <el-option
+                v-for="item in scope.row.third"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+                :key="item.id"
+              ></el-option>
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="inspectionContent" label="检查内容">
+        <el-table-column
+          align="center"
+          prop="inspectionContent"
+          label="检查内容"
+        >
           <template slot-scope="scope">
             <el-input maxlength="500" v-model="scope.row.content"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="address" align="center" label="操作">
           <template slot-scope="scope">
-            <el-button style="margin-right: 8px;"
-              v-if="scope.$index == ruleForm.items.length - 1 && ruleForm.items.length < 50"
-              @click="addPatrolItem(ruleForm.checkContentType)" type="text" size="small">添加</el-button>
-            <el-popconfirm v-if="ruleForm.items.length >= 2" confirm-button-text='确定' cancel-button-text='取消'
-              icon="el-icon-info" icon-color="red" title="确定删除吗？" @confirm="deletePatrolItem(scope.$index)">
-              <el-button slot="reference" style="color: red;" type="text" size="small">删除</el-button>
+            <el-button
+              style="margin-right: 8px"
+              v-if="
+                scope.$index == ruleForm.items.length - 1 &&
+                ruleForm.items.length < 50
+              "
+              @click="addPatrolItem(ruleForm.checkContentType)"
+              type="text"
+              size="small"
+              >添加</el-button
+            >
+            <el-popconfirm
+              v-if="ruleForm.items.length >= 2"
+              confirm-button-text="确定"
+              cancel-button-text="取消"
+              icon="el-icon-info"
+              icon-color="red"
+              title="确定删除吗？"
+              @confirm="deletePatrolItem(scope.$index)"
+            >
+              <el-button
+                slot="reference"
+                style="color: red"
+                type="text"
+                size="small"
+                >删除</el-button
+              >
             </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="submitForm('ruleForm')">保存</el-button>
+        <el-button size="mini" type="primary" @click="submitForm('ruleForm')"
+          >保存</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -374,7 +519,6 @@ export default {
       width: 300px;
       margin-right: 10px;
     }
-
   }
 
   .search-btn {
@@ -389,8 +533,6 @@ export default {
     &:active {
       background-color: #2b8070;
     }
-
-    ;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/dike/runManage/enginerring/patrolManage/index.vue b/src/views/dike/runManage/enginerring/patrolManage/index.vue
index d86f54c..2a320ee 100644
--- a/src/views/dike/runManage/enginerring/patrolManage/index.vue
+++ b/src/views/dike/runManage/enginerring/patrolManage/index.vue
@@ -1,6 +1,6 @@
 <!-- 巡查管理页 -->
 <template>
-  <div class="patrol-manage-page page">
+  <div class="patrol-manage-page">
     <div class="top-title">堤防巡查管理</div>
     <div class="table-box">
       <div class="top-search">
@@ -14,9 +14,9 @@
         <el-select v-model="dikeType" placeholder="请选择">
           <el-option
             v-for="item in dikeTypeList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
           >
           </el-option>
         </el-select>
@@ -30,11 +30,19 @@
       </div>
       <el-table class="mt-16" height="625" :data="tableData" border>
         <el-table-column type="index" align="center" label="序号" width="80" />
-        <el-table-column prop="name" align="center" label="堤防名称" />
-        <el-table-column prop="name" align="center" label="堤防代码" />
-        <el-table-column prop="name" align="center" label="管理单位" />
-        <el-table-column prop="name" align="center" label="行政主管部门" />
-        <el-table-column prop="name" align="center" label="最近巡查时间" />
+        <el-table-column prop="dikeName" align="center" label="堤防名称" />
+        <el-table-column prop="dikeCode" align="center" label="堤防代码" />
+        <el-table-column
+          prop="engineeringManagementUnit"
+          align="center"
+          label="管理单位"
+        />
+        <el-table-column
+          prop="waterAdministrativeDepartment"
+          align="center"
+          label="行政主管部门"
+        />
+        <el-table-column prop="lastTime" align="center" label="最近巡查时间" />
         <el-table-column prop="operate" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -68,14 +76,101 @@
       >
       </el-pagination>
     </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      title="巡查项目配置"
+      @close="dialogVisible = false"
+      :visible.sync="dialogVisible"
+      width="520px"
+    >
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        ref="ruleForm"
+        label-width="100px"
+      >
+        <el-form-item
+          label-width="120px"
+          label="日常巡查项目"
+          prop="checkings[0].xcId"
+        >
+          <el-select
+            filterable
+            remote
+            :remote-method="(query) => handleGetRemoteProjectListData(0, query)"
+            @focus="handleGetRemoteProjectListData(0, '')"
+            v-model="ruleForm.checkings[0].xcId"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in projectList0"
+              :label="item.name"
+              :value="item.id"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label-width="120px"
+          label="定期巡查项目"
+          prop="checkings[1].xcId"
+        >
+          <el-select
+            filterable
+            remote
+            :remote-method="(query) => handleGetRemoteProjectListData(1, query)"
+            @focus="handleGetRemoteProjectListData(1, '')"
+            v-model="ruleForm.checkings[1].xcId"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in projectList1"
+              :label="item.name"
+              :value="item.id"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label-width="120px"
+          label="特别巡查项目"
+          prop="checkings[2].xcId"
+        >
+          <el-select
+            filterable
+            remote
+            :remote-method="(query) => handleGetRemoteProjectListData(2, query)"
+            @focus="handleGetRemoteProjectListData(2, '')"
+            v-model="ruleForm.checkings[2].xcId"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in projectList2"
+              :label="item.name"
+              :value="item.id"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="resetForm">取 消</el-button>
+        <el-button size="mini" type="primary" @click="submitForm"
+          >保存</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { getDikeProjectList } from "@/api/dike";
+import { getDikeProjectList, postProjectChecking } from "@/api/dike";
+import { postDFInspectionProjectList } from "@/api/management";
 
 export default {
   data() {
     return {
+      dialogVisible: false,
       pageData: {
         pageNum: 1,
         pageSize: 10,
@@ -91,28 +186,70 @@ export default {
       dikeType: "",
       tableData: [
         {
-          dikeId: "123123",
-          dikeName: "test",
+          dikeCode: "123123",
+          dikeName: "本地写死的",
+          id: 12312,
         },
       ],
+      ruleForm: {
+        dikeCode: "",
+        checkings: [
+          {
+            type: 0,
+            label: "日常检查",
+            xcId: "",
+          },
+          {
+            type: 1,
+            label: "定期检查",
+            xcId: "",
+          },
+          {
+            type: 2,
+            label: "特别检查",
+            xcId: "",
+          },
+        ],
+      },
+      projectList0: [], // 对应type===0的日常巡查项目
+      projectList1: [], // 对应type===1的日常巡查项目
+      projectList2: [], // 对应type===2的日常巡查项目
+      rules: {
+        ["checkings[0].xcId"]: [
+          { required: true, message: "请选择", trigger: "change" },
+        ],
+        ["checkings[1].xcId"]: [
+          { required: true, message: "请选择", trigger: "change" },
+        ],
+        ["checkings[2].xcId"]: [
+          { required: true, message: "请选择", trigger: "change" },
+        ],
+      },
     };
   },
-  created() {},
+  created() {
+    this.getDicts("embankment_type").then((response) => {
+      this.dikeTypeList = response.data;
+    });
+  },
   mounted() {
-    this.getDikeTypeListData();
     this.getTableData();
   },
   methods: {
-    // 获取堤防类型数据
-    getDikeTypeListData() {},
     // 获取列表信息
     getTableData() {
       getDikeProjectList({
         pageNum: this.pageData.pageNum,
         pageSize: this.pageData.pageSize,
         type: this.dikeType || "",
+        data: {
+          dikeName: this.searchInput || "",
+        },
       }).then((res) => {
-        console.log("res >>>>>  ", res);
+        if (res) {
+          this.tableData = res.records;
+          this.pageData.total = res.total;
+        }
       });
     },
     // 重置搜索条件
@@ -125,7 +262,8 @@ export default {
       this.$router.push({
         path: "inspectionPlan",
         query: {
-          id: row.dikeId,
+          id: row.dikeCode,
+          name: row.dikeName,
         },
       });
     },
@@ -133,10 +271,59 @@ export default {
       this.$router.push({
         path: "inspectionRecords",
         query: {
-          id: row.dikeId,
+          id: row.dikeCode,
+          name: row.dikeName,
         },
       });
     },
+    // 请求项目列表
+    initProjectList(type, query) {
+      postDFInspectionProjectList({
+        data: {
+          timeView: {
+            timeField: "create_time",
+          },
+          type,
+        },
+        cv: {
+          name: "name",
+          type: "like",
+          value: query,
+        },
+        pageSize: 20,
+        pageNum: 1,
+      }).then((res) => {
+        if (res) {
+          this[`projectList${type}`] = res.records;
+        }
+      });
+    },
+    // 请求项目列表数据
+    handleGetRemoteProjectListData(type, query) {
+      this.initProjectList(type, query);
+    },
+    // 配置项目
+    handleSet(row) {
+      // this.initProjectList();
+      this.dialogVisible = true;
+      this.ruleForm.dikeCode = row.dikeCode;
+    },
+    resetForm() {
+      this.$refs.ruleForm.resetFields();
+      this.dialogVisible = false;
+    },
+    submitForm() {
+      console.log("表单 >>> ", this.ruleForm);
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          postProjectChecking(this.ruleForm).then((res) => {
+            console.log("res >>>>>  ", res);
+            if (res) {
+            }
+          });
+        }
+      });
+    },
   },
 };
 </script>
diff --git a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
index f356c49..4441493 100644
--- a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
@@ -1,151 +1,161 @@
 <!-- 害堤动物防护记录-堤防 -->
 <script>
-import { putDFMaintenancePlan, deleteDFMaintenancePlan, postDFMaintenancePlan, postDFMaintenancePlanList, getDFMaintenancePlan, listUser } from '@/api/management'
+import {
+  putDFMaintenancePlan,
+  deleteDFMaintenancePlan,
+  postDFMaintenancePlan,
+  postDFMaintenancePlanList,
+  getDFMaintenancePlan,
+  listUser,
+  postDFPreventionControlPlanList,
+} from "@/api/management";
+import { getDikeAnimalRecordDetails } from "@/api/dike";
 export default {
-  name: 'InspectionItems',
+  name: "InspectionItems",
   data() {
     return {
-      searchInput: '',
-      controlInput: '',
+      searchInput: "",
+      controlInput: "",
       selectType: 3,
-      workMonth: '',
-      constructionLocation: '',
+      workMonth: "",
+      constructionLocation: "",
       dialogVisible: false,
       imageDialog: false,
-      dialogImageUrl: '',
+      dialogImageUrl: "",
       prohibitEditing: false,
+      planList: [], //计划列表
       personnelList: [], // 人员列表
       embankmentList: [
         {
-          label: '堤防1',
-          value: '1',
-          id: '1',
+          label: "堤防1",
+          value: "1",
+          id: "1",
         },
         {
-          label: '堤防2',
-          value: '2',
-          id: '2',
+          label: "堤防2",
+          value: "2",
+          id: "2",
         },
         {
-          label: '堤防3',
-          value: '3',
-          id: '3',
-        }
+          label: "堤防3",
+          value: "3",
+          id: "3",
+        },
       ], // 堤防名称列表
       controlType: [
         {
           id: 1,
-          label: '普查',
-          value: 0
+          label: "普查",
+          value: 0,
         },
         {
           id: 2,
-          label: '防治',
-          value: 1
+          label: "防治",
+          value: 1,
         },
         {
           id: 3,
-          label: '治理',
-          value: 2
-        }
+          label: "治理",
+          value: 2,
+        },
       ],
       tableData: [], // 检查列表
       workTable: [
         {
           id: 1,
-          content: '对堤坝进行巡查，对发现的红火蚁巢穴、鼠洞及时处理并对鼠洞进行回填。',
-          date: '11月1日-11月30日',
-          weekday: '1',
-        }
+          content:
+            "对堤坝进行巡查，对发现的红火蚁巢穴、鼠洞及时处理并对鼠洞进行回填。",
+          date: "11月1日-11月30日",
+          weekday: "1",
+        },
       ], // 工作内容表格
       drugTable: [
         {
           id: 1,
-          name: '杀虫剂',
-          concentration: '80%',
-          dose: '1瓶'
-        }
-
+          name: "杀虫剂",
+          concentration: "80%",
+          dose: "1瓶",
+        },
       ],
       pageData: {
         pageNum: 1, // 当前页
         pageSize: 10, // 请求数量
         pageSizes: [10, 20, 50, 100],
-        total: 0 // 总数量
+        total: 0, // 总数量
       },
       planForm: {
-        dikeCode: '',
-        name: '',
+        dikeCode: "",
+        name: "",
         planTime: 0,
-        nationalSupplement: '',
-        workMonth: '1月',
-        reminderCycle: '',
+        nationalSupplement: "",
+        workMonth: "1月",
+        reminderCycle: "",
         selectDate: 1,
         selectUser: [],
         messageReminder: false,
         week: 1,
         date: 1,
-        reminderTime: '',
+        reminderTime: "",
       },
       recordForm: {
-        constructionLocation: '',
-        constructionSituation: '',
-        harmfulOrganisms: '',
-        image: '',
-        notes: ''
+        constructionLocation: "",
+        constructionSituation: "",
+        harmfulOrganisms: "",
+        image: "",
+        notes: "",
       },
       planRules: {
         dikeCode: [
-          { required: true, message: '请选择堤防名称', trigger: 'blur' }
+          { required: true, message: "请选择堤防名称", trigger: "blur" },
         ],
         name: [
-          { required: true, message: '请输入维养计划名称', trigger: 'blur' },
-          { max: 100, message: '名称最长为100个字符', trigger: 'blur' }
+          { required: true, message: "请输入维养计划名称", trigger: "blur" },
+          { max: 100, message: "名称最长为100个字符", trigger: "blur" },
         ],
         planTime: [
-          { required: true, message: '请选择计划名称', trigger: 'change' }
+          { required: true, message: "请选择计划名称", trigger: "change" },
         ],
         nationalSupplement: [
-          { required: true, message: '请输入资金', trigger: 'change' }
+          { required: true, message: "请输入资金", trigger: "change" },
         ],
         workMonth: [
-          { required: true, message: '请输入资金', trigger: 'change' }
+          { required: true, message: "请输入资金", trigger: "change" },
         ],
         reminderCycle: [
-          { required: true, message: '请选择提醒日期', trigger: 'change' }
+          { required: true, message: "请选择提醒日期", trigger: "change" },
         ],
         selectUser: [
-          { required: true, message: '请选择责任人', trigger: 'change' }
+          { required: true, message: "请选择责任人", trigger: "change" },
         ],
         reminderTime: [
-          { required: true, message: '请选择提醒时间', trigger: 'change' }
+          { required: true, message: "请选择提醒时间", trigger: "change" },
         ],
       },
       recordRules: {
         constructionLocation: [
-          { required: true, message: '请选择施工地点', trigger: 'blur' }
+          { required: true, message: "请选择施工地点", trigger: "blur" },
         ],
         constructionSituation: [
-          { required: true, message: '请输入检查施工情况', trigger: 'blur' },
-          { max: 100, message: '最长为100个字符', trigger: 'blur' }
-        ]
-      }
-    }
+          { required: true, message: "请输入检查施工情况", trigger: "blur" },
+          { max: 100, message: "最长为100个字符", trigger: "blur" },
+        ],
+      },
+    };
   },
   watch: {
     dialogVisible(newVal, oldVal) {
       if (oldVal) {
-        this.prohibitEditing = false
+        this.prohibitEditing = false;
       }
-    }
+    },
   },
   methods: {
     // 删除对应防治计划
     deleteTableItem(row) {
       deleteDFMaintenancePlan(row.id).then((res) => {
-        this.getTableData()
-        this.$message.success('删除成功');
-      })
+        this.getTableData();
+        this.$message.success("删除成功");
+      });
     },
     // 删除对应工作内容
     deleteWorkTableItem(id) {
@@ -159,31 +169,32 @@ export default {
       listUser({
         data: {
           timeView: {
-            timeField: "create_time"
+            timeField: "create_time",
           },
         },
         cv: {
           name: "nickName",
           type: "like",
-          value: e
+          value: e,
         },
         pageSize: 100,
-        pageNum: 1
+        pageNum: 1,
       }).then((res) => {
-        this.personnelList = res.records
-      })
+        this.personnelList = res.records;
+      });
     },
     // 查看或编辑计划详情
     viewOrEditPlanDetails(row, edit = false) {
       if (!edit) {
-        this.prohibitEditing = true
+        this.prohibitEditing = true;
       }
       getDFMaintenancePlan(row.id).then((res) => {
-        console.log('🚀res🚀', res)
-        this.planForm = res.data
-        this.planForm.reminderCycle = res.data.nationalSupplement + res.data.workMonth
-        this.dialogVisible = true
-      })
+        console.log("🚀res🚀", res);
+        this.planForm = res.data;
+        this.planForm.reminderCycle =
+          res.data.nationalSupplement + res.data.workMonth;
+        this.dialogVisible = true;
+      });
     },
     handleRemove(file) {
       console.log(file);
@@ -201,25 +212,25 @@ export default {
         if (valid) {
           if (this.planForm.id) {
             putDFMaintenancePlan(this.planForm).then(() => {
-              this.getTableData()
-              this.dialogVisible = false
+              this.getTableData();
+              this.dialogVisible = false;
               this.$message({
-                message: '保存成功',
-                type: 'success'
-              })
-            })
+                message: "保存成功",
+                type: "success",
+              });
+            });
           } else {
             postDFMaintenancePlan(this.planForm).then(() => {
-              this.getTableData()
-              this.dialogVisible = false
+              this.getTableData();
+              this.dialogVisible = false;
               this.$message({
-                message: '保存成功',
-                type: 'success'
-              })
-            })
+                message: "保存成功",
+                type: "success",
+              });
+            });
           }
         } else {
-          console.log('校验不通过');
+          console.log("校验不通过");
           return false;
         }
       });
@@ -227,209 +238,480 @@ export default {
     // 重置校验
     resetForm(formName) {
       this.$refs[formName].resetFields();
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     // 关闭dialog
-    closeDialog(planForm = 'planForm') {
-      console.log('触发关闭dialog', planForm);
+    closeDialog(planForm = "planForm") {
+      console.log("触发关闭dialog", planForm);
       this.$refs[planForm].resetFields();
       this.planForm = {
-        dikeCode: '',
-        name: '',
-        planTime: '',
+        dikeCode: "",
+        name: "",
+        planTime: "",
         nationalSupplement: 0,
         workMonth: 0,
-        location: '',
+        location: "",
         reminderCycle: 0,
-        content: '',
-      }
+        content: "",
+      };
     },
     // 添加工作项
     addWorkItem() {
       this.drugTable.push({
         id: this.workTable.length + 1,
-        name: '',
-        concentration: '',
-        dose: ''
-      })
+        name: "",
+        concentration: "",
+        dose: "",
+      });
     },
     // 获取数据
-    getTableData(value = '') {
+    getTableData(value = "") {
       postDFMaintenancePlanList({
         data: {
           timeView: {
-            timeField: "create_time"
+            timeField: "create_time",
           },
         },
         cv: {
           name: "name",
           type: "like",
-          value
+          value,
         },
         pageSize: this.pageData.pageSize,
-        pageNum: this.pageData.pageNum
+        pageNum: this.pageData.pageNum,
       }).then((res) => {
         if (res) {
-          this.tableData = res.records
-          this.pageData.total = res.total
+          this.tableData = res.records;
+          this.pageData.total = res.total;
         }
-        console.log('🚀表格数据🚀', res)
-      })
+        console.log("🚀表格数据🚀", res);
+      });
     },
     // 重置搜索
     resetSearch() {
-      this.searchInput = ''
-      this.selectStatus = '2'
-      this.getTableData()
-    }
+      this.searchInput = "";
+      this.selectStatus = "2";
+      this.getTableData();
+    },
+    // 获取计划列表
+    handleGetRemotePlanData(query) {
+      postDFPreventionControlPlanList({
+        data: {
+          timeView: {
+            timeField: "create_time",
+          },
+        },
+        cv: {
+          name: "name",
+          type: "like",
+          value: query,
+        },
+        pageSize: 20,
+        pageNum: 1,
+      }).then((res) => {
+        if (res) {
+          this.planList = res.records;
+        }
+      });
+    },
+    // 选中某个计划
+    changeDikePlan(planId) {
+      console.log("planId >>>>>  ", planId);
+      if (planId) {
+        getDFMaintenancePlan(planId).then((res) => {
+          console.log("getDikeAnimalRecordDetails >>>>>  ", res);
+        });
+      }
+    },
   },
   mounted() {
     // 获取列表数据
-    this.getTableData()
+    this.getTableData();
   },
-}
+};
 </script>
 
 <template>
   <div class="body slider-right">
-    <div class="top-title">
-      基础信息管理
-    </div>
+    <div class="top-title">基础信息管理</div>
     <div class="table-box">
       <div class="top-search">
         <span>防治计划名称：</span>
-        <el-input class="search-input" v-model="searchInput" placeholder="请输入" />
+        <el-input
+          class="search-input"
+          v-model="searchInput"
+          placeholder="请输入"
+        />
         <span>防治堤防：</span>
-        <el-input class="search-input" v-model="controlInput" placeholder="请输入" />
+        <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-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-option
+            v-for="item in controlType"
+            :label="item.label"
+            :value="item.value"
+            :key="item.id"
+          />
         </el-select>
-        <span style="margin-left: 10px;">工作月份：</span>
+        <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" :key="index" />
+          <el-option
+            v-for="(item, index) in 12"
+            :label="index + 1 + '月'"
+            :value="item"
+            :key="index"
+          />
         </el-select>
-        <el-button class="search-btn" type="success" @click="getTableData(searchInput)">搜索</el-button>
+        <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-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="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="createTime" align="center" sortable label="创建时间" />
-        <el-table-column prop="updateTime" align="center" sortable 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>
-            <el-button @click="viewOrEditPlanDetails(scope.row, true)" type="text" size="small">编辑</el-button>
-            <el-button style=" margin-right: 9px;" type="text" size="small">确认</el-button>
-            <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
-              title="确定删除吗？" @confirm="deleteTableItem(scope.row)">
-              <el-button style="color: red;" type="text" size="small" slot="reference">删除</el-button>
+            <el-button
+              @click="viewOrEditPlanDetails(scope.row)"
+              type="text"
+              size="small"
+              >查看</el-button
+            >
+            <el-button
+              @click="viewOrEditPlanDetails(scope.row, true)"
+              type="text"
+              size="small"
+              >编辑</el-button
+            >
+            <el-button style="margin-right: 9px" type="text" size="small"
+              >确认</el-button
+            >
+            <el-popconfirm
+              confirm-button-text="确定"
+              cancel-button-text="取消"
+              icon="el-icon-info"
+              icon-color="red"
+              title="确定删除吗？"
+              @confirm="deleteTableItem(scope.row)"
+            >
+              <el-button
+                style="color: red"
+                type="text"
+                size="small"
+                slot="reference"
+                >删除</el-button
+              >
             </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination background class="pagination" style="margin-top: 16px;margin-right: 16px;float: right;"
-        :current-page="pageData.pageNum" :page-sizes="pageData.pageSizes" layout="total, prev, pager, next, sizes, jumper"
-        :total="pageData.total" @size-change="getTableData()">
+      <el-pagination
+        background
+        class="pagination"
+        style="margin-top: 16px; margin-right: 16px; float: right"
+        :current-page="pageData.pageNum"
+        :page-sizes="pageData.pageSizes"
+        layout="total, prev, pager, next, sizes, jumper"
+        :total="pageData.total"
+        @size-change="getTableData()"
+      >
       </el-pagination>
     </div>
-    <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>
+
+    <!-- 弹窗 -->
+    <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>
-      <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
+        :model="planForm"
+        :rules="planRules"
+        ref="planForm"
+        label-width="100px"
+      >
+        <el-form-item label-width="120px" label="防治计划名称" prop="planId">
+          <el-select
+            v-model="planForm.planId"
+            remote
+            :remote-method="(query) => handleGetRemotePlanData(query)"
+            @focus="handleGetRemotePlanData('')"
+            placeholder="请选择"
+            @change="changeDikePlan"
+          >
+            <el-option
+              v-for="item in planList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          <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="planForm.name" placeholder="请输入" disabled />
+        <div style="display: flex">
+          <el-form-item label-width="120px" label="防治堤防" prop="dikeName">
+            <el-input
+              style="width: 202px"
+              v-model="planForm.dikeName"
+              placeholder="请输入"
+              disabled
+            />
           </el-form-item>
           <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-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
+          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 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-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
+          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 />
+              <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 />
+              <el-input
+                v-model="scope.row.date"
+                placeholder="请输入施工日期"
+                disabled
+              />
             </template>
           </el-table-column>
-          <el-table-column prop="weekday" align="center" label="计划工日" width="80">
+          <el-table-column
+            prop="weekday"
+            align="center"
+            label="计划工日"
+            width="80"
+          >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.weekday" placeholder="请输入计划工日" disabled />
+              <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-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="reminderCycle">
-            <el-input style="width: 80px;" v-model="planForm.reminderCycle" disabled />
+        <div style="display: flex">
+          <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-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-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-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>
         </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>
+        <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 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-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>
@@ -438,36 +720,80 @@ export default {
               <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 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-time-picker
+              v-model="planForm.reminderTime"
+              value-format="yyyy-MM-dd hh:mm:ss"
+              placeholder="选择时间"
+              disabled
+            />
           </el-form-item>
         </div>
       </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 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-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-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-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
+          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="请输入药物名称" />
@@ -475,7 +801,10 @@ export default {
           </el-table-column>
           <el-table-column prop="concentration" align="center" label="浓度">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.concentration" placeholder="请输入浓度" />
+              <el-input
+                v-model="scope.row.concentration"
+                placeholder="请输入浓度"
+              />
             </template>
           </el-table-column>
           <el-table-column prop="dose" align="center" label="剂量" width="80">
@@ -485,11 +814,29 @@ export default {
           </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-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>
@@ -497,33 +844,59 @@ export default {
         <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="">
+            <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)">
+                <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)">
+                <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)">
+                <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="">
+            <img width="100%" :src="dialogImageUrl" alt="" />
           </el-dialog>
         </el-form-item>
         <el-form-item label-width="120px" label="备注" prop="notes">
-          <el-input type="textarea" :rows="2" placeholder="请输入" v-model="recordForm.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('recordForm')">取 消</el-button>
-        <el-button v-if="!prohibitEditing" size="mini" type="primary" @click="submitForm('recordForm')">保存</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>
@@ -581,8 +954,6 @@ export default {
     &:active {
       background-color: #2b8070;
     }
-
-    ;
   }
 }
 
@@ -592,4 +963,4 @@ export default {
   margin-right: 10px;
   margin-bottom: -4px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
index e003d50..a6e9377 100644
--- a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
@@ -1,20 +1,23 @@
 <!-- 害堤动物防护计划管理-堤防 -->
 <script>
-import { putDFMaintenancePlan, deleteDFMaintenancePlan,
-   postDFNewPreventionControlPlan, postDFPreventionControlPlanList,
-   getDFMaintenancePlan, listUser, getDicts } from '@/api/management'
 import {
-  listDikeInfo
-} from "@/api/yg/dikeInfo"
+  putDFPreventionControlPlan,
+  deleteDFMaintenancePlan,
+  postDFNewPreventionControlPlan,
+  postDFPreventionControlPlanList,
+  getDFPreventionControlPlan,
+  listUser,
+} from "@/api/management";
+import { listDikeInfo } from "@/api/yg/dikeInfo";
 
 export default {
-  name: 'InspectionItems',
+  name: "InspectionItems",
   data() {
     return {
-      searchInput: '',
-      controlInput: '',
-      selectLevel: '',
-      selectType: '',
+      searchInput: "",
+      controlInput: "",
+      selectLevel: "",
+      selectType: "",
       dialogVisible: false,
       prohibitEditing: false,
       personnelList: [], // 人员列表
@@ -28,98 +31,99 @@ export default {
         pageNum: 1, // 当前页
         pageSize: 10, // 请求数量
         pageSizes: [10, 20, 50, 100],
-        total: 0 // 总数量
+        total: 0, // 总数量
       },
       ruleForm: {
-        dikeCode: '',
-        name: '',
-        type: '',
-        instruction: '',
-        month: '',
+        dikeCode: "",
+        name: "",
+        type: "",
+        instruction: "",
+        month: "",
         details: [],
-        cycleType: '',
-        frequency: '',
+        cycleType: "",
+        frequency: "",
         operators: [],
         isReminder: 1,
         otherConfig: {
           selectUser: [],
-          week: '',
-          day: ''
+          week: "",
+          day: "",
         },
-        reminderTime: '',
+        reminderTime: "",
       },
       rules: {
         dikeCode: [
-          { required: true, message: '请选择堤防名称', trigger: 'blur' }
+          { required: true, message: "请选择堤防名称", trigger: "blur" },
         ],
         name: [
-          { required: true, message: '请输入防治计划名称', trigger: 'blur' },
-          { max: 100, message: '名称最长为100个字符', trigger: 'blur' }
+          { required: true, message: "请输入防治计划名称", trigger: "blur" },
+          { max: 100, message: "名称最长为100个字符", trigger: "blur" },
         ],
         type: [
-          { required: true, message: '请选择防治类型', trigger: 'change' }
+          { required: true, message: "请选择防治类型", trigger: "change" },
         ],
         instruction: [
-          { required: true, message: '请输入防治说明', trigger: 'change' }
+          { required: true, message: "请输入防治说明", trigger: "change" },
         ],
         month: [
-          { required: true, message: '请选择工作月份', trigger: 'change' }
+          { required: true, message: "请选择工作月份", trigger: "change" },
         ],
         cycleType: [
-          { required: true, message: '请选择提醒日期', trigger: 'change' }
+          { required: true, message: "请选择提醒日期", trigger: "change" },
         ],
         frequency: [
-          { required: true, message: '请输入次数', trigger: 'change' }
+          { required: true, message: "请输入次数", trigger: "change" },
         ],
-        'otherConfig.selectUser': [
-          { required: true, message: '请选择责任人', trigger: 'change' }
+        "otherConfig.selectUser": [
+          { required: true, message: "请选择责任人", trigger: "change" },
         ],
-        'otherConfig.week': [
-          { required: true, message: '请选择星期', trigger: 'change' }
+        "otherConfig.week": [
+          { required: true, message: "请选择星期", trigger: "change" },
         ],
-        'otherConfig.day': [
-          { required: true, message: '请输入', trigger: 'change' }
+        "otherConfig.day": [
+          { required: true, message: "请输入", trigger: "change" },
         ],
         reminderTime: [
-          { required: true, message: '请选择提醒时间', trigger: 'change' }
+          { required: true, message: "请选择提醒时间", trigger: "change" },
         ],
-      }
-    }
+      },
+    };
   },
   watch: {
     dialogVisible(newVal, oldVal) {
       if (oldVal) {
-        this.prohibitEditing = false
+        this.prohibitEditing = false;
       }
-    }
+    },
   },
   methods: {
     // 打开新增弹窗
     openAddDialog() {
       // 获取字典数据
-      getDicts('xc_w_month').then((res) => {
-        this.workMonth = res.data
-        console.log('🏝️this.workMonth🏝️', this.workMonth)
-      })
-      getDicts('xs_cycle_type').then((res) => {
-        this.patrolType = res.data
-        console.log('🏝️this.patrolType🏝️', this.patrolType)
-      })
+      this.getDicts("xc_w_month").then((res) => {
+        this.workMonth = res.data;
+      });
+      this.getDicts("xs_cycle_type").then((res) => {
+        this.patrolType = res.data;
+      });
       if (this.ruleForm.details.length <= 0) {
         this.ruleForm.details.push({
-          constructionDate: '',
-          jobContent: '',
-          planDays: 0
-        })
+          constructionDate: "",
+          jobContent: "",
+          planDays: 0,
+        });
       }
-      this.dialogVisible = true
+      this.dialogVisible = true;
+      setTimeout(() => {
+        this.$refs.ruleForm.resetFields();
+      }, 0);
     },
     // 删除对应防治计划
     deleteTableItem(row) {
       deleteDFMaintenancePlan(row.id).then((res) => {
-        this.getTableData()
-        this.$message.success('删除成功');
-      })
+        this.getTableData();
+        this.$message.success("删除成功");
+      });
     },
     // 删除对应工作内容
     deleteWorkTableItem(id) {
@@ -133,70 +137,75 @@ export default {
       listUser({
         data: {
           timeView: {
-            timeField: "create_time"
+            timeField: "create_time",
           },
         },
         cv: {
           name: "nickName",
           type: "like",
-          value: e
+          value: e,
         },
         pageSize: 100,
-        pageNum: 1
+        pageNum: 1,
       }).then((res) => {
-        this.personnelList = res.records
-      })
+        this.personnelList = res.records;
+      });
     },
     // 查看或编辑计划详情
     viewOrEditPlanDetails(row, edit = false) {
       if (!edit) {
-        this.prohibitEditing = true
+        this.prohibitEditing = true;
+      }
+      getDFPreventionControlPlan(row.id).then((res) => {
+        this.ruleForm = res.data;
+        this.ruleForm.reminderCycle = res.data.instruction + res.data.month;
+        this.dialogVisible = true;
+      });
+    },
+    changeOtherConfigSelectUser(idsArr) {
+      if (idsArr?.length) {
+        this.ruleForm.operators =
+          this.personnelList
+            .filter((v) => idsArr.includes(v.nickName))
+            ?.map((v) => ({
+              name: v.nickName,
+              uid: v.id,
+            })) || [];
+      } else {
+        this.ruleForm.operators = [];
       }
-      getDFMaintenancePlan(row.id).then((res) => {
-        console.log('🚀res🚀', res)
-        this.ruleForm = res.data
-        this.ruleForm.reminderCycle = res.data.instruction + res.data.month
-        this.dialogVisible = true
-      })
     },
     // 保存维修计划
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          console.log('🏝️this.ruleForm🏝️', this.ruleForm)
-          this.ruleForm.cycleType = parseFloat(this.ruleForm.cycleType)
-          this.ruleForm.frequency = parseFloat(this.ruleForm.frequency)
-          this.ruleForm.month = parseFloat(this.ruleForm.month)
-          this.ruleForm.type = parseFloat(this.ruleForm.type)
-          this.ruleForm.otherConfig.selectUser.forEach((item) => {
-            this.ruleForm.operators.push({
-              name: item.userName,
-              uid: item.id
-            })
-          })
-          this.dialogVisible = false
+          this.ruleForm.cycleType = parseFloat(this.ruleForm.cycleType);
+          this.ruleForm.frequency = parseFloat(this.ruleForm.frequency);
+          this.ruleForm.month = parseFloat(this.ruleForm.month);
+          this.ruleForm.type = parseFloat(this.ruleForm.type);
+          this.dialogVisible = false;
           if (this.ruleForm.id) {
-            putDFMaintenancePlan(this.ruleForm).then(() => {
-              this.getTableData()
-              this.dialogVisible = false
+            putDFPreventionControlPlan(this.ruleForm).then(() => {
+              this.getTableData();
+              this.dialogVisible = false;
               this.$message({
-                message: '保存成功',
-                type: 'success'
-              })
-            })
+                message: "保存成功",
+                type: "success",
+              });
+            });
           } else {
             postDFNewPreventionControlPlan(this.ruleForm).then(() => {
-              console.log('保存成功');
-              this.getTableData()
-              this.dialogVisible = false
+              console.log("保存成功");
+              this.getTableData();
+              this.dialogVisible = false;
               this.$message({
-                message: '保存成功',
-                type: 'success'
-              })
-            })
+                message: "保存成功",
+                type: "success",
+              });
+            });
           }
         } else {
-          console.log('校验不通过');
+          console.log("校验不通过");
           return false;
         }
       });
@@ -204,70 +213,73 @@ export default {
     // 重置校验
     resetForm(formName) {
       this.$refs[formName].resetFields();
-      this.dialogVisible = false
+      this.dialogVisible = false;
     },
     // 关闭dialog
-    closeDialog(ruleForm = 'ruleForm') {
-      console.log('触发关闭dialog', ruleForm);
+    closeDialog(ruleForm = "ruleForm") {
+      console.log("触发关闭dialog", ruleForm);
       this.$refs[ruleForm].resetFields();
       this.ruleForm = {
-        dikeCode: '',
-        name: '',
+        dikeCode: "",
+        name: "",
         type: 0,
-        instruction: '',
-        month: '',
+        instruction: "",
+        month: "",
         details: [],
-        cycleType: '',
+        cycleType: "",
         isReminder: true,
         selectUser: [],
         week: 1,
         date: 1,
-        reminderTime: '',
-      }
+        reminderTime: "",
+      };
     },
     // 添加工作项
     addWorkItem() {
       this.ruleForm.details.push({
-        jobContent: '',
-        constructionDate: '',
-        planDays: '',
-      })
+        jobContent: "",
+        constructionDate: "",
+        planDays: "",
+      });
     },
-    // 获取数据
-    getTableData(value = '') {
+    // 获取列表数据
+    getTableData() {
       postDFPreventionControlPlanList({
         data: {
           timeView: {
-            timeField: "create_time"
+            timeField: "create_time",
           },
         },
         cv: {
           name: "name",
           type: "like",
-          value
+          value: this.searchInput,
+        },
+        params: {
+          orderBy: "create_time",
+          sort: "desc",
         },
         pageSize: this.pageData.pageSize,
-        pageNum: this.pageData.pageNum
+        pageNum: this.pageData.pageNum,
       }).then((res) => {
         if (res) {
-          this.tableData = res.records
-          this.pageData.total = res.total
+          this.tableData = res.records;
+          this.pageData.total = res.total;
         }
-        console.log('🚀表格数据🚀', res)
-      })
+      });
     },
     // 重置搜索
     resetSearch() {
-      this.searchInput = ''
-      this.selectStatus = '2'
-      this.getTableData()
+      this.searchInput = "";
+      this.selectStatus = "2";
+      this.getTableData();
     },
     // 打开地图
-    handleOpenMap(){},
+    handleOpenMap() {},
     // 打开详情
-    handleOpenDetail(){},
+    handleOpenDetail() {},
     // 获取堤防列表信息
-    getEmbData(){
+    getEmbData() {
       listDikeInfo({
         pageNum: 1,
         pageSize: 20,
@@ -284,56 +296,79 @@ export default {
           // desc降序，升序asc
           sort: "desc",
         },
-      }).then(res=> {
-        this.embankmentList = res?.records || []
-      })
+      }).then((res) => {
+        this.embankmentList = res?.records || [];
+      });
     },
-    handleChangeDike(value){
-      this.ruleForm.name = this.ruleForm.dikeCode
+    handleChangeDike(value) {
+      this.ruleForm.name = this.ruleForm.dikeCode;
       // let res = this.embankmentList.find(v=> v.dikeCode === value)
       // this.dikeDetailsDialog.id = res?.id || ''
     },
   },
   mounted() {
     // 获取列表数据
-    // this.getTableData()
-    this.getEmbData()
-    getDicts('embankment_level').then((res) => {
-      this.dikeLevel = res.data
-    })
-    getDicts('dh_jh_type').then((res) => {
-      this.controlType = res.data
-    })
+    this.getTableData();
+    this.getEmbData();
+    this.getDicts("embankment_level").then((res) => {
+      this.dikeLevel = res.data;
+    });
+    this.getDicts("dh_jh_type").then((res) => {
+      this.controlType = res.data;
+    });
   },
-}
+};
 </script>
 
 <template>
   <div class="body slider-right">
-    <div class="top-title">
-      基础信息管理
-    </div>
+    <div class="top-title">基础信息管理</div>
     <div class="table-box">
       <div class="top-search">
         <span>防治计划名称：</span>
-        <el-input class="search-input" v-model="searchInput" placeholder="请输入" />
+        <el-input
+          class="search-input"
+          v-model="searchInput"
+          placeholder="请输入"
+        />
         <span>防治堤防：</span>
-        <el-input class="search-input" v-model="controlInput" placeholder="请输入" />
+        <el-input
+          class="search-input"
+          v-model="controlInput"
+          placeholder="请输入"
+        />
         <span>堤防级别：</span>
         <el-select v-model="selectLevel" placeholder="请选择">
           <el-option label="全部" value="0" />
-          <el-option v-for="item in dikeLevel" :label="item.dictLabel" :value="item.dictValue" :key="item.id" />
+          <el-option
+            v-for="item in dikeLevel"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+            :key="item.id"
+          />
         </el-select>
-        <span style="margin-left: 10px;">防治类型：</span>
+        <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.dictLabel" :value="item.dictValue" :key="item.id" />
+          <el-option
+            v-for="item in controlType"
+            :label="item.dictLabel"
+            :value="item.dictValue"
+            :key="item.id"
+          />
         </el-select>
-        <el-button class="search-btn" type="success" @click="getTableData(searchInput)">搜索</el-button>
+        <el-button class="search-btn" type="success" @click="getTableData()"
+          >搜索</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="openAddDialog()">添加</el-button>
+      <el-button
+        class="search-btn"
+        style="margin-right: 16px; margin-bottom: 8px; float: right"
+        type="success"
+        @click="openAddDialog()"
+        >添加</el-button
+      >
       <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="防治计划名称" />
@@ -341,120 +376,323 @@ export default {
         <el-table-column prop="location" align="center" label="堤防级别" />
         <el-table-column prop="content" align="center" label="堤防类型" />
         <el-table-column prop="type" 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="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>
-            <el-button @click="viewOrEditPlanDetails(scope.row, true)" type="text" size="small">编辑</el-button>
-            <el-button style=" margin-right: 9px;" type="text" size="small">记录</el-button>
-            <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
-              title="确定删除吗？" @confirm="deleteTableItem(scope.row)">
-              <el-button style="color: red;" type="text" size="small" slot="reference">删除</el-button>
+            <el-button
+              @click="viewOrEditPlanDetails(scope.row)"
+              type="text"
+              size="small"
+              >查看</el-button
+            >
+            <el-button
+              @click="viewOrEditPlanDetails(scope.row, true)"
+              type="text"
+              size="small"
+              >编辑</el-button
+            >
+            <el-button style="margin-right: 9px" type="text" size="small"
+              >记录</el-button
+            >
+            <el-popconfirm
+              confirm-button-text="确定"
+              cancel-button-text="取消"
+              icon="el-icon-info"
+              icon-color="red"
+              title="确定删除吗？"
+              @confirm="deleteTableItem(scope.row)"
+            >
+              <el-button
+                style="color: red"
+                type="text"
+                size="small"
+                slot="reference"
+                >删除</el-button
+              >
             </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination background class="pagination" style="margin-top: 16px;margin-right: 16px;float: right;"
-        :current-page="pageData.pageNum" :page-sizes="pageData.pageSizes" layout="total, prev, pager, next, sizes, jumper"
-        :total="pageData.total" @size-change="getTableData()">
+      <el-pagination
+        background
+        class="pagination"
+        style="margin-top: 16px; margin-right: 16px; float: right"
+        :current-page="pageData.pageNum"
+        :page-sizes="pageData.pageSizes"
+        layout="total, prev, pager, next, sizes, jumper"
+        :total="pageData.total"
+        @size-change="getTableData()"
+      >
       </el-pagination>
     </div>
     <!-- 弹窗 -->
-    <el-dialog title="新增/编辑防治计划" @close="" :visible.sync="dialogVisible" width="720px">
-      <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>
+    <el-dialog
+      title="新增/编辑防治计划"
+      @close=""
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      width="720px"
+    >
+      <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">
+      <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-select v-model="ruleForm.dikeCode" placeholder="请选择" @change="handleChangeDike"
-            :disabled="prohibitEditing">
-            <el-option v-for="item in embankmentList" :label="item.dikeName" :value="item.dikeCode" :key="item.id"></el-option>
+          <el-select
+            v-model="ruleForm.dikeCode"
+            placeholder="请选择"
+            @change="handleChangeDike"
+            :disabled="prohibitEditing"
+          >
+            <el-option
+              v-for="item in embankmentList"
+              :label="item.dikeName"
+              :value="item.dikeCode"
+              :key="item.id"
+            ></el-option>
           </el-select>
-          <el-button :disabled="!ruleForm.dikeCode" class="!m-6" type="success" size="small" @click="handleOpenDetail">详情</el-button>
-          <el-button :disabled="!ruleForm.dikeCode" class="!ml-6" type="success" size="small" @click="handleOpenMap">打开地图</el-button>
+          <el-button
+            :disabled="!ruleForm.dikeCode"
+            class="!m-6"
+            type="success"
+            size="small"
+            @click="handleOpenDetail"
+            >详情</el-button
+          >
+          <el-button
+            :disabled="!ruleForm.dikeCode"
+            class="!ml-6"
+            type="success"
+            size="small"
+            @click="handleOpenMap"
+            >打开地图</el-button
+          >
         </el-form-item>
-        <div style="display: flex;">
+        <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-input
+              style="width: 202px"
+              v-model="ruleForm.name"
+              placeholder="请输入"
+              :disabled="prohibitEditing"
+            />
           </el-form-item>
           <el-form-item label-width="120px" label="防治类型" prop="type">
-            <el-select v-model="ruleForm.type" placeholder="请选择" :disabled="prohibitEditing">
-              <el-option v-for="item in controlType" :key="item.id" :label="item.dictLabel" :value="item.dictValue">
+            <el-select
+              v-model="ruleForm.type"
+              placeholder="请选择"
+              :disabled="prohibitEditing"
+            >
+              <el-option
+                v-for="item in controlType"
+                :key="item.id"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              >
               </el-option>
             </el-select>
           </el-form-item>
         </div>
         <el-form-item label-width="120px" label="防治说明" prop="instruction">
-          <el-input v-model="ruleForm.instruction" type="textarea" placeholder=" 请输入" :disabled="prohibitEditing" />
+          <el-input
+            v-model="ruleForm.instruction"
+            type="textarea"
+            placeholder=" 请输入"
+            :disabled="prohibitEditing"
+          />
         </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 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="month">
-          <el-select v-model="ruleForm.month" placeholder="请选择" :disabled="prohibitEditing">
-            <el-option v-for="item in workMonth" :label="item.dictLabel" :value="item.dictValue" :key="item.id" />
+          <el-select
+            v-model="ruleForm.month"
+            placeholder="请选择"
+            :disabled="prohibitEditing"
+          >
+            <el-option
+              v-for="item in workMonth"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              :key="item.id"
+            />
           </el-select>
         </el-form-item>
-        <el-table style="margin-bottom: 22px;" max-height="330" :data="ruleForm.details" border>
-          <el-table-column type="index" align="center" label="序号" width="50" />
+        <el-table
+          style="margin-bottom: 22px"
+          max-height="330"
+          :data="ruleForm.details"
+          border
+        >
+          <el-table-column
+            type="index"
+            align="center"
+            label="序号"
+            width="50"
+          />
           <el-table-column prop="jobContent" align="center" label="工作内容">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.jobContent" placeholder="请输入工作内容" />
+              <el-input
+                v-model="scope.row.jobContent"
+                placeholder="请输入工作内容"
+              />
             </template>
           </el-table-column>
-          <el-table-column prop="constructionDate" align="center" label="施工日期">
+          <el-table-column
+            prop="constructionDate"
+            align="center"
+            label="施工日期"
+          >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.constructionDate" placeholder="请输入施工日期" />
+              <el-input
+                v-model="scope.row.constructionDate"
+                placeholder="请输入施工日期"
+              />
             </template>
           </el-table-column>
-          <el-table-column prop="planDays" align="center" label="计划工日" width="80">
+          <el-table-column
+            prop="planDays"
+            align="center"
+            label="计划工日"
+            width="80"
+          >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.planDays" placeholder="请输入计划工日" />
+              <el-input
+                v-model="scope.row.planDays"
+                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="ruleForm.details.length > 1" style="color: red;" type="text" size="small"
-                  slot="reference">删除</el-button>
+              <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="ruleForm.details.length > 1"
+                  style="color: red"
+                  type="text"
+                  size="small"
+                  slot="reference"
+                  >删除</el-button
+                >
               </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
-        <div style="display: flex;">
+        <div style="display: flex">
           <el-form-item label-width="120px" label="提醒周期" prop="frequency">
-            <el-input style="width: 90px;" v-model="ruleForm.frequency" placeholder="请输入" />
+            <el-input
+              style="width: 90px"
+              v-model="ruleForm.frequency"
+              placeholder="请输入"
+            />
             /次
           </el-form-item>
           <el-form-item label-width="10px" prop="cycleType">
-            <el-select style="width: 90px;" v-model="ruleForm.cycleType" placeholder="请选择">
-              <el-option v-for="item in patrolType" :label="item.dictLabel" :value="item.dictValue"
-                :key="item.id"></el-option>
-            </el-select> /日期
+            <el-select
+              style="width: 90px"
+              v-model="ruleForm.cycleType"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in patrolType"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+            /日期
           </el-form-item>
-          <el-form-item label-width="100px" label="责任人" prop="otherConfig.selectUser">
-            <el-select v-model="ruleForm.otherConfig.selectUser" multiple filterable remote :remote-method="searchUser"
-              value-key="id" placeholder="请输入关键词搜索用户" prop="selectUser">
-              <el-option v-for=" item  in  personnelList " :key="item.id" :label="item.nickName" :value="item">
+          <el-form-item
+            label-width="100px"
+            label="责任人"
+            prop="otherConfig.selectUser"
+          >
+            <el-select
+              v-model="ruleForm.otherConfig.selectUser"
+              multiple
+              filterable
+              remote
+              :remote-method="searchUser"
+              value-key="id"
+              placeholder="请输入关键词搜索用户"
+              prop="selectUser"
+              @change="changeOtherConfigSelectUser"
+            >
+              <el-option
+                v-for="item in personnelList"
+                :key="item.id"
+                :label="item.nickName"
+                :value="item.nickName"
+              >
               </el-option>
             </el-select>
           </el-form-item>
         </div>
-        <div style="display: flex;">
+        <div style="display: flex">
           <el-form-item label-width="120px" label="消息提醒" prop="isReminder">
-            <el-switch v-model="ruleForm.isReminder" :active-value="1" :inactive-value="0" active-color="#31a08e"
-              inactive-color="#dcdfe6">
+            <el-switch
+              v-model="ruleForm.isReminder"
+              :active-value="1"
+              :inactive-value="0"
+              active-color="#31a08e"
+              inactive-color="#dcdfe6"
+            >
             </el-switch>
           </el-form-item>
-          <div style="display: flex;flex-direction: column;">
-            <el-form-item v-if="ruleForm.isReminder && ruleForm.cycleType === '1'" label-width="120px" label="提醒时间"
-              prop="otherConfig.week">
+          <div style="display: flex; flex-direction: column">
+            <el-form-item
+              v-if="ruleForm.isReminder && ruleForm.cycleType === '1'"
+              label-width="120px"
+              label="提醒时间"
+              prop="otherConfig.week"
+            >
               <el-radio-group v-model="ruleForm.otherConfig.week">
                 <el-radio :label="1">星期一</el-radio>
                 <el-radio :label="2">星期二</el-radio>
@@ -465,20 +703,42 @@ export default {
                 <el-radio :label="7">星期日</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="ruleForm.isReminder && ruleForm.cycleType === '0'" label-width="120px" label="提醒时间"
-              prop="otherConfig.day">
-              <div>每月<el-input style="width: 202px;" v-model="ruleForm.otherConfig.day" />号
+            <el-form-item
+              v-if="ruleForm.isReminder && ruleForm.cycleType === '0'"
+              label-width="120px"
+              label="提醒时间"
+              prop="otherConfig.day"
+            >
+              <div>
+                每月<el-input
+                  style="width: 202px"
+                  v-model="ruleForm.otherConfig.day"
+                />号
               </div>
             </el-form-item>
-            <el-form-item label-width="120px" :label="ruleForm.cycleType === '2' ? '提醒时间' : ''" prop="reminderTime">
-              <el-time-picker v-model="ruleForm.reminderTime" value-format="yyyy-MM-dd hh:mm:ss" placeholder="选择时间" />
+            <el-form-item
+              label-width="120px"
+              :label="ruleForm.cycleType === '2' ? '提醒时间' : ''"
+              prop="reminderTime"
+            >
+              <el-time-picker
+                v-model="ruleForm.reminderTime"
+                value-format="yyyy-MM-dd hh:mm:ss"
+                placeholder="选择时间"
+              />
             </el-form-item>
           </div>
         </div>
       </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
+          v-if="!prohibitEditing"
+          size="mini"
+          type="primary"
+          @click="submitForm('ruleForm')"
+          >保存</el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -513,10 +773,8 @@ export default {
         width: 202px;
         margin-right: 10px;
       }
-
     }
 
-
     .table {
       height: calc(680px - 34px);
     }
@@ -534,8 +792,6 @@ export default {
     &:active {
       background-color: #2b8070;
     }
-
-    ;
   }
 }