From 1fbc208b5c48fccb60dfa5905a7511f8d4f6bd74 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 13 Jun 2024 12:12:22 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dike/runManage/enginerring/inspectionRecords/index.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue
index d3399f9..8f43f63 100644
--- a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue
@@ -146,7 +146,7 @@ export default {
           adcd: this.paramsData.adcd,
           dikeName: this.paramsData.dikeName,
           dikeType: this.paramsData.dikeType,
-          name: this.paramsData.name,
+          lineName: this.paramsData.name,
           lineType: this.paramsData.lineType,
           dutyHolderType: this.paramsData.dutyHolderType,
           status: this.paramsData.status,

From 3434f22ee86d3256b33985539cec247128388ff0 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 13 Jun 2024 14:20:43 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runManage/enginerring/inspectionRecords/index.vue    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue
index 8f43f63..b7e97e0 100644
--- a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue
@@ -199,6 +199,15 @@ export default {
     },
     // 重置搜索
     handleResetQuery() {
+      this.paramsData.adcd = "";
+      this.paramsData.dikeName = "";
+      this.paramsData.dikeType = "";
+      this.paramsData.name = "";
+      this.paramsData.lineType = "";
+      this.paramsData.dutyHolderType = "";
+      this.paramsData.status = "";
+      this.pageData.pageNum = 1;
+
       this.searchInput = "";
       this.getTableData();
     },

From 62c580bc7ecdf7a48bd7e2d5c45a60c24313a893 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 13 Jun 2024 14:44:48 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E5=B7=A1=E6=9F=A5=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enginerring/inspectionPlan/index.vue      | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
index 2ab3859..deafb77 100644
--- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
@@ -10,6 +10,8 @@ import {
   listUser,
 } from "@/api/management";
 
+import { deleteProjectCheckingPlan } from "@/api/dike";
+
 import TopBackTitle from "@/components/TopBackTitle/index.vue";
 
 import { uploadFileData } from "@/api/system/upload";
@@ -237,6 +239,31 @@ export default {
           this.pageData.total = res.total;
         }
       });
