From 8f5d1f0323ced14f1e917c5badd7d807a22ed609 Mon Sep 17 00:00:00 2001
From: hejunjie <hejunjie@datametatech.com>
Date: Tue, 23 Jul 2024 10:07:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E8=BD=AE=E6=8F=90=E6=B5=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dike/index.js                                    | 8 ++++++++
 .../dike/runManage/maintenance/maintenancePlan/index.vue | 9 +++------
 .../maintenance/maintenancePlanAccept/index.vue          | 5 ++++-
 .../runManage/maintenance/maintenancePlanAudit/index.vue | 5 ++++-
 .../maintenanceRecords/components/RecordDetail.vue       | 4 ++--
 .../runManage/maintenance/maintenancePlan/index.vue      | 3 ++-
 .../maintenance/maintenancePlanAccept/index.vue          | 5 ++++-
 .../runManage/maintenance/maintenancePlanAudit/index.vue | 5 ++++-
 .../maintenanceRecords/components/RecordDetail.vue       | 4 ++--
 9 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/api/dike/index.js b/src/api/dike/index.js
index addc1e8..a93cb7b 100644
--- a/src/api/dike/index.js
+++ b/src/api/dike/index.js
@@ -286,6 +286,14 @@ export function postYhRecordaApproval(data) {
   })
 }
 
+// 删除计划
+export function delRunDzYhPlan(data) {
+  return request({
+    url: `/run/df/yh/plan/${data.id}`,
+    method: 'del'
+  })
+}
+
 // 修改维养记录状态
 export function updateYhRecordStatus(data) {
   return request({
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
index 0d41b42..e49a691 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@@ -1,13 +1,10 @@
 <!-- 巡查计划管理-堤防 -->
 <script>
-import {
-  deleteDFInspectionPlan,
-} from "@/api/management";
 import {
   postYhPlanApprovalReturn,
 } from "@/api/dike";
 
-import { deleteProjectCheckingPlan, getDikeYhPlanList, postYhPlanApproval } from "@/api/dike";
+import { delRunDzYhPlan, getDikeYhPlanList, postYhPlanApproval } from "@/api/dike";
 
 import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import PlanDetail from "./components/PlanDetail.vue";
@@ -132,7 +129,7 @@ export default {
     },
     // 删除对应巡查项目
     deleteTableItem(row) {
-      deleteDFInspectionPlan(row.id).then((res) => {
+      delRunDzYhPlan({id: row.id}).then((res) => {
         this.getTableData();
         this.$message.success("删除成功");
       });
@@ -183,7 +180,7 @@ export default {
         .then(() => {
           console.log("删除");
           const ids = this.tableCheckData.map((item) => item.id);
-          deleteProjectCheckingPlan(ids.join(",")).then((res) => {
+          delRunDzYhPlan({id: ids.join(",")}).then((res) => {
             if (res) {
               this.$message.success("删除成功");
               this.getTableData();
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
index a622445..8a1572f 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -446,7 +446,10 @@ export default {
         <el-table-column prop="comment" align="center" label="审批意见">
           <template #default="scope">
             <el-tooltip class="item" :content="scope.row.comment" placement="top">
-              <span>{{ scope.row.comment.slice(0, 50) }}{{scope.row.comment.length > 50 ? '...' : ''}}</span>
+              <span>
+                {{ scope.row.comment ? scope.row.comment.slice(0, 50) : '' }}
+                {{scope.row.comment && scope.row.comment.length > 50 ? '...' : ''}}
+              </span>
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
index 95eb0b4..39dc0d7 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -443,7 +443,10 @@ export default {
         <el-table-column prop="comment" align="center" label="审批意见">
           <template #default="scope">
             <el-tooltip class="item" :content="scope.row.comment" placement="top">
-              <span>{{ scope.row.comment.slice(0, 50) }}{{scope.row.comment.length > 50 ? '...' : ''}}</span>
+              <span>
+                {{ scope.row.comment ? scope.row.comment.slice(0, 50) : '' }}
+                {{scope.row.comment && scope.row.comment.length > 50 ? '...' : ''}}
+              </span>
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index e0f7f98..2e563e9 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -205,8 +205,7 @@
             :key="url"
           >
             <el-image
-              :src="url"
-              :preview-src-list="[url]"
+              :src="url.url"
               class="w-240 h-124"
             ></el-image>
             <i
@@ -545,6 +544,7 @@ export default {
       fData.append("file", file);
       uploadFileData(fData)
         .then((res) => {
+          console.log(res)
           this.ledgerList.push({
             name: file.name,
             url: res.url,
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
index dcb7edf..ea75c1d 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
@@ -183,7 +183,7 @@ export default {
         .then(() => {
           console.log("删除");
           const ids = this.tableCheckData.map((item) => item.id);
-          delRunSzYhPlan(ids.join(",")).then((res) => {
+          delRunSzYhPlan({id: ids.join(",")}).then((res) => {
             if (res) {
               this.$message.success("删除成功");
               this.getTableData();
@@ -196,6 +196,7 @@ export default {
     },
     // 表格列表多选
     handleSelectionChange(e) {
+      console.log(e)
       this.tableCheckData = e || [];
     },
     // 搜索
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
index 4987567..5f3e40c 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -439,7 +439,10 @@ export default {
         <el-table-column prop="comment" align="center" label="审批意见">
           <template #default="scope">
             <el-tooltip class="item" :content="scope.row.comment" placement="top">
-              <span>{{ scope.row.comment.slice(0, 50) }}{{scope.row.comment.length > 50 ? '...' : ''}}</span>
+              <span>
+                {{ scope.row.comment ? scope.row.comment.slice(0, 50) : '' }}
+                {{scope.row.comment && scope.row.comment.length > 50 ? '...' : ''}}
+              </span>
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
index 0135c38..58e240e 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -434,7 +434,10 @@ export default {
         <el-table-column prop="comment" align="center" label="审批意见">
           <template #default="scope">
             <el-tooltip class="item" :content="scope.row.comment" placement="top">
-              <span>{{ scope.row.comment.slice(0, 50) }}{{scope.row.comment.length > 50 ? '...' : ''}}</span>
+              <span>
+                {{ scope.row.comment ? scope.row.comment.slice(0, 50) : '' }}
+                {{scope.row.comment && scope.row.comment.length > 50 ? '...' : ''}}
+              </span>
             </el-tooltip>
           </template>
         </el-table-column>
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index 9dece66..49d0b27 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -206,8 +206,8 @@
             :key="url"
           >
             <el-image
-              :src="url"
-              :preview-src-list="[url]"
+              :src="url.url"
+              :preview-src-list="[url.url]"
               class="w-240 h-124"
             ></el-image>
             <i