From 64a07733d11138f4120d824c5d1f091d37af33e5 Mon Sep 17 00:00:00 2001
From: hejunjie <hejunjie@datametatech.com>
Date: Thu, 13 Mar 2025 00:00:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=8A=A8=E7=89=A9?=
 =?UTF-8?q?=E9=98=B2=E6=B2=BB=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pestAnimalControl2/InspectionRecords/index.vue   |  4 ++--
 .../pestAnimalControl2/acceptanceRecords/index.vue   |  4 ++--
 .../componentsDetails/acceptanceDetails.vue          |  4 ++--
 .../componentsDetails/inspectionRecordDetails.vue    | 12 ++++++------
 .../componentsDetails/maintenanceDetails.vue         |  6 +++---
 .../pestAnimalControl2/defectList/index.vue          |  4 ++--
 .../pestAnimalControl2/maintenanceRecords/index.vue  |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
index 9c743b8..d6059f2 100644
--- a/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
@@ -203,7 +203,7 @@
             <el-button
               type="text"
               size="small"
-              v-hasPermi="['df:run:patrol:inspection:list:item:check']"
+              v-hasPermi="['df:run:pestanimal2:inspection:list:item:check']"
               @click="handleCheckDetails(scope.row, false)"
             >查看
             </el-button
@@ -212,7 +212,7 @@
               type="text"
               size="small"
               :disabled="scope.row.status !== '1'"
-              v-hasPermi="['df:run:patrol:inspection:list:item:edit']"
+              v-hasPermi="['df:run:pestanimal2:inspection:list:item:edit']"
               @click="handleEditDetails(scope.row, true)"
             >编辑
             </el-button
diff --git a/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
index daf4542..f6f6b24 100644
--- a/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
@@ -217,7 +217,7 @@
             <el-button
               type="text"
               size="small"
-              v-hasPermi="['df:run:patrol:acceptance:list:item:check']"
+              v-hasPermi="['df:run:pestanimal2:acceptance:list:item:check']"
               @click="handleCheckDetails(scope.row, 'check')"
               >查看</el-button
             >
@@ -225,7 +225,7 @@
               type="text"
               size="small"
               :disabled="scope.row.detail.status === '5'"
-              v-hasPermi="['df:run:patrol:acceptance:list:item:edit']"
+              v-hasPermi="['df:run:pestanimal2:acceptance:list:item:edit']"
               @click="handleCheckDetails(scope.row, 'edit')"
               >编辑</el-button
             >
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
index 953c77f..777e4b2 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
@@ -157,13 +157,13 @@
       <el-button
         type="primary"
         @click="handleAccept(true)"
-        v-hasPermi="['df:run:patrol:acceptance:detail:passed']"
+        v-hasPermi="['df:run:pestanimal2:acceptance:detail:passed']"
       >通过</el-button
       >
       <el-button
         type="danger"
         @click="handleAccept(false)"
-        v-hasPermi="['df:run:patrol:acceptance:detail:rejected']"
+        v-hasPermi="['df:run:pestanimal2:acceptance:detail:rejected']"
       >驳回</el-button
       >
     </div>
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
index 859adfc..28f7d20 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
@@ -81,7 +81,7 @@
           :disabled="$route.query.mode === 'check'"
           class="flex-shrink-0 myml-12"
           type="success"
-          v-hasPermi="['df:run:patrol:inspection:detail:add']"
+          v-hasPermi="['df:run:pestanimal2:inspection:detail:add']"
           @click="addProblems"
           >新增</el-button
         >
@@ -90,7 +90,7 @@
           :disabled="$route.query.mode === 'check'"
           class="flex-shrink-0"
           @click="delProblems"
-          v-hasPermi="['df:run:patrol:inspection:detail:allDel']"
+          v-hasPermi="['df:run:pestanimal2:inspection:detail:allDel']"
           size="small"
           >删除</el-button
         >
@@ -237,7 +237,7 @@
                   size="small"
                   style="margin-right: 10px"
                   type="text"
-                  v-hasPermi="['df:run:patrol:inspection:detail:item:upload']"
+                  v-hasPermi="['df:run:pestanimal2:inspection:detail:item:upload']"
                   >上传图片</el-button
                 >
               </el-upload>
@@ -255,7 +255,7 @@
                   size="small"
                   :disabled="$route.query.mode === 'check'"
                   slot="reference"