+    },
+        // 批量删除
+    handleDelAll() {
+      if (this.tableCheckData.length === 0) {
+        this.$message.warning("请选择要删除的数据");
+        return;
+      }
+      this.$confirm("是否删除选中的记录?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          console.log("删除");
+          const ids = this.tableCheckData.map((item) => item.id);
+          deleteProjectCheckingPlan(ids.join(",")).then((res) => {
+            if (res) {
+              this.$message.success("删除成功");
+              this.getTableData();
+            }
+          });
+        })
+        .catch(() => {
+          console.log("取消删除");
+        });
     },
     // 上传前
     beforeUpload(e) {
@@ -399,7 +426,7 @@ export default {
             >新增</el-button
           >
           <!-- <el-button size="small">编辑</el-button> -->
-          <el-button type="danger" size="small">删除</el-button>
+          <el-button type="danger" size="small" @click="handleDelAll">删除</el-button>
         </div>
       </div>
 

From 85bd47f37742c2a099f8515fd04805a16d8f864e Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 13 Jun 2024 15:29:25 +0800
Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dike/runManage/enginerring/inspectionPlan/index.vue    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
index deafb77..d12c612 100644
--- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
@@ -44,6 +44,7 @@ export default {
         pageSizes: [10, 20, 50, 100],
         total: 0, // 总数量
       },
+      tableCheckData: [], // 选中的数据
       ruleForm: {
         dikeCode: this.$route.query.dikeCode || "",
         name: "",
@@ -293,6 +294,10 @@ export default {
       this.pageData.pageNum = 1;
       this.getTableData();
     },
+    handleSelectionChange(e) {
+      console.log("handleSelectionChange >>>>>  ", e);
+      this.tableCheckData = e || [];
+    },
     handleResetQuery() {
       this.paramsData.name = "";
       this.paramsData.status = "";
@@ -430,7 +435,7 @@ export default {
         </div>
       </div>
 
-      <el-table :data="tableData" border>
+      <el-table :data="tableData" border @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="status" align="center" label="状态">
           <template slot-scope="scope">

From 6a40797e2a53017a0b982af595a05b3e95da25ad Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 13 Jun 2024 18:14:26 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A1=E6=9F=A5?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E8=80=85=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enginerring/inspectionPlan/components/PlanDetail.vue     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
index 08762d0..6e0a609 100644
--- a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
+++ b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
@@ -248,7 +248,7 @@
               >
                 <el-option
                   v-for="item in personnelList"
-                  :key="item.id"
+                  :key="item.uid"
                   :label="item.name"
                   :value="item"
                 >
@@ -520,9 +520,8 @@ export default {
       }).then((res) => {
         this.personnelList = res.records.map((item) => {
           return {
-            id: item.id,
             name: item.nickName,
-            uid: item.uuid,
+            uid: item.id,
           };
         });
       });

From ace88ed6e35042b99044a4ce45767598b8803cee Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 13 Jun 2024 18:22:46 +0800
Subject: [PATCH 6/9] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E5=89=8D=E5=85=88?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E9=80=89=E6=8B=A9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runManage/enginerring/inspectionRouteManage/index.vue     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue
index 0f4fafb..d180ff9 100644
--- a/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue
@@ -536,6 +536,10 @@ export default {
       this.tableCheckData = e || [];
     },
     handleDelAll() {
+      if (this.tableCheckData.length === 0) {
+        this.$message.warning("请选择要删除的数据");
+        return;
+      }
       this.$confirm("是否批量删除已选中的路线?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

From 99ab77cc93b874925492674e0bc5aa79f9ea7af9 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 13 Jun 2024 20:41:55 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E9=99=90=E5=88=B6=E8=B4=A3=E4=BB=BB?=
 =?UTF-8?q?=E4=BA=BA=E5=8F=AF=E9=80=89=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dike/runManage/enginerring/inspectionPlan/index.vue  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
index d12c612..6461018 100644
--- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
+++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue
@@ -291,8 +291,13 @@ export default {
       this.ruleForm.files.splice(index, 1);
     },
     handleChangeQuery() {
-      this.pageData.pageNum = 1;
-      this.getTableData();
+      if(this.paramsData.userIds.length > 5){
+          this.$message.warning("最多只能选取5名责任人");
+          this.paramsData.userIds.splice(-1);
+      }else{
+        this.pageData.pageNum = 1;
+        this.getTableData();
+      }
     },
     handleSelectionChange(e) {
       console.log("handleSelectionChange >>>>>  ", e);

From 2f6c9f6099cde8a8724394b6d535632c3f4a90a7 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 13 Jun 2024 20:51:29 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enginerring/inspectionPlan/components/PlanDetail.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
index 6e0a609..a31fb5e 100644
--- a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
+++ b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
@@ -243,7 +243,7 @@
                 filterable
                 remote
                 :remote-method="searchUser"
-                value-key="id"
+                value-key="uid"
                 placeholder="请输入关键词搜索用户"
               >
                 <el-option

From fa12ffbde776bd2def41c4dabe47ec5eba482940 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 13 Jun 2024 20:56:17 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E9=99=90=E5=88=B6=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B9=E6=9C=80=E5=A4=9A50=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enginerring/inspectionPlan/components/PlanDetail.vue      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
index a31fb5e..6f2e6d9 100644
--- a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
+++ b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
@@ -488,6 +488,10 @@ export default {
       this.formData.remindDay = [];
     },
     handleAddNewPlan() {
+      if( this.formData.contents.length >= 50) {
+        this.$message.warning("最多添加50个子项");
+        return;
+      }
       this.formData.contents.push({
         planDateTimeArr: [],
         startDate: "",