-                  v-hasPermi="['df:run:patrol:inspection:detail:item:del']"
+                  v-hasPermi="['df:run:pestanimal2:inspection:detail:item:del']"
                   >删除</el-button
                 >
               </el-popconfirm>
@@ -267,14 +267,14 @@
     <div class="bottom-btns" v-if="$route.query.mode !== 'check'">
       <el-button
         type="primary"
-        v-hasPermi="['df:run:patrol:inspection:detail:submit']"
+        v-hasPermi="['df:run:pestanimal2:inspection:detail:submit']"
         @click="handleSave(true)"
       >
         保存并提交
       </el-button>
       <el-button
         type="primary"
-        v-hasPermi="['df:run:patrol:inspection:detail:save']"
+        v-hasPermi="['df:run:pestanimal2:inspection:detail:save']"
         @click="handleSave(false)"
       >
         保存
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
index 16be4f5..c0ef28c 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
@@ -116,7 +116,7 @@
                 style="margin-right: 16px;"
                 size="small"
                 type="primary"
-                v-hasPermi="['df:run:patrol:maintenance:detail:attachment']"
+                v-hasPermi="['df:run:pestanimal2:maintenance:detail:attachment']"
               >上传</el-button>
               <div slot="tip" style="margin-top: 0" class="el-upload__tip">文件上传支持.jpg.png.tif.gif 单张图片5M以内，最多上传3张</div>
             </div>
@@ -134,13 +134,13 @@
       <el-button
         type="primary"
         @click="handleSave(true)"
-        v-hasPermi="['df:run:patrol:maintenance:detail:submit']"
+        v-hasPermi="['df:run:pestanimal2:maintenance:detail:submit']"
       >保存并提交</el-button
       >
       <el-button
         type="primary"
         @click="handleSave(false)"
-        v-hasPermi="['df:run:patrol:maintenance:detail:save']"
+        v-hasPermi="['df:run:pestanimal2:maintenance:detail:save']"
       >保存</el-button
       >
       <el-button @click="$router.go(-1)">返回</el-button>
diff --git a/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue b/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
index affe36a..d09558c 100644
--- a/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
@@ -204,14 +204,14 @@
             <el-button
               type="text"
               size="small"
-              v-hasPermi="['df:run:patrol:defect:list:item:getInvoices']"
+              v-hasPermi="['df:run:pestanimal2:defect:list:item:getInvoices']"
               @click="handleReceiveDetails(scope.row)"
             >领单</el-button
             >
             <el-button
               type="text"
               size="small"
-              v-hasPermi="['df:run:patrol:defect:list:item:check']"
+              v-hasPermi="['df:run:pestanimal2:defect:list:item:check']"
               @click="handleCheckDetails(scope.row)"
             >查看</el-button
             >
diff --git a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
index becead3..6108e55 100644
--- a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
@@ -229,14 +229,14 @@
             <el-button
               type="text"
               size="small"
-              v-hasPermi="['df:run:patrol:maintenance:list:item:check']"
+              v-hasPermi="['df:run:pestanimal2:maintenance:list:item:check']"
               @click="handleCheckDetails(scope.row, 'check')"
             >查看</el-button
             >
             <el-button
               type="text"
               size="small"
-              v-hasPermi="['df:run:patrol:maintenance:list:item:edit']"
+              v-hasPermi="['df:run:pestanimal2:maintenance:list:item:edit']"
               :disabled="scope.row.status !== '4'"
               @click="handleCheckDetails(scope.row, 'edit')"
             >编辑</el-button

From f11191572a645410c17c23e92df0356cd2af3422 Mon Sep 17 00:00:00 2001
From: hejunjie <hejunjie@datametatech.com>
Date: Thu, 13 Mar 2025 11:42:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=8A=A8?=
 =?UTF-8?q?=E7=89=A9=E9=98=B2=E6=B2=BB=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dike/pestAnimalControl2.js            | 97 +++++++++++++++++++
 .../InspectionRecords/index.vue               |  6 +-
 .../acceptanceRecords/index.vue               |  6 +-
 .../componentsDetails/acceptanceDetails.vue   | 17 ++--
 .../componentsDetails/defectDetails.vue       |  8 +-
 .../inspectionRecordDetails.vue               | 26 ++---
 .../componentsDetails/maintenanceDetails.vue  | 24 ++---
 .../pestAnimalControl2/defectList/index.vue   |  6 +-
 .../maintenanceRecords/index.vue              |  6 +-
 9 files changed, 146 insertions(+), 50 deletions(-)
 create mode 100644 src/api/dike/pestAnimalControl2.js

diff --git a/src/api/dike/pestAnimalControl2.js b/src/api/dike/pestAnimalControl2.js
new file mode 100644
index 0000000..3de0d97
--- /dev/null
+++ b/src/api/dike/pestAnimalControl2.js
@@ -0,0 +1,97 @@
+// 堤防相关接口
+import request from "@/utils/request";
+export * from "../sluice/analysis";
+
+/*************************************巡查记录管理**************************************/
+// 堤防巡视检查记录列表v2
+export function postV2RecordList(data) {
+  return request({
+    url: "/run/dw/v2/record/list",
+    method: "post",
+    data,
+  });
+}
+// 堤防巡视检查记录新增或修改v2
+export function postV2Record(data, commit) {
+  return request({
+    url: `/run/dw/v2/record/${commit}`,
+    method: "post",
+    data,
+  });
+}
+
+// 堤防巡视检查记录详情v2
+export function gettV2Record(id) {
+  return request({
+    url: `/run/dw/v2/record/${id}`,
+    method: "get",
+  });
+}
+
+/*************************************缺陷清单管理**************************************/
+// 堤防巡查缺陷列表v2
+export function postV2ProblemList(data) {
+  return request({
+    url: "/run/dw/v2/problem/list",
+    method: "post",
+    data,
+  });
+}
+/*************************************养护记录管理**************************************/
+// 堤防养护列表v2
+export function postV2YhList(data) {
+  return request({
+    url: "/run/dw/v2/yh/list",
+    method: "post",
+    data,
+  });
+}
+
+// 堤防养护详情v2
+export function getV2Yh(id) {
+  return request({
+    url: `/run/dw/v2/yh/${id}`,
+    method: "get",
+  });
+}
+
+// 堤防养护新增或修改v2
+export function postV2Yh(data, commit) {
+  return request({
+    url: `/run/dw/v2/yh/${commit}`,
+    method: "post",
+    data,
+  });
+}
+/*************************************验收记录管理**************************************/
+// 审批列表
+export function postV2ApprovalList(data) {
+  return request({
+    url: "/run/dw/v2/yh/approval/list",
+    method: "post",
+    data,
+  });
+}
+// 审批通过
+export function postV2ApprovalPassed(data, id) {
+  return request({
+    url: `/run/dw/v2/yh/approval/passed/${id}`,
+    method: "post",
+    data,
+  });
+}
+// 审批驳回
+export function postV2ApprovalRejected(data, id) {
+  return request({
+    url: `/run/dw/v2/yh/approval/rejected/${id}`,
+    method: "post",
+    data,
+  });
+}
+// 审批意见
+export function getV2ApprovalComment(formId) {
+  return request({
+    url: `/run/dw/v2/yh/approval/comment/${formId}`,
+    method: "get",
+  });
+}
diff --git a/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
index d6059f2..68de296 100644
--- a/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/InspectionRecords/index.vue
@@ -136,8 +136,8 @@
       >
         <el-table-column prop="id" align="center" label="单号"/>
         <el-table-column prop="checkingName" align="center" label="防治项目名称"/>
-        <el-table-column prop="dikeName" align="center" label="工程名称"/>
-        <el-table-column prop="dikeCode" align="center" label="工程代码"/>
+        <el-table-column prop="projectName" align="center" label="工程名称"/>
+        <el-table-column prop="projectCode" align="center" label="工程代码"/>
 
         <el-table-column prop="type" align="center" label="检查类型">
           <template slot-scope="scope">
@@ -241,7 +241,7 @@ import {calcTableHeight} from "@/mixins/calcTableHeight";
 
 import {
   postV2RecordList
-} from "@/api/dike/patrolMaintenance";
+} from "@/api/dike/pestAnimalControl2";
 
 export default {
   components: {TopBackTitle},
diff --git a/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
index f6f6b24..1dc5ad0 100644
--- a/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/acceptanceRecords/index.vue
@@ -151,8 +151,8 @@
       <el-table :height="tableHeight" :data="tableData" border>
         <el-table-column prop="id" align="center" label="单号" />
         <el-table-column prop="detail.name" align="center" label="防治项目名称" />
-        <el-table-column prop="dikeName" align="center" label="工程名称"/>
-        <el-table-column prop="dikeCode" align="center" label="工程代码"/>
+        <el-table-column prop="projectName" align="center" label="工程名称"/>
+        <el-table-column prop="projectCode" align="center" label="工程代码"/>
         <el-table-column align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
@@ -251,7 +251,7 @@
 import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import { calcTableHeight } from "@/mixins/calcTableHeight";
 
-import { postV2ApprovalList } from "@/api/dike/patrolMaintenance";
+import { postV2ApprovalList } from "@/api/dike/pestAnimalControl2";
 export default {
   components: { TopBackTitle },
   mixins: [calcTableHeight],
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
index 777e4b2..a11220e 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/acceptanceDetails.vue
@@ -8,7 +8,7 @@
         <el-row>
           <el-col :span="8">
             <div class="tc-text2">堤防名称：</div>
-            <div class="tc-text1">{{ form.dikeName }}</div>
+            <div class="tc-text1">{{ form.projectName }}</div>
           </el-col>
           <el-col :span="8">
             <div class="tc-text2">堤防巡查责任人：</div>
@@ -173,7 +173,7 @@
 import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import {calcTableHeight} from "@/mixins/calcTableHeight";
 import SyMixMap from "@/views/components/SyMixMap.vue";
-import {getV2Yh, getV2ApprovalComment, gettV2Record, postV2ApprovalPassed, postV2ApprovalRejected} from "@/api/dike/patrolMaintenance";
+import {getV2Yh, getV2ApprovalComment, gettV2Record, postV2ApprovalPassed, postV2ApprovalRejected} from "@/api/dike/pestAnimalControl2";
 import {getDictMapData} from "@/api/system/dict/data";
 import {mapGetters} from "vuex";
 
@@ -200,7 +200,7 @@ export default {
         images: '',
         createName: '',
         userName: '',
-        dikeName: '',
+        projectName: '',
         category: '',
         parts: '',
         partsName: '',
@@ -210,8 +210,8 @@ export default {
         problemImages: '',
         problemLevel: '',
         createUid: '',
-        dikeCode: '',
-        dikeType: '',
+        projectCode: '',
+        projectType: '',
         type: '',
         time: [],
         scope: '',
@@ -219,7 +219,6 @@ export default {
       rules: {
         userName: [{required: true}],
         projectName: [{required: true}],
-        dikeName: [{required: true}],
         inspectionCategory: [{required: true}],
         time: [{required: true}],
         describe: [{required: true}],
@@ -251,15 +250,15 @@ export default {
       const checking = await gettV2Record(this.$route.query.recordId)
       this.form.createName = checking.data.createName
       this.form.operator = this.userName
-      this.form.dikeName = checking.data.dikeName
+      this.form.projectName = checking.data.projectName
       this.form.checkingId = checking.data.checkingId
       this.form.checkingName = checking.data.checkingName
       this.form.status = checking.data.status
       this.form.problems = checking.data.problems
       this.form.category = checking.data.category
       this.form.createUid = checking.data.createUid
-      this.form.dikeCode = checking.data.dikeCode
-      this.form.dikeType = checking.data.dikeType
+      this.form.projectCode = checking.data.projectCode
+      this.form.projectType = checking.data.projectType
       this.form.type = checking.data.type
       this.form.startDate = checking.data.startDate
       this.form.endDate = checking.data.endDate
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue
index b67d73c..d1fce0b 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/defectDetails.vue
@@ -8,7 +8,7 @@
         <el-row>
           <el-col :span="8">
             <div class="tc-text2">堤防名称：</div>
-            <div class="tc-text1">{{ form.dikeName }}</div>
+            <div class="tc-text1">{{ form.projectName }}</div>
           </el-col>
           <el-col :span="8">
             <div class="tc-text2">堤防巡查责任人：</div>
@@ -62,7 +62,7 @@
 import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import {calcTableHeight} from "@/mixins/calcTableHeight";
 import SyMixMap from "@/views/components/SyMixMap.vue";
-import {gettV2Record} from "@/api/dike/patrolMaintenance";
+import {gettV2Record} from "@/api/dike/pestAnimalControl2";
 import {getDictMapData} from "@/api/system/dict/data";
 
 export default {
@@ -77,7 +77,7 @@ export default {
       maintenanceLevel: [],
       form: {
         createName: '',
-        dikeName: '',
+        projectName: '',
         category: '',
         parts: '',
         partsName: '',
@@ -105,7 +105,7 @@ export default {
     async initData() {
       const checking = await gettV2Record(this.$route.query.recordId)
       this.form.createName = checking.data.createName
-      this.form.dikeName = checking.data.dikeName
+      this.form.projectName = checking.data.projectName
       this.form.problems = checking.data.problems
       this.form.category = checking.data.category
       this.form.startDate = checking.data.startDate
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
index 28f7d20..a367028 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/inspectionRecordDetails.vue
@@ -17,8 +17,8 @@
           <el-form-item label="防治项目名称:" prop="name">
             {{ form.name }}
           </el-form-item>
-          <el-form-item label="巡查堤防名称:" prop="dikeName">
-            {{ form.dikeName }}
+          <el-form-item label="巡查堤防名称:" prop="projectName">
+            {{ form.projectName }}
           </el-form-item>
           <el-form-item label="防治类别:" prop="category">
             {{ getDictLabelName(form.category, "maintenanceCategory") }}
@@ -292,7 +292,7 @@ import {
   getRecordTraceList,
   getV2PatrolChecking,
 } from "@/api/dike";
-import { gettV2Record, postV2Record } from "@/api/dike/patrolMaintenance";
+import { gettV2Record, postV2Record } from "@/api/dike/pestAnimalControl2";
 import { uploadFileData } from "@/api/system/upload";
 import { getDictMapData } from "@/api/system/dict/data";
 
@@ -315,11 +315,11 @@ export default {
       form: {
         createName: "",
         name: "",
-        dikeName: "",
+        projectName: "",
         category: "",
         createUid: "",
-        dikeCode: "",
-        dikeType: "",
+        projectCode: "",
+        projectType: "",
         type: "",
         time: [],
         scope: "",
@@ -327,7 +327,7 @@ export default {
       rules: {
         createName: [{ required: true }],
         name: [{ required: true }],
-        dikeName: [{ required: true }],
+        projectName: [{ required: true }],
         category: [{ required: true }],
         time: [{ required: true, message: "请选择巡查时间", trigger: "change"}],
         scope: [{ required: true, message: "请输入巡查方位", trigger: "change" }],
@@ -365,11 +365,11 @@ export default {
       const checking = await getV2PatrolChecking(this.$route.query.checkingId);
       this.form.createName = checking.data.createName;
       this.form.name = checking.data.name;
-      this.form.dikeName = checking.data.dikeName;
+      this.form.projectName = checking.data.projectName;
       this.form.category = checking.data.category;
       this.form.createUid = checking.data.createUid;
-      this.form.dikeCode = checking.data.dikeCode;
-      this.form.dikeType = checking.data.dikeType;
+      this.form.projectCode = checking.data.projectCode;
+      this.form.projectType = checking.data.projectType;
       this.form.type = checking.data.type;
       const items = checking.data.items;
       getDictMapData("df_xs_c_classfy").then((res) => {
@@ -496,9 +496,9 @@ export default {
             checkingName: this.form.name,
             createName: this.form.createName,
             createUid: this.form.createUid,
-            dikeName: this.form.dikeName,
-            dikeCode: this.form.dikeCode,
-            dikeType: this.form.dikeType,
+            projectName: this.form.projectName,
+            projectCode: this.form.projectCode,
+            projectType: this.form.projectType,
             scope: this.form.scope,
             problems: this.problemsData,
             startDate:
diff --git a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
index c0ef28c..5d00307 100644
--- a/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/componentsDetails/maintenanceDetails.vue
@@ -8,7 +8,7 @@
         <el-row>
           <el-col :span="8">
             <div class="tc-text2">堤防名称：</div>
-            <div class="tc-text1">{{ form.dikeName }}</div>
+            <div class="tc-text1">{{ form.projectName }}</div>
           </el-col>
           <el-col :span="8">
             <div class="tc-text2">堤防巡查责任人：</div>
@@ -152,7 +152,7 @@ import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import { calcTableHeight } from "@/mixins/calcTableHeight";
 import SyMixMap from "@/views/components/SyMixMap.vue";
 import { uploadFileData } from "@/api/system/upload";
-import { getV2Yh, postV2Yh, gettV2Record } from "@/api/dike/patrolMaintenance";
+import { getV2Yh, postV2Yh, gettV2Record } from "@/api/dike/pestAnimalControl2";
 import { getDictMapData } from "@/api/system/dict/data";
 import { mapGetters } from "vuex";
 
@@ -176,7 +176,7 @@ export default {
         images: [],
         createName: '',
         userName: '',
-        dikeName: '',
+        projectName: '',
         category: '',
         parts: '',
         partsName: '',
@@ -186,8 +186,8 @@ export default {
         problemImages: '',
         problemLevel: '',
         createUid: '',
-        dikeCode: '',
-        dikeType: '',
+        projectCode: '',
+        projectType: '',
         type: '',
         time: [],
         scope: '',
@@ -195,7 +195,7 @@ export default {
       rules: {
         userName: [{required: true}],
         projectName: [{required: true}],
-        dikeName: [{required: true}],
+        projectName: [{required: true}],
         inspectionCategory: [{required: true}],
         time: [{required: true, message: "请选择巡查时间", trigger: "change"}],
         describe: [{required: true, message: "输入巡查详情", trigger: "change"}],
@@ -225,15 +225,15 @@ export default {
       this.form.createName = checking.data.createName
       this.form.userName = this.userName
       this.form.userId = this.userId
-      this.form.dikeName = checking.data.dikeName
+      this.form.projectName = checking.data.projectName
       this.form.checkingId = checking.data.checkingId
       this.form.checkingName = checking.data.checkingName
       this.form.status = checking.data.status
       this.form.problems = checking.data.problems
       this.form.category = checking.data.category
       this.form.createUid = checking.data.createUid
-      this.form.dikeCode = checking.data.dikeCode
-      this.form.dikeType = checking.data.dikeType
+      this.form.projectCode = checking.data.projectCode
+      this.form.projectType = checking.data.projectType
       this.form.type = checking.data.type
       this.form.startDate = checking.data.startDate
       this.form.endDate = checking.data.endDate
@@ -342,9 +342,9 @@ export default {
         if (valid) {
           const data = {
             name: this.form.checkingName,
-            dikeCode: this.form.dikeCode,
-            dikeType: this.form.dikeType,
-            dikeName: this.form.dikeName,
+            projectCode: this.form.projectCode,
+            projectType: this.form.projectType,
+            projectName: this.form.projectName,
             status: this.form.status,
             type: this.form.type,
             category: this.form.category,
diff --git a/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue b/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
index d09558c..d7976b7 100644
--- a/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/defectList/index.vue
@@ -155,8 +155,8 @@
       >
         <el-table-column prop="id" align="center" label="单号" />
         <el-table-column prop="checkingName" align="center" label="防治项目名称" />
-        <el-table-column prop="dikeName" align="center" label="工程名称"/>
-        <el-table-column prop="dikeCode" align="center" label="工程代码"/>
+        <el-table-column prop="projectName" align="center" label="工程名称"/>
+        <el-table-column prop="projectCode" align="center" label="工程代码"/>
         <el-table-column prop="type" align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
@@ -239,7 +239,7 @@ import { calcTableHeight } from "@/mixins/calcTableHeight";
 
 import {
   postV2ProblemList
-} from "@/api/dike/patrolMaintenance";
+} from "@/api/dike/pestAnimalControl2";
 export default {
   components: {TopBackTitle},
   mixins: [calcTableHeight],
diff --git a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
index 6108e55..03a6dcd 100644
--- a/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/pestAnimalControl2/maintenanceRecords/index.vue
@@ -155,8 +155,8 @@
       >
         <el-table-column prop="id" 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="projectName" align="center" label="工程名称"/>
+        <el-table-column prop="projectCode" align="center" label="工程代码"/>
         <el-table-column prop="type" align="center" label="检查类型">
           <template slot-scope="scope">
             <span>{{
@@ -264,7 +264,7 @@ import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import { calcTableHeight } from "@/mixins/calcTableHeight";
 import {
   postV2YhList
-} from "@/api/dike/patrolMaintenance";
+} from "@/api/dike/pestAnimalControl2";
 export default {
   components: {TopBackTitle},
   mixins: [calcTableHeight],